2213 files changed, 134822 insertions, 117974 deletions

diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/.classpath b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/.classpath
index c1f31893de4..c1f31893de4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/.classpath
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/.classpath
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/.project b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/.project
index 0f922a23738..bd6c5dc5bdd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/.project
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.constraints.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>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.constraints.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/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF
index 536dd5ec717..0f95843ca91 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
-Manifest-Version: 1.0

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

- org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.emf.edit;visibility:=reexport

-Export-Package: org.eclipse.papyrus.infra.constraints.environment.provider,

- org.eclipse.papyrus.infra.constraints.provider

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin$Implementation

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.constraints.edit;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0";visibility:=reexport,
+ org.eclipse.emf.edit;visibility:=reexport
+Export-Package: org.eclipse.papyrus.infra.constraints.environment.provider,
+ org.eclipse.papyrus.infra.constraints.provider
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin$Implementation
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.constraints.edit;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/about.html b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/about.html
index dd3c089a94c..dd3c089a94c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/about.html
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/build.properties b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/build.properties
index c3077b739e6..f1e77099679 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/build.properties
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/build.properties
@@ -1,16 +1,16 @@
-

-# <copyright>

-# </copyright>

-#

-# $Id$

-

-bin.includes = .,\

-               icons/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-jars.compile.order = .

-source.. = src-gen/

-output.. = bin/

-src.includes = about.html

+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html
+jars.compile.order = .
+source.. = src-gen/
+output.. = bin/
+src.includes = about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateCompositeConstraint_constraints_SimpleConstraint.gif b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateCompositeConstraint_constraints_SimpleConstraint.gif
index 7943912208c..7943912208c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateCompositeConstraint_constraints_SimpleConstraint.gif
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateCompositeConstraint_constraints_SimpleConstraint.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateConstraintEnvironment_constraintTypes_ConstraintType.gif b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateConstraintEnvironment_constraintTypes_ConstraintType.gif
index 85a51d1b4a8..85a51d1b4a8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateConstraintEnvironment_constraintTypes_ConstraintType.gif
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateConstraintEnvironment_constraintTypes_ConstraintType.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateDisplayUnit_constraints_CompositeConstraint.gif b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateDisplayUnit_constraints_CompositeConstraint.gif
index 6243419e928..6243419e928 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateDisplayUnit_constraints_CompositeConstraint.gif
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateDisplayUnit_constraints_CompositeConstraint.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateDisplayUnit_constraints_SimpleConstraint.gif b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateDisplayUnit_constraints_SimpleConstraint.gif
index 7943912208c..7943912208c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateDisplayUnit_constraints_SimpleConstraint.gif
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateDisplayUnit_constraints_SimpleConstraint.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateSimpleConstraint_properties_ReferenceProperty.gif b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateSimpleConstraint_properties_ReferenceProperty.gif
index efff0c9aa7b..efff0c9aa7b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateSimpleConstraint_properties_ReferenceProperty.gif
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateSimpleConstraint_properties_ReferenceProperty.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateSimpleConstraint_properties_ValueProperty.gif b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateSimpleConstraint_properties_ValueProperty.gif
index c78943ee9d6..c78943ee9d6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateSimpleConstraint_properties_ValueProperty.gif
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/ctool16/CreateSimpleConstraint_properties_ValueProperty.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/CompositeConstraint.gif b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/CompositeConstraint.gif
index 05dc74ad5da..05dc74ad5da 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/CompositeConstraint.gif
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/CompositeConstraint.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ConstraintEnvironment.gif b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ConstraintEnvironment.gif
index a26660ec28f..a26660ec28f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ConstraintEnvironment.gif
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ConstraintEnvironment.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ConstraintType.gif b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ConstraintType.gif
index c8d381f0b32..c8d381f0b32 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ConstraintType.gif
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ConstraintType.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ReferenceProperty.gif b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ReferenceProperty.gif
index 98b351f1c44..98b351f1c44 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ReferenceProperty.gif
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ReferenceProperty.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/SimpleConstraint.gif b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/SimpleConstraint.gif
index d92f34c8aea..d92f34c8aea 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/SimpleConstraint.gif
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/SimpleConstraint.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ValueProperty.gif b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ValueProperty.gif
index 420eee17752..420eee17752 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ValueProperty.gif
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/icons/full/obj16/ValueProperty.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/plugin.properties b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/plugin.properties
index 478a71e3ef0..78356fccd3d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/plugin.properties
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/plugin.properties
@@ -1,48 +1,48 @@
-

-# <copyright>

-# </copyright>

-#

-# $Id$

-

-pluginName = Constraints Edit Support

-providerName = Eclipse Modeling Project

-

-_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_DisplayUnit_type = Display Unit

-_UI_ConstraintDescriptor_type = Constraint Descriptor

-_UI_SimpleConstraint_type = Simple Constraint

-_UI_CompositeConstraint_type = Composite Constraint

-_UI_ConfigProperty_type = Config Property

-_UI_ValueProperty_type = Value Property

-_UI_ReferenceProperty_type = Reference Property

-_UI_ConstraintEnvironment_type = Constraint Environment

-_UI_ConstraintType_type = Constraint Type

-_UI_Unknown_type = Object

-

-_UI_Unknown_datatype= Value

-

-_UI_DisplayUnit_constraints_feature = Constraints

-_UI_DisplayUnit_elementMultiplicity_feature = Element Multiplicity

-_UI_ConstraintDescriptor_name_feature = Name

-_UI_ConstraintDescriptor_display_feature = Display

-_UI_ConstraintDescriptor_overrideable_feature = Overrideable

-_UI_ConstraintDescriptor_overriddenConstraints_feature = Overridden Constraints

-_UI_SimpleConstraint_constraintType_feature = Constraint Type

-_UI_SimpleConstraint_properties_feature = Properties

-_UI_CompositeConstraint_constraints_feature = Constraints

-_UI_ConfigProperty_name_feature = Name

-_UI_ValueProperty_value_feature = Value

-_UI_ReferenceProperty_value_feature = Value

-_UI_ConstraintEnvironment_constraintTypes_feature = Constraint Types

-_UI_ConstraintType_label_feature = Label

-_UI_ConstraintType_constraintClass_feature = Constraint Class

-_UI_Unknown_feature = Unspecified

-

+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+pluginName = Constraints Edit Support
+providerName = Eclipse Modeling Project
+
+_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_DisplayUnit_type = Display Unit
+_UI_ConstraintDescriptor_type = Constraint Descriptor
+_UI_SimpleConstraint_type = Simple Constraint
+_UI_CompositeConstraint_type = Composite Constraint
+_UI_ConfigProperty_type = Config Property
+_UI_ValueProperty_type = Value Property
+_UI_ReferenceProperty_type = Reference Property
+_UI_ConstraintEnvironment_type = Constraint Environment
+_UI_ConstraintType_type = Constraint Type
+_UI_Unknown_type = Object
+
+_UI_Unknown_datatype= Value
+
+_UI_DisplayUnit_constraints_feature = Constraints
+_UI_DisplayUnit_elementMultiplicity_feature = Element Multiplicity
+_UI_ConstraintDescriptor_name_feature = Name
+_UI_ConstraintDescriptor_display_feature = Display
+_UI_ConstraintDescriptor_overrideable_feature = Overrideable
+_UI_ConstraintDescriptor_overriddenConstraints_feature = Overridden Constraints
+_UI_SimpleConstraint_constraintType_feature = Constraint Type
+_UI_SimpleConstraint_properties_feature = Properties
+_UI_CompositeConstraint_constraints_feature = Constraints
+_UI_ConfigProperty_name_feature = Name
+_UI_ValueProperty_value_feature = Value
+_UI_ReferenceProperty_value_feature = Value
+_UI_ConstraintEnvironment_constraintTypes_feature = Constraint Types
+_UI_ConstraintType_label_feature = Label
+_UI_ConstraintType_constraintClass_feature = Constraint Class
+_UI_Unknown_feature = Unspecified
+
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/plugin.xml b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/plugin.xml
index 49240339f92..f886971c330 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/plugin.xml
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/plugin.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

- <copyright>

- </copyright>

-

- $Id$

--->

-

-<plugin>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <factory

-            uri="http://www.eclipse.org/papyrus/constraints/0.9"

-            class="org.eclipse.papyrus.infra.constraints.provider.ConstraintsItemProviderAdapterFactory"

-            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">

-      <factory

-            uri="http://www.eclipse.org/papyrus/constraints/environment/0.9"

-            class="org.eclipse.papyrus.infra.constraints.environment.provider.EnvironmentItemProviderAdapterFactory"

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

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ <copyright>
+ </copyright>
+
+ $Id$
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <factory
+            uri="http://www.eclipse.org/papyrus/constraints/0.9"
+            class="org.eclipse.papyrus.infra.constraints.provider.ConstraintsItemProviderAdapterFactory"
+            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">
+      <factory
+            uri="http://www.eclipse.org/papyrus/constraints/environment/0.9"
+            class="org.eclipse.papyrus.infra.constraints.environment.provider.EnvironmentItemProviderAdapterFactory"
+            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/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/pom.xml b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/pom.xml
index 657a724b47f..f18670ccaec 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/pom.xml
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-constraints</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.constraints.edit</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/ConstraintEnvironmentItemProvider.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/ConstraintEnvironmentItemProvider.java
index fdbeb855808..83d9af786e4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/ConstraintEnvironmentItemProvider.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/ConstraintEnvironmentItemProvider.java
@@ -1,177 +1,177 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.environment.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.infra.constraints.environment.ConstraintEnvironment;

-import org.eclipse.papyrus.infra.constraints.environment.EnvironmentFactory;

-import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;

-import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ConstraintEnvironmentItemProvider

-		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 ConstraintEnvironmentItemProvider(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(EnvironmentPackage.Literals.CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES);

-		}

-		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 ConstraintEnvironment.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ConstraintEnvironment"));

-	}

-

-	/**

-	 * 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_ConstraintEnvironment_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(ConstraintEnvironment.class)) {

-		case EnvironmentPackage.CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES:

-			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

-				(EnvironmentPackage.Literals.CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES,

-						EnvironmentFactory.eINSTANCE.createConstraintType()));

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return ConstraintsEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment.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.infra.constraints.environment.ConstraintEnvironment;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentFactory;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;
+import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ConstraintEnvironmentItemProvider
+		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 ConstraintEnvironmentItemProvider(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(EnvironmentPackage.Literals.CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES);
+		}
+		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 ConstraintEnvironment.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ConstraintEnvironment"));
+	}
+
+	/**
+	 * 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_ConstraintEnvironment_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(ConstraintEnvironment.class)) {
+		case EnvironmentPackage.CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES:
+			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
+				(EnvironmentPackage.Literals.CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES,
+						EnvironmentFactory.eINSTANCE.createConstraintType()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return ConstraintsEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/ConstraintTypeItemProvider.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/ConstraintTypeItemProvider.java
index d1ad13ecba3..e7a3d88666d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/ConstraintTypeItemProvider.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/ConstraintTypeItemProvider.java
@@ -1,193 +1,193 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.environment.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.infra.constraints.environment.ConstraintType;

-import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;

-import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ConstraintTypeItemProvider

-		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 ConstraintTypeItemProvider(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);

-

-			addLabelPropertyDescriptor(object);

-			addConstraintClassPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Label feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addLabelPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ConstraintType_label_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ConstraintType_label_feature", "_UI_ConstraintType_type"),

-						EnvironmentPackage.Literals.CONSTRAINT_TYPE__LABEL,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Constraint Class feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addConstraintClassPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ConstraintType_constraintClass_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ConstraintType_constraintClass_feature", "_UI_ConstraintType_type"),

-						EnvironmentPackage.Literals.CONSTRAINT_TYPE__CONSTRAINT_CLASS,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This returns ConstraintType.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ConstraintType"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((ConstraintType) object).getLabel();

-		return label == null || label.length() == 0 ?

-				getString("_UI_ConstraintType_type") :

-				getString("_UI_ConstraintType_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(ConstraintType.class)) {

-		case EnvironmentPackage.CONSTRAINT_TYPE__LABEL:

-		case EnvironmentPackage.CONSTRAINT_TYPE__CONSTRAINT_CLASS:

-			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 ConstraintsEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment.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.infra.constraints.environment.ConstraintType;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;
+import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ConstraintTypeItemProvider
+		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 ConstraintTypeItemProvider(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);
+
+			addLabelPropertyDescriptor(object);
+			addConstraintClassPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Label feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addLabelPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+				(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_ConstraintType_label_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_ConstraintType_label_feature", "_UI_ConstraintType_type"),
+						EnvironmentPackage.Literals.CONSTRAINT_TYPE__LABEL,
+						true,
+						false,
+						false,
+						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+						null,
+						null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Constraint Class feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addConstraintClassPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+				(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_ConstraintType_constraintClass_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_ConstraintType_constraintClass_feature", "_UI_ConstraintType_type"),
+						EnvironmentPackage.Literals.CONSTRAINT_TYPE__CONSTRAINT_CLASS,
+						true,
+						false,
+						false,
+						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+						null,
+						null));
+	}
+
+	/**
+	 * This returns ConstraintType.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ConstraintType"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((ConstraintType) object).getLabel();
+		return label == null || label.length() == 0 ?
+				getString("_UI_ConstraintType_type") :
+				getString("_UI_ConstraintType_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(ConstraintType.class)) {
+		case EnvironmentPackage.CONSTRAINT_TYPE__LABEL:
+		case EnvironmentPackage.CONSTRAINT_TYPE__CONSTRAINT_CLASS:
+			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 ConstraintsEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/EnvironmentItemProviderAdapterFactory.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/EnvironmentItemProviderAdapterFactory.java
index db52039fea2..dd3f0be5f3d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/EnvironmentItemProviderAdapterFactory.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/environment/provider/EnvironmentItemProviderAdapterFactory.java
@@ -1,253 +1,253 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.environment.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.infra.constraints.environment.util.EnvironmentAdapterFactory;

-

-/**

- * 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 EnvironmentItemProviderAdapterFactory extends EnvironmentAdapterFactory 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 EnvironmentItemProviderAdapterFactory() {

-		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.infra.constraints.environment.ConstraintEnvironment} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConstraintEnvironmentItemProvider constraintEnvironmentItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createConstraintEnvironmentAdapter() {

-		if (constraintEnvironmentItemProvider == null) {

-			constraintEnvironmentItemProvider = new ConstraintEnvironmentItemProvider(this);

-		}

-

-		return constraintEnvironmentItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConstraintTypeItemProvider constraintTypeItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createConstraintTypeAdapter() {

-		if (constraintTypeItemProvider == null) {

-			constraintTypeItemProvider = new ConstraintTypeItemProvider(this);

-		}

-

-		return constraintTypeItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	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

-	 */

-	@Override

-	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

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	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

-	 */

-	@Override

-	public void dispose() {

-		if (constraintEnvironmentItemProvider != null) {

-			constraintEnvironmentItemProvider.dispose();

-		}

-		if (constraintTypeItemProvider != null) {

-			constraintTypeItemProvider.dispose();

-		}

-	}

-

-}

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment.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.infra.constraints.environment.util.EnvironmentAdapterFactory;
+
+/**
+ * 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 EnvironmentItemProviderAdapterFactory extends EnvironmentAdapterFactory 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 EnvironmentItemProviderAdapterFactory() {
+		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.infra.constraints.environment.ConstraintEnvironment} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ConstraintEnvironmentItemProvider constraintEnvironmentItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Adapter createConstraintEnvironmentAdapter() {
+		if (constraintEnvironmentItemProvider == null) {
+			constraintEnvironmentItemProvider = new ConstraintEnvironmentItemProvider(this);
+		}
+
+		return constraintEnvironmentItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ConstraintTypeItemProvider constraintTypeItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Adapter createConstraintTypeAdapter() {
+		if (constraintTypeItemProvider == null) {
+			constraintTypeItemProvider = new ConstraintTypeItemProvider(this);
+		}
+
+		return constraintTypeItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	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
+	 */
+	@Override
+	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
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	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
+	 */
+	@Override
+	public void dispose() {
+		if (constraintEnvironmentItemProvider != null) {
+			constraintEnvironmentItemProvider.dispose();
+		}
+		if (constraintTypeItemProvider != null) {
+			constraintTypeItemProvider.dispose();
+		}
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/CompositeConstraintItemProvider.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/CompositeConstraintItemProvider.java
index c7260cfcf25..970a7564151 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/CompositeConstraintItemProvider.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/CompositeConstraintItemProvider.java
@@ -1,165 +1,165 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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.infra.constraints.CompositeConstraint;

-import org.eclipse.papyrus.infra.constraints.ConstraintsFactory;

-import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.CompositeConstraint} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class CompositeConstraintItemProvider

-		extends ConstraintDescriptorItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public CompositeConstraintItemProvider(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(ConstraintsPackage.Literals.COMPOSITE_CONSTRAINT__CONSTRAINTS);

-		}

-		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 CompositeConstraint.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CompositeConstraint"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((CompositeConstraint) object).getName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_CompositeConstraint_type") :

-				getString("_UI_CompositeConstraint_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(CompositeConstraint.class)) {

-		case ConstraintsPackage.COMPOSITE_CONSTRAINT__CONSTRAINTS:

-			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

-				(ConstraintsPackage.Literals.COMPOSITE_CONSTRAINT__CONSTRAINTS,

-						ConstraintsFactory.eINSTANCE.createSimpleConstraint()));

-	}

-

-}

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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.infra.constraints.CompositeConstraint;
+import org.eclipse.papyrus.infra.constraints.ConstraintsFactory;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.CompositeConstraint} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class CompositeConstraintItemProvider
+		extends ConstraintDescriptorItemProvider
+		implements
+		IEditingDomainItemProvider,
+		IStructuredItemContentProvider,
+		ITreeItemContentProvider,
+		IItemLabelProvider,
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public CompositeConstraintItemProvider(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(ConstraintsPackage.Literals.COMPOSITE_CONSTRAINT__CONSTRAINTS);
+		}
+		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 CompositeConstraint.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/CompositeConstraint"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((CompositeConstraint) object).getName();
+		return label == null || label.length() == 0 ?
+				getString("_UI_CompositeConstraint_type") :
+				getString("_UI_CompositeConstraint_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(CompositeConstraint.class)) {
+		case ConstraintsPackage.COMPOSITE_CONSTRAINT__CONSTRAINTS:
+			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
+				(ConstraintsPackage.Literals.COMPOSITE_CONSTRAINT__CONSTRAINTS,
+						ConstraintsFactory.eINSTANCE.createSimpleConstraint()));
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConfigPropertyItemProvider.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConfigPropertyItemProvider.java
index 4523a84e738..5621df796d8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConfigPropertyItemProvider.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConfigPropertyItemProvider.java
@@ -1,155 +1,155 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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.infra.constraints.ConfigProperty;

-import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.ConfigProperty} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ConfigPropertyItemProvider

-		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 ConfigPropertyItemProvider(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);

-		}

-		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_ConfigProperty_name_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ConfigProperty_name_feature", "_UI_ConfigProperty_type"),

-						ConstraintsPackage.Literals.CONFIG_PROPERTY__NAME,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_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 = ((ConfigProperty) object).getName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_ConfigProperty_type") :

-				getString("_UI_ConfigProperty_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(ConfigProperty.class)) {

-		case ConstraintsPackage.CONFIG_PROPERTY__NAME:

-			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 ConstraintsEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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.infra.constraints.ConfigProperty;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.ConfigProperty} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ConfigPropertyItemProvider
+		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 ConfigPropertyItemProvider(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);
+		}
+		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_ConfigProperty_name_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_ConfigProperty_name_feature", "_UI_ConfigProperty_type"),
+						ConstraintsPackage.Literals.CONFIG_PROPERTY__NAME,
+						true,
+						false,
+						false,
+						ItemPropertyDescriptor.GENERIC_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 = ((ConfigProperty) object).getName();
+		return label == null || label.length() == 0 ?
+				getString("_UI_ConfigProperty_type") :
+				getString("_UI_ConfigProperty_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(ConfigProperty.class)) {
+		case ConstraintsPackage.CONFIG_PROPERTY__NAME:
+			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 ConstraintsEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintDescriptorItemProvider.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintDescriptorItemProvider.java
index 91d697e9193..20f45f17966 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintDescriptorItemProvider.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintDescriptorItemProvider.java
@@ -1,204 +1,204 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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.infra.constraints.ConstraintDescriptor;

-import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ConstraintDescriptorItemProvider

-		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 ConstraintDescriptorItemProvider(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);

-			addOverrideablePropertyDescriptor(object);

-			addOverriddenConstraintsPropertyDescriptor(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_ConstraintDescriptor_name_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ConstraintDescriptor_name_feature", "_UI_ConstraintDescriptor_type"),

-						ConstraintsPackage.Literals.CONSTRAINT_DESCRIPTOR__NAME,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Overrideable feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addOverrideablePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ConstraintDescriptor_overrideable_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ConstraintDescriptor_overrideable_feature", "_UI_ConstraintDescriptor_type"),

-						ConstraintsPackage.Literals.CONSTRAINT_DESCRIPTOR__OVERRIDEABLE,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Overridden Constraints feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addOverriddenConstraintsPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ConstraintDescriptor_overriddenConstraints_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ConstraintDescriptor_overriddenConstraints_feature", "_UI_ConstraintDescriptor_type"),

-						ConstraintsPackage.Literals.CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS,

-						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 = ((ConstraintDescriptor) object).getName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_ConstraintDescriptor_type") :

-				getString("_UI_ConstraintDescriptor_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(ConstraintDescriptor.class)) {

-		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__NAME:

-		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDEABLE:

-			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 ConstraintsEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ConstraintDescriptorItemProvider
+		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 ConstraintDescriptorItemProvider(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);
+			addOverrideablePropertyDescriptor(object);
+			addOverriddenConstraintsPropertyDescriptor(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_ConstraintDescriptor_name_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_ConstraintDescriptor_name_feature", "_UI_ConstraintDescriptor_type"),
+						ConstraintsPackage.Literals.CONSTRAINT_DESCRIPTOR__NAME,
+						true,
+						false,
+						false,
+						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+						null,
+						null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Overrideable feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addOverrideablePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+				(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_ConstraintDescriptor_overrideable_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_ConstraintDescriptor_overrideable_feature", "_UI_ConstraintDescriptor_type"),
+						ConstraintsPackage.Literals.CONSTRAINT_DESCRIPTOR__OVERRIDEABLE,
+						true,
+						false,
+						false,
+						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+						null,
+						null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Overridden Constraints feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addOverriddenConstraintsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+				(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_ConstraintDescriptor_overriddenConstraints_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_ConstraintDescriptor_overriddenConstraints_feature", "_UI_ConstraintDescriptor_type"),
+						ConstraintsPackage.Literals.CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS,
+						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 = ((ConstraintDescriptor) object).getName();
+		return label == null || label.length() == 0 ?
+				getString("_UI_ConstraintDescriptor_type") :
+				getString("_UI_ConstraintDescriptor_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(ConstraintDescriptor.class)) {
+		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__NAME:
+		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDEABLE:
+			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 ConstraintsEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintsEditPlugin.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintsEditPlugin.java
index 424ea174751..11e4a08727f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintsEditPlugin.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintsEditPlugin.java
@@ -1,99 +1,99 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.provider;

-

-import org.eclipse.emf.common.EMFPlugin;

-import org.eclipse.emf.common.util.ResourceLocator;

-

-/**

- * This is the central singleton for the Constraints edit plugin.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public final class ConstraintsEditPlugin extends EMFPlugin {

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final ConstraintsEditPlugin INSTANCE = new ConstraintsEditPlugin();

-

-	/**

-	 * 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 ConstraintsEditPlugin() {

-		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;

-		}

-	}

-

-}

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.provider;
+
+import org.eclipse.emf.common.EMFPlugin;
+import org.eclipse.emf.common.util.ResourceLocator;
+
+/**
+ * This is the central singleton for the Constraints edit plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public final class ConstraintsEditPlugin extends EMFPlugin {
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static final ConstraintsEditPlugin INSTANCE = new ConstraintsEditPlugin();
+
+	/**
+	 * 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 ConstraintsEditPlugin() {
+		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/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintsItemProviderAdapterFactory.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintsItemProviderAdapterFactory.java
index 9c530692c47..180e09c540e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintsItemProviderAdapterFactory.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ConstraintsItemProviderAdapterFactory.java
@@ -1,309 +1,309 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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.infra.constraints.util.ConstraintsAdapterFactory;

-

-/**

- * 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 ConstraintsItemProviderAdapterFactory extends ConstraintsAdapterFactory 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 ConstraintsItemProviderAdapterFactory() {

-		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.infra.constraints.SimpleConstraint} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected SimpleConstraintItemProvider simpleConstraintItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.constraints.SimpleConstraint}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createSimpleConstraintAdapter() {

-		if (simpleConstraintItemProvider == null) {

-			simpleConstraintItemProvider = new SimpleConstraintItemProvider(this);

-		}

-

-		return simpleConstraintItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.constraints.CompositeConstraint} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected CompositeConstraintItemProvider compositeConstraintItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.constraints.CompositeConstraint}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createCompositeConstraintAdapter() {

-		if (compositeConstraintItemProvider == null) {

-			compositeConstraintItemProvider = new CompositeConstraintItemProvider(this);

-		}

-

-		return compositeConstraintItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.constraints.ValueProperty} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ValuePropertyItemProvider valuePropertyItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.constraints.ValueProperty}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createValuePropertyAdapter() {

-		if (valuePropertyItemProvider == null) {

-			valuePropertyItemProvider = new ValuePropertyItemProvider(this);

-		}

-

-		return valuePropertyItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.constraints.ReferenceProperty} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ReferencePropertyItemProvider referencePropertyItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.constraints.ReferenceProperty}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createReferencePropertyAdapter() {

-		if (referencePropertyItemProvider == null) {

-			referencePropertyItemProvider = new ReferencePropertyItemProvider(this);

-		}

-

-		return referencePropertyItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	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

-	 */

-	@Override

-	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

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	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

-	 */

-	@Override

-	public void dispose() {

-		if (simpleConstraintItemProvider != null) {

-			simpleConstraintItemProvider.dispose();

-		}

-		if (compositeConstraintItemProvider != null) {

-			compositeConstraintItemProvider.dispose();

-		}

-		if (valuePropertyItemProvider != null) {

-			valuePropertyItemProvider.dispose();

-		}

-		if (referencePropertyItemProvider != null) {

-			referencePropertyItemProvider.dispose();

-		}

-	}

-

-}

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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.infra.constraints.util.ConstraintsAdapterFactory;
+
+/**
+ * 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 ConstraintsItemProviderAdapterFactory extends ConstraintsAdapterFactory 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 ConstraintsItemProviderAdapterFactory() {
+		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.infra.constraints.SimpleConstraint} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected SimpleConstraintItemProvider simpleConstraintItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.constraints.SimpleConstraint}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Adapter createSimpleConstraintAdapter() {
+		if (simpleConstraintItemProvider == null) {
+			simpleConstraintItemProvider = new SimpleConstraintItemProvider(this);
+		}
+
+		return simpleConstraintItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.constraints.CompositeConstraint} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected CompositeConstraintItemProvider compositeConstraintItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.constraints.CompositeConstraint}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Adapter createCompositeConstraintAdapter() {
+		if (compositeConstraintItemProvider == null) {
+			compositeConstraintItemProvider = new CompositeConstraintItemProvider(this);
+		}
+
+		return compositeConstraintItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.constraints.ValueProperty} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ValuePropertyItemProvider valuePropertyItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.constraints.ValueProperty}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Adapter createValuePropertyAdapter() {
+		if (valuePropertyItemProvider == null) {
+			valuePropertyItemProvider = new ValuePropertyItemProvider(this);
+		}
+
+		return valuePropertyItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.constraints.ReferenceProperty} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ReferencePropertyItemProvider referencePropertyItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.constraints.ReferenceProperty}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Adapter createReferencePropertyAdapter() {
+		if (referencePropertyItemProvider == null) {
+			referencePropertyItemProvider = new ReferencePropertyItemProvider(this);
+		}
+
+		return referencePropertyItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	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
+	 */
+	@Override
+	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
+	 */
+	@Override
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	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
+	 */
+	@Override
+	public void dispose() {
+		if (simpleConstraintItemProvider != null) {
+			simpleConstraintItemProvider.dispose();
+		}
+		if (compositeConstraintItemProvider != null) {
+			compositeConstraintItemProvider.dispose();
+		}
+		if (valuePropertyItemProvider != null) {
+			valuePropertyItemProvider.dispose();
+		}
+		if (referencePropertyItemProvider != null) {
+			referencePropertyItemProvider.dispose();
+		}
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/DisplayUnitItemProvider.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/DisplayUnitItemProvider.java
index b1090913417..048f9033989 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/DisplayUnitItemProvider.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/DisplayUnitItemProvider.java
@@ -1,199 +1,199 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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.infra.constraints.ConstraintsFactory;

-import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.infra.constraints.DisplayUnit;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.DisplayUnit} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class DisplayUnitItemProvider

-		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 DisplayUnitItemProvider(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);

-

-			addElementMultiplicityPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Element Multiplicity feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addElementMultiplicityPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_DisplayUnit_elementMultiplicity_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_DisplayUnit_elementMultiplicity_feature", "_UI_DisplayUnit_type"),

-						ConstraintsPackage.Literals.DISPLAY_UNIT__ELEMENT_MULTIPLICITY,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.INTEGRAL_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(ConstraintsPackage.Literals.DISPLAY_UNIT__CONSTRAINTS);

-		}

-		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 the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		DisplayUnit displayUnit = (DisplayUnit) object;

-		return getString("_UI_DisplayUnit_type") + " " + displayUnit.getElementMultiplicity();

-	}

-

-	/**

-	 * 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(DisplayUnit.class)) {

-		case ConstraintsPackage.DISPLAY_UNIT__ELEMENT_MULTIPLICITY:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		case ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS:

-			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

-				(ConstraintsPackage.Literals.DISPLAY_UNIT__CONSTRAINTS,

-						ConstraintsFactory.eINSTANCE.createSimpleConstraint()));

-

-		newChildDescriptors.add

-				(createChildParameter

-				(ConstraintsPackage.Literals.DISPLAY_UNIT__CONSTRAINTS,

-						ConstraintsFactory.eINSTANCE.createCompositeConstraint()));

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return ConstraintsEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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.infra.constraints.ConstraintsFactory;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.DisplayUnit} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class DisplayUnitItemProvider
+		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 DisplayUnitItemProvider(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);
+
+			addElementMultiplicityPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Element Multiplicity feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addElementMultiplicityPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+				(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_DisplayUnit_elementMultiplicity_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_DisplayUnit_elementMultiplicity_feature", "_UI_DisplayUnit_type"),
+						ConstraintsPackage.Literals.DISPLAY_UNIT__ELEMENT_MULTIPLICITY,
+						true,
+						false,
+						false,
+						ItemPropertyDescriptor.INTEGRAL_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(ConstraintsPackage.Literals.DISPLAY_UNIT__CONSTRAINTS);
+		}
+		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 the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		DisplayUnit displayUnit = (DisplayUnit) object;
+		return getString("_UI_DisplayUnit_type") + " " + displayUnit.getElementMultiplicity();
+	}
+
+	/**
+	 * 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(DisplayUnit.class)) {
+		case ConstraintsPackage.DISPLAY_UNIT__ELEMENT_MULTIPLICITY:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS:
+			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
+				(ConstraintsPackage.Literals.DISPLAY_UNIT__CONSTRAINTS,
+						ConstraintsFactory.eINSTANCE.createSimpleConstraint()));
+
+		newChildDescriptors.add
+				(createChildParameter
+				(ConstraintsPackage.Literals.DISPLAY_UNIT__CONSTRAINTS,
+						ConstraintsFactory.eINSTANCE.createCompositeConstraint()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return ConstraintsEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ReferencePropertyItemProvider.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ReferencePropertyItemProvider.java
index 86c44ff1166..9cc200a8c5e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ReferencePropertyItemProvider.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ReferencePropertyItemProvider.java
@@ -1,145 +1,145 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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.papyrus.infra.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.infra.constraints.ReferenceProperty;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.ReferenceProperty} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ReferencePropertyItemProvider

-		extends ConfigPropertyItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ReferencePropertyItemProvider(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);

-

-			addValuePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Value feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addValuePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ReferenceProperty_value_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ReferenceProperty_value_feature", "_UI_ReferenceProperty_type"),

-						ConstraintsPackage.Literals.REFERENCE_PROPERTY__VALUE,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This returns ReferenceProperty.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ReferenceProperty"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((ReferenceProperty) object).getName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_ReferenceProperty_type") :

-				getString("_UI_ReferenceProperty_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);

-	}

-

-}

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.ReferenceProperty;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.ReferenceProperty} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ReferencePropertyItemProvider
+		extends ConfigPropertyItemProvider
+		implements
+		IEditingDomainItemProvider,
+		IStructuredItemContentProvider,
+		ITreeItemContentProvider,
+		IItemLabelProvider,
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ReferencePropertyItemProvider(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);
+
+			addValuePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Value feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addValuePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+				(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_ReferenceProperty_value_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_ReferenceProperty_value_feature", "_UI_ReferenceProperty_type"),
+						ConstraintsPackage.Literals.REFERENCE_PROPERTY__VALUE,
+						true,
+						false,
+						true,
+						null,
+						null,
+						null));
+	}
+
+	/**
+	 * This returns ReferenceProperty.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ReferenceProperty"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((ReferenceProperty) object).getName();
+		return label == null || label.length() == 0 ?
+				getString("_UI_ReferenceProperty_type") :
+				getString("_UI_ReferenceProperty_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/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/SimpleConstraintItemProvider.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/SimpleConstraintItemProvider.java
index c250574f685..2fbb98f9def 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/SimpleConstraintItemProvider.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/SimpleConstraintItemProvider.java
@@ -1,195 +1,195 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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.ViewerNotification;

-import org.eclipse.papyrus.infra.constraints.ConstraintsFactory;

-import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.infra.constraints.SimpleConstraint;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.SimpleConstraint} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class SimpleConstraintItemProvider

-		extends ConstraintDescriptorItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SimpleConstraintItemProvider(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);

-

-			addConstraintTypePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Constraint Type feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addConstraintTypePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_SimpleConstraint_constraintType_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_SimpleConstraint_constraintType_feature", "_UI_SimpleConstraint_type"),

-						ConstraintsPackage.Literals.SIMPLE_CONSTRAINT__CONSTRAINT_TYPE,

-						true,

-						false,

-						true,

-						null,

-						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(ConstraintsPackage.Literals.SIMPLE_CONSTRAINT__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 SimpleConstraint.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/SimpleConstraint"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((SimpleConstraint) object).getName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_SimpleConstraint_type") :

-				getString("_UI_SimpleConstraint_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(SimpleConstraint.class)) {

-		case ConstraintsPackage.SIMPLE_CONSTRAINT__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

-				(ConstraintsPackage.Literals.SIMPLE_CONSTRAINT__PROPERTIES,

-						ConstraintsFactory.eINSTANCE.createValueProperty()));

-

-		newChildDescriptors.add

-				(createChildParameter

-				(ConstraintsPackage.Literals.SIMPLE_CONSTRAINT__PROPERTIES,

-						ConstraintsFactory.eINSTANCE.createReferenceProperty()));

-	}

-

-}

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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.ViewerNotification;
+import org.eclipse.papyrus.infra.constraints.ConstraintsFactory;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.SimpleConstraint} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class SimpleConstraintItemProvider
+		extends ConstraintDescriptorItemProvider
+		implements
+		IEditingDomainItemProvider,
+		IStructuredItemContentProvider,
+		ITreeItemContentProvider,
+		IItemLabelProvider,
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public SimpleConstraintItemProvider(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);
+
+			addConstraintTypePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Constraint Type feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addConstraintTypePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+				(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_SimpleConstraint_constraintType_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_SimpleConstraint_constraintType_feature", "_UI_SimpleConstraint_type"),
+						ConstraintsPackage.Literals.SIMPLE_CONSTRAINT__CONSTRAINT_TYPE,
+						true,
+						false,
+						true,
+						null,
+						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(ConstraintsPackage.Literals.SIMPLE_CONSTRAINT__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 SimpleConstraint.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/SimpleConstraint"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((SimpleConstraint) object).getName();
+		return label == null || label.length() == 0 ?
+				getString("_UI_SimpleConstraint_type") :
+				getString("_UI_SimpleConstraint_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(SimpleConstraint.class)) {
+		case ConstraintsPackage.SIMPLE_CONSTRAINT__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
+				(ConstraintsPackage.Literals.SIMPLE_CONSTRAINT__PROPERTIES,
+						ConstraintsFactory.eINSTANCE.createValueProperty()));
+
+		newChildDescriptors.add
+				(createChildParameter
+				(ConstraintsPackage.Literals.SIMPLE_CONSTRAINT__PROPERTIES,
+						ConstraintsFactory.eINSTANCE.createReferenceProperty()));
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ValuePropertyItemProvider.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ValuePropertyItemProvider.java
index dac7537c09a..44e02e523db 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ValuePropertyItemProvider.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/src-gen/org/eclipse/papyrus/infra/constraints/provider/ValuePropertyItemProvider.java
@@ -1,153 +1,153 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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.infra.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.infra.constraints.ValueProperty;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.ValueProperty} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ValuePropertyItemProvider

-		extends ConfigPropertyItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ValuePropertyItemProvider(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);

-

-			addValuePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Value feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addValuePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ValueProperty_value_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ValueProperty_value_feature", "_UI_ValueProperty_type"),

-						ConstraintsPackage.Literals.VALUE_PROPERTY__VALUE,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This returns ValueProperty.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ValueProperty"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((ValueProperty) object).getName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_ValueProperty_type") :

-				getString("_UI_ValueProperty_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(ValueProperty.class)) {

-		case ConstraintsPackage.VALUE_PROPERTY__VALUE:

-			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);

-	}

-

-}

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.ValueProperty;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.constraints.ValueProperty} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ValuePropertyItemProvider
+		extends ConfigPropertyItemProvider
+		implements
+		IEditingDomainItemProvider,
+		IStructuredItemContentProvider,
+		ITreeItemContentProvider,
+		IItemLabelProvider,
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ValuePropertyItemProvider(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);
+
+			addValuePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Value feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addValuePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+				(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_ValueProperty_value_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_ValueProperty_value_feature", "_UI_ValueProperty_type"),
+						ConstraintsPackage.Literals.VALUE_PROPERTY__VALUE,
+						true,
+						false,
+						false,
+						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+						null,
+						null));
+	}
+
+	/**
+	 * This returns ValueProperty.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ValueProperty"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((ValueProperty) object).getName();
+		return label == null || label.length() == 0 ?
+				getString("_UI_ValueProperty_type") :
+				getString("_UI_ValueProperty_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(ValueProperty.class)) {
+		case ConstraintsPackage.VALUE_PROPERTY__VALUE:
+			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/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/.classpath b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/.classpath
index c1f31893de4..c1f31893de4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/.classpath
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/.classpath
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/.project b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/.project
index a685f2a76ed..7662e546de1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/.project
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.constraints.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>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.constraints.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/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF
index cf35be2788d..a2229df65f3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
-Manifest-Version: 1.0

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

- org.eclipse.core.resources,

- org.eclipse.papyrus.infra.constraints.edit;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.emf.ecore.xmi;visibility:=reexport,

- org.eclipse.emf.edit.ui;visibility:=reexport,

- org.eclipse.ui.ide

-Export-Package: org.eclipse.papyrus.infra.constraints.environment.presentation,

- org.eclipse.papyrus.infra.constraints.presentation

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.constraints.presentation.ConstraintsEditorPlugin$Implementation

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.constraints.editor;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.papyrus.infra.constraints.edit;bundle-version="1.2.0";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.emf.edit.ui;visibility:=reexport,
+ org.eclipse.ui.ide
+Export-Package: org.eclipse.papyrus.infra.constraints.environment.presentation,
+ org.eclipse.papyrus.infra.constraints.presentation
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.constraints.presentation.ConstraintsEditorPlugin$Implementation
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.constraints.editor;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/about.html b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/about.html
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/about.html
@@ -1,28 +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>

+<!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/infra/org.eclipse.papyrus.infra.constraints.editor/build.properties b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/build.properties
index cbe5ea0f3d9..d2ecb5d5794 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/build.properties
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/build.properties
@@ -1,16 +1,16 @@
-

-# <copyright>

-# </copyright>

-#

-# $Id$

-

-bin.includes = .,\

-               icons/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-jars.compile.order = .

-source.. = src-gen/

-output.. = bin

-src.includes = about.html

+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html
+jars.compile.order = .
+source.. = src-gen/
+output.. = bin
+src.includes = about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/icons/full/obj16/ConstraintsModelFile.gif b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/icons/full/obj16/ConstraintsModelFile.gif
index 4ef24bd30dc..4ef24bd30dc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/icons/full/obj16/ConstraintsModelFile.gif
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/icons/full/obj16/ConstraintsModelFile.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/icons/full/obj16/EnvironmentModelFile.gif b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/icons/full/obj16/EnvironmentModelFile.gif
index 7cd31fe01e0..7cd31fe01e0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/icons/full/obj16/EnvironmentModelFile.gif
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/icons/full/obj16/EnvironmentModelFile.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/icons/full/wizban/NewConstraints.gif b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/icons/full/wizban/NewConstraints.gif
index 440f3695c73..440f3695c73 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/icons/full/wizban/NewConstraints.gif
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/icons/full/wizban/NewConstraints.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/icons/full/wizban/NewEnvironment.gif b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/icons/full/wizban/NewEnvironment.gif
index 1c827789db0..1c827789db0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/icons/full/wizban/NewEnvironment.gif
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/icons/full/wizban/NewEnvironment.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/plugin.properties b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/plugin.properties
index 005586b3423..b443b6befd6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/plugin.properties
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/plugin.properties
@@ -1,66 +1,66 @@
-

-# <copyright>

-# </copyright>

-#

-# $Id$

-

-pluginName = Constraints Editor

-providerName = Eclipse Modeling Project

-

-_UI_ConstraintsEditor_menu = &Constraints Editor

-_UI_EnvironmentEditor_menu = &Environment 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_ConstraintsModelWizard_label = Constraints Model

-_UI_ConstraintsModelWizard_description = Create a new Constraints model

-

-_UI_ConstraintsEditor_label = Constraints Model Editor

-

-_UI_ConstraintsEditorFilenameDefaultBase = My

-_UI_ConstraintsEditorFilenameExtensions = constraints

-

-_UI_EnvironmentModelWizard_label = Environment Model

-_UI_EnvironmentModelWizard_description = Create a new Environment model

-

-_UI_EnvironmentEditor_label = Environment Model Editor

-

-_UI_EnvironmentEditorFilenameDefaultBase = My

-_UI_EnvironmentEditorFilenameExtensions = environment

-

-_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?

-

+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+pluginName = Constraints Editor
+providerName = Eclipse Modeling Project
+
+_UI_ConstraintsEditor_menu = &Constraints Editor
+_UI_EnvironmentEditor_menu = &Environment 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_ConstraintsModelWizard_label = Constraints Model
+_UI_ConstraintsModelWizard_description = Create a new Constraints model
+
+_UI_ConstraintsEditor_label = Constraints Model Editor
+
+_UI_ConstraintsEditorFilenameDefaultBase = My
+_UI_ConstraintsEditorFilenameExtensions = constraints
+
+_UI_EnvironmentModelWizard_label = Environment Model
+_UI_EnvironmentModelWizard_description = Create a new Environment model
+
+_UI_EnvironmentEditor_label = Environment Model Editor
+
+_UI_EnvironmentEditorFilenameDefaultBase = My
+_UI_EnvironmentEditorFilenameExtensions = environment
+
+_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?
+
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/plugin.xml b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/plugin.xml
index 7ffa8637924..167adc4e8d8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/plugin.xml
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/plugin.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

- <copyright>

- </copyright>

-

- $Id$

--->

-

-<plugin>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <category

-            id="org.eclipse.emf.ecore.Wizard.category.ID"

-            name="%_UI_Wizard_category"/>

-      <wizard

-            id="org.eclipse.papyrus.infra.constraints.presentation.ConstraintsModelWizardID"

-            name="%_UI_ConstraintsModelWizard_label"

-            class="org.eclipse.papyrus.infra.constraints.presentation.ConstraintsModelWizard"

-            category="org.eclipse.emf.ecore.Wizard.category.ID"

-            icon="icons/full/obj16/ConstraintsModelFile.gif">

-         <description>%_UI_ConstraintsModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <editor

-            id="org.eclipse.papyrus.infra.constraints.presentation.ConstraintsEditorID"

-            name="%_UI_ConstraintsEditor_label"

-            icon="icons/full/obj16/ConstraintsModelFile.gif"

-            extensions="constraints"

-            class="org.eclipse.papyrus.infra.constraints.presentation.ConstraintsEditor"

-            contributorClass="org.eclipse.papyrus.infra.constraints.presentation.ConstraintsActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <category

-            id="org.eclipse.emf.ecore.Wizard.category.ID"

-            name="%_UI_Wizard_category"/>

-      <wizard

-            id="org.eclipse.papyrus.infra.constraints.environment.presentation.EnvironmentModelWizardID"

-            name="%_UI_EnvironmentModelWizard_label"

-            class="org.eclipse.papyrus.infra.constraints.environment.presentation.EnvironmentModelWizard"

-            category="org.eclipse.emf.ecore.Wizard.category.ID"

-            icon="icons/full/obj16/EnvironmentModelFile.gif">

-         <description>%_UI_EnvironmentModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <editor

-            id="org.eclipse.papyrus.infra.constraints.environment.presentation.EnvironmentEditorID"

-            name="%_UI_EnvironmentEditor_label"

-            icon="icons/full/obj16/EnvironmentModelFile.gif"

-            extensions="environment"

-            class="org.eclipse.papyrus.infra.constraints.environment.presentation.EnvironmentEditor"

-            contributorClass="org.eclipse.papyrus.infra.constraints.environment.presentation.EnvironmentActionBarContributor">

-      </editor>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ <copyright>
+ </copyright>
+
+ $Id$
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <category
+            id="org.eclipse.emf.ecore.Wizard.category.ID"
+            name="%_UI_Wizard_category"/>
+      <wizard
+            id="org.eclipse.papyrus.infra.constraints.presentation.ConstraintsModelWizardID"
+            name="%_UI_ConstraintsModelWizard_label"
+            class="org.eclipse.papyrus.infra.constraints.presentation.ConstraintsModelWizard"
+            category="org.eclipse.emf.ecore.Wizard.category.ID"
+            icon="icons/full/obj16/ConstraintsModelFile.gif">
+         <description>%_UI_ConstraintsModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <editor
+            id="org.eclipse.papyrus.infra.constraints.presentation.ConstraintsEditorID"
+            name="%_UI_ConstraintsEditor_label"
+            icon="icons/full/obj16/ConstraintsModelFile.gif"
+            extensions="constraints"
+            class="org.eclipse.papyrus.infra.constraints.presentation.ConstraintsEditor"
+            contributorClass="org.eclipse.papyrus.infra.constraints.presentation.ConstraintsActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <category
+            id="org.eclipse.emf.ecore.Wizard.category.ID"
+            name="%_UI_Wizard_category"/>
+      <wizard
+            id="org.eclipse.papyrus.infra.constraints.environment.presentation.EnvironmentModelWizardID"
+            name="%_UI_EnvironmentModelWizard_label"
+            class="org.eclipse.papyrus.infra.constraints.environment.presentation.EnvironmentModelWizard"
+            category="org.eclipse.emf.ecore.Wizard.category.ID"
+            icon="icons/full/obj16/EnvironmentModelFile.gif">
+         <description>%_UI_EnvironmentModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <editor
+            id="org.eclipse.papyrus.infra.constraints.environment.presentation.EnvironmentEditorID"
+            name="%_UI_EnvironmentEditor_label"
+            icon="icons/full/obj16/EnvironmentModelFile.gif"
+            extensions="environment"
+            class="org.eclipse.papyrus.infra.constraints.environment.presentation.EnvironmentEditor"
+            contributorClass="org.eclipse.papyrus.infra.constraints.environment.presentation.EnvironmentActionBarContributor">
+      </editor>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/pom.xml b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/pom.xml
index 1eae01ea397..a582793ef1f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/pom.xml
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-constraints</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.constraints.editor</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentActionBarContributor.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentActionBarContributor.java
index e601c5b2d22..247d5e4591a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentActionBarContributor.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentActionBarContributor.java
@@ -1,446 +1,446 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.environment.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.infra.constraints.presentation.ConstraintsEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Environment model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class EnvironmentActionBarContributor

-		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(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {

-				@Override

-				public void run() {

-					try {

-						getPage().showView("org.eclipse.ui.views.PropertySheet");

-					}

-					catch (PartInitException exception) {

-						ConstraintsEditorPlugin.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(ConstraintsEditorPlugin.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 EnvironmentActionBarContributor() {

-		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("environment-settings"));

-		toolBarManager.add(new Separator("environment-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(ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentEditor_menu"), "org.eclipse.papyrus.infra.constraints.environmentMenuID");

-		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(ConstraintsEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

-		submenuManager.insertBefore("additions", createChildMenuManager);

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(ConstraintsEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

-		submenuManager.insertBefore("additions", createSiblingMenuManager);

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-				(new IMenuListener() {

-					@Override

-					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

-	 */

-	@Override

-	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(ConstraintsEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager);

-

-		submenuManager = new MenuManager(ConstraintsEditorPlugin.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;

-	}

-

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment.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.infra.constraints.presentation.ConstraintsEditorPlugin;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Environment model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class EnvironmentActionBarContributor
+		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(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
+				@Override
+				public void run() {
+					try {
+						getPage().showView("org.eclipse.ui.views.PropertySheet");
+					}
+					catch (PartInitException exception) {
+						ConstraintsEditorPlugin.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(ConstraintsEditorPlugin.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 EnvironmentActionBarContributor() {
+		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("environment-settings"));
+		toolBarManager.add(new Separator("environment-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(ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentEditor_menu"), "org.eclipse.papyrus.infra.constraints.environmentMenuID");
+		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(ConstraintsEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+		submenuManager.insertBefore("additions", createChildMenuManager);
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(ConstraintsEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+		submenuManager.insertBefore("additions", createSiblingMenuManager);
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+				(new IMenuListener() {
+					@Override
+					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
+	 */
+	@Override
+	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(ConstraintsEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager);
+
+		submenuManager = new MenuManager(ConstraintsEditorPlugin.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;
+	}
+
 }
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentEditor.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentEditor.java
index e6374b3fc36..c3e911899c2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentEditor.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentEditor.java
@@ -1,1884 +1,1884 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.environment.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.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.EObject;

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

-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.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.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.papyrus.infra.constraints.environment.provider.EnvironmentItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.constraints.presentation.ConstraintsEditorPlugin;

-import org.eclipse.papyrus.infra.constraints.provider.ConstraintsItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-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.actions.WorkspaceModifyOperation;

-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;

-

-

-/**

- * This is an example of a Environment model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class EnvironmentEditor

-		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 PropertySheetPage 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() {

-				@Override

-				public void partActivated(IWorkbenchPart p) {

-					if (p instanceof ContentOutline) {

-						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {

-							getActionBarContributor().setActiveEditor(EnvironmentEditor.this);

-

-							setCurrentViewer(contentOutlineViewer);

-						}

-					}

-					else if (p instanceof PropertySheet) {

-						if (((PropertySheet) p).getCurrentPage() == propertySheetPage) {

-							getActionBarContributor().setActiveEditor(EnvironmentEditor.this);

-							handleActivate();

-						}

-					}

-					else if (p == EnvironmentEditor.this) {

-						handleActivate();

-					}

-				}

-

-				@Override

-				public void partBroughtToTop(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				@Override

-				public void partClosed(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				@Override

-				public void partDeactivated(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				@Override

-				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() {

-											@Override

-											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);

-				}

-			};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-			new IResourceChangeListener() {

-				@Override

-				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>();

-

-							@Override

-							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 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() {

-										@Override

-										public void run() {

-											removedResources.addAll(visitor.getRemovedResources());

-											if (!isDirty()) {

-												getSite().getPage().closeEditor(EnvironmentEditor.this, false);

-											}

-										}

-									});

-						}

-

-						if (!visitor.getChangedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										@Override

-										public void run() {

-											changedResources.addAll(visitor.getChangedResources());

-											if (getSite().getPage().getActiveEditor() == EnvironmentEditor.this) {

-												handleActivate();

-											}

-										}

-									});

-						}

-					}

-					catch (CoreException exception) {

-						ConstraintsEditorPlugin.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(EnvironmentEditor.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.infra.constraints.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) {

-					ConstraintsEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				markerHelper.deleteMarkers(editingDomain.getResourceSet());

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					try {

-						markerHelper.createMarkers(diagnostic);

-					} catch (CoreException exception) {

-						ConstraintsEditorPlugin.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 EnvironmentEditor() {

-		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 ConstraintsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EnvironmentItemProviderAdapterFactory());

-		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() {

-					@Override

-					public void commandStackChanged(final EventObject event) {

-						getContainer().getDisplay().asyncExec

-								(new Runnable() {

-									@Override

-									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());

-										}

-										if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {

-											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() {

-						@Override

-						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

-	 */

-	@Override

-	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.

-							//

-							@Override

-							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

-	 */

-	@Override

-	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() };

-		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.infra.constraints.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.infra.constraints.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(), EnvironmentEditor.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(), EnvironmentEditor.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(), EnvironmentEditor.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(), EnvironmentEditor.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(), EnvironmentEditor.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(), EnvironmentEditor.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() {

-						@Override

-						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() {

-					@Override

-					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.

-						//

-						@Override

-						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() {

-		if (propertySheetPage == null) {

-			propertySheetPage =

-					new ExtendedPropertySheetPage(editingDomain) {

-						@Override

-						public void setSelectionToViewer(List<?> selection) {

-							EnvironmentEditor.this.setSelectionToViewer(selection);

-							EnvironmentEditor.this.setFocus();

-						}

-

-						@Override

-						public void setActionBars(IActionBars actionBars) {

-							super.setActionBars(actionBars);

-							getActionBarContributor().shareGlobalActions(this, actionBars);

-						}

-					};

-			propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		}

-

-		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);

-

-		// 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.

-			//

-			ConstraintsEditorPlugin.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

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		try {

-			if (marker.getType().equals(EValidator.MARKER)) {

-				String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);

-				if (uriAttribute != null) {

-					URI uri = URI.createURI(uriAttribute);

-					EObject eObject = editingDomain.getResourceSet().getEObject(uri, true);

-					if (eObject != null) {

-						setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));

-					}

-				}

-			}

-		} catch (CoreException exception) {

-			ConstraintsEditorPlugin.INSTANCE.log(exception);

-		}

-	}

-

-	/**

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

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	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

-	 */

-	@Override

-	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

-	 */

-	@Override

-	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 ConstraintsEditorPlugin.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 ConstraintsEditorPlugin.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

-	 */

-	@Override

-	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);

-		}

-

-		if (propertySheetPage != null) {

-			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;

-	}

-}

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment.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.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.EObject;
+import org.eclipse.emf.ecore.EValidator;
+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.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.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.papyrus.infra.constraints.environment.provider.EnvironmentItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.constraints.presentation.ConstraintsEditorPlugin;
+import org.eclipse.papyrus.infra.constraints.provider.ConstraintsItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+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.actions.WorkspaceModifyOperation;
+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;
+
+
+/**
+ * This is an example of a Environment model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class EnvironmentEditor
+		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 PropertySheetPage 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() {
+				@Override
+				public void partActivated(IWorkbenchPart p) {
+					if (p instanceof ContentOutline) {
+						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
+							getActionBarContributor().setActiveEditor(EnvironmentEditor.this);
+
+							setCurrentViewer(contentOutlineViewer);
+						}
+					}
+					else if (p instanceof PropertySheet) {
+						if (((PropertySheet) p).getCurrentPage() == propertySheetPage) {
+							getActionBarContributor().setActiveEditor(EnvironmentEditor.this);
+							handleActivate();
+						}
+					}
+					else if (p == EnvironmentEditor.this) {
+						handleActivate();
+					}
+				}
+
+				@Override
+				public void partBroughtToTop(IWorkbenchPart p) {
+					// Ignore.
+				}
+
+				@Override
+				public void partClosed(IWorkbenchPart p) {
+					// Ignore.
+				}
+
+				@Override
+				public void partDeactivated(IWorkbenchPart p) {
+					// Ignore.
+				}
+
+				@Override
+				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() {
+											@Override
+											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);
+				}
+			};
+
+	/**
+	 * This listens for workspace changes.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected IResourceChangeListener resourceChangeListener =
+			new IResourceChangeListener() {
+				@Override
+				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>();
+
+							@Override
+							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 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() {
+										@Override
+										public void run() {
+											removedResources.addAll(visitor.getRemovedResources());
+											if (!isDirty()) {
+												getSite().getPage().closeEditor(EnvironmentEditor.this, false);
+											}
+										}
+									});
+						}
+
+						if (!visitor.getChangedResources().isEmpty()) {
+							getSite().getShell().getDisplay().asyncExec
+									(new Runnable() {
+										@Override
+										public void run() {
+											changedResources.addAll(visitor.getChangedResources());
+											if (getSite().getPage().getActiveEditor() == EnvironmentEditor.this) {
+												handleActivate();
+											}
+										}
+									});
+						}
+					}
+					catch (CoreException exception) {
+						ConstraintsEditorPlugin.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(EnvironmentEditor.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.infra.constraints.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) {
+					ConstraintsEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				markerHelper.deleteMarkers(editingDomain.getResourceSet());
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					try {
+						markerHelper.createMarkers(diagnostic);
+					} catch (CoreException exception) {
+						ConstraintsEditorPlugin.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 EnvironmentEditor() {
+		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 ConstraintsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EnvironmentItemProviderAdapterFactory());
+		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() {
+					@Override
+					public void commandStackChanged(final EventObject event) {
+						getContainer().getDisplay().asyncExec
+								(new Runnable() {
+									@Override
+									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());
+										}
+										if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {
+											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() {
+						@Override
+						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
+	 */
+	@Override
+	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.
+							//
+							@Override
+							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
+	 */
+	@Override
+	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() };
+		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.infra.constraints.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.infra.constraints.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(), EnvironmentEditor.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(), EnvironmentEditor.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(), EnvironmentEditor.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(), EnvironmentEditor.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(), EnvironmentEditor.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(), EnvironmentEditor.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() {
+						@Override
+						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() {
+					@Override
+					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.
+						//
+						@Override
+						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() {
+		if (propertySheetPage == null) {
+			propertySheetPage =
+					new ExtendedPropertySheetPage(editingDomain) {
+						@Override
+						public void setSelectionToViewer(List<?> selection) {
+							EnvironmentEditor.this.setSelectionToViewer(selection);
+							EnvironmentEditor.this.setFocus();
+						}
+
+						@Override
+						public void setActionBars(IActionBars actionBars) {
+							super.setActionBars(actionBars);
+							getActionBarContributor().shareGlobalActions(this, actionBars);
+						}
+					};
+			propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		}
+
+		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);
+
+		// 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.
+			//
+			ConstraintsEditorPlugin.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
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		try {
+			if (marker.getType().equals(EValidator.MARKER)) {
+				String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);
+				if (uriAttribute != null) {
+					URI uri = URI.createURI(uriAttribute);
+					EObject eObject = editingDomain.getResourceSet().getEObject(uri, true);
+					if (eObject != null) {
+						setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));
+					}
+				}
+			}
+		} catch (CoreException exception) {
+			ConstraintsEditorPlugin.INSTANCE.log(exception);
+		}
+	}
+
+	/**
+	 * 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
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	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
+	 */
+	@Override
+	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
+	 */
+	@Override
+	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 ConstraintsEditorPlugin.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 ConstraintsEditorPlugin.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
+	 */
+	@Override
+	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);
+		}
+
+		if (propertySheetPage != null) {
+			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/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentModelWizard.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentModelWizard.java
index af798d4c518..3dde25261ed 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentModelWizard.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/environment/presentation/EnvironmentModelWizard.java
@@ -1,641 +1,641 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.environment.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.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.core.runtime.Path;

-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.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.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

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

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

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

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

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

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.constraints.environment.EnvironmentFactory;

-import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;

-import org.eclipse.papyrus.infra.constraints.presentation.ConstraintsEditorPlugin;

-import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;

-import org.eclipse.swt.SWT;

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

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

-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.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-

-/**

- * This is a simple wizard for creating a new model file.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class EnvironmentModelWizard 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(ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentEditorFilenameExtensions").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 =

-			ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected EnvironmentPackage environmentPackage = EnvironmentPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected EnvironmentFactory environmentFactory = environmentPackage.getEnvironmentFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected EnvironmentModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected EnvironmentModelWizardInitialObjectCreationPage 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

-	 */

-	@Override

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

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(ConstraintsEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ConstraintsEditorPlugin.INSTANCE.getImage("full/wizban/NewEnvironment")));

-	}

-

-	/**

-	 * 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 : environmentPackage.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) environmentPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = environmentFactory.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) {

-								ConstraintsEditorPlugin.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() {

-							@Override

-							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(), ConstraintsEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());

-				return false;

-			}

-

-			return true;

-		} catch (Exception exception) {

-			ConstraintsEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public class EnvironmentModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public EnvironmentModelWizardNewFileCreationPage(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(ConstraintsEditorPlugin.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 EnvironmentModelWizardInitialObjectCreationPage 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 EnvironmentModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		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(ConstraintsEditorPlugin.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(ConstraintsEditorPlugin.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() {

-					@Override

-					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 ConstraintsEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");

-			} catch (MissingResourceException mre) {

-				ConstraintsEditorPlugin.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(ConstraintsEditorPlugin.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 EnvironmentModelWizardNewFileCreationPage("Whatever", selection);

-		newFileCreationPage.setTitle(ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentModelWizard_label"));

-		newFileCreationPage.setDescription(ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentModelWizard_description"));

-		newFileCreationPage.setFileName(ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentEditorFilenameDefaultBase") + "." + 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 = ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentEditorFilenameDefaultBase");

-					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 EnvironmentModelWizardInitialObjectCreationPage("Whatever2");

-		initialObjectCreationPage.setTitle(ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentModelWizard_label"));

-		initialObjectCreationPage.setDescription(ConstraintsEditorPlugin.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();

-	}

-

-}

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment.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.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.core.runtime.Path;
+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.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.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentFactory;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;
+import org.eclipse.papyrus.infra.constraints.presentation.ConstraintsEditorPlugin;
+import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+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.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+
+
+/**
+ * This is a simple wizard for creating a new model file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class EnvironmentModelWizard 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(ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentEditorFilenameExtensions").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 =
+			ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected EnvironmentPackage environmentPackage = EnvironmentPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected EnvironmentFactory environmentFactory = environmentPackage.getEnvironmentFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected EnvironmentModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected EnvironmentModelWizardInitialObjectCreationPage 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
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(ConstraintsEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ConstraintsEditorPlugin.INSTANCE.getImage("full/wizban/NewEnvironment")));
+	}
+
+	/**
+	 * 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 : environmentPackage.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) environmentPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = environmentFactory.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) {
+								ConstraintsEditorPlugin.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() {
+							@Override
+							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(), ConstraintsEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
+				return false;
+			}
+
+			return true;
+		} catch (Exception exception) {
+			ConstraintsEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public class EnvironmentModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		public EnvironmentModelWizardNewFileCreationPage(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(ConstraintsEditorPlugin.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 EnvironmentModelWizardInitialObjectCreationPage 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 EnvironmentModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		@Override
+		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(ConstraintsEditorPlugin.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(ConstraintsEditorPlugin.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() {
+					@Override
+					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 ConstraintsEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");
+			} catch (MissingResourceException mre) {
+				ConstraintsEditorPlugin.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(ConstraintsEditorPlugin.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 EnvironmentModelWizardNewFileCreationPage("Whatever", selection);
+		newFileCreationPage.setTitle(ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentModelWizard_label"));
+		newFileCreationPage.setDescription(ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentModelWizard_description"));
+		newFileCreationPage.setFileName(ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentEditorFilenameDefaultBase") + "." + 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 = ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentEditorFilenameDefaultBase");
+					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 EnvironmentModelWizardInitialObjectCreationPage("Whatever2");
+		initialObjectCreationPage.setTitle(ConstraintsEditorPlugin.INSTANCE.getString("_UI_EnvironmentModelWizard_label"));
+		initialObjectCreationPage.setDescription(ConstraintsEditorPlugin.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/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsActionBarContributor.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsActionBarContributor.java
index 6bc69602904..0a696e93003 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsActionBarContributor.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsActionBarContributor.java
@@ -1,445 +1,445 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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 Constraints model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ConstraintsActionBarContributor

-		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(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {

-				@Override

-				public void run() {

-					try {

-						getPage().showView("org.eclipse.ui.views.PropertySheet");

-					}

-					catch (PartInitException exception) {

-						ConstraintsEditorPlugin.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(ConstraintsEditorPlugin.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 ConstraintsActionBarContributor() {

-		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("constraints-settings"));

-		toolBarManager.add(new Separator("constraints-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(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsEditor_menu"), "org.eclipse.papyrus.infra.constraintsMenuID");

-		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(ConstraintsEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

-		submenuManager.insertBefore("additions", createChildMenuManager);

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(ConstraintsEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

-		submenuManager.insertBefore("additions", createSiblingMenuManager);

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-				(new IMenuListener() {

-					@Override

-					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

-	 */

-	@Override

-	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(ConstraintsEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager);

-

-		submenuManager = new MenuManager(ConstraintsEditorPlugin.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;

-	}

-

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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 Constraints model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ConstraintsActionBarContributor
+		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(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
+				@Override
+				public void run() {
+					try {
+						getPage().showView("org.eclipse.ui.views.PropertySheet");
+					}
+					catch (PartInitException exception) {
+						ConstraintsEditorPlugin.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(ConstraintsEditorPlugin.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 ConstraintsActionBarContributor() {
+		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("constraints-settings"));
+		toolBarManager.add(new Separator("constraints-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(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsEditor_menu"), "org.eclipse.papyrus.infra.constraintsMenuID");
+		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(ConstraintsEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+		submenuManager.insertBefore("additions", createChildMenuManager);
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(ConstraintsEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+		submenuManager.insertBefore("additions", createSiblingMenuManager);
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+				(new IMenuListener() {
+					@Override
+					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
+	 */
+	@Override
+	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(ConstraintsEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager);
+
+		submenuManager = new MenuManager(ConstraintsEditorPlugin.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;
+	}
+
 }
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsEditor.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsEditor.java
index 7fdfe33556a..166227af2ba 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsEditor.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsEditor.java
@@ -1,1883 +1,1883 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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.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.EObject;

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

-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.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.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.papyrus.infra.constraints.environment.provider.EnvironmentItemProviderAdapterFactory;

-import org.eclipse.papyrus.infra.constraints.provider.ConstraintsItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-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.actions.WorkspaceModifyOperation;

-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;

-

-

-/**

- * This is an example of a Constraints model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ConstraintsEditor

-		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 PropertySheetPage 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() {

-				@Override

-				public void partActivated(IWorkbenchPart p) {

-					if (p instanceof ContentOutline) {

-						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {

-							getActionBarContributor().setActiveEditor(ConstraintsEditor.this);

-

-							setCurrentViewer(contentOutlineViewer);

-						}

-					}

-					else if (p instanceof PropertySheet) {

-						if (((PropertySheet) p).getCurrentPage() == propertySheetPage) {

-							getActionBarContributor().setActiveEditor(ConstraintsEditor.this);

-							handleActivate();

-						}

-					}

-					else if (p == ConstraintsEditor.this) {

-						handleActivate();

-					}

-				}

-

-				@Override

-				public void partBroughtToTop(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				@Override

-				public void partClosed(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				@Override

-				public void partDeactivated(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				@Override

-				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() {

-											@Override

-											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);

-				}

-			};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-			new IResourceChangeListener() {

-				@Override

-				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>();

-

-							@Override

-							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 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() {

-										@Override

-										public void run() {

-											removedResources.addAll(visitor.getRemovedResources());

-											if (!isDirty()) {

-												getSite().getPage().closeEditor(ConstraintsEditor.this, false);

-											}

-										}

-									});

-						}

-

-						if (!visitor.getChangedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										@Override

-										public void run() {

-											changedResources.addAll(visitor.getChangedResources());

-											if (getSite().getPage().getActiveEditor() == ConstraintsEditor.this) {

-												handleActivate();

-											}

-										}

-									});

-						}

-					}

-					catch (CoreException exception) {

-						ConstraintsEditorPlugin.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(ConstraintsEditor.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.infra.constraints.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) {

-					ConstraintsEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				markerHelper.deleteMarkers(editingDomain.getResourceSet());

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					try {

-						markerHelper.createMarkers(diagnostic);

-					} catch (CoreException exception) {

-						ConstraintsEditorPlugin.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 ConstraintsEditor() {

-		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 ConstraintsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EnvironmentItemProviderAdapterFactory());

-		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() {

-					@Override

-					public void commandStackChanged(final EventObject event) {

-						getContainer().getDisplay().asyncExec

-								(new Runnable() {

-									@Override

-									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());

-										}

-										if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {

-											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() {

-						@Override

-						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

-	 */

-	@Override

-	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.

-							//

-							@Override

-							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

-	 */

-	@Override

-	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() };

-		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.infra.constraints.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.infra.constraints.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(), ConstraintsEditor.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(), ConstraintsEditor.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(), ConstraintsEditor.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(), ConstraintsEditor.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(), ConstraintsEditor.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(), ConstraintsEditor.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() {

-						@Override

-						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() {

-					@Override

-					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.

-						//

-						@Override

-						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() {

-		if (propertySheetPage == null) {

-			propertySheetPage =

-					new ExtendedPropertySheetPage(editingDomain) {

-						@Override

-						public void setSelectionToViewer(List<?> selection) {

-							ConstraintsEditor.this.setSelectionToViewer(selection);

-							ConstraintsEditor.this.setFocus();

-						}

-

-						@Override

-						public void setActionBars(IActionBars actionBars) {

-							super.setActionBars(actionBars);

-							getActionBarContributor().shareGlobalActions(this, actionBars);

-						}

-					};

-			propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		}

-

-		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);

-

-		// 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.

-			//

-			ConstraintsEditorPlugin.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

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		try {

-			if (marker.getType().equals(EValidator.MARKER)) {

-				String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);

-				if (uriAttribute != null) {

-					URI uri = URI.createURI(uriAttribute);

-					EObject eObject = editingDomain.getResourceSet().getEObject(uri, true);

-					if (eObject != null) {

-						setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));

-					}

-				}

-			}

-		} catch (CoreException exception) {

-			ConstraintsEditorPlugin.INSTANCE.log(exception);

-		}

-	}

-

-	/**

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

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	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

-	 */

-	@Override

-	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

-	 */

-	@Override

-	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 ConstraintsEditorPlugin.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 ConstraintsEditorPlugin.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

-	 */

-	@Override

-	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);

-		}

-

-		if (propertySheetPage != null) {

-			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;

-	}

-}

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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.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.EObject;
+import org.eclipse.emf.ecore.EValidator;
+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.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.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.papyrus.infra.constraints.environment.provider.EnvironmentItemProviderAdapterFactory;
+import org.eclipse.papyrus.infra.constraints.provider.ConstraintsItemProviderAdapterFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+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.actions.WorkspaceModifyOperation;
+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;
+
+
+/**
+ * This is an example of a Constraints model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ConstraintsEditor
+		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 PropertySheetPage 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() {
+				@Override
+				public void partActivated(IWorkbenchPart p) {
+					if (p instanceof ContentOutline) {
+						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
+							getActionBarContributor().setActiveEditor(ConstraintsEditor.this);
+
+							setCurrentViewer(contentOutlineViewer);
+						}
+					}
+					else if (p instanceof PropertySheet) {
+						if (((PropertySheet) p).getCurrentPage() == propertySheetPage) {
+							getActionBarContributor().setActiveEditor(ConstraintsEditor.this);
+							handleActivate();
+						}
+					}
+					else if (p == ConstraintsEditor.this) {
+						handleActivate();
+					}
+				}
+
+				@Override
+				public void partBroughtToTop(IWorkbenchPart p) {
+					// Ignore.
+				}
+
+				@Override
+				public void partClosed(IWorkbenchPart p) {
+					// Ignore.
+				}
+
+				@Override
+				public void partDeactivated(IWorkbenchPart p) {
+					// Ignore.
+				}
+
+				@Override
+				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() {
+											@Override
+											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);
+				}
+			};
+
+	/**
+	 * This listens for workspace changes.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected IResourceChangeListener resourceChangeListener =
+			new IResourceChangeListener() {
+				@Override
+				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>();
+
+							@Override
+							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 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() {
+										@Override
+										public void run() {
+											removedResources.addAll(visitor.getRemovedResources());
+											if (!isDirty()) {
+												getSite().getPage().closeEditor(ConstraintsEditor.this, false);
+											}
+										}
+									});
+						}
+
+						if (!visitor.getChangedResources().isEmpty()) {
+							getSite().getShell().getDisplay().asyncExec
+									(new Runnable() {
+										@Override
+										public void run() {
+											changedResources.addAll(visitor.getChangedResources());
+											if (getSite().getPage().getActiveEditor() == ConstraintsEditor.this) {
+												handleActivate();
+											}
+										}
+									});
+						}
+					}
+					catch (CoreException exception) {
+						ConstraintsEditorPlugin.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(ConstraintsEditor.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.infra.constraints.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) {
+					ConstraintsEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				markerHelper.deleteMarkers(editingDomain.getResourceSet());
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					try {
+						markerHelper.createMarkers(diagnostic);
+					} catch (CoreException exception) {
+						ConstraintsEditorPlugin.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 ConstraintsEditor() {
+		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 ConstraintsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EnvironmentItemProviderAdapterFactory());
+		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() {
+					@Override
+					public void commandStackChanged(final EventObject event) {
+						getContainer().getDisplay().asyncExec
+								(new Runnable() {
+									@Override
+									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());
+										}
+										if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {
+											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() {
+						@Override
+						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
+	 */
+	@Override
+	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.
+							//
+							@Override
+							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
+	 */
+	@Override
+	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() };
+		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.infra.constraints.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.infra.constraints.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(), ConstraintsEditor.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(), ConstraintsEditor.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(), ConstraintsEditor.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(), ConstraintsEditor.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(), ConstraintsEditor.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(), ConstraintsEditor.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() {
+						@Override
+						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() {
+					@Override
+					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.
+						//
+						@Override
+						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() {
+		if (propertySheetPage == null) {
+			propertySheetPage =
+					new ExtendedPropertySheetPage(editingDomain) {
+						@Override
+						public void setSelectionToViewer(List<?> selection) {
+							ConstraintsEditor.this.setSelectionToViewer(selection);
+							ConstraintsEditor.this.setFocus();
+						}
+
+						@Override
+						public void setActionBars(IActionBars actionBars) {
+							super.setActionBars(actionBars);
+							getActionBarContributor().shareGlobalActions(this, actionBars);
+						}
+					};
+			propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		}
+
+		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);
+
+		// 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.
+			//
+			ConstraintsEditorPlugin.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
+	 */
+	@Override
+	public void gotoMarker(IMarker marker) {
+		try {
+			if (marker.getType().equals(EValidator.MARKER)) {
+				String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);
+				if (uriAttribute != null) {
+					URI uri = URI.createURI(uriAttribute);
+					EObject eObject = editingDomain.getResourceSet().getEObject(uri, true);
+					if (eObject != null) {
+						setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));
+					}
+				}
+			}
+		} catch (CoreException exception) {
+			ConstraintsEditorPlugin.INSTANCE.log(exception);
+		}
+	}
+
+	/**
+	 * 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
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	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
+	 */
+	@Override
+	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
+	 */
+	@Override
+	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 ConstraintsEditorPlugin.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 ConstraintsEditorPlugin.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
+	 */
+	@Override
+	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);
+		}
+
+		if (propertySheetPage != null) {
+			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/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsEditorPlugin.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsEditorPlugin.java
index 8b31f90f083..c48db1cc9cb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsEditorPlugin.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsEditorPlugin.java
@@ -1,100 +1,100 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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 Constraints editor plugin.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public final class ConstraintsEditorPlugin extends EMFPlugin {

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final ConstraintsEditorPlugin INSTANCE = new ConstraintsEditorPlugin();

-

-	/**

-	 * 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 ConstraintsEditorPlugin() {

-		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;

-		}

-	}

-

-}

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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 Constraints editor plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public final class ConstraintsEditorPlugin extends EMFPlugin {
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static final ConstraintsEditorPlugin INSTANCE = new ConstraintsEditorPlugin();
+
+	/**
+	 * 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 ConstraintsEditorPlugin() {
+		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/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsModelWizard.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsModelWizard.java
index 55734fa058f..30e53746847 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsModelWizard.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/src-gen/org/eclipse/papyrus/infra/constraints/presentation/ConstraintsModelWizard.java
@@ -1,640 +1,640 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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.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.core.runtime.Path;

-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.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.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

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

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

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

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

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

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.constraints.ConstraintsFactory;

-import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;

-import org.eclipse.swt.SWT;

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

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

-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.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-

-/**

- * This is a simple wizard for creating a new model file.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ConstraintsModelWizard 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(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsEditorFilenameExtensions").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 =

-			ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConstraintsPackage constraintsPackage = ConstraintsPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConstraintsFactory constraintsFactory = constraintsPackage.getConstraintsFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConstraintsModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConstraintsModelWizardInitialObjectCreationPage 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

-	 */

-	@Override

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

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(ConstraintsEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ConstraintsEditorPlugin.INSTANCE.getImage("full/wizban/NewConstraints")));

-	}

-

-	/**

-	 * 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 : constraintsPackage.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) constraintsPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = constraintsFactory.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) {

-								ConstraintsEditorPlugin.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() {

-							@Override

-							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(), ConstraintsEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());

-				return false;

-			}

-

-			return true;

-		} catch (Exception exception) {

-			ConstraintsEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public class ConstraintsModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public ConstraintsModelWizardNewFileCreationPage(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(ConstraintsEditorPlugin.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 ConstraintsModelWizardInitialObjectCreationPage 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 ConstraintsModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		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(ConstraintsEditorPlugin.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(ConstraintsEditorPlugin.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() {

-					@Override

-					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 ConstraintsEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");

-			} catch (MissingResourceException mre) {

-				ConstraintsEditorPlugin.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(ConstraintsEditorPlugin.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 ConstraintsModelWizardNewFileCreationPage("Whatever", selection);

-		newFileCreationPage.setTitle(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsModelWizard_label"));

-		newFileCreationPage.setDescription(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsModelWizard_description"));

-		newFileCreationPage.setFileName(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsEditorFilenameDefaultBase") + "." + 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 = ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsEditorFilenameDefaultBase");

-					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 ConstraintsModelWizardInitialObjectCreationPage("Whatever2");

-		initialObjectCreationPage.setTitle(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsModelWizard_label"));

-		initialObjectCreationPage.setDescription(ConstraintsEditorPlugin.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();

-	}

-

-}

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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.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.core.runtime.Path;
+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.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.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.constraints.ConstraintsFactory;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+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.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+
+
+/**
+ * This is a simple wizard for creating a new model file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ConstraintsModelWizard 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(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsEditorFilenameExtensions").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 =
+			ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ConstraintsPackage constraintsPackage = ConstraintsPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ConstraintsFactory constraintsFactory = constraintsPackage.getConstraintsFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ConstraintsModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ConstraintsModelWizardInitialObjectCreationPage 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
+	 */
+	@Override
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(ConstraintsEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ConstraintsEditorPlugin.INSTANCE.getImage("full/wizban/NewConstraints")));
+	}
+
+	/**
+	 * 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 : constraintsPackage.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) constraintsPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = constraintsFactory.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) {
+								ConstraintsEditorPlugin.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() {
+							@Override
+							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(), ConstraintsEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
+				return false;
+			}
+
+			return true;
+		} catch (Exception exception) {
+			ConstraintsEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public class ConstraintsModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		public ConstraintsModelWizardNewFileCreationPage(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(ConstraintsEditorPlugin.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 ConstraintsModelWizardInitialObjectCreationPage 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 ConstraintsModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		@Override
+		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(ConstraintsEditorPlugin.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(ConstraintsEditorPlugin.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() {
+					@Override
+					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 ConstraintsEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");
+			} catch (MissingResourceException mre) {
+				ConstraintsEditorPlugin.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(ConstraintsEditorPlugin.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 ConstraintsModelWizardNewFileCreationPage("Whatever", selection);
+		newFileCreationPage.setTitle(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsModelWizard_label"));
+		newFileCreationPage.setDescription(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsModelWizard_description"));
+		newFileCreationPage.setFileName(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsEditorFilenameDefaultBase") + "." + 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 = ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsEditorFilenameDefaultBase");
+					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 ConstraintsModelWizardInitialObjectCreationPage("Whatever2");
+		initialObjectCreationPage.setTitle(ConstraintsEditorPlugin.INSTANCE.getString("_UI_ConstraintsModelWizard_label"));
+		initialObjectCreationPage.setDescription(ConstraintsEditorPlugin.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/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/.classpath b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/.classpath
index eca7bdba8f0..eca7bdba8f0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/.classpath
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/.classpath
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/.project b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/.project
index 504fa7b2052..504fa7b2052 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/.project
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/.project
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/.settings/org.eclipse.jdt.core.prefs
index b3aa6d60f94..b3aa6d60f94 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/META-INF/MANIFEST.MF b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/META-INF/MANIFEST.MF
index 9406211cf94..9406211cf94 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/META-INF/MANIFEST.MF
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/about.html b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/about.html
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/build.properties b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/build.properties
index 41aa4bbad6a..41aa4bbad6a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/build.properties
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/build.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/custom/constraints.uiCustom b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/custom/constraints.uiCustom
index 60ae64f34ea..60ae64f34ea 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/custom/constraints.uiCustom
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/custom/constraints.uiCustom
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/plugin.properties b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/plugin.properties
index 182bbe58da4..182bbe58da4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/plugin.properties
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/plugin.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/pom.xml b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/pom.xml
index aa7860b2cf4..389b28e37b7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/pom.xml
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-constraints</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.constraints.ui</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/src/org/eclipse/papyrus/infra/constraints/internal/ui/Activator.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/src/org/eclipse/papyrus/infra/constraints/internal/ui/Activator.java
index f9a4610bfff..f9a4610bfff 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/src/org/eclipse/papyrus/infra/constraints/internal/ui/Activator.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/src/org/eclipse/papyrus/infra/constraints/internal/ui/Activator.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/src/org/eclipse/papyrus/infra/constraints/ui/providers/ConstraintTypeContentProvider.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/src/org/eclipse/papyrus/infra/constraints/ui/providers/ConstraintTypeContentProvider.java
index eed0c02784d..518d2ce339e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/src/org/eclipse/papyrus/infra/constraints/ui/providers/ConstraintTypeContentProvider.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/src/org/eclipse/papyrus/infra/constraints/ui/providers/ConstraintTypeContentProvider.java
@@ -1,37 +1,37 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *  Christian W. Damus - bug 485220

- *  

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

-package org.eclipse.papyrus.infra.constraints.ui.providers;

-

-import org.eclipse.papyrus.infra.constraints.runtime.ConstraintsManager;

-import org.eclipse.papyrus.infra.widgets.providers.AbstractFilteredContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-

-/**

- * A ContentProvider which returns Constraint types

- *

- *

- * @author Camille Letavernier

- */

-public class ConstraintTypeContentProvider extends AbstractFilteredContentProvider implements IStaticContentProvider {

-

-	@Override

-	public Object[] getElements() {

-		return ConstraintsManager.instance.getConstraintTypes().toArray();

-	}

-

-	@Override

-	public Object[] getElements(Object inputElement) {

-		return getElements();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ /*****************************************************************************/
+package org.eclipse.papyrus.infra.constraints.ui.providers;
+
+import org.eclipse.papyrus.infra.constraints.runtime.ConstraintsManager;
+import org.eclipse.papyrus.infra.widgets.providers.AbstractFilteredContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+
+/**
+ * A ContentProvider which returns Constraint types
+ *
+ *
+ * @author Camille Letavernier
+ */
+public class ConstraintTypeContentProvider extends AbstractFilteredContentProvider implements IStaticContentProvider {
+
+	@Override
+	public Object[] getElements() {
+		return ConstraintsManager.instance.getConstraintTypes().toArray();
+	}
+
+	@Override
+	public Object[] getElements(Object inputElement) {
+		return getElements();
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/.classpath b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/.classpath
index 50aae142c50..50aae142c50 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/.classpath
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/.classpath
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/.project b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/.project
index ed51e8e7431..b25074f0f42 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/.project
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/.project
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.constraints</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.papyrus.emf.facet.common.ProjectNature</nature>

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

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

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.constraints</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.papyrus.emf.facet.common.ProjectNature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

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

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

-org.eclipse.jdt.core.compiler.compliance=1.8

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

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

-org.eclipse.jdt.core.compiler.source=1.8

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF
index 10cc975a604..570db921afc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF
@@ -1,25 +1,25 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.constraints,

- org.eclipse.papyrus.infra.constraints.constraints,

- org.eclipse.papyrus.infra.constraints.environment,

- org.eclipse.papyrus.infra.constraints.environment.impl,

- org.eclipse.papyrus.infra.constraints.environment.util,

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

- org.eclipse.papyrus.infra.constraints.runtime,

- org.eclipse.papyrus.infra.constraints.util

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

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

- org.eclipse.emf.ecore,

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

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

- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0";visibility:=reexport

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Eclipse-BuddyPolicy: dependent

-Bundle-Activator: org.eclipse.papyrus.infra.constraints.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.constraints;singleton:=true

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.constraints,
+ org.eclipse.papyrus.infra.constraints.constraints,
+ org.eclipse.papyrus.infra.constraints.environment,
+ org.eclipse.papyrus.infra.constraints.environment.impl,
+ org.eclipse.papyrus.infra.constraints.environment.util,
+ org.eclipse.papyrus.infra.constraints.impl,
+ org.eclipse.papyrus.infra.constraints.runtime,
+ org.eclipse.papyrus.infra.constraints.util
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore,
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.2.0";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Eclipse-BuddyPolicy: dependent
+Bundle-Activator: org.eclipse.papyrus.infra.constraints.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.constraints;singleton:=true
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi
index 652e46f32b6..1993d832196 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="ASCII"?>

-<environment:ConstraintEnvironment

-    xmi:version="2.0"

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

-    xmlns:environment="http://www.eclipse.org/papyrus/constraints/environment/0.9">

-  <constraintTypes

-      label="EMF Instance Of"

-      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.EMFInstanceOfConstraint"/>

-  <constraintTypes

-      label="True constraint"

-      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.TrueConstraint"/>

-  <constraintTypes

-      label="EMF Query"

-      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.EMFQueryConstraint"/>

-  <constraintTypes

-      label="Java Instance Of"

-      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.JavaInstanceOf"/>

-  <constraintTypes

-      label="Java Query"

-      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.JavaQueryConstraint"/>

-  <constraintTypes

-      label="Has EAnnotation"

-      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.HasEAnnotationConstraint"/>

-  <constraintTypes

-      label="Attached to Resource"

-      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.AttachedToResourceConstraint"/>

-</environment:ConstraintEnvironment>

+<?xml version="1.0" encoding="ASCII"?>
+<environment:ConstraintEnvironment
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:environment="http://www.eclipse.org/papyrus/constraints/environment/0.9">
+  <constraintTypes
+      label="EMF Instance Of"
+      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.EMFInstanceOfConstraint"/>
+  <constraintTypes
+      label="True constraint"
+      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.TrueConstraint"/>
+  <constraintTypes
+      label="EMF Query"
+      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.EMFQueryConstraint"/>
+  <constraintTypes
+      label="Java Instance Of"
+      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.JavaInstanceOf"/>
+  <constraintTypes
+      label="Java Query"
+      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.JavaQueryConstraint"/>
+  <constraintTypes
+      label="Has EAnnotation"
+      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.HasEAnnotationConstraint"/>
+  <constraintTypes
+      label="Attached to Resource"
+      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.AttachedToResourceConstraint"/>
+</environment:ConstraintEnvironment>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/Model/Constraints.ecore b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/Model/Constraints.ecore
index 1a7c4d2d211..9324eea80a8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/Model/Constraints.ecore
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/Model/Constraints.ecore
@@ -1,52 +1,52 @@
-<?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="constraints" nsURI="http://www.eclipse.org/papyrus/constraints/0.9"

-    nsPrefix="constraints">

-  <eClassifiers xsi:type="ecore:EClass" name="DisplayUnit" abstract="true">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="constraints" upperBound="-1"

-        eType="#//ConstraintDescriptor" containment="true" eOpposite="#//ConstraintDescriptor/display"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementMultiplicity" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"

-        defaultValueLiteral="1"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ConstraintDescriptor" abstract="true">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="display" eType="#//DisplayUnit"

-        eOpposite="#//DisplayUnit/constraints"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overrideable" lowerBound="1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="overriddenConstraints"

-        upperBound="-1" eType="#//SimpleConstraint"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="SimpleConstraint" eSuperTypes="#//ConstraintDescriptor">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="constraintType" lowerBound="1"

-        eType="#//environment/ConstraintType"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"

-        eType="#//ConfigProperty" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="CompositeConstraint" eSuperTypes="#//ConstraintDescriptor">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="constraints" upperBound="-1"

-        eType="#//SimpleConstraint" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ConfigProperty" abstract="true">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ValueProperty" eSuperTypes="#//ConfigProperty">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ReferenceProperty" eSuperTypes="#//ConfigProperty">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-  </eClassifiers>

-  <eSubpackages name="environment" nsURI="http://www.eclipse.org/papyrus/constraints/environment/0.9"

-      nsPrefix="environment">

-    <eClassifiers xsi:type="ecore:EClass" name="ConstraintEnvironment">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="constraintTypes" upperBound="-1"

-          eType="#//environment/ConstraintType" containment="true"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="ConstraintType">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="constraintClass" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </eClassifiers>

-  </eSubpackages>

-</ecore:EPackage>

+<?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="constraints" nsURI="http://www.eclipse.org/papyrus/constraints/0.9"
+    nsPrefix="constraints">
+  <eClassifiers xsi:type="ecore:EClass" name="DisplayUnit" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="constraints" upperBound="-1"
+        eType="#//ConstraintDescriptor" containment="true" eOpposite="#//ConstraintDescriptor/display"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementMultiplicity" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="1"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ConstraintDescriptor" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="display" eType="#//DisplayUnit"
+        eOpposite="#//DisplayUnit/constraints"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overrideable" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="overriddenConstraints"
+        upperBound="-1" eType="#//SimpleConstraint"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SimpleConstraint" eSuperTypes="#//ConstraintDescriptor">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="constraintType" lowerBound="1"
+        eType="#//environment/ConstraintType"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
+        eType="#//ConfigProperty" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CompositeConstraint" eSuperTypes="#//ConstraintDescriptor">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="constraints" upperBound="-1"
+        eType="#//SimpleConstraint" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ConfigProperty" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ValueProperty" eSuperTypes="#//ConfigProperty">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ReferenceProperty" eSuperTypes="#//ConfigProperty">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+  </eClassifiers>
+  <eSubpackages name="environment" nsURI="http://www.eclipse.org/papyrus/constraints/environment/0.9"
+      nsPrefix="environment">
+    <eClassifiers xsi:type="ecore:EClass" name="ConstraintEnvironment">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="constraintTypes" upperBound="-1"
+          eType="#//environment/ConstraintType" containment="true"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="ConstraintType">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" lowerBound="1"
+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="constraintClass" lowerBound="1"
+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+  </eSubpackages>
+</ecore:EPackage>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel
index bed1d9e77e2..47a9fc9acc1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel
@@ -1,48 +1,48 @@
-<?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.infra.constraints/src-gen"

-    editDirectory="/org.eclipse.papyrus.infra.constraints.edit/src-gen" editorDirectory="/org.eclipse.papyrus.infra.constraints.editor/src-gen"

-    modelPluginID="org.eclipse.papyrus.infra.constraints" modelName="Constraints"

-    testsDirectory="/org.eclipse.papyrus.infra.constraints.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"

-    complianceLevel="5.0" copyrightFields="false">

-  <foreignModel>Constraints.ecore</foreignModel>

-  <genPackages prefix="Constraints" basePackage="org.eclipse.papyrus.infra" disposableProviderFactory="true"

-      ecorePackage="Constraints.ecore#/">

-    <genClasses image="false" ecoreClass="Constraints.ecore#//DisplayUnit">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Constraints.ecore#//DisplayUnit/constraints"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Constraints.ecore#//DisplayUnit/elementMultiplicity"/>

-    </genClasses>

-    <genClasses image="false" ecoreClass="Constraints.ecore#//ConstraintDescriptor">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Constraints.ecore#//ConstraintDescriptor/name"/>

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Constraints.ecore#//ConstraintDescriptor/display"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Constraints.ecore#//ConstraintDescriptor/overrideable"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Constraints.ecore#//ConstraintDescriptor/overriddenConstraints"/>

-    </genClasses>

-    <genClasses ecoreClass="Constraints.ecore#//SimpleConstraint">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Constraints.ecore#//SimpleConstraint/constraintType"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Constraints.ecore#//SimpleConstraint/properties"/>

-    </genClasses>

-    <genClasses ecoreClass="Constraints.ecore#//CompositeConstraint">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Constraints.ecore#//CompositeConstraint/constraints"/>

-    </genClasses>

-    <genClasses image="false" ecoreClass="Constraints.ecore#//ConfigProperty">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Constraints.ecore#//ConfigProperty/name"/>

-    </genClasses>

-    <genClasses ecoreClass="Constraints.ecore#//ValueProperty">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Constraints.ecore#//ValueProperty/value"/>

-    </genClasses>

-    <genClasses ecoreClass="Constraints.ecore#//ReferenceProperty">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Constraints.ecore#//ReferenceProperty/value"/>

-    </genClasses>

-    <nestedGenPackages prefix="Environment" basePackage="org.eclipse.papyrus.infra.constraints"

-        disposableProviderFactory="true" ecorePackage="Constraints.ecore#//environment">

-      <genClasses ecoreClass="Constraints.ecore#//environment/ConstraintEnvironment">

-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Constraints.ecore#//environment/ConstraintEnvironment/constraintTypes"/>

-      </genClasses>

-      <genClasses ecoreClass="Constraints.ecore#//environment/ConstraintType">

-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Constraints.ecore#//environment/ConstraintType/label"/>

-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Constraints.ecore#//environment/ConstraintType/constraintClass"/>

-      </genClasses>

-    </nestedGenPackages>

-  </genPackages>

-</genmodel:GenModel>

+<?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.infra.constraints/src-gen"
+    editDirectory="/org.eclipse.papyrus.infra.constraints.edit/src-gen" editorDirectory="/org.eclipse.papyrus.infra.constraints.editor/src-gen"
+    modelPluginID="org.eclipse.papyrus.infra.constraints" modelName="Constraints"
+    testsDirectory="/org.eclipse.papyrus.infra.constraints.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"
+    complianceLevel="5.0" copyrightFields="false">
+  <foreignModel>Constraints.ecore</foreignModel>
+  <genPackages prefix="Constraints" basePackage="org.eclipse.papyrus.infra" disposableProviderFactory="true"
+      ecorePackage="Constraints.ecore#/">
+    <genClasses image="false" ecoreClass="Constraints.ecore#//DisplayUnit">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Constraints.ecore#//DisplayUnit/constraints"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Constraints.ecore#//DisplayUnit/elementMultiplicity"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="Constraints.ecore#//ConstraintDescriptor">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Constraints.ecore#//ConstraintDescriptor/name"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Constraints.ecore#//ConstraintDescriptor/display"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Constraints.ecore#//ConstraintDescriptor/overrideable"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Constraints.ecore#//ConstraintDescriptor/overriddenConstraints"/>
+    </genClasses>
+    <genClasses ecoreClass="Constraints.ecore#//SimpleConstraint">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Constraints.ecore#//SimpleConstraint/constraintType"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Constraints.ecore#//SimpleConstraint/properties"/>
+    </genClasses>
+    <genClasses ecoreClass="Constraints.ecore#//CompositeConstraint">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Constraints.ecore#//CompositeConstraint/constraints"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="Constraints.ecore#//ConfigProperty">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Constraints.ecore#//ConfigProperty/name"/>
+    </genClasses>
+    <genClasses ecoreClass="Constraints.ecore#//ValueProperty">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Constraints.ecore#//ValueProperty/value"/>
+    </genClasses>
+    <genClasses ecoreClass="Constraints.ecore#//ReferenceProperty">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Constraints.ecore#//ReferenceProperty/value"/>
+    </genClasses>
+    <nestedGenPackages prefix="Environment" basePackage="org.eclipse.papyrus.infra.constraints"
+        disposableProviderFactory="true" ecorePackage="Constraints.ecore#//environment">
+      <genClasses ecoreClass="Constraints.ecore#//environment/ConstraintEnvironment">
+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Constraints.ecore#//environment/ConstraintEnvironment/constraintTypes"/>
+      </genClasses>
+      <genClasses ecoreClass="Constraints.ecore#//environment/ConstraintType">
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Constraints.ecore#//environment/ConstraintType/label"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Constraints.ecore#//environment/ConstraintType/constraintClass"/>
+      </genClasses>
+    </nestedGenPackages>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/about.html b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/about.html
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/build.properties b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/build.properties
index c61d781dc34..b59c2f4e3b0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/build.properties
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/build.properties
@@ -1,12 +1,12 @@
-bin.includes = .,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html,\

-               Model/,\

-               schema/

-output.. = bin/

-jars.compile.order = .

-source.. = src-gen/,\

-           src/

-src.includes = about.html

+bin.includes = .,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html,\
+               Model/,\
+               schema/
+output.. = bin/
+jars.compile.order = .
+source.. = src-gen/,\
+           src/
+src.includes = about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/plugin.properties b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/plugin.properties
index 0058766b6f7..657ef7033b7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/plugin.properties
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/plugin.properties
@@ -1,8 +1,8 @@
-

-# <copyright>

-# </copyright>

-#

-# $Id$

-

-pluginName = Constraints model

-providerName = Eclipse Modeling Project

+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+pluginName = Constraints model
+providerName = Eclipse Modeling Project
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/plugin.xml b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/plugin.xml
index 39460de172b..d3639045d3f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/plugin.xml
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/plugin.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<?eclipse version="3.0"?>

-<!--

- Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.

-

- All rights reserved. This program and the accompanying materials

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

- which accompanies this distribution, and is available at

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

-

- Contributors:

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

-  Christian W. Damus - bug 485220

--->

-<plugin>

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

-

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

-      <package class="org.eclipse.papyrus.infra.constraints.ConstraintsPackage" genModel="Model/Constraints.genmodel" uri="http://www.eclipse.org/papyrus/constraints/0.9"/>

-      <package

-            class="org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage"

-            genModel="Model/Constraints.genmodel"

-            uri="http://www.eclipse.org/papyrus/constraints/environment/0.9">

-      </package>

-   </extension>

-   

-   <extension

-         point="org.eclipse.papyrus.infra.constraints.ConstraintEnvironment">

-      <environment

-            environmentModel="Model/ConstraintEnvironment.xmi">

-      </environment>

-   </extension>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse version="3.0"?>
+<!--
+ Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
 
-</plugin>

+ All rights reserved. This program and the accompanying materials
+ are made available under the terms 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
+  Christian W. Damus - bug 485220
+-->
+<plugin>
+   <extension-point id="ConstraintEnvironment" name="ConstraintEnvironment" schema="schema/ConstraintEnvironment.exsd"/>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <package class="org.eclipse.papyrus.infra.constraints.ConstraintsPackage" genModel="Model/Constraints.genmodel" uri="http://www.eclipse.org/papyrus/constraints/0.9"/>
+      <package
+            class="org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage"
+            genModel="Model/Constraints.genmodel"
+            uri="http://www.eclipse.org/papyrus/constraints/environment/0.9">
+      </package>
+   </extension>
+   
+   <extension
+         point="org.eclipse.papyrus.infra.constraints.ConstraintEnvironment">
+      <environment
+            environmentModel="Model/ConstraintEnvironment.xmi">
+      </environment>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/pom.xml b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/pom.xml
index 1924f31536d..d0cbe425a31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/pom.xml
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-constraints</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.constraints</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/schema/ConstraintEnvironment.exsd b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/schema/ConstraintEnvironment.exsd
index 0cee06a42c3..b8e2cb97fc9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/schema/ConstraintEnvironment.exsd
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/schema/ConstraintEnvironment.exsd
@@ -1,102 +1,102 @@
-<?xml version='1.0' encoding='UTF-8'?>

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

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

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.constraints" id="ConstraintEnvironment" name="ConstraintEnvironment"/>

-      </appInfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appInfo>

-            <meta.element />

-         </appInfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="environment" 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="environment">

-      <complexType>

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

-            <annotation>

-               <documentation>

-                  

-               </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>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.constraints" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.constraints" id="ConstraintEnvironment" name="ConstraintEnvironment"/>
+      </appInfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="environment" 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="environment">
+      <complexType>
+         <attribute name="environmentModel" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </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.constraints/src-gen/org/eclipse/papyrus/infra/constraints/CompositeConstraint.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/CompositeConstraint.java
index c27ee3e35c1..d513dc9d843 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/CompositeConstraint.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/CompositeConstraint.java
@@ -1,44 +1,44 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Composite Constraint</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.constraints.CompositeConstraint#getConstraints <em>Constraints</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getCompositeConstraint()

- * @model

- * @generated

- */

-public interface CompositeConstraint extends ConstraintDescriptor {

-	/**

-	 * Returns the value of the '<em><b>Constraints</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.constraints.SimpleConstraint}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Constraints</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>Constraints</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getCompositeConstraint_Constraints()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<SimpleConstraint> getConstraints();

-

-} // CompositeConstraint

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Composite Constraint</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.CompositeConstraint#getConstraints <em>Constraints</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getCompositeConstraint()
+ * @model
+ * @generated
+ */
+public interface CompositeConstraint extends ConstraintDescriptor {
+	/**
+	 * Returns the value of the '<em><b>Constraints</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.constraints.SimpleConstraint}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Constraints</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>Constraints</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getCompositeConstraint_Constraints()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<SimpleConstraint> getConstraints();
+
+} // CompositeConstraint
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConfigProperty.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConfigProperty.java
index 657d210ab8d..55401ad9ded 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConfigProperty.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConfigProperty.java
@@ -1,56 +1,56 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Config Property</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.constraints.ConfigProperty#getName <em>Name</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getConfigProperty()

- * @model abstract="true"

- * @generated

- */

-public interface ConfigProperty 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.infra.constraints.ConstraintsPackage#getConfigProperty_Name()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.ConfigProperty#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);

-

-} // ConfigProperty

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Config Property</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.ConfigProperty#getName <em>Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getConfigProperty()
+ * @model abstract="true"
+ * @generated
+ */
+public interface ConfigProperty 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.infra.constraints.ConstraintsPackage#getConfigProperty_Name()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.ConfigProperty#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);
+
+} // ConfigProperty
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConstraintDescriptor.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConstraintDescriptor.java
index b878970f7cc..0e9e07c66df 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConstraintDescriptor.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConstraintDescriptor.java
@@ -1,135 +1,135 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints;

-

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

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Constraint Descriptor</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getDisplay <em>Display</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#isOverrideable <em>Overrideable</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getOverriddenConstraints <em>Overridden Constraints</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getConstraintDescriptor()

- * @model abstract="true"

- * @generated

- */

-public interface ConstraintDescriptor 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.infra.constraints.ConstraintsPackage#getConstraintDescriptor_Name()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#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>Display</b></em>' container reference.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit#getConstraints <em>Constraints</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Display</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>Display</em>' container reference.

-	 * @see #setDisplay(DisplayUnit)

-	 * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getConstraintDescriptor_Display()

-	 * @see org.eclipse.papyrus.infra.constraints.DisplayUnit#getConstraints

-	 * @model opposite="constraints" transient="false"

-	 * @generated

-	 */

-	DisplayUnit getDisplay();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getDisplay <em>Display</em>}' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Display</em>' container reference.

-	 * @see #getDisplay()

-	 * @generated

-	 */

-	void setDisplay(DisplayUnit value);

-

-	/**

-	 * Returns the value of the '<em><b>Overrideable</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Overrideable</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Overrideable</em>' attribute.

-	 * @see #setOverrideable(boolean)

-	 * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getConstraintDescriptor_Overrideable()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isOverrideable();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#isOverrideable <em>Overrideable</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Overrideable</em>' attribute.

-	 * @see #isOverrideable()

-	 * @generated

-	 */

-	void setOverrideable(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Overridden Constraints</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.constraints.SimpleConstraint}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Overridden Constraints</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>Overridden Constraints</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getConstraintDescriptor_OverriddenConstraints()

-	 * @model

-	 * @generated

-	 */

-	EList<SimpleConstraint> getOverriddenConstraints();

-

-} // ConstraintDescriptor

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Constraint Descriptor</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getDisplay <em>Display</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#isOverrideable <em>Overrideable</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getOverriddenConstraints <em>Overridden Constraints</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getConstraintDescriptor()
+ * @model abstract="true"
+ * @generated
+ */
+public interface ConstraintDescriptor 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.infra.constraints.ConstraintsPackage#getConstraintDescriptor_Name()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#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>Display</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit#getConstraints <em>Constraints</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Display</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>Display</em>' container reference.
+	 * @see #setDisplay(DisplayUnit)
+	 * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getConstraintDescriptor_Display()
+	 * @see org.eclipse.papyrus.infra.constraints.DisplayUnit#getConstraints
+	 * @model opposite="constraints" transient="false"
+	 * @generated
+	 */
+	DisplayUnit getDisplay();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getDisplay <em>Display</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Display</em>' container reference.
+	 * @see #getDisplay()
+	 * @generated
+	 */
+	void setDisplay(DisplayUnit value);
+
+	/**
+	 * Returns the value of the '<em><b>Overrideable</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Overrideable</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Overrideable</em>' attribute.
+	 * @see #setOverrideable(boolean)
+	 * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getConstraintDescriptor_Overrideable()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isOverrideable();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#isOverrideable <em>Overrideable</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Overrideable</em>' attribute.
+	 * @see #isOverrideable()
+	 * @generated
+	 */
+	void setOverrideable(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Overridden Constraints</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.constraints.SimpleConstraint}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Overridden Constraints</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>Overridden Constraints</em>' reference list.
+	 * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getConstraintDescriptor_OverriddenConstraints()
+	 * @model
+	 * @generated
+	 */
+	EList<SimpleConstraint> getOverriddenConstraints();
+
+} // ConstraintDescriptor
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConstraintsFactory.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConstraintsFactory.java
index 4254f77b4e3..199ca260537 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConstraintsFactory.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConstraintsFactory.java
@@ -1,80 +1,80 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints;

-

-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.constraints.ConstraintsPackage

- * @generated

- */

-public interface ConstraintsFactory extends EFactory {

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	ConstraintsFactory eINSTANCE = org.eclipse.papyrus.infra.constraints.impl.ConstraintsFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Simple Constraint</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Simple Constraint</em>'.

-	 * @generated

-	 */

-	SimpleConstraint createSimpleConstraint();

-

-	/**

-	 * Returns a new object of class '<em>Composite Constraint</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Composite Constraint</em>'.

-	 * @generated

-	 */

-	CompositeConstraint createCompositeConstraint();

-

-	/**

-	 * Returns a new object of class '<em>Value Property</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Value Property</em>'.

-	 * @generated

-	 */

-	ValueProperty createValueProperty();

-

-	/**

-	 * Returns a new object of class '<em>Reference Property</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Reference Property</em>'.

-	 * @generated

-	 */

-	ReferenceProperty createReferenceProperty();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	ConstraintsPackage getConstraintsPackage();

-

-} // ConstraintsFactory

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints;
+
+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.constraints.ConstraintsPackage
+ * @generated
+ */
+public interface ConstraintsFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	ConstraintsFactory eINSTANCE = org.eclipse.papyrus.infra.constraints.impl.ConstraintsFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Simple Constraint</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Simple Constraint</em>'.
+	 * @generated
+	 */
+	SimpleConstraint createSimpleConstraint();
+
+	/**
+	 * Returns a new object of class '<em>Composite Constraint</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Composite Constraint</em>'.
+	 * @generated
+	 */
+	CompositeConstraint createCompositeConstraint();
+
+	/**
+	 * Returns a new object of class '<em>Value Property</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Value Property</em>'.
+	 * @generated
+	 */
+	ValueProperty createValueProperty();
+
+	/**
+	 * Returns a new object of class '<em>Reference Property</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Reference Property</em>'.
+	 * @generated
+	 */
+	ReferenceProperty createReferenceProperty();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	ConstraintsPackage getConstraintsPackage();
+
+} // ConstraintsFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConstraintsPackage.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConstraintsPackage.java
index f3d18b20e49..a458bce2f10 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConstraintsPackage.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ConstraintsPackage.java
@@ -1,869 +1,869 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints;

-

-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 enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.constraints.ConstraintsFactory

- * @model kind="package"

- * @generated

- */

-public interface ConstraintsPackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "constraints";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/constraints/0.9";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "constraints";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	ConstraintsPackage eINSTANCE = org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.impl.DisplayUnitImpl <em>Display Unit</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.constraints.impl.DisplayUnitImpl

-	 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getDisplayUnit()

-	 * @generated

-	 */

-	int DISPLAY_UNIT = 0;

-

-	/**

-	 * The feature id for the '<em><b>Constraints</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DISPLAY_UNIT__CONSTRAINTS = 0;

-

-	/**

-	 * The feature id for the '<em><b>Element Multiplicity</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DISPLAY_UNIT__ELEMENT_MULTIPLICITY = 1;

-

-	/**

-	 * The number of structural features of the '<em>Display Unit</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DISPLAY_UNIT_FEATURE_COUNT = 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl <em>Constraint Descriptor</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl

-	 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getConstraintDescriptor()

-	 * @generated

-	 */

-	int CONSTRAINT_DESCRIPTOR = 1;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONSTRAINT_DESCRIPTOR__NAME = 0;

-

-	/**

-	 * The feature id for the '<em><b>Display</b></em>' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONSTRAINT_DESCRIPTOR__DISPLAY = 1;

-

-	/**

-	 * The feature id for the '<em><b>Overrideable</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONSTRAINT_DESCRIPTOR__OVERRIDEABLE = 2;

-

-	/**

-	 * The feature id for the '<em><b>Overridden Constraints</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS = 3;

-

-	/**

-	 * The number of structural features of the '<em>Constraint Descriptor</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONSTRAINT_DESCRIPTOR_FEATURE_COUNT = 4;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.impl.SimpleConstraintImpl <em>Simple Constraint</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.constraints.impl.SimpleConstraintImpl

-	 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getSimpleConstraint()

-	 * @generated

-	 */

-	int SIMPLE_CONSTRAINT = 2;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SIMPLE_CONSTRAINT__NAME = CONSTRAINT_DESCRIPTOR__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Display</b></em>' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SIMPLE_CONSTRAINT__DISPLAY = CONSTRAINT_DESCRIPTOR__DISPLAY;

-

-	/**

-	 * The feature id for the '<em><b>Overrideable</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SIMPLE_CONSTRAINT__OVERRIDEABLE = CONSTRAINT_DESCRIPTOR__OVERRIDEABLE;

-

-	/**

-	 * The feature id for the '<em><b>Overridden Constraints</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SIMPLE_CONSTRAINT__OVERRIDDEN_CONSTRAINTS = CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS;

-

-	/**

-	 * The feature id for the '<em><b>Constraint Type</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SIMPLE_CONSTRAINT__CONSTRAINT_TYPE = CONSTRAINT_DESCRIPTOR_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SIMPLE_CONSTRAINT__PROPERTIES = CONSTRAINT_DESCRIPTOR_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Simple Constraint</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SIMPLE_CONSTRAINT_FEATURE_COUNT = CONSTRAINT_DESCRIPTOR_FEATURE_COUNT + 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.impl.CompositeConstraintImpl <em>Composite Constraint</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.constraints.impl.CompositeConstraintImpl

-	 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getCompositeConstraint()

-	 * @generated

-	 */

-	int COMPOSITE_CONSTRAINT = 3;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int COMPOSITE_CONSTRAINT__NAME = CONSTRAINT_DESCRIPTOR__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Display</b></em>' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int COMPOSITE_CONSTRAINT__DISPLAY = CONSTRAINT_DESCRIPTOR__DISPLAY;

-

-	/**

-	 * The feature id for the '<em><b>Overrideable</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int COMPOSITE_CONSTRAINT__OVERRIDEABLE = CONSTRAINT_DESCRIPTOR__OVERRIDEABLE;

-

-	/**

-	 * The feature id for the '<em><b>Overridden Constraints</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int COMPOSITE_CONSTRAINT__OVERRIDDEN_CONSTRAINTS = CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS;

-

-	/**

-	 * The feature id for the '<em><b>Constraints</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int COMPOSITE_CONSTRAINT__CONSTRAINTS = CONSTRAINT_DESCRIPTOR_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Composite Constraint</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int COMPOSITE_CONSTRAINT_FEATURE_COUNT = CONSTRAINT_DESCRIPTOR_FEATURE_COUNT + 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.impl.ConfigPropertyImpl <em>Config Property</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.constraints.impl.ConfigPropertyImpl

-	 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getConfigProperty()

-	 * @generated

-	 */

-	int CONFIG_PROPERTY = 4;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONFIG_PROPERTY__NAME = 0;

-

-	/**

-	 * The number of structural features of the '<em>Config Property</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONFIG_PROPERTY_FEATURE_COUNT = 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.impl.ValuePropertyImpl <em>Value Property</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.constraints.impl.ValuePropertyImpl

-	 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getValueProperty()

-	 * @generated

-	 */

-	int VALUE_PROPERTY = 5;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VALUE_PROPERTY__NAME = CONFIG_PROPERTY__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VALUE_PROPERTY__VALUE = CONFIG_PROPERTY_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Value Property</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VALUE_PROPERTY_FEATURE_COUNT = CONFIG_PROPERTY_FEATURE_COUNT + 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.impl.ReferencePropertyImpl <em>Reference Property</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.constraints.impl.ReferencePropertyImpl

-	 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getReferenceProperty()

-	 * @generated

-	 */

-	int REFERENCE_PROPERTY = 6;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REFERENCE_PROPERTY__NAME = CONFIG_PROPERTY__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REFERENCE_PROPERTY__VALUE = CONFIG_PROPERTY_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Reference Property</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int REFERENCE_PROPERTY_FEATURE_COUNT = CONFIG_PROPERTY_FEATURE_COUNT + 1;

-

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit <em>Display Unit</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Display Unit</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.DisplayUnit

-	 * @generated

-	 */

-	EClass getDisplayUnit();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit#getConstraints <em>Constraints</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Constraints</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.DisplayUnit#getConstraints()

-	 * @see #getDisplayUnit()

-	 * @generated

-	 */

-	EReference getDisplayUnit_Constraints();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit#getElementMultiplicity <em>Element Multiplicity</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Element Multiplicity</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.DisplayUnit#getElementMultiplicity()

-	 * @see #getDisplayUnit()

-	 * @generated

-	 */

-	EAttribute getDisplayUnit_ElementMultiplicity();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor <em>Constraint Descriptor</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Constraint Descriptor</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.ConstraintDescriptor

-	 * @generated

-	 */

-	EClass getConstraintDescriptor();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getName <em>Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Name</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getName()

-	 * @see #getConstraintDescriptor()

-	 * @generated

-	 */

-	EAttribute getConstraintDescriptor_Name();

-

-	/**

-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getDisplay <em>Display</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the container reference '<em>Display</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getDisplay()

-	 * @see #getConstraintDescriptor()

-	 * @generated

-	 */

-	EReference getConstraintDescriptor_Display();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#isOverrideable <em>Overrideable</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Overrideable</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#isOverrideable()

-	 * @see #getConstraintDescriptor()

-	 * @generated

-	 */

-	EAttribute getConstraintDescriptor_Overrideable();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getOverriddenConstraints <em>Overridden Constraints</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Overridden Constraints</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getOverriddenConstraints()

-	 * @see #getConstraintDescriptor()

-	 * @generated

-	 */

-	EReference getConstraintDescriptor_OverriddenConstraints();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.SimpleConstraint <em>Simple Constraint</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Simple Constraint</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.SimpleConstraint

-	 * @generated

-	 */

-	EClass getSimpleConstraint();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.constraints.SimpleConstraint#getConstraintType <em>Constraint Type</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Constraint Type</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.SimpleConstraint#getConstraintType()

-	 * @see #getSimpleConstraint()

-	 * @generated

-	 */

-	EReference getSimpleConstraint_ConstraintType();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.constraints.SimpleConstraint#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.infra.constraints.SimpleConstraint#getProperties()

-	 * @see #getSimpleConstraint()

-	 * @generated

-	 */

-	EReference getSimpleConstraint_Properties();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.CompositeConstraint <em>Composite Constraint</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Composite Constraint</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.CompositeConstraint

-	 * @generated

-	 */

-	EClass getCompositeConstraint();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.constraints.CompositeConstraint#getConstraints <em>Constraints</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Constraints</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.CompositeConstraint#getConstraints()

-	 * @see #getCompositeConstraint()

-	 * @generated

-	 */

-	EReference getCompositeConstraint_Constraints();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.ConfigProperty <em>Config Property</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Config Property</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.ConfigProperty

-	 * @generated

-	 */

-	EClass getConfigProperty();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.constraints.ConfigProperty#getName <em>Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Name</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.ConfigProperty#getName()

-	 * @see #getConfigProperty()

-	 * @generated

-	 */

-	EAttribute getConfigProperty_Name();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.ValueProperty <em>Value Property</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Value Property</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.ValueProperty

-	 * @generated

-	 */

-	EClass getValueProperty();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.constraints.ValueProperty#getValue <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Value</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.ValueProperty#getValue()

-	 * @see #getValueProperty()

-	 * @generated

-	 */

-	EAttribute getValueProperty_Value();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.ReferenceProperty <em>Reference Property</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Reference Property</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.ReferenceProperty

-	 * @generated

-	 */

-	EClass getReferenceProperty();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.constraints.ReferenceProperty#getValue <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Value</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.ReferenceProperty#getValue()

-	 * @see #getReferenceProperty()

-	 * @generated

-	 */

-	EReference getReferenceProperty_Value();

-

-	/**

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

-	 */

-	ConstraintsFactory getConstraintsFactory();

-

-	/**

-	 * <!-- 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 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.constraints.impl.DisplayUnitImpl <em>Display Unit</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.constraints.impl.DisplayUnitImpl

-		 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getDisplayUnit()

-		 * @generated

-		 */

-		EClass DISPLAY_UNIT = eINSTANCE.getDisplayUnit();

-

-		/**

-		 * The meta object literal for the '<em><b>Constraints</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference DISPLAY_UNIT__CONSTRAINTS = eINSTANCE.getDisplayUnit_Constraints();

-

-		/**

-		 * The meta object literal for the '<em><b>Element Multiplicity</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute DISPLAY_UNIT__ELEMENT_MULTIPLICITY = eINSTANCE.getDisplayUnit_ElementMultiplicity();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl <em>Constraint Descriptor</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl

-		 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getConstraintDescriptor()

-		 * @generated

-		 */

-		EClass CONSTRAINT_DESCRIPTOR = eINSTANCE.getConstraintDescriptor();

-

-		/**

-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute CONSTRAINT_DESCRIPTOR__NAME = eINSTANCE.getConstraintDescriptor_Name();

-

-		/**

-		 * The meta object literal for the '<em><b>Display</b></em>' container reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CONSTRAINT_DESCRIPTOR__DISPLAY = eINSTANCE.getConstraintDescriptor_Display();

-

-		/**

-		 * The meta object literal for the '<em><b>Overrideable</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute CONSTRAINT_DESCRIPTOR__OVERRIDEABLE = eINSTANCE.getConstraintDescriptor_Overrideable();

-

-		/**

-		 * The meta object literal for the '<em><b>Overridden Constraints</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS = eINSTANCE.getConstraintDescriptor_OverriddenConstraints();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.impl.SimpleConstraintImpl <em>Simple Constraint</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.constraints.impl.SimpleConstraintImpl

-		 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getSimpleConstraint()

-		 * @generated

-		 */

-		EClass SIMPLE_CONSTRAINT = eINSTANCE.getSimpleConstraint();

-

-		/**

-		 * The meta object literal for the '<em><b>Constraint Type</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference SIMPLE_CONSTRAINT__CONSTRAINT_TYPE = eINSTANCE.getSimpleConstraint_ConstraintType();

-

-		/**

-		 * The meta object literal for the '<em><b>Properties</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference SIMPLE_CONSTRAINT__PROPERTIES = eINSTANCE.getSimpleConstraint_Properties();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.impl.CompositeConstraintImpl <em>Composite Constraint</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.constraints.impl.CompositeConstraintImpl

-		 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getCompositeConstraint()

-		 * @generated

-		 */

-		EClass COMPOSITE_CONSTRAINT = eINSTANCE.getCompositeConstraint();

-

-		/**

-		 * The meta object literal for the '<em><b>Constraints</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference COMPOSITE_CONSTRAINT__CONSTRAINTS = eINSTANCE.getCompositeConstraint_Constraints();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.impl.ConfigPropertyImpl <em>Config Property</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.constraints.impl.ConfigPropertyImpl

-		 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getConfigProperty()

-		 * @generated

-		 */

-		EClass CONFIG_PROPERTY = eINSTANCE.getConfigProperty();

-

-		/**

-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute CONFIG_PROPERTY__NAME = eINSTANCE.getConfigProperty_Name();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.impl.ValuePropertyImpl <em>Value Property</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.constraints.impl.ValuePropertyImpl

-		 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getValueProperty()

-		 * @generated

-		 */

-		EClass VALUE_PROPERTY = eINSTANCE.getValueProperty();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute VALUE_PROPERTY__VALUE = eINSTANCE.getValueProperty_Value();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.impl.ReferencePropertyImpl <em>Reference Property</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.constraints.impl.ReferencePropertyImpl

-		 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getReferenceProperty()

-		 * @generated

-		 */

-		EClass REFERENCE_PROPERTY = eINSTANCE.getReferenceProperty();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference REFERENCE_PROPERTY__VALUE = eINSTANCE.getReferenceProperty_Value();

-

-	}

-

-} // ConstraintsPackage

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints;
+
+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 enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface ConstraintsPackage extends EPackage {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNAME = "constraints";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/constraints/0.9";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_PREFIX = "constraints";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	ConstraintsPackage eINSTANCE = org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.impl.DisplayUnitImpl <em>Display Unit</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.constraints.impl.DisplayUnitImpl
+	 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getDisplayUnit()
+	 * @generated
+	 */
+	int DISPLAY_UNIT = 0;
+
+	/**
+	 * The feature id for the '<em><b>Constraints</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int DISPLAY_UNIT__CONSTRAINTS = 0;
+
+	/**
+	 * The feature id for the '<em><b>Element Multiplicity</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int DISPLAY_UNIT__ELEMENT_MULTIPLICITY = 1;
+
+	/**
+	 * The number of structural features of the '<em>Display Unit</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int DISPLAY_UNIT_FEATURE_COUNT = 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl <em>Constraint Descriptor</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl
+	 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getConstraintDescriptor()
+	 * @generated
+	 */
+	int CONSTRAINT_DESCRIPTOR = 1;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTRAINT_DESCRIPTOR__NAME = 0;
+
+	/**
+	 * The feature id for the '<em><b>Display</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTRAINT_DESCRIPTOR__DISPLAY = 1;
+
+	/**
+	 * The feature id for the '<em><b>Overrideable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTRAINT_DESCRIPTOR__OVERRIDEABLE = 2;
+
+	/**
+	 * The feature id for the '<em><b>Overridden Constraints</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS = 3;
+
+	/**
+	 * The number of structural features of the '<em>Constraint Descriptor</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTRAINT_DESCRIPTOR_FEATURE_COUNT = 4;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.impl.SimpleConstraintImpl <em>Simple Constraint</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.constraints.impl.SimpleConstraintImpl
+	 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getSimpleConstraint()
+	 * @generated
+	 */
+	int SIMPLE_CONSTRAINT = 2;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SIMPLE_CONSTRAINT__NAME = CONSTRAINT_DESCRIPTOR__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Display</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SIMPLE_CONSTRAINT__DISPLAY = CONSTRAINT_DESCRIPTOR__DISPLAY;
+
+	/**
+	 * The feature id for the '<em><b>Overrideable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SIMPLE_CONSTRAINT__OVERRIDEABLE = CONSTRAINT_DESCRIPTOR__OVERRIDEABLE;
+
+	/**
+	 * The feature id for the '<em><b>Overridden Constraints</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SIMPLE_CONSTRAINT__OVERRIDDEN_CONSTRAINTS = CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS;
+
+	/**
+	 * The feature id for the '<em><b>Constraint Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SIMPLE_CONSTRAINT__CONSTRAINT_TYPE = CONSTRAINT_DESCRIPTOR_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SIMPLE_CONSTRAINT__PROPERTIES = CONSTRAINT_DESCRIPTOR_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Simple Constraint</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SIMPLE_CONSTRAINT_FEATURE_COUNT = CONSTRAINT_DESCRIPTOR_FEATURE_COUNT + 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.impl.CompositeConstraintImpl <em>Composite Constraint</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.constraints.impl.CompositeConstraintImpl
+	 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getCompositeConstraint()
+	 * @generated
+	 */
+	int COMPOSITE_CONSTRAINT = 3;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int COMPOSITE_CONSTRAINT__NAME = CONSTRAINT_DESCRIPTOR__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Display</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int COMPOSITE_CONSTRAINT__DISPLAY = CONSTRAINT_DESCRIPTOR__DISPLAY;
+
+	/**
+	 * The feature id for the '<em><b>Overrideable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int COMPOSITE_CONSTRAINT__OVERRIDEABLE = CONSTRAINT_DESCRIPTOR__OVERRIDEABLE;
+
+	/**
+	 * The feature id for the '<em><b>Overridden Constraints</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int COMPOSITE_CONSTRAINT__OVERRIDDEN_CONSTRAINTS = CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS;
+
+	/**
+	 * The feature id for the '<em><b>Constraints</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int COMPOSITE_CONSTRAINT__CONSTRAINTS = CONSTRAINT_DESCRIPTOR_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Composite Constraint</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int COMPOSITE_CONSTRAINT_FEATURE_COUNT = CONSTRAINT_DESCRIPTOR_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.impl.ConfigPropertyImpl <em>Config Property</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.constraints.impl.ConfigPropertyImpl
+	 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getConfigProperty()
+	 * @generated
+	 */
+	int CONFIG_PROPERTY = 4;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONFIG_PROPERTY__NAME = 0;
+
+	/**
+	 * The number of structural features of the '<em>Config Property</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONFIG_PROPERTY_FEATURE_COUNT = 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.impl.ValuePropertyImpl <em>Value Property</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.constraints.impl.ValuePropertyImpl
+	 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getValueProperty()
+	 * @generated
+	 */
+	int VALUE_PROPERTY = 5;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VALUE_PROPERTY__NAME = CONFIG_PROPERTY__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VALUE_PROPERTY__VALUE = CONFIG_PROPERTY_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Value Property</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VALUE_PROPERTY_FEATURE_COUNT = CONFIG_PROPERTY_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.impl.ReferencePropertyImpl <em>Reference Property</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.constraints.impl.ReferencePropertyImpl
+	 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getReferenceProperty()
+	 * @generated
+	 */
+	int REFERENCE_PROPERTY = 6;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int REFERENCE_PROPERTY__NAME = CONFIG_PROPERTY__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Value</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int REFERENCE_PROPERTY__VALUE = CONFIG_PROPERTY_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Reference Property</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int REFERENCE_PROPERTY_FEATURE_COUNT = CONFIG_PROPERTY_FEATURE_COUNT + 1;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit <em>Display Unit</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Display Unit</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.DisplayUnit
+	 * @generated
+	 */
+	EClass getDisplayUnit();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit#getConstraints <em>Constraints</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference list '<em>Constraints</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.DisplayUnit#getConstraints()
+	 * @see #getDisplayUnit()
+	 * @generated
+	 */
+	EReference getDisplayUnit_Constraints();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit#getElementMultiplicity <em>Element Multiplicity</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Element Multiplicity</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.DisplayUnit#getElementMultiplicity()
+	 * @see #getDisplayUnit()
+	 * @generated
+	 */
+	EAttribute getDisplayUnit_ElementMultiplicity();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor <em>Constraint Descriptor</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Constraint Descriptor</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.ConstraintDescriptor
+	 * @generated
+	 */
+	EClass getConstraintDescriptor();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getName()
+	 * @see #getConstraintDescriptor()
+	 * @generated
+	 */
+	EAttribute getConstraintDescriptor_Name();
+
+	/**
+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getDisplay <em>Display</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the container reference '<em>Display</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getDisplay()
+	 * @see #getConstraintDescriptor()
+	 * @generated
+	 */
+	EReference getConstraintDescriptor_Display();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#isOverrideable <em>Overrideable</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Overrideable</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#isOverrideable()
+	 * @see #getConstraintDescriptor()
+	 * @generated
+	 */
+	EAttribute getConstraintDescriptor_Overrideable();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getOverriddenConstraints <em>Overridden Constraints</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the reference list '<em>Overridden Constraints</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getOverriddenConstraints()
+	 * @see #getConstraintDescriptor()
+	 * @generated
+	 */
+	EReference getConstraintDescriptor_OverriddenConstraints();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.SimpleConstraint <em>Simple Constraint</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Simple Constraint</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.SimpleConstraint
+	 * @generated
+	 */
+	EClass getSimpleConstraint();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.constraints.SimpleConstraint#getConstraintType <em>Constraint Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the reference '<em>Constraint Type</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.SimpleConstraint#getConstraintType()
+	 * @see #getSimpleConstraint()
+	 * @generated
+	 */
+	EReference getSimpleConstraint_ConstraintType();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.constraints.SimpleConstraint#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.infra.constraints.SimpleConstraint#getProperties()
+	 * @see #getSimpleConstraint()
+	 * @generated
+	 */
+	EReference getSimpleConstraint_Properties();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.CompositeConstraint <em>Composite Constraint</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Composite Constraint</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.CompositeConstraint
+	 * @generated
+	 */
+	EClass getCompositeConstraint();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.constraints.CompositeConstraint#getConstraints <em>Constraints</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference list '<em>Constraints</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.CompositeConstraint#getConstraints()
+	 * @see #getCompositeConstraint()
+	 * @generated
+	 */
+	EReference getCompositeConstraint_Constraints();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.ConfigProperty <em>Config Property</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Config Property</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.ConfigProperty
+	 * @generated
+	 */
+	EClass getConfigProperty();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.constraints.ConfigProperty#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.ConfigProperty#getName()
+	 * @see #getConfigProperty()
+	 * @generated
+	 */
+	EAttribute getConfigProperty_Name();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.ValueProperty <em>Value Property</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Value Property</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.ValueProperty
+	 * @generated
+	 */
+	EClass getValueProperty();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.constraints.ValueProperty#getValue <em>Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Value</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.ValueProperty#getValue()
+	 * @see #getValueProperty()
+	 * @generated
+	 */
+	EAttribute getValueProperty_Value();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.ReferenceProperty <em>Reference Property</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Reference Property</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.ReferenceProperty
+	 * @generated
+	 */
+	EClass getReferenceProperty();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.constraints.ReferenceProperty#getValue <em>Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the reference '<em>Value</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.ReferenceProperty#getValue()
+	 * @see #getReferenceProperty()
+	 * @generated
+	 */
+	EReference getReferenceProperty_Value();
+
+	/**
+	 * 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
+	 */
+	ConstraintsFactory getConstraintsFactory();
+
+	/**
+	 * <!-- 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 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.constraints.impl.DisplayUnitImpl <em>Display Unit</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.constraints.impl.DisplayUnitImpl
+		 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getDisplayUnit()
+		 * @generated
+		 */
+		EClass DISPLAY_UNIT = eINSTANCE.getDisplayUnit();
+
+		/**
+		 * The meta object literal for the '<em><b>Constraints</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference DISPLAY_UNIT__CONSTRAINTS = eINSTANCE.getDisplayUnit_Constraints();
+
+		/**
+		 * The meta object literal for the '<em><b>Element Multiplicity</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute DISPLAY_UNIT__ELEMENT_MULTIPLICITY = eINSTANCE.getDisplayUnit_ElementMultiplicity();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl <em>Constraint Descriptor</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl
+		 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getConstraintDescriptor()
+		 * @generated
+		 */
+		EClass CONSTRAINT_DESCRIPTOR = eINSTANCE.getConstraintDescriptor();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute CONSTRAINT_DESCRIPTOR__NAME = eINSTANCE.getConstraintDescriptor_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Display</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference CONSTRAINT_DESCRIPTOR__DISPLAY = eINSTANCE.getConstraintDescriptor_Display();
+
+		/**
+		 * The meta object literal for the '<em><b>Overrideable</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute CONSTRAINT_DESCRIPTOR__OVERRIDEABLE = eINSTANCE.getConstraintDescriptor_Overrideable();
+
+		/**
+		 * The meta object literal for the '<em><b>Overridden Constraints</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS = eINSTANCE.getConstraintDescriptor_OverriddenConstraints();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.impl.SimpleConstraintImpl <em>Simple Constraint</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.constraints.impl.SimpleConstraintImpl
+		 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getSimpleConstraint()
+		 * @generated
+		 */
+		EClass SIMPLE_CONSTRAINT = eINSTANCE.getSimpleConstraint();
+
+		/**
+		 * The meta object literal for the '<em><b>Constraint Type</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference SIMPLE_CONSTRAINT__CONSTRAINT_TYPE = eINSTANCE.getSimpleConstraint_ConstraintType();
+
+		/**
+		 * The meta object literal for the '<em><b>Properties</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference SIMPLE_CONSTRAINT__PROPERTIES = eINSTANCE.getSimpleConstraint_Properties();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.impl.CompositeConstraintImpl <em>Composite Constraint</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.constraints.impl.CompositeConstraintImpl
+		 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getCompositeConstraint()
+		 * @generated
+		 */
+		EClass COMPOSITE_CONSTRAINT = eINSTANCE.getCompositeConstraint();
+
+		/**
+		 * The meta object literal for the '<em><b>Constraints</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference COMPOSITE_CONSTRAINT__CONSTRAINTS = eINSTANCE.getCompositeConstraint_Constraints();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.impl.ConfigPropertyImpl <em>Config Property</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.constraints.impl.ConfigPropertyImpl
+		 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getConfigProperty()
+		 * @generated
+		 */
+		EClass CONFIG_PROPERTY = eINSTANCE.getConfigProperty();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute CONFIG_PROPERTY__NAME = eINSTANCE.getConfigProperty_Name();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.impl.ValuePropertyImpl <em>Value Property</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.constraints.impl.ValuePropertyImpl
+		 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getValueProperty()
+		 * @generated
+		 */
+		EClass VALUE_PROPERTY = eINSTANCE.getValueProperty();
+
+		/**
+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute VALUE_PROPERTY__VALUE = eINSTANCE.getValueProperty_Value();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.impl.ReferencePropertyImpl <em>Reference Property</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.constraints.impl.ReferencePropertyImpl
+		 * @see org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl#getReferenceProperty()
+		 * @generated
+		 */
+		EClass REFERENCE_PROPERTY = eINSTANCE.getReferenceProperty();
+
+		/**
+		 * The meta object literal for the '<em><b>Value</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference REFERENCE_PROPERTY__VALUE = eINSTANCE.getReferenceProperty_Value();
+
+	}
+
+} // ConstraintsPackage
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/DisplayUnit.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/DisplayUnit.java
index e4d1f333f1b..a19aa371ab1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/DisplayUnit.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/DisplayUnit.java
@@ -1,77 +1,77 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints;

-

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

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Display Unit</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.constraints.DisplayUnit#getConstraints <em>Constraints</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.constraints.DisplayUnit#getElementMultiplicity <em>Element Multiplicity</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getDisplayUnit()

- * @model abstract="true"

- * @generated

- */

-public interface DisplayUnit extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Constraints</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getDisplay <em>Display</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Constraints</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>Constraints</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getDisplayUnit_Constraints()

-	 * @see org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getDisplay

-	 * @model opposite="display" containment="true"

-	 * @generated

-	 */

-	EList<ConstraintDescriptor> getConstraints();

-

-	/**

-	 * Returns the value of the '<em><b>Element Multiplicity</b></em>' attribute.

-	 * The default value is <code>"1"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Element Multiplicity</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 Multiplicity</em>' attribute.

-	 * @see #setElementMultiplicity(int)

-	 * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getDisplayUnit_ElementMultiplicity()

-	 * @model default="1"

-	 * @generated

-	 */

-	int getElementMultiplicity();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit#getElementMultiplicity <em>Element Multiplicity</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Element Multiplicity</em>' attribute.

-	 * @see #getElementMultiplicity()

-	 * @generated

-	 */

-	void setElementMultiplicity(int value);

-

-} // DisplayUnit

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Display Unit</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.DisplayUnit#getConstraints <em>Constraints</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.DisplayUnit#getElementMultiplicity <em>Element Multiplicity</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getDisplayUnit()
+ * @model abstract="true"
+ * @generated
+ */
+public interface DisplayUnit extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Constraints</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getDisplay <em>Display</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Constraints</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>Constraints</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getDisplayUnit_Constraints()
+	 * @see org.eclipse.papyrus.infra.constraints.ConstraintDescriptor#getDisplay
+	 * @model opposite="display" containment="true"
+	 * @generated
+	 */
+	EList<ConstraintDescriptor> getConstraints();
+
+	/**
+	 * Returns the value of the '<em><b>Element Multiplicity</b></em>' attribute.
+	 * The default value is <code>"1"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Element Multiplicity</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 Multiplicity</em>' attribute.
+	 * @see #setElementMultiplicity(int)
+	 * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getDisplayUnit_ElementMultiplicity()
+	 * @model default="1"
+	 * @generated
+	 */
+	int getElementMultiplicity();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.DisplayUnit#getElementMultiplicity <em>Element Multiplicity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Element Multiplicity</em>' attribute.
+	 * @see #getElementMultiplicity()
+	 * @generated
+	 */
+	void setElementMultiplicity(int value);
+
+} // DisplayUnit
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ReferenceProperty.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ReferenceProperty.java
index 53275d0fa07..d2d9ae6b17d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ReferenceProperty.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ReferenceProperty.java
@@ -1,56 +1,56 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Reference Property</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.constraints.ReferenceProperty#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getReferenceProperty()

- * @model

- * @generated

- */

-public interface ReferenceProperty extends ConfigProperty {

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value</em>' reference.

-	 * @see #setValue(EObject)

-	 * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getReferenceProperty_Value()

-	 * @model required="true"

-	 * @generated

-	 */

-	EObject getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.ReferenceProperty#getValue <em>Value</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' reference.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(EObject value);

-

-} // ReferenceProperty

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Reference Property</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.ReferenceProperty#getValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getReferenceProperty()
+ * @model
+ * @generated
+ */
+public interface ReferenceProperty extends ConfigProperty {
+	/**
+	 * Returns the value of the '<em><b>Value</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Value</em>' reference isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Value</em>' reference.
+	 * @see #setValue(EObject)
+	 * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getReferenceProperty_Value()
+	 * @model required="true"
+	 * @generated
+	 */
+	EObject getValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.ReferenceProperty#getValue <em>Value</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Value</em>' reference.
+	 * @see #getValue()
+	 * @generated
+	 */
+	void setValue(EObject value);
+
+} // ReferenceProperty
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/SimpleConstraint.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/SimpleConstraint.java
index 4607dee4158..1a0c908ad92 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/SimpleConstraint.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/SimpleConstraint.java
@@ -1,74 +1,74 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints;

-

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

-import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Simple Constraint</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.constraints.SimpleConstraint#getConstraintType <em>Constraint Type</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.constraints.SimpleConstraint#getProperties <em>Properties</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getSimpleConstraint()

- * @model

- * @generated

- */

-public interface SimpleConstraint extends ConstraintDescriptor {

-	/**

-	 * Returns the value of the '<em><b>Constraint Type</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Constraint 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>Constraint Type</em>' reference.

-	 * @see #setConstraintType(ConstraintType)

-	 * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getSimpleConstraint_ConstraintType()

-	 * @model required="true"

-	 * @generated

-	 */

-	ConstraintType getConstraintType();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.SimpleConstraint#getConstraintType <em>Constraint Type</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Constraint Type</em>' reference.

-	 * @see #getConstraintType()

-	 * @generated

-	 */

-	void setConstraintType(ConstraintType value);

-

-	/**

-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.constraints.ConfigProperty}.

-	 * <!-- 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.infra.constraints.ConstraintsPackage#getSimpleConstraint_Properties()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<ConfigProperty> getProperties();

-

-} // SimpleConstraint

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Simple Constraint</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.SimpleConstraint#getConstraintType <em>Constraint Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.SimpleConstraint#getProperties <em>Properties</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getSimpleConstraint()
+ * @model
+ * @generated
+ */
+public interface SimpleConstraint extends ConstraintDescriptor {
+	/**
+	 * Returns the value of the '<em><b>Constraint Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Constraint 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>Constraint Type</em>' reference.
+	 * @see #setConstraintType(ConstraintType)
+	 * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getSimpleConstraint_ConstraintType()
+	 * @model required="true"
+	 * @generated
+	 */
+	ConstraintType getConstraintType();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.SimpleConstraint#getConstraintType <em>Constraint Type</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Constraint Type</em>' reference.
+	 * @see #getConstraintType()
+	 * @generated
+	 */
+	void setConstraintType(ConstraintType value);
+
+	/**
+	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.constraints.ConfigProperty}.
+	 * <!-- 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.infra.constraints.ConstraintsPackage#getSimpleConstraint_Properties()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<ConfigProperty> getProperties();
+
+} // SimpleConstraint
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ValueProperty.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ValueProperty.java
index 69474d42f37..3fdfbadc79e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ValueProperty.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/ValueProperty.java
@@ -1,55 +1,55 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Value Property</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.constraints.ValueProperty#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getValueProperty()

- * @model

- * @generated

- */

-public interface ValueProperty extends ConfigProperty {

-	/**

-	 * 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.infra.constraints.ConstraintsPackage#getValueProperty_Value()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.ValueProperty#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);

-

-} // ValueProperty

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Value Property</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.ValueProperty#getValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.constraints.ConstraintsPackage#getValueProperty()
+ * @model
+ * @generated
+ */
+public interface ValueProperty extends ConfigProperty {
+	/**
+	 * 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.infra.constraints.ConstraintsPackage#getValueProperty_Value()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.ValueProperty#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);
+
+} // ValueProperty
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/ConstraintEnvironment.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/ConstraintEnvironment.java
index 6fc4ae290b4..1b35ac39f90 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/ConstraintEnvironment.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/ConstraintEnvironment.java
@@ -1,45 +1,45 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.environment;

-

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

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Constraint Environment</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment#getConstraintTypes <em>Constraint Types</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage#getConstraintEnvironment()

- * @model

- * @generated

- */

-public interface ConstraintEnvironment extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Constraint Types</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Constraint Types</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>Constraint Types</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage#getConstraintEnvironment_ConstraintTypes()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<ConstraintType> getConstraintTypes();

-

-} // ConstraintEnvironment

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Constraint Environment</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment#getConstraintTypes <em>Constraint Types</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage#getConstraintEnvironment()
+ * @model
+ * @generated
+ */
+public interface ConstraintEnvironment extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Constraint Types</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Constraint Types</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>Constraint Types</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage#getConstraintEnvironment_ConstraintTypes()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<ConstraintType> getConstraintTypes();
+
+} // ConstraintEnvironment
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/ConstraintType.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/ConstraintType.java
index 350aab75cb9..3efd87dfe14 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/ConstraintType.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/ConstraintType.java
@@ -1,85 +1,85 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.environment;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Constraint Type</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType#getLabel <em>Label</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType#getConstraintClass <em>Constraint Class</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage#getConstraintType()

- * @model

- * @generated

- */

-public interface ConstraintType 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.constraints.environment.EnvironmentPackage#getConstraintType_Label()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getLabel();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType#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>Constraint Class</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Constraint Class</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Constraint Class</em>' attribute.

-	 * @see #setConstraintClass(String)

-	 * @see org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage#getConstraintType_ConstraintClass()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getConstraintClass();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType#getConstraintClass <em>Constraint Class</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Constraint Class</em>' attribute.

-	 * @see #getConstraintClass()

-	 * @generated

-	 */

-	void setConstraintClass(String value);

-

-} // ConstraintType

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Constraint Type</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType#getLabel <em>Label</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType#getConstraintClass <em>Constraint Class</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage#getConstraintType()
+ * @model
+ * @generated
+ */
+public interface ConstraintType 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.constraints.environment.EnvironmentPackage#getConstraintType_Label()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getLabel();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType#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>Constraint Class</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Constraint Class</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Constraint Class</em>' attribute.
+	 * @see #setConstraintClass(String)
+	 * @see org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage#getConstraintType_ConstraintClass()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getConstraintClass();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType#getConstraintClass <em>Constraint Class</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Constraint Class</em>' attribute.
+	 * @see #getConstraintClass()
+	 * @generated
+	 */
+	void setConstraintClass(String value);
+
+} // ConstraintType
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/EnvironmentFactory.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/EnvironmentFactory.java
index dfdee3745be..9bd2431bd1f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/EnvironmentFactory.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/EnvironmentFactory.java
@@ -1,60 +1,60 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.environment;

-

-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.constraints.environment.EnvironmentPackage

- * @generated

- */

-public interface EnvironmentFactory extends EFactory {

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	EnvironmentFactory eINSTANCE = org.eclipse.papyrus.infra.constraints.environment.impl.EnvironmentFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Constraint Environment</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Constraint Environment</em>'.

-	 * @generated

-	 */

-	ConstraintEnvironment createConstraintEnvironment();

-

-	/**

-	 * Returns a new object of class '<em>Constraint Type</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Constraint Type</em>'.

-	 * @generated

-	 */

-	ConstraintType createConstraintType();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	EnvironmentPackage getEnvironmentPackage();

-

-} // EnvironmentFactory

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment;
+
+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.constraints.environment.EnvironmentPackage
+ * @generated
+ */
+public interface EnvironmentFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	EnvironmentFactory eINSTANCE = org.eclipse.papyrus.infra.constraints.environment.impl.EnvironmentFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Constraint Environment</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Constraint Environment</em>'.
+	 * @generated
+	 */
+	ConstraintEnvironment createConstraintEnvironment();
+
+	/**
+	 * Returns a new object of class '<em>Constraint Type</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Constraint Type</em>'.
+	 * @generated
+	 */
+	ConstraintType createConstraintType();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	EnvironmentPackage getEnvironmentPackage();
+
+} // EnvironmentFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/EnvironmentPackage.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/EnvironmentPackage.java
index 6039a52f626..bda8f281494 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/EnvironmentPackage.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/EnvironmentPackage.java
@@ -1,273 +1,273 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.environment;

-

-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 enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.constraints.environment.EnvironmentFactory

- * @model kind="package"

- * @generated

- */

-public interface EnvironmentPackage extends EPackage {

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "environment";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/constraints/environment/0.9";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "environment";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	EnvironmentPackage eINSTANCE = org.eclipse.papyrus.infra.constraints.environment.impl.EnvironmentPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintEnvironmentImpl <em>Constraint Environment</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintEnvironmentImpl

-	 * @see org.eclipse.papyrus.infra.constraints.environment.impl.EnvironmentPackageImpl#getConstraintEnvironment()

-	 * @generated

-	 */

-	int CONSTRAINT_ENVIRONMENT = 0;

-

-	/**

-	 * The feature id for the '<em><b>Constraint Types</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES = 0;

-

-	/**

-	 * The number of structural features of the '<em>Constraint Environment</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONSTRAINT_ENVIRONMENT_FEATURE_COUNT = 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintTypeImpl <em>Constraint Type</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintTypeImpl

-	 * @see org.eclipse.papyrus.infra.constraints.environment.impl.EnvironmentPackageImpl#getConstraintType()

-	 * @generated

-	 */

-	int CONSTRAINT_TYPE = 1;

-

-	/**

-	 * The feature id for the '<em><b>Label</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONSTRAINT_TYPE__LABEL = 0;

-

-	/**

-	 * The feature id for the '<em><b>Constraint Class</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONSTRAINT_TYPE__CONSTRAINT_CLASS = 1;

-

-	/**

-	 * The number of structural features of the '<em>Constraint Type</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONSTRAINT_TYPE_FEATURE_COUNT = 2;

-

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment <em>Constraint Environment</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Constraint Environment</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment

-	 * @generated

-	 */

-	EClass getConstraintEnvironment();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment#getConstraintTypes <em>Constraint Types</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Constraint Types</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment#getConstraintTypes()

-	 * @see #getConstraintEnvironment()

-	 * @generated

-	 */

-	EReference getConstraintEnvironment_ConstraintTypes();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType <em>Constraint Type</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Constraint Type</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.environment.ConstraintType

-	 * @generated

-	 */

-	EClass getConstraintType();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType#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.constraints.environment.ConstraintType#getLabel()

-	 * @see #getConstraintType()

-	 * @generated

-	 */

-	EAttribute getConstraintType_Label();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType#getConstraintClass <em>Constraint Class</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Constraint Class</em>'.

-	 * @see org.eclipse.papyrus.infra.constraints.environment.ConstraintType#getConstraintClass()

-	 * @see #getConstraintType()

-	 * @generated

-	 */

-	EAttribute getConstraintType_ConstraintClass();

-

-	/**

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

-	 */

-	EnvironmentFactory getEnvironmentFactory();

-

-	/**

-	 * <!-- 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 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.constraints.environment.impl.ConstraintEnvironmentImpl <em>Constraint Environment</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintEnvironmentImpl

-		 * @see org.eclipse.papyrus.infra.constraints.environment.impl.EnvironmentPackageImpl#getConstraintEnvironment()

-		 * @generated

-		 */

-		EClass CONSTRAINT_ENVIRONMENT = eINSTANCE.getConstraintEnvironment();

-

-		/**

-		 * The meta object literal for the '<em><b>Constraint Types</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES = eINSTANCE.getConstraintEnvironment_ConstraintTypes();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintTypeImpl <em>Constraint Type</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintTypeImpl

-		 * @see org.eclipse.papyrus.infra.constraints.environment.impl.EnvironmentPackageImpl#getConstraintType()

-		 * @generated

-		 */

-		EClass CONSTRAINT_TYPE = eINSTANCE.getConstraintType();

-

-		/**

-		 * The meta object literal for the '<em><b>Label</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute CONSTRAINT_TYPE__LABEL = eINSTANCE.getConstraintType_Label();

-

-		/**

-		 * The meta object literal for the '<em><b>Constraint Class</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute CONSTRAINT_TYPE__CONSTRAINT_CLASS = eINSTANCE.getConstraintType_ConstraintClass();

-

-	}

-

-} // EnvironmentPackage

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment;
+
+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 enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.constraints.environment.EnvironmentFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface EnvironmentPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNAME = "environment";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/constraints/environment/0.9";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_PREFIX = "environment";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	EnvironmentPackage eINSTANCE = org.eclipse.papyrus.infra.constraints.environment.impl.EnvironmentPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintEnvironmentImpl <em>Constraint Environment</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintEnvironmentImpl
+	 * @see org.eclipse.papyrus.infra.constraints.environment.impl.EnvironmentPackageImpl#getConstraintEnvironment()
+	 * @generated
+	 */
+	int CONSTRAINT_ENVIRONMENT = 0;
+
+	/**
+	 * The feature id for the '<em><b>Constraint Types</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES = 0;
+
+	/**
+	 * The number of structural features of the '<em>Constraint Environment</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTRAINT_ENVIRONMENT_FEATURE_COUNT = 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintTypeImpl <em>Constraint Type</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintTypeImpl
+	 * @see org.eclipse.papyrus.infra.constraints.environment.impl.EnvironmentPackageImpl#getConstraintType()
+	 * @generated
+	 */
+	int CONSTRAINT_TYPE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTRAINT_TYPE__LABEL = 0;
+
+	/**
+	 * The feature id for the '<em><b>Constraint Class</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTRAINT_TYPE__CONSTRAINT_CLASS = 1;
+
+	/**
+	 * The number of structural features of the '<em>Constraint Type</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTRAINT_TYPE_FEATURE_COUNT = 2;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment <em>Constraint Environment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Constraint Environment</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment
+	 * @generated
+	 */
+	EClass getConstraintEnvironment();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment#getConstraintTypes <em>Constraint Types</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference list '<em>Constraint Types</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment#getConstraintTypes()
+	 * @see #getConstraintEnvironment()
+	 * @generated
+	 */
+	EReference getConstraintEnvironment_ConstraintTypes();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType <em>Constraint Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Constraint Type</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.environment.ConstraintType
+	 * @generated
+	 */
+	EClass getConstraintType();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType#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.constraints.environment.ConstraintType#getLabel()
+	 * @see #getConstraintType()
+	 * @generated
+	 */
+	EAttribute getConstraintType_Label();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType#getConstraintClass <em>Constraint Class</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Constraint Class</em>'.
+	 * @see org.eclipse.papyrus.infra.constraints.environment.ConstraintType#getConstraintClass()
+	 * @see #getConstraintType()
+	 * @generated
+	 */
+	EAttribute getConstraintType_ConstraintClass();
+
+	/**
+	 * 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
+	 */
+	EnvironmentFactory getEnvironmentFactory();
+
+	/**
+	 * <!-- 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 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.constraints.environment.impl.ConstraintEnvironmentImpl <em>Constraint Environment</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintEnvironmentImpl
+		 * @see org.eclipse.papyrus.infra.constraints.environment.impl.EnvironmentPackageImpl#getConstraintEnvironment()
+		 * @generated
+		 */
+		EClass CONSTRAINT_ENVIRONMENT = eINSTANCE.getConstraintEnvironment();
+
+		/**
+		 * The meta object literal for the '<em><b>Constraint Types</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES = eINSTANCE.getConstraintEnvironment_ConstraintTypes();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintTypeImpl <em>Constraint Type</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintTypeImpl
+		 * @see org.eclipse.papyrus.infra.constraints.environment.impl.EnvironmentPackageImpl#getConstraintType()
+		 * @generated
+		 */
+		EClass CONSTRAINT_TYPE = eINSTANCE.getConstraintType();
+
+		/**
+		 * The meta object literal for the '<em><b>Label</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute CONSTRAINT_TYPE__LABEL = eINSTANCE.getConstraintType_Label();
+
+		/**
+		 * The meta object literal for the '<em><b>Constraint Class</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute CONSTRAINT_TYPE__CONSTRAINT_CLASS = eINSTANCE.getConstraintType_ConstraintClass();
+
+	}
+
+} // EnvironmentPackage
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/ConstraintEnvironmentImpl.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/ConstraintEnvironmentImpl.java
index 805e6241188..761f0afc6f1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/ConstraintEnvironmentImpl.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/ConstraintEnvironmentImpl.java
@@ -1,160 +1,160 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.environment.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.EObjectImpl;

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

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

-import org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment;

-import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;

-import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Constraint Environment</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintEnvironmentImpl#getConstraintTypes <em>Constraint Types</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ConstraintEnvironmentImpl extends EObjectImpl implements ConstraintEnvironment {

-	/**

-	 * The cached value of the '{@link #getConstraintTypes() <em>Constraint Types</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getConstraintTypes()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ConstraintType> constraintTypes;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConstraintEnvironmentImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return EnvironmentPackage.Literals.CONSTRAINT_ENVIRONMENT;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ConstraintType> getConstraintTypes() {

-		if (constraintTypes == null) {

-			constraintTypes = new EObjectContainmentEList<ConstraintType>(ConstraintType.class, this, EnvironmentPackage.CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES);

-		}

-		return constraintTypes;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case EnvironmentPackage.CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES:

-			return ((InternalEList<?>) getConstraintTypes()).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 EnvironmentPackage.CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES:

-			return getConstraintTypes();

-		}

-		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 EnvironmentPackage.CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES:

-			getConstraintTypes().clear();

-			getConstraintTypes().addAll((Collection<? extends ConstraintType>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case EnvironmentPackage.CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES:

-			getConstraintTypes().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case EnvironmentPackage.CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES:

-			return constraintTypes != null && !constraintTypes.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // ConstraintEnvironmentImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment.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.EObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment;
+import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Constraint Environment</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintEnvironmentImpl#getConstraintTypes <em>Constraint Types</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ConstraintEnvironmentImpl extends EObjectImpl implements ConstraintEnvironment {
+	/**
+	 * The cached value of the '{@link #getConstraintTypes() <em>Constraint Types</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getConstraintTypes()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ConstraintType> constraintTypes;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ConstraintEnvironmentImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return EnvironmentPackage.Literals.CONSTRAINT_ENVIRONMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EList<ConstraintType> getConstraintTypes() {
+		if (constraintTypes == null) {
+			constraintTypes = new EObjectContainmentEList<ConstraintType>(ConstraintType.class, this, EnvironmentPackage.CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES);
+		}
+		return constraintTypes;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case EnvironmentPackage.CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES:
+			return ((InternalEList<?>) getConstraintTypes()).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 EnvironmentPackage.CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES:
+			return getConstraintTypes();
+		}
+		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 EnvironmentPackage.CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES:
+			getConstraintTypes().clear();
+			getConstraintTypes().addAll((Collection<? extends ConstraintType>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case EnvironmentPackage.CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES:
+			getConstraintTypes().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case EnvironmentPackage.CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES:
+			return constraintTypes != null && !constraintTypes.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} // ConstraintEnvironmentImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/ConstraintTypeImpl.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/ConstraintTypeImpl.java
index 64be8ca868f..50682cdee34 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/ConstraintTypeImpl.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/ConstraintTypeImpl.java
@@ -1,237 +1,237 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.environment.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.EObjectImpl;

-import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;

-import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Constraint Type</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintTypeImpl#getLabel <em>Label</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintTypeImpl#getConstraintClass <em>Constraint Class</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ConstraintTypeImpl extends EObjectImpl implements ConstraintType {

-	/**

-	 * 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 #getConstraintClass() <em>Constraint Class</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getConstraintClass()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String CONSTRAINT_CLASS_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getConstraintClass() <em>Constraint Class</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getConstraintClass()

-	 * @generated

-	 * @ordered

-	 */

-	protected String constraintClass = CONSTRAINT_CLASS_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConstraintTypeImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return EnvironmentPackage.Literals.CONSTRAINT_TYPE;

-	}

-

-	/**

-	 * <!-- 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, EnvironmentPackage.CONSTRAINT_TYPE__LABEL, oldLabel, label));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getConstraintClass() {

-		return constraintClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setConstraintClass(String newConstraintClass) {

-		String oldConstraintClass = constraintClass;

-		constraintClass = newConstraintClass;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, EnvironmentPackage.CONSTRAINT_TYPE__CONSTRAINT_CLASS, oldConstraintClass, constraintClass));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case EnvironmentPackage.CONSTRAINT_TYPE__LABEL:

-			return getLabel();

-		case EnvironmentPackage.CONSTRAINT_TYPE__CONSTRAINT_CLASS:

-			return getConstraintClass();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case EnvironmentPackage.CONSTRAINT_TYPE__LABEL:

-			setLabel((String) newValue);

-			return;

-		case EnvironmentPackage.CONSTRAINT_TYPE__CONSTRAINT_CLASS:

-			setConstraintClass((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case EnvironmentPackage.CONSTRAINT_TYPE__LABEL:

-			setLabel(LABEL_EDEFAULT);

-			return;

-		case EnvironmentPackage.CONSTRAINT_TYPE__CONSTRAINT_CLASS:

-			setConstraintClass(CONSTRAINT_CLASS_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case EnvironmentPackage.CONSTRAINT_TYPE__LABEL:

-			return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);

-		case EnvironmentPackage.CONSTRAINT_TYPE__CONSTRAINT_CLASS:

-			return CONSTRAINT_CLASS_EDEFAULT == null ? constraintClass != null : !CONSTRAINT_CLASS_EDEFAULT.equals(constraintClass);

-		}

-		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(", constraintClass: ");

-		result.append(constraintClass);

-		result.append(')');

-		return result.toString();

-	}

-

-} // ConstraintTypeImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment.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.EObjectImpl;
+import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Constraint Type</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintTypeImpl#getLabel <em>Label</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.environment.impl.ConstraintTypeImpl#getConstraintClass <em>Constraint Class</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ConstraintTypeImpl extends EObjectImpl implements ConstraintType {
+	/**
+	 * 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 #getConstraintClass() <em>Constraint Class</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getConstraintClass()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CONSTRAINT_CLASS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getConstraintClass() <em>Constraint Class</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getConstraintClass()
+	 * @generated
+	 * @ordered
+	 */
+	protected String constraintClass = CONSTRAINT_CLASS_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ConstraintTypeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return EnvironmentPackage.Literals.CONSTRAINT_TYPE;
+	}
+
+	/**
+	 * <!-- 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, EnvironmentPackage.CONSTRAINT_TYPE__LABEL, oldLabel, label));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getConstraintClass() {
+		return constraintClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setConstraintClass(String newConstraintClass) {
+		String oldConstraintClass = constraintClass;
+		constraintClass = newConstraintClass;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, EnvironmentPackage.CONSTRAINT_TYPE__CONSTRAINT_CLASS, oldConstraintClass, constraintClass));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case EnvironmentPackage.CONSTRAINT_TYPE__LABEL:
+			return getLabel();
+		case EnvironmentPackage.CONSTRAINT_TYPE__CONSTRAINT_CLASS:
+			return getConstraintClass();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case EnvironmentPackage.CONSTRAINT_TYPE__LABEL:
+			setLabel((String) newValue);
+			return;
+		case EnvironmentPackage.CONSTRAINT_TYPE__CONSTRAINT_CLASS:
+			setConstraintClass((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case EnvironmentPackage.CONSTRAINT_TYPE__LABEL:
+			setLabel(LABEL_EDEFAULT);
+			return;
+		case EnvironmentPackage.CONSTRAINT_TYPE__CONSTRAINT_CLASS:
+			setConstraintClass(CONSTRAINT_CLASS_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case EnvironmentPackage.CONSTRAINT_TYPE__LABEL:
+			return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
+		case EnvironmentPackage.CONSTRAINT_TYPE__CONSTRAINT_CLASS:
+			return CONSTRAINT_CLASS_EDEFAULT == null ? constraintClass != null : !CONSTRAINT_CLASS_EDEFAULT.equals(constraintClass);
+		}
+		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(", constraintClass: ");
+		result.append(constraintClass);
+		result.append(')');
+		return result.toString();
+	}
+
+} // ConstraintTypeImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/EnvironmentFactoryImpl.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/EnvironmentFactoryImpl.java
index df18d1f255f..0e160de923b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/EnvironmentFactoryImpl.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/EnvironmentFactoryImpl.java
@@ -1,119 +1,119 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.environment.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.constraints.environment.ConstraintEnvironment;

-import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;

-import org.eclipse.papyrus.infra.constraints.environment.EnvironmentFactory;

-import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class EnvironmentFactoryImpl extends EFactoryImpl implements EnvironmentFactory {

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static EnvironmentFactory init() {

-		try {

-			EnvironmentFactory theEnvironmentFactory = (EnvironmentFactory) EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/constraints/environment/0.9");

-			if (theEnvironmentFactory != null) {

-				return theEnvironmentFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new EnvironmentFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EnvironmentFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case EnvironmentPackage.CONSTRAINT_ENVIRONMENT:

-			return createConstraintEnvironment();

-		case EnvironmentPackage.CONSTRAINT_TYPE:

-			return createConstraintType();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConstraintEnvironment createConstraintEnvironment() {

-		ConstraintEnvironmentImpl constraintEnvironment = new ConstraintEnvironmentImpl();

-		return constraintEnvironment;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConstraintType createConstraintType() {

-		ConstraintTypeImpl constraintType = new ConstraintTypeImpl();

-		return constraintType;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EnvironmentPackage getEnvironmentPackage() {

-		return (EnvironmentPackage) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static EnvironmentPackage getPackage() {

-		return EnvironmentPackage.eINSTANCE;

-	}

-

-} // EnvironmentFactoryImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment.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.constraints.environment.ConstraintEnvironment;
+import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentFactory;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class EnvironmentFactoryImpl extends EFactoryImpl implements EnvironmentFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static EnvironmentFactory init() {
+		try {
+			EnvironmentFactory theEnvironmentFactory = (EnvironmentFactory) EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/constraints/environment/0.9");
+			if (theEnvironmentFactory != null) {
+				return theEnvironmentFactory;
+			}
+		} catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new EnvironmentFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EnvironmentFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+		case EnvironmentPackage.CONSTRAINT_ENVIRONMENT:
+			return createConstraintEnvironment();
+		case EnvironmentPackage.CONSTRAINT_TYPE:
+			return createConstraintType();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ConstraintEnvironment createConstraintEnvironment() {
+		ConstraintEnvironmentImpl constraintEnvironment = new ConstraintEnvironmentImpl();
+		return constraintEnvironment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ConstraintType createConstraintType() {
+		ConstraintTypeImpl constraintType = new ConstraintTypeImpl();
+		return constraintType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EnvironmentPackage getEnvironmentPackage() {
+		return (EnvironmentPackage) getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static EnvironmentPackage getPackage() {
+		return EnvironmentPackage.eINSTANCE;
+	}
+
+} // EnvironmentFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/EnvironmentPackageImpl.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/EnvironmentPackageImpl.java
index 7ab2eee7845..8fd849b8ff6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/EnvironmentPackageImpl.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/impl/EnvironmentPackageImpl.java
@@ -1,245 +1,245 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.environment.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.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment;

-import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;

-import org.eclipse.papyrus.infra.constraints.environment.EnvironmentFactory;

-import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;

-import org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentPackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass constraintEnvironmentEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass constraintTypeEClass = 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.constraints.environment.EnvironmentPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private EnvironmentPackageImpl() {

-		super(eNS_URI, EnvironmentFactory.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 EnvironmentPackage#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 EnvironmentPackage init() {

-		if (isInited) {

-			return (EnvironmentPackage) EPackage.Registry.INSTANCE.getEPackage(EnvironmentPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		EnvironmentPackageImpl theEnvironmentPackage = (EnvironmentPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EnvironmentPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EnvironmentPackageImpl());

-

-		isInited = true;

-

-		// Obtain or create and register interdependencies

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)

-				: ConstraintsPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theEnvironmentPackage.createPackageContents();

-		theConstraintsPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theEnvironmentPackage.initializePackageContents();

-		theConstraintsPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theEnvironmentPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(EnvironmentPackage.eNS_URI, theEnvironmentPackage);

-		return theEnvironmentPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getConstraintEnvironment() {

-		return constraintEnvironmentEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getConstraintEnvironment_ConstraintTypes() {

-		return (EReference) constraintEnvironmentEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getConstraintType() {

-		return constraintTypeEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getConstraintType_Label() {

-		return (EAttribute) constraintTypeEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getConstraintType_ConstraintClass() {

-		return (EAttribute) constraintTypeEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EnvironmentFactory getEnvironmentFactory() {

-		return (EnvironmentFactory) 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

-		constraintEnvironmentEClass = createEClass(CONSTRAINT_ENVIRONMENT);

-		createEReference(constraintEnvironmentEClass, CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES);

-

-		constraintTypeEClass = createEClass(CONSTRAINT_TYPE);

-		createEAttribute(constraintTypeEClass, CONSTRAINT_TYPE__LABEL);

-		createEAttribute(constraintTypeEClass, CONSTRAINT_TYPE__CONSTRAINT_CLASS);

-	}

-

-	/**

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

-

-		// Initialize classes and features; add operations and parameters

-		initEClass(constraintEnvironmentEClass, ConstraintEnvironment.class, "ConstraintEnvironment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getConstraintEnvironment_ConstraintTypes(), this.getConstraintType(), null, "constraintTypes", null, 0, -1, ConstraintEnvironment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(constraintTypeEClass, ConstraintType.class, "ConstraintType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getConstraintType_Label(), ecorePackage.getEString(), "label", null, 1, 1, ConstraintType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getConstraintType_ConstraintClass(), ecorePackage.getEString(), "constraintClass", null, 1, 1, ConstraintType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-	}

-

-} // EnvironmentPackageImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment.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.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment;
+import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentFactory;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;
+import org.eclipse.papyrus.infra.constraints.impl.ConstraintsPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentPackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass constraintEnvironmentEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass constraintTypeEClass = 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.constraints.environment.EnvironmentPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private EnvironmentPackageImpl() {
+		super(eNS_URI, EnvironmentFactory.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 EnvironmentPackage#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 EnvironmentPackage init() {
+		if (isInited) {
+			return (EnvironmentPackage) EPackage.Registry.INSTANCE.getEPackage(EnvironmentPackage.eNS_URI);
+		}
+
+		// Obtain or create and register package
+		EnvironmentPackageImpl theEnvironmentPackage = (EnvironmentPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EnvironmentPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EnvironmentPackageImpl());
+
+		isInited = true;
+
+		// Obtain or create and register interdependencies
+		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI)
+				: ConstraintsPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theEnvironmentPackage.createPackageContents();
+		theConstraintsPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theEnvironmentPackage.initializePackageContents();
+		theConstraintsPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theEnvironmentPackage.freeze();
+
+
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(EnvironmentPackage.eNS_URI, theEnvironmentPackage);
+		return theEnvironmentPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getConstraintEnvironment() {
+		return constraintEnvironmentEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getConstraintEnvironment_ConstraintTypes() {
+		return (EReference) constraintEnvironmentEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getConstraintType() {
+		return constraintTypeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getConstraintType_Label() {
+		return (EAttribute) constraintTypeEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getConstraintType_ConstraintClass() {
+		return (EAttribute) constraintTypeEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EnvironmentFactory getEnvironmentFactory() {
+		return (EnvironmentFactory) 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
+		constraintEnvironmentEClass = createEClass(CONSTRAINT_ENVIRONMENT);
+		createEReference(constraintEnvironmentEClass, CONSTRAINT_ENVIRONMENT__CONSTRAINT_TYPES);
+
+		constraintTypeEClass = createEClass(CONSTRAINT_TYPE);
+		createEAttribute(constraintTypeEClass, CONSTRAINT_TYPE__LABEL);
+		createEAttribute(constraintTypeEClass, CONSTRAINT_TYPE__CONSTRAINT_CLASS);
+	}
+
+	/**
+	 * <!-- 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
+
+		// Initialize classes and features; add operations and parameters
+		initEClass(constraintEnvironmentEClass, ConstraintEnvironment.class, "ConstraintEnvironment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getConstraintEnvironment_ConstraintTypes(), this.getConstraintType(), null, "constraintTypes", null, 0, -1, ConstraintEnvironment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(constraintTypeEClass, ConstraintType.class, "ConstraintType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getConstraintType_Label(), ecorePackage.getEString(), "label", null, 1, 1, ConstraintType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstraintType_ConstraintClass(), ecorePackage.getEString(), "constraintClass", null, 1, 1, ConstraintType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+	}
+
+} // EnvironmentPackageImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/util/EnvironmentAdapterFactory.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/util/EnvironmentAdapterFactory.java
index dc3c64f0ca2..54c418a51eb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/util/EnvironmentAdapterFactory.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/util/EnvironmentAdapterFactory.java
@@ -1,153 +1,153 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.environment.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.constraints.environment.ConstraintEnvironment;

-import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;

-import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;

-

-/**

- * <!-- 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.constraints.environment.EnvironmentPackage

- * @generated

- */

-public class EnvironmentAdapterFactory extends AdapterFactoryImpl {

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static EnvironmentPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EnvironmentAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = EnvironmentPackage.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 EnvironmentSwitch<Adapter> modelSwitch =

-			new EnvironmentSwitch<Adapter>() {

-				@Override

-				public Adapter caseConstraintEnvironment(ConstraintEnvironment object) {

-					return createConstraintEnvironmentAdapter();

-				}

-

-				@Override

-				public Adapter caseConstraintType(ConstraintType object) {

-					return createConstraintTypeAdapter();

-				}

-

-				@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.constraints.environment.ConstraintEnvironment <em>Constraint Environment</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.constraints.environment.ConstraintEnvironment

-	 * @generated

-	 */

-	public Adapter createConstraintEnvironmentAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType <em>Constraint Type</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.constraints.environment.ConstraintType

-	 * @generated

-	 */

-	public Adapter createConstraintTypeAdapter() {

-		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;

-	}

-

-} // EnvironmentAdapterFactory

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment.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.constraints.environment.ConstraintEnvironment;
+import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;
+
+/**
+ * <!-- 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.constraints.environment.EnvironmentPackage
+ * @generated
+ */
+public class EnvironmentAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static EnvironmentPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EnvironmentAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = EnvironmentPackage.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 EnvironmentSwitch<Adapter> modelSwitch =
+			new EnvironmentSwitch<Adapter>() {
+				@Override
+				public Adapter caseConstraintEnvironment(ConstraintEnvironment object) {
+					return createConstraintEnvironmentAdapter();
+				}
+
+				@Override
+				public Adapter caseConstraintType(ConstraintType object) {
+					return createConstraintTypeAdapter();
+				}
+
+				@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.constraints.environment.ConstraintEnvironment <em>Constraint Environment</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.constraints.environment.ConstraintEnvironment
+	 * @generated
+	 */
+	public Adapter createConstraintEnvironmentAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.environment.ConstraintType <em>Constraint Type</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.constraints.environment.ConstraintType
+	 * @generated
+	 */
+	public Adapter createConstraintTypeAdapter() {
+		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;
+	}
+
+} // EnvironmentAdapterFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/util/EnvironmentSwitch.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/util/EnvironmentSwitch.java
index 415cdb1002c..560059290fe 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/util/EnvironmentSwitch.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/environment/util/EnvironmentSwitch.java
@@ -1,150 +1,150 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.environment.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.constraints.environment.ConstraintEnvironment;

-import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;

-import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;

-

-/**

- * <!-- 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.constraints.environment.EnvironmentPackage

- * @generated

- */

-public class EnvironmentSwitch<T> extends Switch<T> {

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static EnvironmentPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EnvironmentSwitch() {

-		if (modelPackage == null) {

-			modelPackage = EnvironmentPackage.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 EnvironmentPackage.CONSTRAINT_ENVIRONMENT: {

-			ConstraintEnvironment constraintEnvironment = (ConstraintEnvironment) theEObject;

-			T result = caseConstraintEnvironment(constraintEnvironment);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case EnvironmentPackage.CONSTRAINT_TYPE: {

-			ConstraintType constraintType = (ConstraintType) theEObject;

-			T result = caseConstraintType(constraintType);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Constraint Environment</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>Constraint Environment</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseConstraintEnvironment(ConstraintEnvironment object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Constraint Type</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>Constraint Type</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseConstraintType(ConstraintType 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;

-	}

-

-} // EnvironmentSwitch

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.environment.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.constraints.environment.ConstraintEnvironment;
+import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;
+
+/**
+ * <!-- 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.constraints.environment.EnvironmentPackage
+ * @generated
+ */
+public class EnvironmentSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static EnvironmentPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EnvironmentSwitch() {
+		if (modelPackage == null) {
+			modelPackage = EnvironmentPackage.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 EnvironmentPackage.CONSTRAINT_ENVIRONMENT: {
+			ConstraintEnvironment constraintEnvironment = (ConstraintEnvironment) theEObject;
+			T result = caseConstraintEnvironment(constraintEnvironment);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case EnvironmentPackage.CONSTRAINT_TYPE: {
+			ConstraintType constraintType = (ConstraintType) theEObject;
+			T result = caseConstraintType(constraintType);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Constraint Environment</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>Constraint Environment</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseConstraintEnvironment(ConstraintEnvironment object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Constraint Type</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>Constraint Type</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseConstraintType(ConstraintType 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;
+	}
+
+} // EnvironmentSwitch
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/CompositeConstraintImpl.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/CompositeConstraintImpl.java
index 1061f17ca4b..94a4f192e6c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/CompositeConstraintImpl.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/CompositeConstraintImpl.java
@@ -1,159 +1,159 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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.constraints.CompositeConstraint;

-import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.infra.constraints.SimpleConstraint;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Composite Constraint</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.constraints.impl.CompositeConstraintImpl#getConstraints <em>Constraints</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class CompositeConstraintImpl extends ConstraintDescriptorImpl implements CompositeConstraint {

-	/**

-	 * The cached value of the '{@link #getConstraints() <em>Constraints</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getConstraints()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<SimpleConstraint> constraints;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected CompositeConstraintImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ConstraintsPackage.Literals.COMPOSITE_CONSTRAINT;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<SimpleConstraint> getConstraints() {

-		if (constraints == null) {

-			constraints = new EObjectContainmentEList<SimpleConstraint>(SimpleConstraint.class, this, ConstraintsPackage.COMPOSITE_CONSTRAINT__CONSTRAINTS);

-		}

-		return constraints;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case ConstraintsPackage.COMPOSITE_CONSTRAINT__CONSTRAINTS:

-			return ((InternalEList<?>) getConstraints()).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 ConstraintsPackage.COMPOSITE_CONSTRAINT__CONSTRAINTS:

-			return getConstraints();

-		}

-		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 ConstraintsPackage.COMPOSITE_CONSTRAINT__CONSTRAINTS:

-			getConstraints().clear();

-			getConstraints().addAll((Collection<? extends SimpleConstraint>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ConstraintsPackage.COMPOSITE_CONSTRAINT__CONSTRAINTS:

-			getConstraints().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ConstraintsPackage.COMPOSITE_CONSTRAINT__CONSTRAINTS:

-			return constraints != null && !constraints.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // CompositeConstraintImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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.constraints.CompositeConstraint;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Composite Constraint</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.CompositeConstraintImpl#getConstraints <em>Constraints</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class CompositeConstraintImpl extends ConstraintDescriptorImpl implements CompositeConstraint {
+	/**
+	 * The cached value of the '{@link #getConstraints() <em>Constraints</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getConstraints()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<SimpleConstraint> constraints;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected CompositeConstraintImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ConstraintsPackage.Literals.COMPOSITE_CONSTRAINT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EList<SimpleConstraint> getConstraints() {
+		if (constraints == null) {
+			constraints = new EObjectContainmentEList<SimpleConstraint>(SimpleConstraint.class, this, ConstraintsPackage.COMPOSITE_CONSTRAINT__CONSTRAINTS);
+		}
+		return constraints;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case ConstraintsPackage.COMPOSITE_CONSTRAINT__CONSTRAINTS:
+			return ((InternalEList<?>) getConstraints()).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 ConstraintsPackage.COMPOSITE_CONSTRAINT__CONSTRAINTS:
+			return getConstraints();
+		}
+		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 ConstraintsPackage.COMPOSITE_CONSTRAINT__CONSTRAINTS:
+			getConstraints().clear();
+			getConstraints().addAll((Collection<? extends SimpleConstraint>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case ConstraintsPackage.COMPOSITE_CONSTRAINT__CONSTRAINTS:
+			getConstraints().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case ConstraintsPackage.COMPOSITE_CONSTRAINT__CONSTRAINTS:
+			return constraints != null && !constraints.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} // CompositeConstraintImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConfigPropertyImpl.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConfigPropertyImpl.java
index 832df135edb..60c79d0d880 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConfigPropertyImpl.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConfigPropertyImpl.java
@@ -1,178 +1,178 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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.EObjectImpl;

-import org.eclipse.papyrus.infra.constraints.ConfigProperty;

-import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Config Property</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.constraints.impl.ConfigPropertyImpl#getName <em>Name</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public abstract class ConfigPropertyImpl extends EObjectImpl implements ConfigProperty {

-	/**

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

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConfigPropertyImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ConstraintsPackage.Literals.CONFIG_PROPERTY;

-	}

-

-	/**

-	 * <!-- 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, ConstraintsPackage.CONFIG_PROPERTY__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ConstraintsPackage.CONFIG_PROPERTY__NAME:

-			return getName();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ConstraintsPackage.CONFIG_PROPERTY__NAME:

-			setName((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ConstraintsPackage.CONFIG_PROPERTY__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ConstraintsPackage.CONFIG_PROPERTY__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		}

-		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(')');

-		return result.toString();

-	}

-

-} // ConfigPropertyImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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.EObjectImpl;
+import org.eclipse.papyrus.infra.constraints.ConfigProperty;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Config Property</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.ConfigPropertyImpl#getName <em>Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class ConfigPropertyImpl extends EObjectImpl implements ConfigProperty {
+	/**
+	 * 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;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ConfigPropertyImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ConstraintsPackage.Literals.CONFIG_PROPERTY;
+	}
+
+	/**
+	 * <!-- 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, ConstraintsPackage.CONFIG_PROPERTY__NAME, oldName, name));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case ConstraintsPackage.CONFIG_PROPERTY__NAME:
+			return getName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case ConstraintsPackage.CONFIG_PROPERTY__NAME:
+			setName((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case ConstraintsPackage.CONFIG_PROPERTY__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case ConstraintsPackage.CONFIG_PROPERTY__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		}
+		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(')');
+		return result.toString();
+	}
+
+} // ConfigPropertyImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConstraintDescriptorImpl.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConstraintDescriptorImpl.java
index 412ac2d76f5..d6cd8161851 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConstraintDescriptorImpl.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConstraintDescriptorImpl.java
@@ -1,394 +1,394 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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.EObjectImpl;

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

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

-import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;

-import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.infra.constraints.DisplayUnit;

-import org.eclipse.papyrus.infra.constraints.SimpleConstraint;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Constraint Descriptor</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl#getDisplay <em>Display</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl#isOverrideable <em>Overrideable</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl#getOverriddenConstraints <em>Overridden Constraints</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public abstract class ConstraintDescriptorImpl extends EObjectImpl implements ConstraintDescriptor {

-	/**

-	 * 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 #isOverrideable() <em>Overrideable</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isOverrideable()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean OVERRIDEABLE_EDEFAULT = true;

-

-	/**

-	 * The cached value of the '{@link #isOverrideable() <em>Overrideable</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isOverrideable()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean overrideable = OVERRIDEABLE_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getOverriddenConstraints() <em>Overridden Constraints</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getOverriddenConstraints()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<SimpleConstraint> overriddenConstraints;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConstraintDescriptorImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ConstraintsPackage.Literals.CONSTRAINT_DESCRIPTOR;

-	}

-

-	/**

-	 * <!-- 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, ConstraintsPackage.CONSTRAINT_DESCRIPTOR__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public DisplayUnit getDisplay() {

-		if (eContainerFeatureID() != ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY) {

-			return null;

-		}

-		return (DisplayUnit) eContainer();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetDisplay(DisplayUnit newDisplay, NotificationChain msgs) {

-		msgs = eBasicSetContainer((InternalEObject) newDisplay, ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY, msgs);

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setDisplay(DisplayUnit newDisplay) {

-		if (newDisplay != eInternalContainer() || (eContainerFeatureID() != ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY && newDisplay != null)) {

-			if (EcoreUtil.isAncestor(this, newDisplay)) {

-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());

-			}

-			NotificationChain msgs = null;

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			if (newDisplay != null) {

-				msgs = ((InternalEObject) newDisplay).eInverseAdd(this, ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS, DisplayUnit.class, msgs);

-			}

-			msgs = basicSetDisplay(newDisplay, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY, newDisplay, newDisplay));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public boolean isOverrideable() {

-		return overrideable;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setOverrideable(boolean newOverrideable) {

-		boolean oldOverrideable = overrideable;

-		overrideable = newOverrideable;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDEABLE, oldOverrideable, overrideable));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<SimpleConstraint> getOverriddenConstraints() {

-		if (overriddenConstraints == null) {

-			overriddenConstraints = new EObjectResolvingEList<SimpleConstraint>(SimpleConstraint.class, this, ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS);

-		}

-		return overriddenConstraints;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY:

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			return basicSetDisplay((DisplayUnit) 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 ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY:

-			return basicSetDisplay(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

-		switch (eContainerFeatureID()) {

-		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY:

-			return eInternalContainer().eInverseRemove(this, ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS, DisplayUnit.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 ConstraintsPackage.CONSTRAINT_DESCRIPTOR__NAME:

-			return getName();

-		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY:

-			return getDisplay();

-		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDEABLE:

-			return isOverrideable();

-		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS:

-			return getOverriddenConstraints();

-		}

-		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 ConstraintsPackage.CONSTRAINT_DESCRIPTOR__NAME:

-			setName((String) newValue);

-			return;

-		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY:

-			setDisplay((DisplayUnit) newValue);

-			return;

-		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDEABLE:

-			setOverrideable((Boolean) newValue);

-			return;

-		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS:

-			getOverriddenConstraints().clear();

-			getOverriddenConstraints().addAll((Collection<? extends SimpleConstraint>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY:

-			setDisplay((DisplayUnit) null);

-			return;

-		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDEABLE:

-			setOverrideable(OVERRIDEABLE_EDEFAULT);

-			return;

-		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS:

-			getOverriddenConstraints().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY:

-			return getDisplay() != null;

-		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDEABLE:

-			return overrideable != OVERRIDEABLE_EDEFAULT;

-		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS:

-			return overriddenConstraints != null && !overriddenConstraints.isEmpty();

-		}

-		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(", overrideable: ");

-		result.append(overrideable);

-		result.append(')');

-		return result.toString();

-	}

-

-} // ConstraintDescriptorImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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.EObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Constraint Descriptor</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl#getDisplay <em>Display</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl#isOverrideable <em>Overrideable</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.ConstraintDescriptorImpl#getOverriddenConstraints <em>Overridden Constraints</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class ConstraintDescriptorImpl extends EObjectImpl implements ConstraintDescriptor {
+	/**
+	 * 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 #isOverrideable() <em>Overrideable</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isOverrideable()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean OVERRIDEABLE_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isOverrideable() <em>Overrideable</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isOverrideable()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean overrideable = OVERRIDEABLE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getOverriddenConstraints() <em>Overridden Constraints</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getOverriddenConstraints()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<SimpleConstraint> overriddenConstraints;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ConstraintDescriptorImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ConstraintsPackage.Literals.CONSTRAINT_DESCRIPTOR;
+	}
+
+	/**
+	 * <!-- 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, ConstraintsPackage.CONSTRAINT_DESCRIPTOR__NAME, oldName, name));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public DisplayUnit getDisplay() {
+		if (eContainerFeatureID() != ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY) {
+			return null;
+		}
+		return (DisplayUnit) eContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetDisplay(DisplayUnit newDisplay, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject) newDisplay, ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setDisplay(DisplayUnit newDisplay) {
+		if (newDisplay != eInternalContainer() || (eContainerFeatureID() != ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY && newDisplay != null)) {
+			if (EcoreUtil.isAncestor(this, newDisplay)) {
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			}
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null) {
+				msgs = eBasicRemoveFromContainer(msgs);
+			}
+			if (newDisplay != null) {
+				msgs = ((InternalEObject) newDisplay).eInverseAdd(this, ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS, DisplayUnit.class, msgs);
+			}
+			msgs = basicSetDisplay(newDisplay, msgs);
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		}
+		else if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY, newDisplay, newDisplay));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean isOverrideable() {
+		return overrideable;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setOverrideable(boolean newOverrideable) {
+		boolean oldOverrideable = overrideable;
+		overrideable = newOverrideable;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDEABLE, oldOverrideable, overrideable));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EList<SimpleConstraint> getOverriddenConstraints() {
+		if (overriddenConstraints == null) {
+			overriddenConstraints = new EObjectResolvingEList<SimpleConstraint>(SimpleConstraint.class, this, ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS);
+		}
+		return overriddenConstraints;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY:
+			if (eInternalContainer() != null) {
+				msgs = eBasicRemoveFromContainer(msgs);
+			}
+			return basicSetDisplay((DisplayUnit) 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 ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY:
+			return basicSetDisplay(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY:
+			return eInternalContainer().eInverseRemove(this, ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS, DisplayUnit.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 ConstraintsPackage.CONSTRAINT_DESCRIPTOR__NAME:
+			return getName();
+		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY:
+			return getDisplay();
+		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDEABLE:
+			return isOverrideable();
+		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS:
+			return getOverriddenConstraints();
+		}
+		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 ConstraintsPackage.CONSTRAINT_DESCRIPTOR__NAME:
+			setName((String) newValue);
+			return;
+		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY:
+			setDisplay((DisplayUnit) newValue);
+			return;
+		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDEABLE:
+			setOverrideable((Boolean) newValue);
+			return;
+		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS:
+			getOverriddenConstraints().clear();
+			getOverriddenConstraints().addAll((Collection<? extends SimpleConstraint>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY:
+			setDisplay((DisplayUnit) null);
+			return;
+		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDEABLE:
+			setOverrideable(OVERRIDEABLE_EDEFAULT);
+			return;
+		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS:
+			getOverriddenConstraints().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY:
+			return getDisplay() != null;
+		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDEABLE:
+			return overrideable != OVERRIDEABLE_EDEFAULT;
+		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS:
+			return overriddenConstraints != null && !overriddenConstraints.isEmpty();
+		}
+		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(", overrideable: ");
+		result.append(overrideable);
+		result.append(')');
+		return result.toString();
+	}
+
+} // ConstraintDescriptorImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConstraintsFactoryImpl.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConstraintsFactoryImpl.java
index 5aac065030b..f4ce36d440c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConstraintsFactoryImpl.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConstraintsFactoryImpl.java
@@ -1,148 +1,148 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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.constraints.CompositeConstraint;

-import org.eclipse.papyrus.infra.constraints.ConstraintsFactory;

-import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.infra.constraints.ReferenceProperty;

-import org.eclipse.papyrus.infra.constraints.SimpleConstraint;

-import org.eclipse.papyrus.infra.constraints.ValueProperty;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ConstraintsFactoryImpl extends EFactoryImpl implements ConstraintsFactory {

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static ConstraintsFactory init() {

-		try {

-			ConstraintsFactory theConstraintsFactory = (ConstraintsFactory) EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/constraints/0.9");

-			if (theConstraintsFactory != null) {

-				return theConstraintsFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new ConstraintsFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConstraintsFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case ConstraintsPackage.SIMPLE_CONSTRAINT:

-			return createSimpleConstraint();

-		case ConstraintsPackage.COMPOSITE_CONSTRAINT:

-			return createCompositeConstraint();

-		case ConstraintsPackage.VALUE_PROPERTY:

-			return createValueProperty();

-		case ConstraintsPackage.REFERENCE_PROPERTY:

-			return createReferenceProperty();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SimpleConstraint createSimpleConstraint() {

-		SimpleConstraintImpl simpleConstraint = new SimpleConstraintImpl();

-		return simpleConstraint;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public CompositeConstraint createCompositeConstraint() {

-		CompositeConstraintImpl compositeConstraint = new CompositeConstraintImpl();

-		return compositeConstraint;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ValueProperty createValueProperty() {

-		ValuePropertyImpl valueProperty = new ValuePropertyImpl();

-		return valueProperty;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ReferenceProperty createReferenceProperty() {

-		ReferencePropertyImpl referenceProperty = new ReferencePropertyImpl();

-		return referenceProperty;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConstraintsPackage getConstraintsPackage() {

-		return (ConstraintsPackage) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static ConstraintsPackage getPackage() {

-		return ConstraintsPackage.eINSTANCE;

-	}

-

-} // ConstraintsFactoryImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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.constraints.CompositeConstraint;
+import org.eclipse.papyrus.infra.constraints.ConstraintsFactory;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.ReferenceProperty;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.constraints.ValueProperty;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ConstraintsFactoryImpl extends EFactoryImpl implements ConstraintsFactory {
+
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static ConstraintsFactory init() {
+		try {
+			ConstraintsFactory theConstraintsFactory = (ConstraintsFactory) EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/constraints/0.9");
+			if (theConstraintsFactory != null) {
+				return theConstraintsFactory;
+			}
+		} catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new ConstraintsFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ConstraintsFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+		case ConstraintsPackage.SIMPLE_CONSTRAINT:
+			return createSimpleConstraint();
+		case ConstraintsPackage.COMPOSITE_CONSTRAINT:
+			return createCompositeConstraint();
+		case ConstraintsPackage.VALUE_PROPERTY:
+			return createValueProperty();
+		case ConstraintsPackage.REFERENCE_PROPERTY:
+			return createReferenceProperty();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public SimpleConstraint createSimpleConstraint() {
+		SimpleConstraintImpl simpleConstraint = new SimpleConstraintImpl();
+		return simpleConstraint;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public CompositeConstraint createCompositeConstraint() {
+		CompositeConstraintImpl compositeConstraint = new CompositeConstraintImpl();
+		return compositeConstraint;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ValueProperty createValueProperty() {
+		ValuePropertyImpl valueProperty = new ValuePropertyImpl();
+		return valueProperty;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ReferenceProperty createReferenceProperty() {
+		ReferencePropertyImpl referenceProperty = new ReferencePropertyImpl();
+		return referenceProperty;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ConstraintsPackage getConstraintsPackage() {
+		return (ConstraintsPackage) getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static ConstraintsPackage getPackage() {
+		return ConstraintsPackage.eINSTANCE;
+	}
+
+} // ConstraintsFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConstraintsPackageImpl.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConstraintsPackageImpl.java
index 7cbdf73cd0b..b20845917c4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConstraintsPackageImpl.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ConstraintsPackageImpl.java
@@ -1,486 +1,486 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.constraints.CompositeConstraint;

-import org.eclipse.papyrus.infra.constraints.ConfigProperty;

-import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;

-import org.eclipse.papyrus.infra.constraints.ConstraintsFactory;

-import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.infra.constraints.DisplayUnit;

-import org.eclipse.papyrus.infra.constraints.ReferenceProperty;

-import org.eclipse.papyrus.infra.constraints.SimpleConstraint;

-import org.eclipse.papyrus.infra.constraints.ValueProperty;

-import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;

-import org.eclipse.papyrus.infra.constraints.environment.impl.EnvironmentPackageImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ConstraintsPackageImpl extends EPackageImpl implements ConstraintsPackage {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass displayUnitEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass constraintDescriptorEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass simpleConstraintEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass compositeConstraintEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass configPropertyEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass valuePropertyEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass referencePropertyEClass = 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.constraints.ConstraintsPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private ConstraintsPackageImpl() {

-		super(eNS_URI, ConstraintsFactory.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 ConstraintsPackage#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 ConstraintsPackage init() {

-		if (isInited) {

-			return (ConstraintsPackage) EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ConstraintsPackageImpl());

-

-		isInited = true;

-

-		// Obtain or create and register interdependencies

-		EnvironmentPackageImpl theEnvironmentPackage = (EnvironmentPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(EnvironmentPackage.eNS_URI) instanceof EnvironmentPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EnvironmentPackage.eNS_URI)

-				: EnvironmentPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theConstraintsPackage.createPackageContents();

-		theEnvironmentPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theConstraintsPackage.initializePackageContents();

-		theEnvironmentPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theConstraintsPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(ConstraintsPackage.eNS_URI, theConstraintsPackage);

-		return theConstraintsPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getDisplayUnit() {

-		return displayUnitEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getDisplayUnit_Constraints() {

-		return (EReference) displayUnitEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getDisplayUnit_ElementMultiplicity() {

-		return (EAttribute) displayUnitEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getConstraintDescriptor() {

-		return constraintDescriptorEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getConstraintDescriptor_Name() {

-		return (EAttribute) constraintDescriptorEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getConstraintDescriptor_Display() {

-		return (EReference) constraintDescriptorEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getConstraintDescriptor_Overrideable() {

-		return (EAttribute) constraintDescriptorEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getConstraintDescriptor_OverriddenConstraints() {

-		return (EReference) constraintDescriptorEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getSimpleConstraint() {

-		return simpleConstraintEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getSimpleConstraint_ConstraintType() {

-		return (EReference) simpleConstraintEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getSimpleConstraint_Properties() {

-		return (EReference) simpleConstraintEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getCompositeConstraint() {

-		return compositeConstraintEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getCompositeConstraint_Constraints() {

-		return (EReference) compositeConstraintEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getConfigProperty() {

-		return configPropertyEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getConfigProperty_Name() {

-		return (EAttribute) configPropertyEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getValueProperty() {

-		return valuePropertyEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getValueProperty_Value() {

-		return (EAttribute) valuePropertyEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getReferenceProperty() {

-		return referencePropertyEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getReferenceProperty_Value() {

-		return (EReference) referencePropertyEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConstraintsFactory getConstraintsFactory() {

-		return (ConstraintsFactory) 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

-		displayUnitEClass = createEClass(DISPLAY_UNIT);

-		createEReference(displayUnitEClass, DISPLAY_UNIT__CONSTRAINTS);

-		createEAttribute(displayUnitEClass, DISPLAY_UNIT__ELEMENT_MULTIPLICITY);

-

-		constraintDescriptorEClass = createEClass(CONSTRAINT_DESCRIPTOR);

-		createEAttribute(constraintDescriptorEClass, CONSTRAINT_DESCRIPTOR__NAME);

-		createEReference(constraintDescriptorEClass, CONSTRAINT_DESCRIPTOR__DISPLAY);

-		createEAttribute(constraintDescriptorEClass, CONSTRAINT_DESCRIPTOR__OVERRIDEABLE);

-		createEReference(constraintDescriptorEClass, CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS);

-

-		simpleConstraintEClass = createEClass(SIMPLE_CONSTRAINT);

-		createEReference(simpleConstraintEClass, SIMPLE_CONSTRAINT__CONSTRAINT_TYPE);

-		createEReference(simpleConstraintEClass, SIMPLE_CONSTRAINT__PROPERTIES);

-

-		compositeConstraintEClass = createEClass(COMPOSITE_CONSTRAINT);

-		createEReference(compositeConstraintEClass, COMPOSITE_CONSTRAINT__CONSTRAINTS);

-

-		configPropertyEClass = createEClass(CONFIG_PROPERTY);

-		createEAttribute(configPropertyEClass, CONFIG_PROPERTY__NAME);

-

-		valuePropertyEClass = createEClass(VALUE_PROPERTY);

-		createEAttribute(valuePropertyEClass, VALUE_PROPERTY__VALUE);

-

-		referencePropertyEClass = createEClass(REFERENCE_PROPERTY);

-		createEReference(referencePropertyEClass, REFERENCE_PROPERTY__VALUE);

-	}

-

-	/**

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

-		EnvironmentPackage theEnvironmentPackage = (EnvironmentPackage) EPackage.Registry.INSTANCE.getEPackage(EnvironmentPackage.eNS_URI);

-

-		// Add subpackages

-		getESubpackages().add(theEnvironmentPackage);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		simpleConstraintEClass.getESuperTypes().add(this.getConstraintDescriptor());

-		compositeConstraintEClass.getESuperTypes().add(this.getConstraintDescriptor());

-		valuePropertyEClass.getESuperTypes().add(this.getConfigProperty());

-		referencePropertyEClass.getESuperTypes().add(this.getConfigProperty());

-

-		// Initialize classes and features; add operations and parameters

-		initEClass(displayUnitEClass, DisplayUnit.class, "DisplayUnit", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getDisplayUnit_Constraints(), this.getConstraintDescriptor(), this.getConstraintDescriptor_Display(), "constraints", null, 0, -1, DisplayUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getDisplayUnit_ElementMultiplicity(), ecorePackage.getEInt(), "elementMultiplicity", "1", 0, 1, DisplayUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(constraintDescriptorEClass, ConstraintDescriptor.class, "ConstraintDescriptor", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getConstraintDescriptor_Name(), ecorePackage.getEString(), "name", null, 1, 1, ConstraintDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getConstraintDescriptor_Display(), this.getDisplayUnit(), this.getDisplayUnit_Constraints(), "display", null, 0, 1, ConstraintDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getConstraintDescriptor_Overrideable(), ecorePackage.getEBoolean(), "overrideable", "true", 1, 1, ConstraintDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getConstraintDescriptor_OverriddenConstraints(), this.getSimpleConstraint(), null, "overriddenConstraints", null, 0, -1, ConstraintDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(simpleConstraintEClass, SimpleConstraint.class, "SimpleConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getSimpleConstraint_ConstraintType(), theEnvironmentPackage.getConstraintType(), null, "constraintType", null, 1, 1, SimpleConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getSimpleConstraint_Properties(), this.getConfigProperty(), null, "properties", null, 0, -1, SimpleConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

-				IS_ORDERED);

-

-		initEClass(compositeConstraintEClass, CompositeConstraint.class, "CompositeConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getCompositeConstraint_Constraints(), this.getSimpleConstraint(), null, "constraints", null, 0, -1, CompositeConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

-				!IS_DERIVED, IS_ORDERED);

-

-		initEClass(configPropertyEClass, ConfigProperty.class, "ConfigProperty", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getConfigProperty_Name(), ecorePackage.getEString(), "name", null, 1, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(valuePropertyEClass, ValueProperty.class, "ValueProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getValueProperty_Value(), ecorePackage.getEString(), "value", null, 1, 1, ValueProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(referencePropertyEClass, ReferenceProperty.class, "ReferenceProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getReferenceProperty_Value(), ecorePackage.getEObject(), null, "value", null, 1, 1, ReferenceProperty.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);

-	}

-

-} // ConstraintsPackageImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.constraints.CompositeConstraint;
+import org.eclipse.papyrus.infra.constraints.ConfigProperty;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.ConstraintsFactory;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.constraints.ReferenceProperty;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.constraints.ValueProperty;
+import org.eclipse.papyrus.infra.constraints.environment.EnvironmentPackage;
+import org.eclipse.papyrus.infra.constraints.environment.impl.EnvironmentPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ConstraintsPackageImpl extends EPackageImpl implements ConstraintsPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass displayUnitEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass constraintDescriptorEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass simpleConstraintEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass compositeConstraintEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass configPropertyEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass valuePropertyEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass referencePropertyEClass = 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.constraints.ConstraintsPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private ConstraintsPackageImpl() {
+		super(eNS_URI, ConstraintsFactory.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 ConstraintsPackage#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 ConstraintsPackage init() {
+		if (isInited) {
+			return (ConstraintsPackage) EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI);
+		}
+
+		// Obtain or create and register package
+		ConstraintsPackageImpl theConstraintsPackage = (ConstraintsPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ConstraintsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ConstraintsPackageImpl());
+
+		isInited = true;
+
+		// Obtain or create and register interdependencies
+		EnvironmentPackageImpl theEnvironmentPackage = (EnvironmentPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(EnvironmentPackage.eNS_URI) instanceof EnvironmentPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EnvironmentPackage.eNS_URI)
+				: EnvironmentPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theConstraintsPackage.createPackageContents();
+		theEnvironmentPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theConstraintsPackage.initializePackageContents();
+		theEnvironmentPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theConstraintsPackage.freeze();
+
+
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(ConstraintsPackage.eNS_URI, theConstraintsPackage);
+		return theConstraintsPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getDisplayUnit() {
+		return displayUnitEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getDisplayUnit_Constraints() {
+		return (EReference) displayUnitEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getDisplayUnit_ElementMultiplicity() {
+		return (EAttribute) displayUnitEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getConstraintDescriptor() {
+		return constraintDescriptorEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getConstraintDescriptor_Name() {
+		return (EAttribute) constraintDescriptorEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getConstraintDescriptor_Display() {
+		return (EReference) constraintDescriptorEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getConstraintDescriptor_Overrideable() {
+		return (EAttribute) constraintDescriptorEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getConstraintDescriptor_OverriddenConstraints() {
+		return (EReference) constraintDescriptorEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getSimpleConstraint() {
+		return simpleConstraintEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getSimpleConstraint_ConstraintType() {
+		return (EReference) simpleConstraintEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getSimpleConstraint_Properties() {
+		return (EReference) simpleConstraintEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getCompositeConstraint() {
+		return compositeConstraintEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getCompositeConstraint_Constraints() {
+		return (EReference) compositeConstraintEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getConfigProperty() {
+		return configPropertyEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getConfigProperty_Name() {
+		return (EAttribute) configPropertyEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getValueProperty() {
+		return valuePropertyEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getValueProperty_Value() {
+		return (EAttribute) valuePropertyEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getReferenceProperty() {
+		return referencePropertyEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getReferenceProperty_Value() {
+		return (EReference) referencePropertyEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ConstraintsFactory getConstraintsFactory() {
+		return (ConstraintsFactory) 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
+		displayUnitEClass = createEClass(DISPLAY_UNIT);
+		createEReference(displayUnitEClass, DISPLAY_UNIT__CONSTRAINTS);
+		createEAttribute(displayUnitEClass, DISPLAY_UNIT__ELEMENT_MULTIPLICITY);
+
+		constraintDescriptorEClass = createEClass(CONSTRAINT_DESCRIPTOR);
+		createEAttribute(constraintDescriptorEClass, CONSTRAINT_DESCRIPTOR__NAME);
+		createEReference(constraintDescriptorEClass, CONSTRAINT_DESCRIPTOR__DISPLAY);
+		createEAttribute(constraintDescriptorEClass, CONSTRAINT_DESCRIPTOR__OVERRIDEABLE);
+		createEReference(constraintDescriptorEClass, CONSTRAINT_DESCRIPTOR__OVERRIDDEN_CONSTRAINTS);
+
+		simpleConstraintEClass = createEClass(SIMPLE_CONSTRAINT);
+		createEReference(simpleConstraintEClass, SIMPLE_CONSTRAINT__CONSTRAINT_TYPE);
+		createEReference(simpleConstraintEClass, SIMPLE_CONSTRAINT__PROPERTIES);
+
+		compositeConstraintEClass = createEClass(COMPOSITE_CONSTRAINT);
+		createEReference(compositeConstraintEClass, COMPOSITE_CONSTRAINT__CONSTRAINTS);
+
+		configPropertyEClass = createEClass(CONFIG_PROPERTY);
+		createEAttribute(configPropertyEClass, CONFIG_PROPERTY__NAME);
+
+		valuePropertyEClass = createEClass(VALUE_PROPERTY);
+		createEAttribute(valuePropertyEClass, VALUE_PROPERTY__VALUE);
+
+		referencePropertyEClass = createEClass(REFERENCE_PROPERTY);
+		createEReference(referencePropertyEClass, REFERENCE_PROPERTY__VALUE);
+	}
+
+	/**
+	 * <!-- 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
+		EnvironmentPackage theEnvironmentPackage = (EnvironmentPackage) EPackage.Registry.INSTANCE.getEPackage(EnvironmentPackage.eNS_URI);
+
+		// Add subpackages
+		getESubpackages().add(theEnvironmentPackage);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		simpleConstraintEClass.getESuperTypes().add(this.getConstraintDescriptor());
+		compositeConstraintEClass.getESuperTypes().add(this.getConstraintDescriptor());
+		valuePropertyEClass.getESuperTypes().add(this.getConfigProperty());
+		referencePropertyEClass.getESuperTypes().add(this.getConfigProperty());
+
+		// Initialize classes and features; add operations and parameters
+		initEClass(displayUnitEClass, DisplayUnit.class, "DisplayUnit", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getDisplayUnit_Constraints(), this.getConstraintDescriptor(), this.getConstraintDescriptor_Display(), "constraints", null, 0, -1, DisplayUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDisplayUnit_ElementMultiplicity(), ecorePackage.getEInt(), "elementMultiplicity", "1", 0, 1, DisplayUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(constraintDescriptorEClass, ConstraintDescriptor.class, "ConstraintDescriptor", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getConstraintDescriptor_Name(), ecorePackage.getEString(), "name", null, 1, 1, ConstraintDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getConstraintDescriptor_Display(), this.getDisplayUnit(), this.getDisplayUnit_Constraints(), "display", null, 0, 1, ConstraintDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstraintDescriptor_Overrideable(), ecorePackage.getEBoolean(), "overrideable", "true", 1, 1, ConstraintDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getConstraintDescriptor_OverriddenConstraints(), this.getSimpleConstraint(), null, "overriddenConstraints", null, 0, -1, ConstraintDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(simpleConstraintEClass, SimpleConstraint.class, "SimpleConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getSimpleConstraint_ConstraintType(), theEnvironmentPackage.getConstraintType(), null, "constraintType", null, 1, 1, SimpleConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getSimpleConstraint_Properties(), this.getConfigProperty(), null, "properties", null, 0, -1, SimpleConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+
+		initEClass(compositeConstraintEClass, CompositeConstraint.class, "CompositeConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCompositeConstraint_Constraints(), this.getSimpleConstraint(), null, "constraints", null, 0, -1, CompositeConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+
+		initEClass(configPropertyEClass, ConfigProperty.class, "ConfigProperty", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getConfigProperty_Name(), ecorePackage.getEString(), "name", null, 1, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(valuePropertyEClass, ValueProperty.class, "ValueProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getValueProperty_Value(), ecorePackage.getEString(), "value", null, 1, 1, ValueProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(referencePropertyEClass, ReferenceProperty.class, "ReferenceProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getReferenceProperty_Value(), ecorePackage.getEObject(), null, "value", null, 1, 1, ReferenceProperty.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);
+	}
+
+} // ConstraintsPackageImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/DisplayUnitImpl.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/DisplayUnitImpl.java
index 60a853ee0a5..f54c5eabd17 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/DisplayUnitImpl.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/DisplayUnitImpl.java
@@ -1,253 +1,253 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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.EObjectImpl;

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

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

-import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;

-import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.infra.constraints.DisplayUnit;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Display Unit</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.constraints.impl.DisplayUnitImpl#getConstraints <em>Constraints</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.constraints.impl.DisplayUnitImpl#getElementMultiplicity <em>Element Multiplicity</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public abstract class DisplayUnitImpl extends EObjectImpl implements DisplayUnit {

-	/**

-	 * The cached value of the '{@link #getConstraints() <em>Constraints</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getConstraints()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ConstraintDescriptor> constraints;

-

-	/**

-	 * The default value of the '{@link #getElementMultiplicity() <em>Element Multiplicity</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getElementMultiplicity()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final int ELEMENT_MULTIPLICITY_EDEFAULT = 1;

-	/**

-	 * The cached value of the '{@link #getElementMultiplicity() <em>Element Multiplicity</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getElementMultiplicity()

-	 * @generated

-	 * @ordered

-	 */

-	protected int elementMultiplicity = ELEMENT_MULTIPLICITY_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected DisplayUnitImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ConstraintsPackage.Literals.DISPLAY_UNIT;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ConstraintDescriptor> getConstraints() {

-		if (constraints == null) {

-			constraints = new EObjectContainmentWithInverseEList<ConstraintDescriptor>(ConstraintDescriptor.class, this, ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS, ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY);

-		}

-		return constraints;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public int getElementMultiplicity() {

-		return elementMultiplicity;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setElementMultiplicity(int newElementMultiplicity) {

-		int oldElementMultiplicity = elementMultiplicity;

-		elementMultiplicity = newElementMultiplicity;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ConstraintsPackage.DISPLAY_UNIT__ELEMENT_MULTIPLICITY, oldElementMultiplicity, elementMultiplicity));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getConstraints()).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 ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS:

-			return ((InternalEList<?>) getConstraints()).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 ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS:

-			return getConstraints();

-		case ConstraintsPackage.DISPLAY_UNIT__ELEMENT_MULTIPLICITY:

-			return getElementMultiplicity();

-		}

-		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 ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS:

-			getConstraints().clear();

-			getConstraints().addAll((Collection<? extends ConstraintDescriptor>) newValue);

-			return;

-		case ConstraintsPackage.DISPLAY_UNIT__ELEMENT_MULTIPLICITY:

-			setElementMultiplicity((Integer) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS:

-			getConstraints().clear();

-			return;

-		case ConstraintsPackage.DISPLAY_UNIT__ELEMENT_MULTIPLICITY:

-			setElementMultiplicity(ELEMENT_MULTIPLICITY_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS:

-			return constraints != null && !constraints.isEmpty();

-		case ConstraintsPackage.DISPLAY_UNIT__ELEMENT_MULTIPLICITY:

-			return elementMultiplicity != ELEMENT_MULTIPLICITY_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(" (elementMultiplicity: ");

-		result.append(elementMultiplicity);

-		result.append(')');

-		return result.toString();

-	}

-

-} // DisplayUnitImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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.EObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Display Unit</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.DisplayUnitImpl#getConstraints <em>Constraints</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.DisplayUnitImpl#getElementMultiplicity <em>Element Multiplicity</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class DisplayUnitImpl extends EObjectImpl implements DisplayUnit {
+	/**
+	 * The cached value of the '{@link #getConstraints() <em>Constraints</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getConstraints()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ConstraintDescriptor> constraints;
+
+	/**
+	 * The default value of the '{@link #getElementMultiplicity() <em>Element Multiplicity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getElementMultiplicity()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int ELEMENT_MULTIPLICITY_EDEFAULT = 1;
+	/**
+	 * The cached value of the '{@link #getElementMultiplicity() <em>Element Multiplicity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getElementMultiplicity()
+	 * @generated
+	 * @ordered
+	 */
+	protected int elementMultiplicity = ELEMENT_MULTIPLICITY_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected DisplayUnitImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ConstraintsPackage.Literals.DISPLAY_UNIT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EList<ConstraintDescriptor> getConstraints() {
+		if (constraints == null) {
+			constraints = new EObjectContainmentWithInverseEList<ConstraintDescriptor>(ConstraintDescriptor.class, this, ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS, ConstraintsPackage.CONSTRAINT_DESCRIPTOR__DISPLAY);
+		}
+		return constraints;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public int getElementMultiplicity() {
+		return elementMultiplicity;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setElementMultiplicity(int newElementMultiplicity) {
+		int oldElementMultiplicity = elementMultiplicity;
+		elementMultiplicity = newElementMultiplicity;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ConstraintsPackage.DISPLAY_UNIT__ELEMENT_MULTIPLICITY, oldElementMultiplicity, elementMultiplicity));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS:
+			return ((InternalEList<InternalEObject>) (InternalEList<?>) getConstraints()).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 ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS:
+			return ((InternalEList<?>) getConstraints()).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 ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS:
+			return getConstraints();
+		case ConstraintsPackage.DISPLAY_UNIT__ELEMENT_MULTIPLICITY:
+			return getElementMultiplicity();
+		}
+		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 ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS:
+			getConstraints().clear();
+			getConstraints().addAll((Collection<? extends ConstraintDescriptor>) newValue);
+			return;
+		case ConstraintsPackage.DISPLAY_UNIT__ELEMENT_MULTIPLICITY:
+			setElementMultiplicity((Integer) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS:
+			getConstraints().clear();
+			return;
+		case ConstraintsPackage.DISPLAY_UNIT__ELEMENT_MULTIPLICITY:
+			setElementMultiplicity(ELEMENT_MULTIPLICITY_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case ConstraintsPackage.DISPLAY_UNIT__CONSTRAINTS:
+			return constraints != null && !constraints.isEmpty();
+		case ConstraintsPackage.DISPLAY_UNIT__ELEMENT_MULTIPLICITY:
+			return elementMultiplicity != ELEMENT_MULTIPLICITY_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(" (elementMultiplicity: ");
+		result.append(elementMultiplicity);
+		result.append(')');
+		return result.toString();
+	}
+
+} // DisplayUnitImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ReferencePropertyImpl.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ReferencePropertyImpl.java
index 12788d5697c..63ffe4e0bcf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ReferencePropertyImpl.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ReferencePropertyImpl.java
@@ -1,171 +1,171 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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.papyrus.infra.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.infra.constraints.ReferenceProperty;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Reference Property</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.constraints.impl.ReferencePropertyImpl#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ReferencePropertyImpl extends ConfigPropertyImpl implements ReferenceProperty {

-	/**

-	 * The cached value of the '{@link #getValue() <em>Value</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected EObject value;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ReferencePropertyImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ConstraintsPackage.Literals.REFERENCE_PROPERTY;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EObject getValue() {

-		if (value != null && value.eIsProxy()) {

-			InternalEObject oldValue = (InternalEObject) value;

-			value = eResolveProxy(oldValue);

-			if (value != oldValue) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConstraintsPackage.REFERENCE_PROPERTY__VALUE, oldValue, value));

-				}

-			}

-		}

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EObject basicGetValue() {

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setValue(EObject newValue) {

-		EObject oldValue = value;

-		value = newValue;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ConstraintsPackage.REFERENCE_PROPERTY__VALUE, oldValue, value));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ConstraintsPackage.REFERENCE_PROPERTY__VALUE:

-			if (resolve) {

-				return getValue();

-			}

-			return basicGetValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ConstraintsPackage.REFERENCE_PROPERTY__VALUE:

-			setValue((EObject) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ConstraintsPackage.REFERENCE_PROPERTY__VALUE:

-			setValue((EObject) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ConstraintsPackage.REFERENCE_PROPERTY__VALUE:

-			return value != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // ReferencePropertyImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.ReferenceProperty;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Reference Property</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.ReferencePropertyImpl#getValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ReferencePropertyImpl extends ConfigPropertyImpl implements ReferenceProperty {
+	/**
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected EObject value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ReferencePropertyImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ConstraintsPackage.Literals.REFERENCE_PROPERTY;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EObject getValue() {
+		if (value != null && value.eIsProxy()) {
+			InternalEObject oldValue = (InternalEObject) value;
+			value = eResolveProxy(oldValue);
+			if (value != oldValue) {
+				if (eNotificationRequired()) {
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConstraintsPackage.REFERENCE_PROPERTY__VALUE, oldValue, value));
+				}
+			}
+		}
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EObject basicGetValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setValue(EObject newValue) {
+		EObject oldValue = value;
+		value = newValue;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ConstraintsPackage.REFERENCE_PROPERTY__VALUE, oldValue, value));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case ConstraintsPackage.REFERENCE_PROPERTY__VALUE:
+			if (resolve) {
+				return getValue();
+			}
+			return basicGetValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case ConstraintsPackage.REFERENCE_PROPERTY__VALUE:
+			setValue((EObject) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case ConstraintsPackage.REFERENCE_PROPERTY__VALUE:
+			setValue((EObject) null);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case ConstraintsPackage.REFERENCE_PROPERTY__VALUE:
+			return value != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} // ReferencePropertyImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/SimpleConstraintImpl.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/SimpleConstraintImpl.java
index a7bbb4b3511..382b29719ab 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/SimpleConstraintImpl.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/SimpleConstraintImpl.java
@@ -1,230 +1,230 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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.InternalEList;

-import org.eclipse.papyrus.infra.constraints.ConfigProperty;

-import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.infra.constraints.SimpleConstraint;

-import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Simple Constraint</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.constraints.impl.SimpleConstraintImpl#getConstraintType <em>Constraint Type</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.constraints.impl.SimpleConstraintImpl#getProperties <em>Properties</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class SimpleConstraintImpl extends ConstraintDescriptorImpl implements SimpleConstraint {

-	/**

-	 * The cached value of the '{@link #getConstraintType() <em>Constraint Type</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getConstraintType()

-	 * @generated

-	 * @ordered

-	 */

-	protected ConstraintType constraintType;

-

-	/**

-	 * 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<ConfigProperty> properties;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected SimpleConstraintImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ConstraintsPackage.Literals.SIMPLE_CONSTRAINT;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConstraintType getConstraintType() {

-		if (constraintType != null && constraintType.eIsProxy()) {

-			InternalEObject oldConstraintType = (InternalEObject) constraintType;

-			constraintType = (ConstraintType) eResolveProxy(oldConstraintType);

-			if (constraintType != oldConstraintType) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConstraintsPackage.SIMPLE_CONSTRAINT__CONSTRAINT_TYPE, oldConstraintType, constraintType));

-				}

-			}

-		}

-		return constraintType;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConstraintType basicGetConstraintType() {

-		return constraintType;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setConstraintType(ConstraintType newConstraintType) {

-		ConstraintType oldConstraintType = constraintType;

-		constraintType = newConstraintType;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ConstraintsPackage.SIMPLE_CONSTRAINT__CONSTRAINT_TYPE, oldConstraintType, constraintType));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ConfigProperty> getProperties() {

-		if (properties == null) {

-			properties = new EObjectContainmentEList<ConfigProperty>(ConfigProperty.class, this, ConstraintsPackage.SIMPLE_CONSTRAINT__PROPERTIES);

-		}

-		return properties;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case ConstraintsPackage.SIMPLE_CONSTRAINT__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 ConstraintsPackage.SIMPLE_CONSTRAINT__CONSTRAINT_TYPE:

-			if (resolve) {

-				return getConstraintType();

-			}

-			return basicGetConstraintType();

-		case ConstraintsPackage.SIMPLE_CONSTRAINT__PROPERTIES:

-			return getProperties();

-		}

-		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 ConstraintsPackage.SIMPLE_CONSTRAINT__CONSTRAINT_TYPE:

-			setConstraintType((ConstraintType) newValue);

-			return;

-		case ConstraintsPackage.SIMPLE_CONSTRAINT__PROPERTIES:

-			getProperties().clear();

-			getProperties().addAll((Collection<? extends ConfigProperty>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ConstraintsPackage.SIMPLE_CONSTRAINT__CONSTRAINT_TYPE:

-			setConstraintType((ConstraintType) null);

-			return;

-		case ConstraintsPackage.SIMPLE_CONSTRAINT__PROPERTIES:

-			getProperties().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ConstraintsPackage.SIMPLE_CONSTRAINT__CONSTRAINT_TYPE:

-			return constraintType != null;

-		case ConstraintsPackage.SIMPLE_CONSTRAINT__PROPERTIES:

-			return properties != null && !properties.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // SimpleConstraintImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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.InternalEList;
+import org.eclipse.papyrus.infra.constraints.ConfigProperty;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Simple Constraint</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.SimpleConstraintImpl#getConstraintType <em>Constraint Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.SimpleConstraintImpl#getProperties <em>Properties</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class SimpleConstraintImpl extends ConstraintDescriptorImpl implements SimpleConstraint {
+	/**
+	 * The cached value of the '{@link #getConstraintType() <em>Constraint Type</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getConstraintType()
+	 * @generated
+	 * @ordered
+	 */
+	protected ConstraintType constraintType;
+
+	/**
+	 * 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<ConfigProperty> properties;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected SimpleConstraintImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ConstraintsPackage.Literals.SIMPLE_CONSTRAINT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ConstraintType getConstraintType() {
+		if (constraintType != null && constraintType.eIsProxy()) {
+			InternalEObject oldConstraintType = (InternalEObject) constraintType;
+			constraintType = (ConstraintType) eResolveProxy(oldConstraintType);
+			if (constraintType != oldConstraintType) {
+				if (eNotificationRequired()) {
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConstraintsPackage.SIMPLE_CONSTRAINT__CONSTRAINT_TYPE, oldConstraintType, constraintType));
+				}
+			}
+		}
+		return constraintType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ConstraintType basicGetConstraintType() {
+		return constraintType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setConstraintType(ConstraintType newConstraintType) {
+		ConstraintType oldConstraintType = constraintType;
+		constraintType = newConstraintType;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ConstraintsPackage.SIMPLE_CONSTRAINT__CONSTRAINT_TYPE, oldConstraintType, constraintType));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EList<ConfigProperty> getProperties() {
+		if (properties == null) {
+			properties = new EObjectContainmentEList<ConfigProperty>(ConfigProperty.class, this, ConstraintsPackage.SIMPLE_CONSTRAINT__PROPERTIES);
+		}
+		return properties;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case ConstraintsPackage.SIMPLE_CONSTRAINT__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 ConstraintsPackage.SIMPLE_CONSTRAINT__CONSTRAINT_TYPE:
+			if (resolve) {
+				return getConstraintType();
+			}
+			return basicGetConstraintType();
+		case ConstraintsPackage.SIMPLE_CONSTRAINT__PROPERTIES:
+			return getProperties();
+		}
+		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 ConstraintsPackage.SIMPLE_CONSTRAINT__CONSTRAINT_TYPE:
+			setConstraintType((ConstraintType) newValue);
+			return;
+		case ConstraintsPackage.SIMPLE_CONSTRAINT__PROPERTIES:
+			getProperties().clear();
+			getProperties().addAll((Collection<? extends ConfigProperty>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case ConstraintsPackage.SIMPLE_CONSTRAINT__CONSTRAINT_TYPE:
+			setConstraintType((ConstraintType) null);
+			return;
+		case ConstraintsPackage.SIMPLE_CONSTRAINT__PROPERTIES:
+			getProperties().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case ConstraintsPackage.SIMPLE_CONSTRAINT__CONSTRAINT_TYPE:
+			return constraintType != null;
+		case ConstraintsPackage.SIMPLE_CONSTRAINT__PROPERTIES:
+			return properties != null && !properties.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} // SimpleConstraintImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ValuePropertyImpl.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ValuePropertyImpl.java
index be09fefe581..447531c6573 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ValuePropertyImpl.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/impl/ValuePropertyImpl.java
@@ -1,177 +1,177 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.infra.constraints.ValueProperty;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Value Property</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.constraints.impl.ValuePropertyImpl#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ValuePropertyImpl extends ConfigPropertyImpl implements ValueProperty {

-	/**

-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String VALUE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected String value = VALUE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ValuePropertyImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ConstraintsPackage.Literals.VALUE_PROPERTY;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getValue() {

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setValue(String newValue) {

-		String oldValue = value;

-		value = newValue;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ConstraintsPackage.VALUE_PROPERTY__VALUE, oldValue, value));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ConstraintsPackage.VALUE_PROPERTY__VALUE:

-			return getValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ConstraintsPackage.VALUE_PROPERTY__VALUE:

-			setValue((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ConstraintsPackage.VALUE_PROPERTY__VALUE:

-			setValue(VALUE_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ConstraintsPackage.VALUE_PROPERTY__VALUE:

-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

-		}

-		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(" (value: ");

-		result.append(value);

-		result.append(')');

-		return result.toString();

-	}

-

-} // ValuePropertyImpl

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.ValueProperty;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Value Property</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.constraints.impl.ValuePropertyImpl#getValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ValuePropertyImpl extends ConfigPropertyImpl implements ValueProperty {
+	/**
+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String VALUE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected String value = VALUE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ValuePropertyImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ConstraintsPackage.Literals.VALUE_PROPERTY;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setValue(String newValue) {
+		String oldValue = value;
+		value = newValue;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ConstraintsPackage.VALUE_PROPERTY__VALUE, oldValue, value));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case ConstraintsPackage.VALUE_PROPERTY__VALUE:
+			return getValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case ConstraintsPackage.VALUE_PROPERTY__VALUE:
+			setValue((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case ConstraintsPackage.VALUE_PROPERTY__VALUE:
+			setValue(VALUE_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case ConstraintsPackage.VALUE_PROPERTY__VALUE:
+			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+		}
+		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(" (value: ");
+		result.append(value);
+		result.append(')');
+		return result.toString();
+	}
+
+} // ValuePropertyImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/util/ConstraintsAdapterFactory.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/util/ConstraintsAdapterFactory.java
index e2d6f76349d..1dd84fff518 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/util/ConstraintsAdapterFactory.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/util/ConstraintsAdapterFactory.java
@@ -1,258 +1,258 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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.constraints.CompositeConstraint;

-import org.eclipse.papyrus.infra.constraints.ConfigProperty;

-import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;

-import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.infra.constraints.DisplayUnit;

-import org.eclipse.papyrus.infra.constraints.ReferenceProperty;

-import org.eclipse.papyrus.infra.constraints.SimpleConstraint;

-import org.eclipse.papyrus.infra.constraints.ValueProperty;

-

-/**

- * <!-- 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.constraints.ConstraintsPackage

- * @generated

- */

-public class ConstraintsAdapterFactory extends AdapterFactoryImpl {

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static ConstraintsPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConstraintsAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = ConstraintsPackage.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 ConstraintsSwitch<Adapter> modelSwitch =

-			new ConstraintsSwitch<Adapter>() {

-				@Override

-				public Adapter caseDisplayUnit(DisplayUnit object) {

-					return createDisplayUnitAdapter();

-				}

-

-				@Override

-				public Adapter caseConstraintDescriptor(ConstraintDescriptor object) {

-					return createConstraintDescriptorAdapter();

-				}

-

-				@Override

-				public Adapter caseSimpleConstraint(SimpleConstraint object) {

-					return createSimpleConstraintAdapter();

-				}

-

-				@Override

-				public Adapter caseCompositeConstraint(CompositeConstraint object) {

-					return createCompositeConstraintAdapter();

-				}

-

-				@Override

-				public Adapter caseConfigProperty(ConfigProperty object) {

-					return createConfigPropertyAdapter();

-				}

-

-				@Override

-				public Adapter caseValueProperty(ValueProperty object) {

-					return createValuePropertyAdapter();

-				}

-

-				@Override

-				public Adapter caseReferenceProperty(ReferenceProperty object) {

-					return createReferencePropertyAdapter();

-				}

-

-				@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.constraints.DisplayUnit <em>Display Unit</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.constraints.DisplayUnit

-	 * @generated

-	 */

-	public Adapter createDisplayUnitAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor <em>Constraint Descriptor</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.constraints.ConstraintDescriptor

-	 * @generated

-	 */

-	public Adapter createConstraintDescriptorAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.SimpleConstraint <em>Simple Constraint</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.constraints.SimpleConstraint

-	 * @generated

-	 */

-	public Adapter createSimpleConstraintAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.CompositeConstraint <em>Composite Constraint</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.constraints.CompositeConstraint

-	 * @generated

-	 */

-	public Adapter createCompositeConstraintAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.ConfigProperty <em>Config 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.infra.constraints.ConfigProperty

-	 * @generated

-	 */

-	public Adapter createConfigPropertyAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.ValueProperty <em>Value 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.infra.constraints.ValueProperty

-	 * @generated

-	 */

-	public Adapter createValuePropertyAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.ReferenceProperty <em>Reference 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.infra.constraints.ReferenceProperty

-	 * @generated

-	 */

-	public Adapter createReferencePropertyAdapter() {

-		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;

-	}

-

-} // ConstraintsAdapterFactory

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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.constraints.CompositeConstraint;
+import org.eclipse.papyrus.infra.constraints.ConfigProperty;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.constraints.ReferenceProperty;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.constraints.ValueProperty;
+
+/**
+ * <!-- 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.constraints.ConstraintsPackage
+ * @generated
+ */
+public class ConstraintsAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static ConstraintsPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ConstraintsAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = ConstraintsPackage.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 ConstraintsSwitch<Adapter> modelSwitch =
+			new ConstraintsSwitch<Adapter>() {
+				@Override
+				public Adapter caseDisplayUnit(DisplayUnit object) {
+					return createDisplayUnitAdapter();
+				}
+
+				@Override
+				public Adapter caseConstraintDescriptor(ConstraintDescriptor object) {
+					return createConstraintDescriptorAdapter();
+				}
+
+				@Override
+				public Adapter caseSimpleConstraint(SimpleConstraint object) {
+					return createSimpleConstraintAdapter();
+				}
+
+				@Override
+				public Adapter caseCompositeConstraint(CompositeConstraint object) {
+					return createCompositeConstraintAdapter();
+				}
+
+				@Override
+				public Adapter caseConfigProperty(ConfigProperty object) {
+					return createConfigPropertyAdapter();
+				}
+
+				@Override
+				public Adapter caseValueProperty(ValueProperty object) {
+					return createValuePropertyAdapter();
+				}
+
+				@Override
+				public Adapter caseReferenceProperty(ReferenceProperty object) {
+					return createReferencePropertyAdapter();
+				}
+
+				@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.constraints.DisplayUnit <em>Display Unit</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.constraints.DisplayUnit
+	 * @generated
+	 */
+	public Adapter createDisplayUnitAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.ConstraintDescriptor <em>Constraint Descriptor</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.constraints.ConstraintDescriptor
+	 * @generated
+	 */
+	public Adapter createConstraintDescriptorAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.SimpleConstraint <em>Simple Constraint</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.constraints.SimpleConstraint
+	 * @generated
+	 */
+	public Adapter createSimpleConstraintAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.CompositeConstraint <em>Composite Constraint</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.constraints.CompositeConstraint
+	 * @generated
+	 */
+	public Adapter createCompositeConstraintAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.ConfigProperty <em>Config 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.infra.constraints.ConfigProperty
+	 * @generated
+	 */
+	public Adapter createConfigPropertyAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.ValueProperty <em>Value 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.infra.constraints.ValueProperty
+	 * @generated
+	 */
+	public Adapter createValuePropertyAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.constraints.ReferenceProperty <em>Reference 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.infra.constraints.ReferenceProperty
+	 * @generated
+	 */
+	public Adapter createReferencePropertyAdapter() {
+		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;
+	}
+
+} // ConstraintsAdapterFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/util/ConstraintsSwitch.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/util/ConstraintsSwitch.java
index 3a66a27037b..481671b7660 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/util/ConstraintsSwitch.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src-gen/org/eclipse/papyrus/infra/constraints/util/ConstraintsSwitch.java
@@ -1,292 +1,292 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.infra.constraints.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.constraints.CompositeConstraint;

-import org.eclipse.papyrus.infra.constraints.ConfigProperty;

-import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;

-import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;

-import org.eclipse.papyrus.infra.constraints.DisplayUnit;

-import org.eclipse.papyrus.infra.constraints.ReferenceProperty;

-import org.eclipse.papyrus.infra.constraints.SimpleConstraint;

-import org.eclipse.papyrus.infra.constraints.ValueProperty;

-

-/**

- * <!-- 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.constraints.ConstraintsPackage

- * @generated

- */

-public class ConstraintsSwitch<T> extends Switch<T> {

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static ConstraintsPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConstraintsSwitch() {

-		if (modelPackage == null) {

-			modelPackage = ConstraintsPackage.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 ConstraintsPackage.DISPLAY_UNIT: {

-			DisplayUnit displayUnit = (DisplayUnit) theEObject;

-			T result = caseDisplayUnit(displayUnit);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR: {

-			ConstraintDescriptor constraintDescriptor = (ConstraintDescriptor) theEObject;

-			T result = caseConstraintDescriptor(constraintDescriptor);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ConstraintsPackage.SIMPLE_CONSTRAINT: {

-			SimpleConstraint simpleConstraint = (SimpleConstraint) theEObject;

-			T result = caseSimpleConstraint(simpleConstraint);

-			if (result == null) {

-				result = caseConstraintDescriptor(simpleConstraint);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ConstraintsPackage.COMPOSITE_CONSTRAINT: {

-			CompositeConstraint compositeConstraint = (CompositeConstraint) theEObject;

-			T result = caseCompositeConstraint(compositeConstraint);

-			if (result == null) {

-				result = caseConstraintDescriptor(compositeConstraint);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ConstraintsPackage.CONFIG_PROPERTY: {

-			ConfigProperty configProperty = (ConfigProperty) theEObject;

-			T result = caseConfigProperty(configProperty);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ConstraintsPackage.VALUE_PROPERTY: {

-			ValueProperty valueProperty = (ValueProperty) theEObject;

-			T result = caseValueProperty(valueProperty);

-			if (result == null) {

-				result = caseConfigProperty(valueProperty);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ConstraintsPackage.REFERENCE_PROPERTY: {

-			ReferenceProperty referenceProperty = (ReferenceProperty) theEObject;

-			T result = caseReferenceProperty(referenceProperty);

-			if (result == null) {

-				result = caseConfigProperty(referenceProperty);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Display Unit</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>Display Unit</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseDisplayUnit(DisplayUnit object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Constraint Descriptor</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>Constraint Descriptor</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseConstraintDescriptor(ConstraintDescriptor object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Simple Constraint</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>Simple Constraint</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseSimpleConstraint(SimpleConstraint object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Composite Constraint</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>Composite Constraint</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseCompositeConstraint(CompositeConstraint object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Config 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>Config Property</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseConfigProperty(ConfigProperty object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Value 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>Value Property</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseValueProperty(ValueProperty object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Reference 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>Reference Property</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseReferenceProperty(ReferenceProperty 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;

-	}

-

-} // ConstraintsSwitch

+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.papyrus.infra.constraints.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.constraints.CompositeConstraint;
+import org.eclipse.papyrus.infra.constraints.ConfigProperty;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.constraints.ReferenceProperty;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.constraints.ValueProperty;
+
+/**
+ * <!-- 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.constraints.ConstraintsPackage
+ * @generated
+ */
+public class ConstraintsSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static ConstraintsPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ConstraintsSwitch() {
+		if (modelPackage == null) {
+			modelPackage = ConstraintsPackage.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 ConstraintsPackage.DISPLAY_UNIT: {
+			DisplayUnit displayUnit = (DisplayUnit) theEObject;
+			T result = caseDisplayUnit(displayUnit);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case ConstraintsPackage.CONSTRAINT_DESCRIPTOR: {
+			ConstraintDescriptor constraintDescriptor = (ConstraintDescriptor) theEObject;
+			T result = caseConstraintDescriptor(constraintDescriptor);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case ConstraintsPackage.SIMPLE_CONSTRAINT: {
+			SimpleConstraint simpleConstraint = (SimpleConstraint) theEObject;
+			T result = caseSimpleConstraint(simpleConstraint);
+			if (result == null) {
+				result = caseConstraintDescriptor(simpleConstraint);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case ConstraintsPackage.COMPOSITE_CONSTRAINT: {
+			CompositeConstraint compositeConstraint = (CompositeConstraint) theEObject;
+			T result = caseCompositeConstraint(compositeConstraint);
+			if (result == null) {
+				result = caseConstraintDescriptor(compositeConstraint);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case ConstraintsPackage.CONFIG_PROPERTY: {
+			ConfigProperty configProperty = (ConfigProperty) theEObject;
+			T result = caseConfigProperty(configProperty);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case ConstraintsPackage.VALUE_PROPERTY: {
+			ValueProperty valueProperty = (ValueProperty) theEObject;
+			T result = caseValueProperty(valueProperty);
+			if (result == null) {
+				result = caseConfigProperty(valueProperty);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case ConstraintsPackage.REFERENCE_PROPERTY: {
+			ReferenceProperty referenceProperty = (ReferenceProperty) theEObject;
+			T result = caseReferenceProperty(referenceProperty);
+			if (result == null) {
+				result = caseConfigProperty(referenceProperty);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Display Unit</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>Display Unit</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDisplayUnit(DisplayUnit object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Constraint Descriptor</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>Constraint Descriptor</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseConstraintDescriptor(ConstraintDescriptor object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Simple Constraint</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>Simple Constraint</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSimpleConstraint(SimpleConstraint object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Composite Constraint</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>Composite Constraint</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCompositeConstraint(CompositeConstraint object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Config 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>Config Property</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseConfigProperty(ConfigProperty object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Value 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>Value Property</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseValueProperty(ValueProperty object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Reference 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>Reference Property</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseReferenceProperty(ReferenceProperty 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;
+	}
+
+} // ConstraintsSwitch
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/Activator.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/Activator.java
index 99012a4c38e..1a8d8d8b43e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/Activator.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/Activator.java
@@ -1,66 +1,66 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *  Christian W. Damus - bug 485220

- *  

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

-package org.eclipse.papyrus.infra.constraints;

-

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

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

-import org.osgi.framework.BundleContext;

-

-/**

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

- */

-public class Activator extends Plugin {

-

-	/**

-	 * The plug-in ID

-	 */

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.constraints"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * The plug-in's logger

-	 */

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	@Override

-	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;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.constraints;
+
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends Plugin {
+
+	/**
+	 * The plug-in ID
+	 */
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.constraints"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/**
+	 * The plug-in's logger
+	 */
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	@Override
+	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.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/AbstractConstraint.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/AbstractConstraint.java
index 4578330de51..c758dfd4a0f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/AbstractConstraint.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/AbstractConstraint.java
@@ -1,268 +1,268 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *  Christian W. Damus - bug 485220

- *  

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

-package org.eclipse.papyrus.infra.constraints.constraints;

-

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.papyrus.infra.constraints.Activator;

-import org.eclipse.papyrus.infra.constraints.ConfigProperty;

-import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;

-import org.eclipse.papyrus.infra.constraints.DisplayUnit;

-import org.eclipse.papyrus.infra.constraints.ReferenceProperty;

-import org.eclipse.papyrus.infra.constraints.SimpleConstraint;

-import org.eclipse.papyrus.infra.constraints.ValueProperty;

-

-/**

- * An abstract implementation for the Constraint interface.

- *

- * @author Camille Letavernier

- *

- */

-public abstract class AbstractConstraint implements Constraint {

-

-	/**

-	 * The descriptor used to instantiate this constraint.

-	 * Contains some attributes for this constraint

-	 */

-	protected ConstraintDescriptor descriptor;

-

-	/**

-	 * The display unit (Section or View) associated to this constraint

-	 */

-	protected DisplayUnit display;

-

-	@Override

-	public final void setConstraintDescriptor(ConstraintDescriptor descriptor) {

-		this.descriptor = descriptor;

-		display = getDisplay(descriptor);

-		if (descriptor instanceof SimpleConstraint) {

-			setDescriptor((SimpleConstraint) descriptor);

-		}

-	}

-

-	private DisplayUnit getDisplay(ConstraintDescriptor descriptor) {

-		if (descriptor.getDisplay() == null) {

-			if (descriptor.eContainer() instanceof ConstraintDescriptor) {

-				return getDisplay((ConstraintDescriptor) descriptor.eContainer());

-			}

-		}

-		return descriptor.getDisplay();

-	}

-

-	@Override

-	public DisplayUnit getDisplayUnit() {

-		return display;

-	}

-

-	/**

-	 * A constraint for a Single element (Exactly one) overrides

-	 * the same constraint for a multiple element (One or more)

-	 */

-	@Override

-	public boolean overrides(Constraint constraint) {

-		if (equivalent(constraint)) {

-			if (getDisplayUnit().getElementMultiplicity() == 1) {

-				if (constraint.getDisplayUnit().getElementMultiplicity() != 1) {

-					return true;

-				}

-			}

-		}

-

-		return false;

-	}

-

-	/**

-	 * Tests if two constraints are equivalent.

-	 * Two constraints are equivalent if they have the same parameters.

-	 * Two equivalent constraints may have different Display units, with

-	 * different multiplicities.

-	 *

-	 * @param constraint

-	 * @return

-	 * 		True if this object is equivalent to the given constraint

-	 */

-	protected abstract boolean equivalent(Constraint constraint);

-

-	@Override

-	public ConstraintDescriptor getDescriptor() {

-		return descriptor;

-	}

-

-	/**

-	 * Returns the ConfigProperty corresponding to the given propertyName

-	 *

-	 * @param propertyName

-	 *            The name of the property to retrieve

-	 * @return

-	 * 		The ConfigProperty corresponding to the given propertyName

-	 */

-	protected ConfigProperty getProperty(String propertyName) {

-		if (descriptor == null || !(descriptor instanceof SimpleConstraint)) {

-			Activator.log.warn("The constraint descriptor has not been set for this constraint : " + this); //$NON-NLS-1$

-		} else {

-			for (ConfigProperty property : ((SimpleConstraint) descriptor).getProperties()) {

-				if (property.getName().equals(propertyName)) {

-					return property;

-				}

-			}

-		}

-

-		Activator.log.warn("The property " + propertyName + " has not been set for constraint " + descriptor.getName()); //$NON-NLS-1$ //$NON-NLS-2$

-

-		return null;

-	}

-

-	/**

-	 * Tests whether a value is available for the requested property

-	 *

-	 * @param propertyName

-	 * @return

-	 * 		True if the property exists in the constraint descriptor

-	 */

-	protected boolean hasProperty(String propertyName) {

-		if (descriptor == null || !(descriptor instanceof SimpleConstraint)) {

-			Activator.log.warn("The constraint descriptor has not been set for this constraint : " + this); //$NON-NLS-1$

-		} else {

-			for (ConfigProperty property : ((SimpleConstraint) descriptor).getProperties()) {

-				if (property.getName().equals(propertyName)) {

-					return true;

-				}

-			}

-		}

-

-		return false;

-	}

-

-	/**

-	 * Returns the value associated to the given property

-	 *

-	 * @param propertyName

-	 *            The name of the property for which we want to retrieve the value

-	 *            The name must correspond to a valid ValueProperty

-	 * @return

-	 * 		The value associated to the given property

-	 *

-	 * @see #getReferenceValue(String)

-	 */

-	protected String getValue(String propertyName) {

-		ConfigProperty property = getProperty(propertyName);

-

-		if (property instanceof ValueProperty) {

-			return ((ValueProperty) property).getValue();

-		}

-

-		Activator.log.warn("The property " + propertyName + " is not a ValueProperty (Constraint " + descriptor.getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-		return null;

-	}

-

-	/**

-	 * Returns the value associated to the given property

-	 *

-	 * @param propertyName

-	 *            The name of the property for which we want to retrieve the value

-	 *            The name must correspond to a valid ReferenceProperty

-	 * @return

-	 * 		The value associated to the given property

-	 *

-	 * @see #getValue(String)

-	 */

-	protected Object getReferenceValue(String propertyName) {

-		ConfigProperty property = getProperty(propertyName);

-		if (property instanceof ReferenceProperty) {

-			return ((ReferenceProperty) property).getValue();

-		}

-

-		Activator.log.warn("The property " + propertyName + " is not a ReferenceProperty (Constraint " + descriptor.getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-		return null;

-	}

-

-	/**

-	 * Sets the Constraint Descriptor for this constraint.

-	 * The constraint descriptor may contain some parameters to configure this

-	 * constraint.

-	 * Implementors may override.

-	 *

-	 * @param descriptor

-	 *            The constraint descriptor to be associated to this constraint

-	 *

-	 * @see #setConstraintDescriptor(ConstraintDescriptor)

-	 */

-	protected void setDescriptor(SimpleConstraint descriptor) {

-		// Implementors may override

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * The default implementation matches a selection iff the constraint matches

-	 * each object of the selection.

-	 */

-	@Override

-	public boolean match(Collection<?> selection) {

-		if (selection.isEmpty()) {

-			return false;

-		}

-

-

-		int elementMultiplicity;

-

-		elementMultiplicity = display.getElementMultiplicity();

-

-		int selectionSize = selection.size();

-		if (elementMultiplicity == 1) {

-			if (selectionSize == 1) {

-				if (match(first(selection))) {

-					return true;

-				}

-			}

-		} else if (elementMultiplicity == selectionSize || elementMultiplicity < 0) {

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

-			while (selectionIterator.hasNext()) {

-				Object selectedItem = selectionIterator.next();

-				if (!match(selectedItem)) {

-					return false;

-				}

-			}

-

-			return true;

-		}

-

-		return false;

-	}

-

-	protected Object first(Collection<?> collection) {

-		return (collection instanceof List<?>)

-				? ((List<?>) collection).get(0)

-				: collection.iterator().next();

-	}

-

-	/**

-	 * Tests if this constraint matches the given object

-	 * This methods only needs to be implemented when you don't

-	 * override {@link AbstractConstraint#match(IStructuredSelection)}

-	 *

-	 * @param selection

-	 *            The object to be tested against this constraint

-	 * @return

-	 * 		True if this constraint matches the given object

-	 *

-	 * @see {@link #match(IStructuredSelection)}

-	 */

-	protected abstract boolean match(Object selection);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.constraints.constraints;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.papyrus.infra.constraints.Activator;
+import org.eclipse.papyrus.infra.constraints.ConfigProperty;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.constraints.ReferenceProperty;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.constraints.ValueProperty;
+
+/**
+ * An abstract implementation for the Constraint interface.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public abstract class AbstractConstraint implements Constraint {
+
+	/**
+	 * The descriptor used to instantiate this constraint.
+	 * Contains some attributes for this constraint
+	 */
+	protected ConstraintDescriptor descriptor;
+
+	/**
+	 * The display unit (Section or View) associated to this constraint
+	 */
+	protected DisplayUnit display;
+
+	@Override
+	public final void setConstraintDescriptor(ConstraintDescriptor descriptor) {
+		this.descriptor = descriptor;
+		display = getDisplay(descriptor);
+		if (descriptor instanceof SimpleConstraint) {
+			setDescriptor((SimpleConstraint) descriptor);
+		}
+	}
+
+	private DisplayUnit getDisplay(ConstraintDescriptor descriptor) {
+		if (descriptor.getDisplay() == null) {
+			if (descriptor.eContainer() instanceof ConstraintDescriptor) {
+				return getDisplay((ConstraintDescriptor) descriptor.eContainer());
+			}
+		}
+		return descriptor.getDisplay();
+	}
+
+	@Override
+	public DisplayUnit getDisplayUnit() {
+		return display;
+	}
+
+	/**
+	 * A constraint for a Single element (Exactly one) overrides
+	 * the same constraint for a multiple element (One or more)
+	 */
+	@Override
+	public boolean overrides(Constraint constraint) {
+		if (equivalent(constraint)) {
+			if (getDisplayUnit().getElementMultiplicity() == 1) {
+				if (constraint.getDisplayUnit().getElementMultiplicity() != 1) {
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Tests if two constraints are equivalent.
+	 * Two constraints are equivalent if they have the same parameters.
+	 * Two equivalent constraints may have different Display units, with
+	 * different multiplicities.
+	 *
+	 * @param constraint
+	 * @return
+	 * 		True if this object is equivalent to the given constraint
+	 */
+	protected abstract boolean equivalent(Constraint constraint);
+
+	@Override
+	public ConstraintDescriptor getDescriptor() {
+		return descriptor;
+	}
+
+	/**
+	 * Returns the ConfigProperty corresponding to the given propertyName
+	 *
+	 * @param propertyName
+	 *            The name of the property to retrieve
+	 * @return
+	 * 		The ConfigProperty corresponding to the given propertyName
+	 */
+	protected ConfigProperty getProperty(String propertyName) {
+		if (descriptor == null || !(descriptor instanceof SimpleConstraint)) {
+			Activator.log.warn("The constraint descriptor has not been set for this constraint : " + this); //$NON-NLS-1$
+		} else {
+			for (ConfigProperty property : ((SimpleConstraint) descriptor).getProperties()) {
+				if (property.getName().equals(propertyName)) {
+					return property;
+				}
+			}
+		}
+
+		Activator.log.warn("The property " + propertyName + " has not been set for constraint " + descriptor.getName()); //$NON-NLS-1$ //$NON-NLS-2$
+
+		return null;
+	}
+
+	/**
+	 * Tests whether a value is available for the requested property
+	 *
+	 * @param propertyName
+	 * @return
+	 * 		True if the property exists in the constraint descriptor
+	 */
+	protected boolean hasProperty(String propertyName) {
+		if (descriptor == null || !(descriptor instanceof SimpleConstraint)) {
+			Activator.log.warn("The constraint descriptor has not been set for this constraint : " + this); //$NON-NLS-1$
+		} else {
+			for (ConfigProperty property : ((SimpleConstraint) descriptor).getProperties()) {
+				if (property.getName().equals(propertyName)) {
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns the value associated to the given property
+	 *
+	 * @param propertyName
+	 *            The name of the property for which we want to retrieve the value
+	 *            The name must correspond to a valid ValueProperty
+	 * @return
+	 * 		The value associated to the given property
+	 *
+	 * @see #getReferenceValue(String)
+	 */
+	protected String getValue(String propertyName) {
+		ConfigProperty property = getProperty(propertyName);
+
+		if (property instanceof ValueProperty) {
+			return ((ValueProperty) property).getValue();
+		}
+
+		Activator.log.warn("The property " + propertyName + " is not a ValueProperty (Constraint " + descriptor.getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+		return null;
+	}
+
+	/**
+	 * Returns the value associated to the given property
+	 *
+	 * @param propertyName
+	 *            The name of the property for which we want to retrieve the value
+	 *            The name must correspond to a valid ReferenceProperty
+	 * @return
+	 * 		The value associated to the given property
+	 *
+	 * @see #getValue(String)
+	 */
+	protected Object getReferenceValue(String propertyName) {
+		ConfigProperty property = getProperty(propertyName);
+		if (property instanceof ReferenceProperty) {
+			return ((ReferenceProperty) property).getValue();
+		}
+
+		Activator.log.warn("The property " + propertyName + " is not a ReferenceProperty (Constraint " + descriptor.getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+		return null;
+	}
+
+	/**
+	 * Sets the Constraint Descriptor for this constraint.
+	 * The constraint descriptor may contain some parameters to configure this
+	 * constraint.
+	 * Implementors may override.
+	 *
+	 * @param descriptor
+	 *            The constraint descriptor to be associated to this constraint
+	 *
+	 * @see #setConstraintDescriptor(ConstraintDescriptor)
+	 */
+	protected void setDescriptor(SimpleConstraint descriptor) {
+		// Implementors may override
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * The default implementation matches a selection iff the constraint matches
+	 * each object of the selection.
+	 */
+	@Override
+	public boolean match(Collection<?> selection) {
+		if (selection.isEmpty()) {
+			return false;
+		}
+
+
+		int elementMultiplicity;
+
+		elementMultiplicity = display.getElementMultiplicity();
+
+		int selectionSize = selection.size();
+		if (elementMultiplicity == 1) {
+			if (selectionSize == 1) {
+				if (match(first(selection))) {
+					return true;
+				}
+			}
+		} else if (elementMultiplicity == selectionSize || elementMultiplicity < 0) {
+			Iterator<?> selectionIterator = selection.iterator();
+			while (selectionIterator.hasNext()) {
+				Object selectedItem = selectionIterator.next();
+				if (!match(selectedItem)) {
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	protected Object first(Collection<?> collection) {
+		return (collection instanceof List<?>)
+				? ((List<?>) collection).get(0)
+				: collection.iterator().next();
+	}
+
+	/**
+	 * Tests if this constraint matches the given object
+	 * This methods only needs to be implemented when you don't
+	 * override {@link AbstractConstraint#match(IStructuredSelection)}
+	 *
+	 * @param selection
+	 *            The object to be tested against this constraint
+	 * @return
+	 * 		True if this constraint matches the given object
+	 *
+	 * @see {@link #match(IStructuredSelection)}
+	 */
+	protected abstract boolean match(Object selection);
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/AttachedToResourceConstraint.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/AttachedToResourceConstraint.java
index 5859aac77fd..5859aac77fd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/AttachedToResourceConstraint.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/AttachedToResourceConstraint.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/CompoundConstraint.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/CompoundConstraint.java
index 7ffe3b2024a..839ef1454b5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/CompoundConstraint.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/CompoundConstraint.java
@@ -1,120 +1,120 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *  Christian W. Damus - bug 485220

- *  

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

-package org.eclipse.papyrus.infra.constraints.constraints;

-

-import java.util.Collection;

-import java.util.LinkedList;

-import java.util.List;

-

-/**

- * A Composite constraint. It matches a given selection if and only if

- * all its sub constraints match this selection.

- *

- * @author Camille Letavernier

- */

-public class CompoundConstraint extends AbstractConstraint {

-

-	/**

-	 * Adds a sub-constraint to this constraint

-	 *

-	 * @param subConstraint

-	 *            The sub-constraint to be added

-	 */

-	public void addConstraint(Constraint subConstraint) {

-		if (subConstraint == null) {

-			throw new IllegalArgumentException("The subConstraint shall not be null");

-		}

-		constraints.add(subConstraint);

-	}

-

-	/**

-	 * A Composite Constraints matches a selection if and only if

-	 * all its inner constraints match it

-	 */

-	@Override

-	public boolean match(Collection<?> selection) {

-		for (Constraint constraint : constraints) {

-			if (!constraint.match(selection)) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-	@Override

-	protected boolean match(Object selection) {

-		// Unused: we override AbstractConstraint#match(IStructuredSelection)

-		return false;

-	}

-

-	@Override

-	public boolean overrides(Constraint constraint) {

-		if (constraints.size() == 0) {

-			return false;

-		}

-

-		if (constraints.size() == 1) {

-			return constraints.get(0).overrides(constraint);

-		}

-

-		// A Composite overrides another Composite if at least one sub-constraint overrides another one,

-		// and each sub-constraint is at least equal to another one

-		if (constraint instanceof CompoundConstraint) {

-			boolean atLeastOneOverride = false;

-			for (Constraint subConstraint : constraints) {

-				boolean equalsOrOverride = false;

-				for (Constraint otherSubConstraint : ((CompoundConstraint) constraint).constraints) {

-					if (subConstraint.overrides(otherSubConstraint)) {

-						atLeastOneOverride = true;

-						break;

-					}

-					if (subConstraint.equals(otherSubConstraint)) {

-						equalsOrOverride = true;

-					}

-				}

-

-				if (!equalsOrOverride) {

-					return false;

-				}

-			}

-

-			if (atLeastOneOverride) {

-				return true;

-			}

-		} else { // At least one of our constraints must override or be equal to the other constraint

-			for (Constraint c : constraints) {

-				if (c.overrides(constraint) || c.equals(constraint)) {

-					// TODO : The equals() method is not defined for most constraint implementations.

-					// We may actually need an "isEquivalent" method, defined in the Constraint Interface

-					return true;

-				}

-			}

-		}

-

-		return false;

-	}

-

-	@Override

-	public String toString() {

-		return constraints.toString();

-	}

-

-	private List<Constraint> constraints = new LinkedList<Constraint>();

-

-	@Override

-	protected boolean equivalent(Constraint constraint) {

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.constraints.constraints;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * A Composite constraint. It matches a given selection if and only if
+ * all its sub constraints match this selection.
+ *
+ * @author Camille Letavernier
+ */
+public class CompoundConstraint extends AbstractConstraint {
+
+	/**
+	 * Adds a sub-constraint to this constraint
+	 *
+	 * @param subConstraint
+	 *            The sub-constraint to be added
+	 */
+	public void addConstraint(Constraint subConstraint) {
+		if (subConstraint == null) {
+			throw new IllegalArgumentException("The subConstraint shall not be null");
+		}
+		constraints.add(subConstraint);
+	}
+
+	/**
+	 * A Composite Constraints matches a selection if and only if
+	 * all its inner constraints match it
+	 */
+	@Override
+	public boolean match(Collection<?> selection) {
+		for (Constraint constraint : constraints) {
+			if (!constraint.match(selection)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	@Override
+	protected boolean match(Object selection) {
+		// Unused: we override AbstractConstraint#match(IStructuredSelection)
+		return false;
+	}
+
+	@Override
+	public boolean overrides(Constraint constraint) {
+		if (constraints.size() == 0) {
+			return false;
+		}
+
+		if (constraints.size() == 1) {
+			return constraints.get(0).overrides(constraint);
+		}
+
+		// A Composite overrides another Composite if at least one sub-constraint overrides another one,
+		// and each sub-constraint is at least equal to another one
+		if (constraint instanceof CompoundConstraint) {
+			boolean atLeastOneOverride = false;
+			for (Constraint subConstraint : constraints) {
+				boolean equalsOrOverride = false;
+				for (Constraint otherSubConstraint : ((CompoundConstraint) constraint).constraints) {
+					if (subConstraint.overrides(otherSubConstraint)) {
+						atLeastOneOverride = true;
+						break;
+					}
+					if (subConstraint.equals(otherSubConstraint)) {
+						equalsOrOverride = true;
+					}
+				}
+
+				if (!equalsOrOverride) {
+					return false;
+				}
+			}
+
+			if (atLeastOneOverride) {
+				return true;
+			}
+		} else { // At least one of our constraints must override or be equal to the other constraint
+			for (Constraint c : constraints) {
+				if (c.overrides(constraint) || c.equals(constraint)) {
+					// TODO : The equals() method is not defined for most constraint implementations.
+					// We may actually need an "isEquivalent" method, defined in the Constraint Interface
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	@Override
+	public String toString() {
+		return constraints.toString();
+	}
+
+	private List<Constraint> constraints = new LinkedList<Constraint>();
+
+	@Override
+	protected boolean equivalent(Constraint constraint) {
+		return false;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/Constraint.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/Constraint.java
index b33919d3065..b6a96f7bc0b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/Constraint.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/Constraint.java
@@ -1,76 +1,76 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *  Christian W. Damus - bug 485220

- *  

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

-package org.eclipse.papyrus.infra.constraints.constraints;

-

-import java.util.Collection;

-

-import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;

-import org.eclipse.papyrus.infra.constraints.DisplayUnit;

-

-/**

- * An interface representing a Constraint. A Constraint is used to test if a selection

- * is matching a pre-configured property view.

- *

- * @author Camille Letavernier

- *

- */

-public interface Constraint {

-

-	/**

-	 * Sets the Constraint Descriptor for this constraint.

-	 * The constraint descriptor may contain some parameters to configure this

-	 * constraint

-	 *

-	 * @param descriptor

-	 *            The constraint descriptor to be associated to this constraint

-	 */

-	public void setConstraintDescriptor(ConstraintDescriptor descriptor);

-

-	/**

-	 * Tests if this constraint matches the given selection

-	 *

-	 * @param selection

-	 *            The selection to be tested against this constraint

-	 * @return

-	 * 		True if this constraint matches the given selection

-	 */

-	public boolean match(Collection<?> selection);

-

-	/**

-	 * Returns the view associated to this constraint, or null if the constraint is associated to another

-	 * kind of display unit (e.g. a section)

-	 *

-	 * @return

-	 * 		The view associated to this constraint

-	 */

-	public DisplayUnit getDisplayUnit();

-

-	/**

-	 * Tests if this constraint should override the given constraint. If true,

-	 * the other constraint's display unit won't be displayed. A constraint should

-	 * never override itself, and you should ensure that there are no loops in the

-	 * constraint overriding graph. If such a loops occurs, nothing will be displayed

-	 *

-	 * @param constraint

-	 *            The tested constraint

-	 * @return

-	 * 		True if this constraint overrides the given constraint

-	 */

-	public boolean overrides(Constraint constraint);

-

-	/**

-	 * @return the constraint descriptor associated to this constraint

-	 */

-	public ConstraintDescriptor getDescriptor();

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.constraints.constraints;
+
+import java.util.Collection;
+
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+
+/**
+ * An interface representing a Constraint. A Constraint is used to test if a selection
+ * is matching a pre-configured property view.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public interface Constraint {
+
+	/**
+	 * Sets the Constraint Descriptor for this constraint.
+	 * The constraint descriptor may contain some parameters to configure this
+	 * constraint
+	 *
+	 * @param descriptor
+	 *            The constraint descriptor to be associated to this constraint
+	 */
+	public void setConstraintDescriptor(ConstraintDescriptor descriptor);
+
+	/**
+	 * Tests if this constraint matches the given selection
+	 *
+	 * @param selection
+	 *            The selection to be tested against this constraint
+	 * @return
+	 * 		True if this constraint matches the given selection
+	 */
+	public boolean match(Collection<?> selection);
+
+	/**
+	 * Returns the view associated to this constraint, or null if the constraint is associated to another
+	 * kind of display unit (e.g. a section)
+	 *
+	 * @return
+	 * 		The view associated to this constraint
+	 */
+	public DisplayUnit getDisplayUnit();
+
+	/**
+	 * Tests if this constraint should override the given constraint. If true,
+	 * the other constraint's display unit won't be displayed. A constraint should
+	 * never override itself, and you should ensure that there are no loops in the
+	 * constraint overriding graph. If such a loops occurs, nothing will be displayed
+	 *
+	 * @param constraint
+	 *            The tested constraint
+	 * @return
+	 * 		True if this constraint overrides the given constraint
+	 */
+	public boolean overrides(Constraint constraint);
+
+	/**
+	 * @return the constraint descriptor associated to this constraint
+	 */
+	public ConstraintDescriptor getDescriptor();
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/EMFInstanceOfConstraint.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/EMFInstanceOfConstraint.java
index 1f83c5e1f16..86374d2d625 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/EMFInstanceOfConstraint.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/EMFInstanceOfConstraint.java
@@ -1,117 +1,117 @@
-/*****************************************************************************

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

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

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

-package org.eclipse.papyrus.infra.constraints.constraints;

-

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

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

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

-import org.eclipse.papyrus.infra.constraints.Activator;

-import org.eclipse.papyrus.infra.constraints.SimpleConstraint;

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

-

-/**

- * A constraint testing if a Selection is an EObject, instance of the given

- * EClass. The EClass is identified by its nsURI and name.

- *

- * @author Camille Letavernier

- *

- */

-public class EMFInstanceOfConstraint extends AbstractConstraint {

-

-	private String className;

-

-	private String nsUri;

-

-	private EPackage metamodel;

-

-	@Override

-	protected void setDescriptor(SimpleConstraint descriptor) {

-		className = getValue("className"); //$NON-NLS-1$

-		nsUri = getValue("nsUri"); //$NON-NLS-1$

-		metamodel = EPackage.Registry.INSTANCE.getEPackage(nsUri);

-		if (metamodel == null) {

-			Activator.log.warn("Metamodel with nsUri " + nsUri + " not found"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * A class constraint overrides its superclass constraints

-	 * e.g. : instanceOf(Class) overrides instanceOf(Classifier)

-	 */

-	@Override

-	public boolean overrides(Constraint otherConstraint) {

-		if (!(otherConstraint instanceof EMFInstanceOfConstraint)) {

-			return false;

-		}

-

-		EMFInstanceOfConstraint constraint = (EMFInstanceOfConstraint) otherConstraint;

-		EClass thisClass = EMFHelper.getEClass(nsUri, className);

-		EClass otherClass = EMFHelper.getEClass(constraint.nsUri, constraint.className);

-		boolean result = (!equals(constraint)) && EMFHelper.isSubclass(thisClass, otherClass) && thisClass != otherClass;

-

-		return result || super.overrides(constraint);

-	}

-

-	@Override

-	public boolean match(Object selection) {

-		if (className == null || nsUri == null) {

-			return false;

-		}

-

-		EObject selectedItem = EMFHelper.getEObject(selection);

-

-		if (selectedItem != null) {

-			if (metamodel == null) { // This may be a dynamic, local (non-registered) EPackage

-				return EMFHelper.isInstance(selectedItem, className, nsUri);

-			} else {

-				return EMFHelper.isInstance(selectedItem, className, metamodel);

-			}

-		}

-

-		return false;

-	}

-

-	@Override

-	public String toString() {

-		return "EMFInstanceOfConstraint (" + nsUri + "/" + className + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-	}

-

-	@Override

-	protected boolean equivalent(Constraint constraint) {

-		if (this == constraint) {

-			return true;

-		}

-		if (constraint == null) {

-			return false;

-		}

-		if (!(constraint instanceof EMFInstanceOfConstraint)) {

-			return false;

-		}

-		EMFInstanceOfConstraint other = (EMFInstanceOfConstraint) constraint;

-		if (className == null) {

-			if (other.className != null) {

-				return false;

-			}

-		} else if (!className.equals(other.className)) {

-			return false;

-		}

-		if (nsUri == null) {

-			if (other.nsUri != null) {

-				return false;

-			}

-		} else if (!nsUri.equals(other.nsUri)) {

-			return false;

-		}

-		return true;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.constraints.constraints;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.papyrus.infra.constraints.Activator;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+
+/**
+ * A constraint testing if a Selection is an EObject, instance of the given
+ * EClass. The EClass is identified by its nsURI and name.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class EMFInstanceOfConstraint extends AbstractConstraint {
+
+	private String className;
+
+	private String nsUri;
+
+	private EPackage metamodel;
+
+	@Override
+	protected void setDescriptor(SimpleConstraint descriptor) {
+		className = getValue("className"); //$NON-NLS-1$
+		nsUri = getValue("nsUri"); //$NON-NLS-1$
+		metamodel = EPackage.Registry.INSTANCE.getEPackage(nsUri);
+		if (metamodel == null) {
+			Activator.log.warn("Metamodel with nsUri " + nsUri + " not found"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * A class constraint overrides its superclass constraints
+	 * e.g. : instanceOf(Class) overrides instanceOf(Classifier)
+	 */
+	@Override
+	public boolean overrides(Constraint otherConstraint) {
+		if (!(otherConstraint instanceof EMFInstanceOfConstraint)) {
+			return false;
+		}
+
+		EMFInstanceOfConstraint constraint = (EMFInstanceOfConstraint) otherConstraint;
+		EClass thisClass = EMFHelper.getEClass(nsUri, className);
+		EClass otherClass = EMFHelper.getEClass(constraint.nsUri, constraint.className);
+		boolean result = (!equals(constraint)) && EMFHelper.isSubclass(thisClass, otherClass) && thisClass != otherClass;
+
+		return result || super.overrides(constraint);
+	}
+
+	@Override
+	public boolean match(Object selection) {
+		if (className == null || nsUri == null) {
+			return false;
+		}
+
+		EObject selectedItem = EMFHelper.getEObject(selection);
+
+		if (selectedItem != null) {
+			if (metamodel == null) { // This may be a dynamic, local (non-registered) EPackage
+				return EMFHelper.isInstance(selectedItem, className, nsUri);
+			} else {
+				return EMFHelper.isInstance(selectedItem, className, metamodel);
+			}
+		}
+
+		return false;
+	}
+
+	@Override
+	public String toString() {
+		return "EMFInstanceOfConstraint (" + nsUri + "/" + className + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+	}
+
+	@Override
+	protected boolean equivalent(Constraint constraint) {
+		if (this == constraint) {
+			return true;
+		}
+		if (constraint == null) {
+			return false;
+		}
+		if (!(constraint instanceof EMFInstanceOfConstraint)) {
+			return false;
+		}
+		EMFInstanceOfConstraint other = (EMFInstanceOfConstraint) constraint;
+		if (className == null) {
+			if (other.className != null) {
+				return false;
+			}
+		} else if (!className.equals(other.className)) {
+			return false;
+		}
+		if (nsUri == null) {
+			if (other.nsUri != null) {
+				return false;
+			}
+		} else if (!nsUri.equals(other.nsUri)) {
+			return false;
+		}
+		return true;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/EMFQueryConstraint.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/EMFQueryConstraint.java
index 9cbcdf097a3..33d1c361798 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/EMFQueryConstraint.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/EMFQueryConstraint.java
@@ -1,83 +1,83 @@
-/*****************************************************************************

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

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

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

-package org.eclipse.papyrus.infra.constraints.constraints;

-

-

-/**

- * A constraint applying an EMF Query on a selection. The Query should return

- * a Boolean.

- *

- * @author Camille Letavernier

- */

-public class EMFQueryConstraint extends AbstractConstraint {

-

-	@Override

-	protected boolean equivalent(Constraint constraint) {

-		// TODO Auto-generated method stub

-		return false;

-	}

-

-	@Override

-	protected boolean match(Object selection) {

-		// TODO Auto-generated method stub

-		return false;

-	}

-

-	// private OCLModelQuery query;

-	//

-	// @Override

-	// protected void setDescriptor(SimpleConstraint descriptor) {

-	//		ConfigProperty property = getProperty("query"); //$NON-NLS-1$

-	// if(property instanceof ReferenceProperty) {

-	//			query = (OCLModelQuery)getReferenceValue("query"); //$NON-NLS-1$

-	// } else {

-	// String queryExpression = ((ValueProperty)property).getValue();

-	// query = QueryFactory.eINSTANCE.createOCLModelQuery();

-	// query.setQuery(queryExpression);

-	// query.setReturnType(EcorePackage.eINSTANCE.getEBoolean());

-	// query.getScope().add(EcorePackage.eINSTANCE.getEObject());

-	// throw new UnsupportedOperationException();

-	// }

-	// }

-	//

-	// public boolean match(Object selection) {

-	// if(query == null) {

-	// return false;

-	// }

-	//

-	// EObject selectedItem = EMFHelper.getEObject(selection);

-	//

-	// if(selectedItem != null) {

-	// try {

-	// ModelQuerySetCatalog catalog = ModelQuerySetCatalog.getSingleton();

-	// AbstractModelQuery abstractQuery = catalog.getModelQueryImpl(query);

-	// ModelQueryResult result = abstractQuery.evaluate(selectedItem);

-	// Object value = result.getValue();

-	// return value == null ? false : (Boolean)value;

-	// } catch (Exception ex) {

-	// Activator.log.error(ex);

-	// }

-	//

-	// }

-	// return false;

-	// }

-	//

-	// @Override

-	// protected boolean equivalent(Constraint constraint) {

-	// if(constraint != null && constraint instanceof EMFQueryConstraint) {

-	// EMFQueryConstraint other = (EMFQueryConstraint)constraint;

-	// return other.query.equals(query);

-	// }

-	// return false;

-	// }

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.constraints.constraints;
+
+
+/**
+ * A constraint applying an EMF Query on a selection. The Query should return
+ * a Boolean.
+ *
+ * @author Camille Letavernier
+ */
+public class EMFQueryConstraint extends AbstractConstraint {
+
+	@Override
+	protected boolean equivalent(Constraint constraint) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	protected boolean match(Object selection) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	// private OCLModelQuery query;
+	//
+	// @Override
+	// protected void setDescriptor(SimpleConstraint descriptor) {
+	//		ConfigProperty property = getProperty("query"); //$NON-NLS-1$
+	// if(property instanceof ReferenceProperty) {
+	//			query = (OCLModelQuery)getReferenceValue("query"); //$NON-NLS-1$
+	// } else {
+	// String queryExpression = ((ValueProperty)property).getValue();
+	// query = QueryFactory.eINSTANCE.createOCLModelQuery();
+	// query.setQuery(queryExpression);
+	// query.setReturnType(EcorePackage.eINSTANCE.getEBoolean());
+	// query.getScope().add(EcorePackage.eINSTANCE.getEObject());
+	// throw new UnsupportedOperationException();
+	// }
+	// }
+	//
+	// public boolean match(Object selection) {
+	// if(query == null) {
+	// return false;
+	// }
+	//
+	// EObject selectedItem = EMFHelper.getEObject(selection);
+	//
+	// if(selectedItem != null) {
+	// try {
+	// ModelQuerySetCatalog catalog = ModelQuerySetCatalog.getSingleton();
+	// AbstractModelQuery abstractQuery = catalog.getModelQueryImpl(query);
+	// ModelQueryResult result = abstractQuery.evaluate(selectedItem);
+	// Object value = result.getValue();
+	// return value == null ? false : (Boolean)value;
+	// } catch (Exception ex) {
+	// Activator.log.error(ex);
+	// }
+	//
+	// }
+	// return false;
+	// }
+	//
+	// @Override
+	// protected boolean equivalent(Constraint constraint) {
+	// if(constraint != null && constraint instanceof EMFQueryConstraint) {
+	// EMFQueryConstraint other = (EMFQueryConstraint)constraint;
+	// return other.query.equals(query);
+	// }
+	// return false;
+	// }
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/HasEAnnotationConstraint.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/HasEAnnotationConstraint.java
index 1fc5cdb74d5..06da4f02a91 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/HasEAnnotationConstraint.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/HasEAnnotationConstraint.java
@@ -1,55 +1,55 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

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

- * are made available under the terms 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.constraints.constraints;

-

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

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

-import org.eclipse.papyrus.infra.constraints.SimpleConstraint;

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

-

-/**

- * A Constraint to test whether the selected EObject has a specific EAnnotation

- *

- * @author Camille Letavernier

- *

- */

-public class HasEAnnotationConstraint extends AbstractConstraint {

-

-	protected String annotationName;

-

-	@Override

-	protected boolean equivalent(Constraint constraint) {

-		if (constraint instanceof HasEAnnotationConstraint) {

-			HasEAnnotationConstraint other = (HasEAnnotationConstraint) constraint;

-			return annotationName.equals(other.annotationName);

-		}

-		return false;

-	}

-

-	@Override

-	protected void setDescriptor(SimpleConstraint descriptor) {

-		super.setDescriptor(descriptor);

-		this.annotationName = getValue("annotationName");

-	}

-

-	@Override

-	protected boolean match(Object selection) {

-		EObject eObject = EMFHelper.getEObject(selection);

-		if (eObject instanceof EModelElement) {

-			EModelElement modelElement = (EModelElement) eObject;

-			return modelElement.getEAnnotation(annotationName) != null;

-		}

-

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.constraints.constraints;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+
+/**
+ * A Constraint to test whether the selected EObject has a specific EAnnotation
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class HasEAnnotationConstraint extends AbstractConstraint {
+
+	protected String annotationName;
+
+	@Override
+	protected boolean equivalent(Constraint constraint) {
+		if (constraint instanceof HasEAnnotationConstraint) {
+			HasEAnnotationConstraint other = (HasEAnnotationConstraint) constraint;
+			return annotationName.equals(other.annotationName);
+		}
+		return false;
+	}
+
+	@Override
+	protected void setDescriptor(SimpleConstraint descriptor) {
+		super.setDescriptor(descriptor);
+		this.annotationName = getValue("annotationName");
+	}
+
+	@Override
+	protected boolean match(Object selection) {
+		EObject eObject = EMFHelper.getEObject(selection);
+		if (eObject instanceof EModelElement) {
+			EModelElement modelElement = (EModelElement) eObject;
+			return modelElement.getEAnnotation(annotationName) != null;
+		}
+
+		return false;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaInstanceOf.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaInstanceOf.java
index e2f8bfc998d..0f038831a83 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaInstanceOf.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaInstanceOf.java
@@ -1,46 +1,46 @@
-/*****************************************************************************

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

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

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

-package org.eclipse.papyrus.infra.constraints.constraints;

-

-import org.eclipse.papyrus.infra.constraints.SimpleConstraint;

-import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;

-

-/**

- * A Constraint to test if an object is an instance of a given

- * Java class

- *

- * @author Camille Letavernier

- */

-public class JavaInstanceOf extends AbstractConstraint {

-

-	private Class<?> clazz;

-

-	@Override

-	public void setDescriptor(SimpleConstraint descriptor) {

-		clazz = ClassLoaderHelper.loadClass(getValue("class")); //$NON-NLS-1$

-	}

-

-	@Override

-	public boolean match(Object selection) {

-		if (clazz == null) {

-			return false;

-		}

-

-		return clazz.isInstance(selection);

-	}

-

-	@Override

-	protected boolean equivalent(Constraint constraint) {

-		return false; // TODO

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.constraints.constraints;
+
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
+
+/**
+ * A Constraint to test if an object is an instance of a given
+ * Java class
+ *
+ * @author Camille Letavernier
+ */
+public class JavaInstanceOf extends AbstractConstraint {
+
+	private Class<?> clazz;
+
+	@Override
+	public void setDescriptor(SimpleConstraint descriptor) {
+		clazz = ClassLoaderHelper.loadClass(getValue("class")); //$NON-NLS-1$
+	}
+
+	@Override
+	public boolean match(Object selection) {
+		if (clazz == null) {
+			return false;
+		}
+
+		return clazz.isInstance(selection);
+	}
+
+	@Override
+	protected boolean equivalent(Constraint constraint) {
+		return false; // TODO
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaQuery.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaQuery.java
index 7cb1e3de6b7..9e3d08b8486 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaQuery.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaQuery.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * 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.constraints.constraints;

-

-/**

- * Represents a Java Query

- */

-public interface JavaQuery {

-

-	/**

-	 * Tests whether the query matches a given object

-	 *

-	 * @param selection

-	 * @return

-	 */

-	public boolean match(Object selection);

-

-	/**

-	 * A Java query which is always false

-	 *

-	 * @author Camille Letavernier

-	 *

-	 */

-	public class FalseQuery implements JavaQuery {

-

-		public boolean match(Object selection) {

-			return false;

-		}

-	}

-}

+/*****************************************************************************
+ * 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.constraints.constraints;
+
+/**
+ * Represents a Java Query
+ */
+public interface JavaQuery {
+
+	/**
+	 * Tests whether the query matches a given object
+	 *
+	 * @param selection
+	 * @return
+	 */
+	public boolean match(Object selection);
+
+	/**
+	 * A Java query which is always false
+	 *
+	 * @author Camille Letavernier
+	 *
+	 */
+	public class FalseQuery implements JavaQuery {
+
+		public boolean match(Object selection) {
+			return false;
+		}
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaQueryConstraint.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaQueryConstraint.java
index dfcbb0a57c6..0aa5cffd5f5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaQueryConstraint.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/JavaQueryConstraint.java
@@ -1,63 +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:

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

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

-package org.eclipse.papyrus.infra.constraints.constraints;

-

-import org.eclipse.papyrus.infra.constraints.Activator;

-import org.eclipse.papyrus.infra.constraints.SimpleConstraint;

-import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery.FalseQuery;

-import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;

-

-/**

- * This constraint allows to define a Java Query (without parameters) without

- * defining it in an environment file.

- *

- * The constraint takes one parameter ("className"), which defines the

- * qualified name of the Java class used to implement the constraint.

- *

- * The Java class must implement the {@link JavaQuery} interface

- *

- * @author Camille Letavernier

- */

-public class JavaQueryConstraint extends AbstractConstraint {

-

-	/**

-	 * The Java Class property

-	 */

-	public final static String QUERY_CLASS_NAME_PROPERTY = "className"; //$NON-NLS-1$

-

-	private JavaQuery query = new FalseQuery();

-

-	@Override

-	protected void setDescriptor(SimpleConstraint descriptor) {

-		String queryClassName = getValue(QUERY_CLASS_NAME_PROPERTY);

-		query = ClassLoaderHelper.newInstance(queryClassName, JavaQuery.class);

-		if (query == null) {

-			Activator.log.warn("Cannot load the JavaQuery for this constraint : " + descriptor.getName());

-		}

-	}

-

-	@Override

-	public boolean match(Object selection) {

-		return query.match(selection);

-	}

-

-	@Override

-	protected boolean equivalent(Constraint constraint) {

-		if (constraint instanceof JavaQueryConstraint) {

-			return ((JavaQueryConstraint) constraint).query.getClass().equals(query.getClass());

-		}

-		return false;

-	}

-

-

-}

+/*****************************************************************************
+ * 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.infra.constraints.constraints;
+
+import org.eclipse.papyrus.infra.constraints.Activator;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery.FalseQuery;
+import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
+
+/**
+ * This constraint allows to define a Java Query (without parameters) without
+ * defining it in an environment file.
+ *
+ * The constraint takes one parameter ("className"), which defines the
+ * qualified name of the Java class used to implement the constraint.
+ *
+ * The Java class must implement the {@link JavaQuery} interface
+ *
+ * @author Camille Letavernier
+ */
+public class JavaQueryConstraint extends AbstractConstraint {
+
+	/**
+	 * The Java Class property
+	 */
+	public final static String QUERY_CLASS_NAME_PROPERTY = "className"; //$NON-NLS-1$
+
+	private JavaQuery query = new FalseQuery();
+
+	@Override
+	protected void setDescriptor(SimpleConstraint descriptor) {
+		String queryClassName = getValue(QUERY_CLASS_NAME_PROPERTY);
+		query = ClassLoaderHelper.newInstance(queryClassName, JavaQuery.class);
+		if (query == null) {
+			Activator.log.warn("Cannot load the JavaQuery for this constraint : " + descriptor.getName());
+		}
+	}
+
+	@Override
+	public boolean match(Object selection) {
+		return query.match(selection);
+	}
+
+	@Override
+	protected boolean equivalent(Constraint constraint) {
+		if (constraint instanceof JavaQueryConstraint) {
+			return ((JavaQueryConstraint) constraint).query.getClass().equals(query.getClass());
+		}
+		return false;
+	}
+
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/TrueConstraint.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/TrueConstraint.java
index 2ff3e337236..050810aba81 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/TrueConstraint.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/constraints/TrueConstraint.java
@@ -1,32 +1,32 @@
-/*****************************************************************************

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

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

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

-package org.eclipse.papyrus.infra.constraints.constraints;

-

-/**

- * A Constraint always returning true.

- *

- * @author Camille Letavernier

- */

-public class TrueConstraint extends AbstractConstraint {

-

-	@Override

-	public boolean match(Object selection) {

-		return true;

-	}

-

-	@Override

-	protected boolean equivalent(Constraint constraint) {

-		// return constraint != null && constraint instanceof TrueConstraint;

-		return false; // TrueConstraint is always true ; it shouldn't override another "always true" constraint

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.constraints.constraints;
+
+/**
+ * A Constraint always returning true.
+ *
+ * @author Camille Letavernier
+ */
+public class TrueConstraint extends AbstractConstraint {
+
+	@Override
+	public boolean match(Object selection) {
+		return true;
+	}
+
+	@Override
+	protected boolean equivalent(Constraint constraint) {
+		// return constraint != null && constraint instanceof TrueConstraint;
+		return false; // TrueConstraint is always true ; it shouldn't override another "always true" constraint
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintEngine.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintEngine.java
index 2db2ad3dc2e..0d93115d4d2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintEngine.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintEngine.java
@@ -1,61 +1,61 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 CEA LIST and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *  Christian W. Damus (CEA) - bug 417409

- *

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

-package org.eclipse.papyrus.infra.constraints.runtime;

-

-import java.util.Collection;

-import java.util.Set;

-

-import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;

-import org.eclipse.papyrus.infra.constraints.DisplayUnit;

-

-/**

- * An interface representing a Constraint Engine.

- * The Constraint Engine is responsible for retrieving the DisplayUnits

- * to display for a given ISelection.

- *

- * @author Camille Letavernier

- * @param <E>

- *            The type of DisplayUnit managed by this Constraint Engine

- */

-public interface ConstraintEngine<E extends DisplayUnit> {

-

-	/**

-	 * Returns the DisplayUnits matching the given selection

-	 *

-	 * @param a

-	 *            plastic "selection" of objects, which may be a {@link Collection} of

-	 *            some kind, something convertible to a collection (like a JFace {@code IStructuredSelection}),

-	 *            or just a single object

-	 * 

-	 * @return the display units applicable to the selection

-	 */

-	public Set<E> getDisplayUnits(Object selection);

-

-	/**

-	 * Adds a constraint descriptor to this engine

-	 *

-	 * @param descriptor

-	 */

-	public void addConstraint(ConstraintDescriptor descriptor);

-

-	/**

-	 * Indicate that the available constraints might have changed

-	 * Refreshes the Constraint Engine

-	 */

-	public void refresh();

-

-	void addConstraintEngineListener(ConstraintEngineListener listener);

-

-	void removeConstraintEngineListener(ConstraintEngineListener listener);

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.constraints.runtime;
+
+import java.util.Collection;
+import java.util.Set;
+
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+
+/**
+ * An interface representing a Constraint Engine.
+ * The Constraint Engine is responsible for retrieving the DisplayUnits
+ * to display for a given ISelection.
+ *
+ * @author Camille Letavernier
+ * @param <E>
+ *            The type of DisplayUnit managed by this Constraint Engine
+ */
+public interface ConstraintEngine<E extends DisplayUnit> {
+
+	/**
+	 * Returns the DisplayUnits matching the given selection
+	 *
+	 * @param a
+	 *            plastic "selection" of objects, which may be a {@link Collection} of
+	 *            some kind, something convertible to a collection (like a JFace {@code IStructuredSelection}),
+	 *            or just a single object
+	 * 
+	 * @return the display units applicable to the selection
+	 */
+	public Set<E> getDisplayUnits(Object selection);
+
+	/**
+	 * Adds a constraint descriptor to this engine
+	 *
+	 * @param descriptor
+	 */
+	public void addConstraint(ConstraintDescriptor descriptor);
+
+	/**
+	 * Indicate that the available constraints might have changed
+	 * Refreshes the Constraint Engine
+	 */
+	public void refresh();
+
+	void addConstraintEngineListener(ConstraintEngineListener listener);
+
+	void removeConstraintEngineListener(ConstraintEngineListener listener);
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintEngineListener.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintEngineListener.java
index 208b50e409f..208b50e409f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintEngineListener.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintEngineListener.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintFactory.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintFactory.java
index 76552abbb34..72aed02e3c2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintFactory.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintFactory.java
@@ -1,91 +1,91 @@
-/*****************************************************************************

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

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

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

-package org.eclipse.papyrus.infra.constraints.runtime;

-

-import org.eclipse.papyrus.infra.constraints.Activator;

-import org.eclipse.papyrus.infra.constraints.CompositeConstraint;

-import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;

-import org.eclipse.papyrus.infra.constraints.SimpleConstraint;

-import org.eclipse.papyrus.infra.constraints.constraints.CompoundConstraint;

-import org.eclipse.papyrus.infra.constraints.constraints.Constraint;

-import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;

-

-

-/**

- * A Singleton class for creating {@link Constraint}s from a {@link ConstraintDescriptor}

- *

- * @author Camille Letavernier

- */

-public class ConstraintFactory {

-

-	private ConstraintFactory() {

-

-	}

-

-	/**

-	 * @return the singleton instance

-	 */

-	public static ConstraintFactory getInstance() {

-		return instance;

-	}

-

-	/**

-	 * Creates a new Constraint from the given ConstraintDescriptor

-	 *

-	 * @param model

-	 *            The ConstraintDescriptor describing the Constraint

-	 * @return

-	 *         The new constraint instance

-	 */

-	public Constraint createFromModel(ConstraintDescriptor model) {

-		Constraint constraint = null;

-		if (model instanceof CompositeConstraint) {

-			CompoundConstraint cConstraint = new CompoundConstraint();

-			cConstraint.setConstraintDescriptor(model);

-			for (SimpleConstraint descriptor : ((CompositeConstraint) model).getConstraints()) {

-				Constraint subConstraint = loadConstraint(descriptor);

-

-				// One of the subConstraint is invalid : we stop building the constraint

-				if (subConstraint == null) {

-					Activator.log.warn("Cannot load constraint " + model.getName()); //$NON-NLS-1$

-					return null;

-				}

-

-				cConstraint.addConstraint(subConstraint);

-			}

-

-			constraint = cConstraint;

-		} else {

-			constraint = loadConstraint((SimpleConstraint) model);

-		}

-		return constraint;

-	}

-

-	private Constraint loadConstraint(SimpleConstraint model) {

-		Constraint constraint = null;

-

-		if (model.getConstraintType() != null) {

-			String className = model.getConstraintType().getConstraintClass();

-			constraint = ClassLoaderHelper.newInstance(className, Constraint.class);

-		}

-

-		if (constraint == null) {

-			Activator.log.warn("Cannot load constraint " + model.getName()); //$NON-NLS-1$

-			return null;

-		}

-

-		constraint.setConstraintDescriptor(model);

-		return constraint;

-	}

-

-	private static ConstraintFactory instance = new ConstraintFactory();

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.constraints.runtime;
+
+import org.eclipse.papyrus.infra.constraints.Activator;
+import org.eclipse.papyrus.infra.constraints.CompositeConstraint;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.SimpleConstraint;
+import org.eclipse.papyrus.infra.constraints.constraints.CompoundConstraint;
+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
+import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
+
+
+/**
+ * A Singleton class for creating {@link Constraint}s from a {@link ConstraintDescriptor}
+ *
+ * @author Camille Letavernier
+ */
+public class ConstraintFactory {
+
+	private ConstraintFactory() {
+
+	}
+
+	/**
+	 * @return the singleton instance
+	 */
+	public static ConstraintFactory getInstance() {
+		return instance;
+	}
+
+	/**
+	 * Creates a new Constraint from the given ConstraintDescriptor
+	 *
+	 * @param model
+	 *            The ConstraintDescriptor describing the Constraint
+	 * @return
+	 *         The new constraint instance
+	 */
+	public Constraint createFromModel(ConstraintDescriptor model) {
+		Constraint constraint = null;
+		if (model instanceof CompositeConstraint) {
+			CompoundConstraint cConstraint = new CompoundConstraint();
+			cConstraint.setConstraintDescriptor(model);
+			for (SimpleConstraint descriptor : ((CompositeConstraint) model).getConstraints()) {
+				Constraint subConstraint = loadConstraint(descriptor);
+
+				// One of the subConstraint is invalid : we stop building the constraint
+				if (subConstraint == null) {
+					Activator.log.warn("Cannot load constraint " + model.getName()); //$NON-NLS-1$
+					return null;
+				}
+
+				cConstraint.addConstraint(subConstraint);
+			}
+
+			constraint = cConstraint;
+		} else {
+			constraint = loadConstraint((SimpleConstraint) model);
+		}
+		return constraint;
+	}
+
+	private Constraint loadConstraint(SimpleConstraint model) {
+		Constraint constraint = null;
+
+		if (model.getConstraintType() != null) {
+			String className = model.getConstraintType().getConstraintClass();
+			constraint = ClassLoaderHelper.newInstance(className, Constraint.class);
+		}
+
+		if (constraint == null) {
+			Activator.log.warn("Cannot load constraint " + model.getName()); //$NON-NLS-1$
+			return null;
+		}
+
+		constraint.setConstraintDescriptor(model);
+		return constraint;
+	}
+
+	private static ConstraintFactory instance = new ConstraintFactory();
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintsChangedEvent.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintsChangedEvent.java
index c6d7776db3b..c6d7776db3b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintsChangedEvent.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintsChangedEvent.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintsManager.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintsManager.java
index 3818f7dd270..072fe8e856b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintsManager.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/ConstraintsManager.java
@@ -1,113 +1,113 @@
-/*****************************************************************************

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

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

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

-package org.eclipse.papyrus.infra.constraints.runtime;

-

-import java.io.IOException;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Set;

-

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

-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.ResourceSet;

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

-import org.eclipse.papyrus.infra.constraints.Activator;

-import org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment;

-import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;

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

-

-/**

- * A singleton instance to manage constraints.

- * The available constraints can be loaded from an extension point, or

- * dynamically

- *

- * @author Camille Letavernier

- *

- */

-public class ConstraintsManager {

-

-	/**

-	 * The Constraints extension point ID

-	 */

-	public final static String EXTENSION_ID = Activator.PLUGIN_ID + ".ConstraintEnvironment"; //$NON-NLS-1$

-

-	private ResourceSet resourceSet;

-

-	private final Set<ConstraintEnvironment> environments;

-

-	private ConstraintsManager() {

-		environments = new HashSet<ConstraintEnvironment>();

-		resourceSet = new ResourceSetImpl();

-		loadExtensionPoint();

-	}

-

-	private void loadExtensionPoint() {

-		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);

-

-		for (IConfigurationElement e : config) {

-			final String environmentResource = e.getAttribute("environmentModel"); //$NON-NLS-1$

-			URI uri = URI.createPlatformPluginURI(e.getContributor().getName() + "/" + environmentResource, true); //$NON-NLS-1$

-			try {

-				addEnvironment(uri);

-			} catch (IOException ex) {

-				Activator.log.error("The plugin " + e.getContributor() + " contributed an invalid extension for " + EXTENSION_ID, ex); //$NON-NLS-1$//$NON-NLS-2$

-			}

-		}

-	}

-

-	/**

-	 * Adds a constraint environment model, which should be loaded at

-	 * the given URI. The root element should be a {@link ConstraintEnvironment}

-	 *

-	 * @param uri

-	 *            The location of the model to load. Its root element should be a {@link ConstraintEnvironment}

-	 * @throws IOException

-	 *             If the model cannot be loaded

-	 */

-	public void addEnvironment(URI uri) throws IOException {

-		EObject model = EMFHelper.loadEMFModel(resourceSet, uri);

-		if (model instanceof ConstraintEnvironment) {

-			addEnvironment((ConstraintEnvironment) model);

-		}

-	}

-

-	/**

-	 * Adds a constraint environment model to the manager

-	 *

-	 * @param environment

-	 *            The {@link ConstraintEnvironment} to add to the manager

-	 */

-	public void addEnvironment(ConstraintEnvironment environment) {

-		environments.add(environment);

-	}

-

-	/**

-	 * The singleton instance of {@link ConstraintsManager}

-	 */

-	public static final ConstraintsManager instance = new ConstraintsManager();

-

-	/**

-	 * Returns all {@link ConstraintType}s contained in the {@link ConstraintEnvironment} managed by this singleton

-	 *

-	 * @return

-	 * 		All known {@link ConstraintType}s

-	 */

-	public Collection<ConstraintType> getConstraintTypes() {

-		Collection<ConstraintType> constraintTypes = new HashSet<ConstraintType>();

-		for (ConstraintEnvironment environment : environments) {

-			constraintTypes.addAll(environment.getConstraintTypes());

-		}

-		return constraintTypes;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.constraints.runtime;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+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.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.papyrus.infra.constraints.Activator;
+import org.eclipse.papyrus.infra.constraints.environment.ConstraintEnvironment;
+import org.eclipse.papyrus.infra.constraints.environment.ConstraintType;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+
+/**
+ * A singleton instance to manage constraints.
+ * The available constraints can be loaded from an extension point, or
+ * dynamically
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class ConstraintsManager {
+
+	/**
+	 * The Constraints extension point ID
+	 */
+	public final static String EXTENSION_ID = Activator.PLUGIN_ID + ".ConstraintEnvironment"; //$NON-NLS-1$
+
+	private ResourceSet resourceSet;
+
+	private final Set<ConstraintEnvironment> environments;
+
+	private ConstraintsManager() {
+		environments = new HashSet<ConstraintEnvironment>();
+		resourceSet = new ResourceSetImpl();
+		loadExtensionPoint();
+	}
+
+	private void loadExtensionPoint() {
+		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+
+		for (IConfigurationElement e : config) {
+			final String environmentResource = e.getAttribute("environmentModel"); //$NON-NLS-1$
+			URI uri = URI.createPlatformPluginURI(e.getContributor().getName() + "/" + environmentResource, true); //$NON-NLS-1$
+			try {
+				addEnvironment(uri);
+			} catch (IOException ex) {
+				Activator.log.error("The plugin " + e.getContributor() + " contributed an invalid extension for " + EXTENSION_ID, ex); //$NON-NLS-1$//$NON-NLS-2$
+			}
+		}
+	}
+
+	/**
+	 * Adds a constraint environment model, which should be loaded at
+	 * the given URI. The root element should be a {@link ConstraintEnvironment}
+	 *
+	 * @param uri
+	 *            The location of the model to load. Its root element should be a {@link ConstraintEnvironment}
+	 * @throws IOException
+	 *             If the model cannot be loaded
+	 */
+	public void addEnvironment(URI uri) throws IOException {
+		EObject model = EMFHelper.loadEMFModel(resourceSet, uri);
+		if (model instanceof ConstraintEnvironment) {
+			addEnvironment((ConstraintEnvironment) model);
+		}
+	}
+
+	/**
+	 * Adds a constraint environment model to the manager
+	 *
+	 * @param environment
+	 *            The {@link ConstraintEnvironment} to add to the manager
+	 */
+	public void addEnvironment(ConstraintEnvironment environment) {
+		environments.add(environment);
+	}
+
+	/**
+	 * The singleton instance of {@link ConstraintsManager}
+	 */
+	public static final ConstraintsManager instance = new ConstraintsManager();
+
+	/**
+	 * Returns all {@link ConstraintType}s contained in the {@link ConstraintEnvironment} managed by this singleton
+	 *
+	 * @return
+	 * 		All known {@link ConstraintType}s
+	 */
+	public Collection<ConstraintType> getConstraintTypes() {
+		Collection<ConstraintType> constraintTypes = new HashSet<ConstraintType>();
+		for (ConstraintEnvironment environment : environments) {
+			constraintTypes.addAll(environment.getConstraintTypes());
+		}
+		return constraintTypes;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/DefaultConstraintEngine.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/DefaultConstraintEngine.java
index 2b6704379d8..63bae2ba467 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/DefaultConstraintEngine.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/DefaultConstraintEngine.java
@@ -1,226 +1,226 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *  Christian W. Damus (CEA) - bug 417409

- *  Christian W. Damus - bug 485220

- *

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

-package org.eclipse.papyrus.infra.constraints.runtime;

-

-import java.lang.reflect.Method;

-import java.lang.reflect.Modifier;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.LinkedHashSet;

-import java.util.Map;

-import java.util.Set;

-import java.util.regex.Pattern;

-import java.util.stream.Collectors;

-import java.util.stream.StreamSupport;

-

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

-import org.eclipse.papyrus.infra.constraints.Activator;

-import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;

-import org.eclipse.papyrus.infra.constraints.DisplayUnit;

-import org.eclipse.papyrus.infra.constraints.constraints.Constraint;

-

-/**

- * The default, generic implementation for ConstraintEngine

- *

- * @author Camille Letavernier

- * @param <E>

- *            The type of DisplayUnit managed by this Constraint Engine

- */

-public abstract class DefaultConstraintEngine<E extends DisplayUnit> implements ConstraintEngine<E> {

-

-	// Pattern for names of methods that convert an object to a collection

-	private static final Pattern CONVERTER_PATTERN = Pattern.compile("(?:to|as)(?:Collection|List|Set)"); //$NON-NLS-1$

-

-	private static final Method NO_CONVERTER = Object.class.getMethods()[0];

-

-	private final ListenerList listeners = new ListenerList(ListenerList.IDENTITY);

-

-	/**

-	 * The constraints instantiated by this Engine

-	 */

-	protected final Set<Constraint> constraints = new LinkedHashSet<Constraint>();

-

-	private final Class<? extends E> displayUnitType;

-

-	private final Map<Class<?>, Method> collectionConverters = new HashMap<>();

-

-	protected DefaultConstraintEngine(Class<? extends E> displayUnitType) {

-		super();

-

-		this.displayUnitType = displayUnitType;

-	}

-

-	@Override

-	public abstract void refresh();

-

-	@Override

-	public synchronized void addConstraint(ConstraintDescriptor descriptor) {

-		Constraint constraint = ConstraintFactory.getInstance().createFromModel(descriptor);

-		if (constraint != null) {

-			constraints.add(constraint);

-		}

-	}

-

-	@Override

-	public synchronized Set<E> getDisplayUnits(final Object selection) {

-		Collection<?> collection = asCollection(selection);

-

-		Set<Constraint> matchedConstraints = match(collection);

-

-		return getDisplayUnits(matchedConstraints);

-	}

-

-	private Set<Constraint> match(final Collection<?> selection) {

-		Set<Constraint> matchedConstraints = new LinkedHashSet<Constraint>();

-

-		if (selection.isEmpty()) {

-			return matchedConstraints;

-		}

-

-		for (Constraint c : constraints) {

-			try {

-				if (c.match(selection)) {

-					matchedConstraints.add(c);

-				}

-			} catch (Throwable ex) {

-				String errorMessage = String.format("An error occurred when executing the matching constraint %s. This constraint will be ignored", c.getDescriptor().getName());

-				Activator.log.error(errorMessage, ex);

-			}

-

-		}

-

-		// String logValue;

-		//

-		// logValue = "Filtered Constraints : "; //$NON-NLS-1$

-		// for(Constraint constraint : matchedConstraints) {

-		// logValue += constraint.getDescriptor().getName() + ", ";

-		// }

-		// Activator.log.warn(logValue);

-

-		resolveConstraintConflicts(matchedConstraints);

-

-		// logValue = "Filtered Constraints : "; //$NON-NLS-1$

-		// for(Constraint constraint : matchedConstraints) {

-		// logValue += constraint.getDescriptor().getName() + ", ";

-		// }

-		//

-		// Activator.log.warn(logValue);

-

-		return matchedConstraints;

-	}

-

-	private void resolveConstraintConflicts(final Set<Constraint> matchedConstraints) {

-		Set<Constraint> constraintsSet = new HashSet<Constraint>(matchedConstraints);

-		for (Constraint c : constraintsSet) {

-			for (Constraint c2 : constraintsSet) {

-				if (c == c2) {

-					continue;

-				}

-

-				if (c.getDescriptor().getOverriddenConstraints().contains(c2.getDescriptor())) {

-					matchedConstraints.remove(c2);

-					continue;

-				}

-

-				if (c2.getDescriptor().isOverrideable() && c.overrides(c2)) {

-					matchedConstraints.remove(c2);

-					continue;

-				}

-			}

-		}

-	}

-

-	private Set<E> getDisplayUnits(final Set<Constraint> matchedConstraints) {

-		Set<E> displayUnits = new LinkedHashSet<E>();

-		for (Constraint c : matchedConstraints) {

-			displayUnits.add(displayUnitType.cast(c.getDescriptor().getDisplay()));

-		}

-		return displayUnits;

-	}

-

-	@Override

-	public void addConstraintEngineListener(ConstraintEngineListener listener) {

-		listeners.add(listener);

-	}

-

-	@Override

-	public void removeConstraintEngineListener(ConstraintEngineListener listener) {

-		listeners.remove(listener);

-	}

-

-	protected void fireConstraintsChanged() {

-		if (!listeners.isEmpty()) {

-			Object[] toNotify = listeners.getListeners();

-			ConstraintsChangedEvent event = new ConstraintsChangedEvent(this);

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

-				try {

-					((ConstraintEngineListener) toNotify[i]).constraintsChanged(event);

-				} catch (Exception e) {

-					Activator.log.error("Uncaught exception in constraints-changed listener.", e); //$NON-NLS-1$

-				}

-			}

-		}

-	}

-

-	private Collection<?> asCollection(Object object) {

-		Collection<?> result;

-

-		if (object == null) {

-			result = Collections.EMPTY_LIST;

-		} else if (object instanceof Collection<?>) {

-			result = (Collection<?>) object;

-		} else if (object instanceof Iterable<?>) {

-			result = StreamSupport.stream(((Iterable<?>) object).spliterator(), false).collect(Collectors.toList());

-		} else {

-			Method converter = getToCollectionMethod(object);

-			if (converter != null) {

-				try {

-					result = (Collection<?>) converter.invoke(object);

-				} catch (Exception e) {

-					// Converter not valid. Fine. Don't try it again

-					rejectConverter(object);

-					result = Collections.EMPTY_LIST;

-				}

-			} else {

-				result = Collections.singletonList(object);

-			}

-		}

-

-		return result;

-	}

-

-	private Method getToCollectionMethod(Object object) {

-		Class<?> key = object.getClass();

-		Method result = collectionConverters.computeIfAbsent(key, owner -> {

-			for (Method next : owner.getMethods()) {

-				if (((next.getModifiers() & Modifier.STATIC) == 0)

-						&& Collection.class.isAssignableFrom(next.getReturnType())

-						&& (next.getParameterCount() == 0)

-						&& CONVERTER_PATTERN.matcher(next.getName()).matches()) {

-					return next;

-				}

-			}

-			return NO_CONVERTER;

-		});

-

-		return (result == NO_CONVERTER) ? null : result;

-	}

-

-	private void rejectConverter(Object object) {

-		collectionConverters.put(object.getClass(), NO_CONVERTER);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.constraints.runtime;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.papyrus.infra.constraints.Activator;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.DisplayUnit;
+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
+
+/**
+ * The default, generic implementation for ConstraintEngine
+ *
+ * @author Camille Letavernier
+ * @param <E>
+ *            The type of DisplayUnit managed by this Constraint Engine
+ */
+public abstract class DefaultConstraintEngine<E extends DisplayUnit> implements ConstraintEngine<E> {
+
+	// Pattern for names of methods that convert an object to a collection
+	private static final Pattern CONVERTER_PATTERN = Pattern.compile("(?:to|as)(?:Collection|List|Set)"); //$NON-NLS-1$
+
+	private static final Method NO_CONVERTER = Object.class.getMethods()[0];
+
+	private final ListenerList listeners = new ListenerList(ListenerList.IDENTITY);
+
+	/**
+	 * The constraints instantiated by this Engine
+	 */
+	protected final Set<Constraint> constraints = new LinkedHashSet<Constraint>();
+
+	private final Class<? extends E> displayUnitType;
+
+	private final Map<Class<?>, Method> collectionConverters = new HashMap<>();
+
+	protected DefaultConstraintEngine(Class<? extends E> displayUnitType) {
+		super();
+
+		this.displayUnitType = displayUnitType;
+	}
+
+	@Override
+	public abstract void refresh();
+
+	@Override
+	public synchronized void addConstraint(ConstraintDescriptor descriptor) {
+		Constraint constraint = ConstraintFactory.getInstance().createFromModel(descriptor);
+		if (constraint != null) {
+			constraints.add(constraint);
+		}
+	}
+
+	@Override
+	public synchronized Set<E> getDisplayUnits(final Object selection) {
+		Collection<?> collection = asCollection(selection);
+
+		Set<Constraint> matchedConstraints = match(collection);
+
+		return getDisplayUnits(matchedConstraints);
+	}
+
+	private Set<Constraint> match(final Collection<?> selection) {
+		Set<Constraint> matchedConstraints = new LinkedHashSet<Constraint>();
+
+		if (selection.isEmpty()) {
+			return matchedConstraints;
+		}
+
+		for (Constraint c : constraints) {
+			try {
+				if (c.match(selection)) {
+					matchedConstraints.add(c);
+				}
+			} catch (Throwable ex) {
+				String errorMessage = String.format("An error occurred when executing the matching constraint %s. This constraint will be ignored", c.getDescriptor().getName());
+				Activator.log.error(errorMessage, ex);
+			}
+
+		}
+
+		// String logValue;
+		//
+		// logValue = "Filtered Constraints : "; //$NON-NLS-1$
+		// for(Constraint constraint : matchedConstraints) {
+		// logValue += constraint.getDescriptor().getName() + ", ";
+		// }
+		// Activator.log.warn(logValue);
+
+		resolveConstraintConflicts(matchedConstraints);
+
+		// logValue = "Filtered Constraints : "; //$NON-NLS-1$
+		// for(Constraint constraint : matchedConstraints) {
+		// logValue += constraint.getDescriptor().getName() + ", ";
+		// }
+		//
+		// Activator.log.warn(logValue);
+
+		return matchedConstraints;
+	}
+
+	private void resolveConstraintConflicts(final Set<Constraint> matchedConstraints) {
+		Set<Constraint> constraintsSet = new HashSet<Constraint>(matchedConstraints);
+		for (Constraint c : constraintsSet) {
+			for (Constraint c2 : constraintsSet) {
+				if (c == c2) {
+					continue;
+				}
+
+				if (c.getDescriptor().getOverriddenConstraints().contains(c2.getDescriptor())) {
+					matchedConstraints.remove(c2);
+					continue;
+				}
+
+				if (c2.getDescriptor().isOverrideable() && c.overrides(c2)) {
+					matchedConstraints.remove(c2);
+					continue;
+				}
+			}
+		}
+	}
+
+	private Set<E> getDisplayUnits(final Set<Constraint> matchedConstraints) {
+		Set<E> displayUnits = new LinkedHashSet<E>();
+		for (Constraint c : matchedConstraints) {
+			displayUnits.add(displayUnitType.cast(c.getDescriptor().getDisplay()));
+		}
+		return displayUnits;
+	}
+
+	@Override
+	public void addConstraintEngineListener(ConstraintEngineListener listener) {
+		listeners.add(listener);
+	}
+
+	@Override
+	public void removeConstraintEngineListener(ConstraintEngineListener listener) {
+		listeners.remove(listener);
+	}
+
+	protected void fireConstraintsChanged() {
+		if (!listeners.isEmpty()) {
+			Object[] toNotify = listeners.getListeners();
+			ConstraintsChangedEvent event = new ConstraintsChangedEvent(this);
+			for (int i = 0; i < toNotify.length; i++) {
+				try {
+					((ConstraintEngineListener) toNotify[i]).constraintsChanged(event);
+				} catch (Exception e) {
+					Activator.log.error("Uncaught exception in constraints-changed listener.", e); //$NON-NLS-1$
+				}
+			}
+		}
+	}
+
+	private Collection<?> asCollection(Object object) {
+		Collection<?> result;
+
+		if (object == null) {
+			result = Collections.EMPTY_LIST;
+		} else if (object instanceof Collection<?>) {
+			result = (Collection<?>) object;
+		} else if (object instanceof Iterable<?>) {
+			result = StreamSupport.stream(((Iterable<?>) object).spliterator(), false).collect(Collectors.toList());
+		} else {
+			Method converter = getToCollectionMethod(object);
+			if (converter != null) {
+				try {
+					result = (Collection<?>) converter.invoke(object);
+				} catch (Exception e) {
+					// Converter not valid. Fine. Don't try it again
+					rejectConverter(object);
+					result = Collections.EMPTY_LIST;
+				}
+			} else {
+				result = Collections.singletonList(object);
+			}
+		}
+
+		return result;
+	}
+
+	private Method getToCollectionMethod(Object object) {
+		Class<?> key = object.getClass();
+		Method result = collectionConverters.computeIfAbsent(key, owner -> {
+			for (Method next : owner.getMethods()) {
+				if (((next.getModifiers() & Modifier.STATIC) == 0)
+						&& Collection.class.isAssignableFrom(next.getReturnType())
+						&& (next.getParameterCount() == 0)
+						&& CONVERTER_PATTERN.matcher(next.getName()).matches()) {
+					return next;
+				}
+			}
+			return NO_CONVERTER;
+		});
+
+		return (result == NO_CONVERTER) ? null : result;
+	}
+
+	private void rejectConverter(Object object) {
+		collectionConverters.put(object.getClass(), NO_CONVERTER);
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/util/ClassLoader.java b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/util/ClassLoader.java
index a5cdbea5d96..ab0ad2832d0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/util/ClassLoader.java
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/util/ClassLoader.java
@@ -1,84 +1,84 @@
-/*****************************************************************************

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

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

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

-package org.eclipse.papyrus.infra.constraints.util;

-

-import org.eclipse.papyrus.infra.constraints.Activator;

-

-/**

- * A Helper class for Class Loading.

- *

- * @author Camille Letavernier

- */

-public class ClassLoader {

-

-	/**

-	 * Loads the class matching the given className. Exceptions are caught and sent

-	 * to the Logger.

-	 *

-	 * @param className

-	 *            The qualified name of the Class to load.

-	 * @return

-	 *         The loaded Class, or null if an error occured

-	 */

-	public Class<?> loadClass(String className) {

-		try {

-			Class<?> clazz = Activator.getDefault().getBundle().loadClass(className);

-			return clazz;

-		} catch (ClassNotFoundException ex) {

-			Activator.log.error("Cannot load class " + className, ex); //$NON-NLS-1$

-		} catch (ClassCastException ex) {

-			Activator.log.error("Cannot load class " + className, ex); //$NON-NLS-1$

-		} catch (NullPointerException ex) {

-			Activator.log.error("Cannot load class " + className, ex); //$NON-NLS-1$

-		}

-

-		return null;

-	}

-

-	/**

-	 * Returns a new Instance of the given class

-	 *

-	 * @param className

-	 *            The qualified name of the Class to instantiate

-	 * @return

-	 *         A new instance of the given class, or null if the class couldn't be

-	 *         instantiated

-	 */

-	public Object newInstance(String className) {

-		return newInstance(loadClass(className));

-	}

-

-	/**

-	 * Returns a new Instance of the given class

-	 *

-	 * @param theClass

-	 *            The Class to instantiate

-	 * @return

-	 *         A new instance of the given class, or null if the class couldn't be

-	 *         instantiated

-	 */

-	public <T extends Object> T newInstance(Class<T> theClass) {

-		if (theClass == null) {

-			return null;

-		}

-

-		try {

-			return theClass.newInstance();

-		} catch (IllegalAccessException ex) {

-			Activator.log.error(ex);

-		} catch (InstantiationException ex) {

-			Activator.log.error(ex);

-		}

-

-		return null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.constraints.util;
+
+import org.eclipse.papyrus.infra.constraints.Activator;
+
+/**
+ * A Helper class for Class Loading.
+ *
+ * @author Camille Letavernier
+ */
+public class ClassLoader {
+
+	/**
+	 * Loads the class matching the given className. Exceptions are caught and sent
+	 * to the Logger.
+	 *
+	 * @param className
+	 *            The qualified name of the Class to load.
+	 * @return
+	 *         The loaded Class, or null if an error occured
+	 */
+	public Class<?> loadClass(String className) {
+		try {
+			Class<?> clazz = Activator.getDefault().getBundle().loadClass(className);
+			return clazz;
+		} catch (ClassNotFoundException ex) {
+			Activator.log.error("Cannot load class " + className, ex); //$NON-NLS-1$
+		} catch (ClassCastException ex) {
+			Activator.log.error("Cannot load class " + className, ex); //$NON-NLS-1$
+		} catch (NullPointerException ex) {
+			Activator.log.error("Cannot load class " + className, ex); //$NON-NLS-1$
+		}
+
+		return null;
+	}
+
+	/**
+	 * Returns a new Instance of the given class
+	 *
+	 * @param className
+	 *            The qualified name of the Class to instantiate
+	 * @return
+	 *         A new instance of the given class, or null if the class couldn't be
+	 *         instantiated
+	 */
+	public Object newInstance(String className) {
+		return newInstance(loadClass(className));
+	}
+
+	/**
+	 * Returns a new Instance of the given class
+	 *
+	 * @param theClass
+	 *            The Class to instantiate
+	 * @return
+	 *         A new instance of the given class, or null if the class couldn't be
+	 *         instantiated
+	 */
+	public <T extends Object> T newInstance(Class<T> theClass) {
+		if (theClass == null) {
+			return null;
+		}
+
+		try {
+			return theClass.newInstance();
+		} catch (IllegalAccessException ex) {
+			Activator.log.error(ex);
+		} catch (InstantiationException ex) {
+			Activator.log.error(ex);
+		}
+
+		return null;
+	}
+}
diff --git a/plugins/infra/constraints/pom.xml b/plugins/infra/constraints/pom.xml
new file mode 100644
index 00000000000..f5e1d348b6a
--- /dev/null
+++ b/plugins/infra/constraints/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.infra-constraints</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+	<name>Papyrus Infra Constraints</name>
+	<description>Model and UI for constraints supporting conditional UI presentation as in the Papyrus Properties framework.</description>
+
+	<modules>
+		<module>org.eclipse.papyrus.infra.constraints</module>
+		<module>org.eclipse.papyrus.infra.constraints.edit</module>
+		<module>org.eclipse.papyrus.infra.constraints.editor</module>
+		<module>org.eclipse.papyrus.infra.constraints.ui</module>
+	</modules>
+</project>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/pom.xml
index b5d2bdfd90f..11b1b68b60c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/pom.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<artifactId>org.eclipse.papyrus.infra-core</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.core.log</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/pom.xml
index 0b735aae0d9..b21f8997b31 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/pom.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<artifactId>org.eclipse.papyrus.infra-core</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.core.pluginexplorer</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/pom.xml
index 3f885ce4530..1daf5ae6e56 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/pom.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<artifactId>org.eclipse.papyrus.infra-core</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.core.sasheditor.di</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/pom.xml
index e9f1d27360c..57ef0408764 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/pom.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<artifactId>org.eclipse.papyrus.infra-core</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.core.sasheditor</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/pom.xml
index 8e67e56cd32..f4d64d319a9 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/pom.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<artifactId>org.eclipse.papyrus.infra-core</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.core.sashwindows.di</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
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 a7a4780781c..cb8e66e2229 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/plugin.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/plugin.xml
@@ -1,119 +1,120 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.2"?>

-<plugin>

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

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

-   <extension-point id="model" name="plugin.xml.ModelName" schema="schema/model.exsd"/>

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

-   <extension-point id="sashModelProvider" name="Sash Model Providers" schema="schema/sashModelProvider.exsd"/>

-   <extension-point id="language" name="Modeling Language" schema="schema/language.exsd"/>

-   

-  <extension

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

-      <model

-            classname="org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel"

-            description="Model for sash system"

-            fileExtension="sash">

-      </model>

-      <modelSetSnippet

-            classname="org.eclipse.papyrus.infra.core.modelsetquery.impl.ModelSetQueryInitializer"

-            description="Adapter attached to the ModelSet (aka ResourceSet)">

-      </modelSetSnippet>

-      <model

-            classname="org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel"

-            description="Main Papyrus IModel"

-            fileExtension="di">

-      </model>

-   </extension>

-   <extension

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

-      <serviceFactory

-            classname="org.eclipse.papyrus.infra.core.editor.ModelSetServiceFactory"

-            description="The service loading Models"

-            id="org.eclipse.papyrus.infra.core.resource.ModelSet"

-            priority="1"

-            startKind="startup">

-      </serviceFactory>

-      <serviceFactory

-            classname="org.eclipse.papyrus.infra.core.editor.DiResourceSetServiceFactory"

-            description="An alias to ModelSet"

-            id="org.eclipse.papyrus.infra.core.utils.DiResourceSet"

-            priority="1"

-            startKind="startup">

-         <dependsOn

-               serviceKeyRef="org.eclipse.papyrus.infra.core.resource.ModelSet">

-         </dependsOn>

-      </serviceFactory>

-      <serviceFactory

-            classname="org.eclipse.papyrus.infra.core.resource.EditingDomainServiceFactory"

-            description="TransactionalEditing Domain"

-            id="org.eclipse.emf.transaction.TransactionalEditingDomain"

-            priority="1"

-            startKind="startup">

-         <dependsOn

-               serviceKeyRef="org.eclipse.papyrus.infra.core.resource.ModelSet">

-         </dependsOn>

-      </serviceFactory>

-      <serviceFactory

-            classname="org.eclipse.papyrus.infra.core.resource.EditingDomainServiceFactory"

-            description="Editing Domain"

-            id="org.eclipse.emf.edit.domain.EditingDomain"

-            priority="1"

-            startKind="startup">

-         <dependsOn

-               serviceKeyRef="org.eclipse.papyrus.infra.core.resource.ModelSet">

-         </dependsOn>

-      </serviceFactory>

-   </extension>

-   <extension

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

-       name="model marker"

-       point="org.eclipse.core.resources.markers">

-     <attribute

-           name="uri">

-     </attribute>

-     <persistent

-           value="true">

-     </persistent>

-   </extension>

-    <extension

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

-       <factory

-             adaptableType="org.eclipse.papyrus.infra.core.resource.ModelSet"

-             class="org.eclipse.papyrus.infra.core.services.ModelSetServiceAdapter$Factory">

-          <adapter

-                type="org.eclipse.papyrus.infra.core.services.IService">

-          </adapter>

-       </factory>

-    </extension>

-    <extension

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

-       <service

-             classname="org.eclipse.papyrus.infra.core.internal.language.LanguageService"

-             id="org.eclipse.papyrus.infra.core.language.ILanguageService"

-             priority="10"

-             startKind="startup">

-       </service>

-       <serviceFactory

-             classname="org.eclipse.papyrus.infra.core.internal.sashmodel.BasicPageManagerServiceFactory"

-             description="Default IPageManager service for headless operation."

-             id="org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager"

-             priority="1"

-             startKind="startup">

-          <dependsOn

-                serviceKeyRef="org.eclipse.papyrus.infra.core.resource.ModelSet">

-          </dependsOn>

-       </serviceFactory>

-    </extension>

-    

-    <extension

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

-       <propertyTester

-             id="org.eclipse.papyrus.infra.core.serviceRegistryProperties"

-             type="org.eclipse.papyrus.infra.core.services.ServicesRegistry"

-             namespace="org.eclipse.papyrus.infra.core"

-             properties="hasSemanticModel"

-             class="org.eclipse.papyrus.infra.core.internal.expressions.ServiceRegistryPropertyTester">

-       </propertyTester>

-    </extension>

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+   <extension-point id="modelListener" name="ModelListener" schema="schema/modelListener.exsd"/>
+   <extension-point id="service" name="Service" schema="schema/service.exsd"/>
+   <extension-point id="model" name="plugin.xml.ModelName" schema="schema/model.exsd"/>
+   <extension-point id="transactionalEditingDomainProvider" name="transactionalEditingDomainProvider" schema="schema/transactionalEditingDomainProvider.exsd"/>
+   <extension-point id="sashModelProvider" name="Sash Model Providers" schema="schema/sashModelProvider.exsd"/>
+   <extension-point id="language" name="Modeling Language" schema="schema/language.exsd"/>
+   
+  <extension
+         point="org.eclipse.papyrus.infra.core.model">
+      <model
+            classname="org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel"
+            description="Model for sash system"
+            fileExtension="sash">
+      </model>
+      <modelSetSnippet
+            classname="org.eclipse.papyrus.infra.core.modelsetquery.impl.ModelSetQueryInitializer"
+            description="Adapter attached to the ModelSet (aka ResourceSet)">
+      </modelSetSnippet>
+      <model
+            classname="org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel"
+            description="Main Papyrus IModel"
+            fileExtension="di"
+            required="true">
+      </model>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.core.service">
+      <serviceFactory
+            classname="org.eclipse.papyrus.infra.core.editor.ModelSetServiceFactory"
+            description="The service loading Models"
+            id="org.eclipse.papyrus.infra.core.resource.ModelSet"
+            priority="1"
+            startKind="startup">
+      </serviceFactory>
+      <serviceFactory
+            classname="org.eclipse.papyrus.infra.core.editor.DiResourceSetServiceFactory"
+            description="An alias to ModelSet"
+            id="org.eclipse.papyrus.infra.core.utils.DiResourceSet"
+            priority="1"
+            startKind="startup">
+         <dependsOn
+               serviceKeyRef="org.eclipse.papyrus.infra.core.resource.ModelSet">
+         </dependsOn>
+      </serviceFactory>
+      <serviceFactory
+            classname="org.eclipse.papyrus.infra.core.resource.EditingDomainServiceFactory"
+            description="TransactionalEditing Domain"
+            id="org.eclipse.emf.transaction.TransactionalEditingDomain"
+            priority="1"
+            startKind="startup">
+         <dependsOn
+               serviceKeyRef="org.eclipse.papyrus.infra.core.resource.ModelSet">
+         </dependsOn>
+      </serviceFactory>
+      <serviceFactory
+            classname="org.eclipse.papyrus.infra.core.resource.EditingDomainServiceFactory"
+            description="Editing Domain"
+            id="org.eclipse.emf.edit.domain.EditingDomain"
+            priority="1"
+            startKind="startup">
+         <dependsOn
+               serviceKeyRef="org.eclipse.papyrus.infra.core.resource.ModelSet">
+         </dependsOn>
+      </serviceFactory>
+   </extension>
+   <extension
+       id="org.eclipse.papyrus.modelmarker"
+       name="model marker"
+       point="org.eclipse.core.resources.markers">
+     <attribute
+           name="uri">
+     </attribute>
+     <persistent
+           value="true">
+     </persistent>
+   </extension>
+    <extension
+          point="org.eclipse.core.runtime.adapters">
+       <factory
+             adaptableType="org.eclipse.papyrus.infra.core.resource.ModelSet"
+             class="org.eclipse.papyrus.infra.core.services.ModelSetServiceAdapter$Factory">
+          <adapter
+                type="org.eclipse.papyrus.infra.core.services.IService">
+          </adapter>
+       </factory>
+    </extension>
+    <extension
+          point="org.eclipse.papyrus.infra.core.service">
+       <service
+             classname="org.eclipse.papyrus.infra.core.internal.language.LanguageService"
+             id="org.eclipse.papyrus.infra.core.language.ILanguageService"
+             priority="10"
+             startKind="startup">
+       </service>
+       <serviceFactory
+             classname="org.eclipse.papyrus.infra.core.internal.sashmodel.BasicPageManagerServiceFactory"
+             description="Default IPageManager service for headless operation."
+             id="org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager"
+             priority="1"
+             startKind="startup">
+          <dependsOn
+                serviceKeyRef="org.eclipse.papyrus.infra.core.resource.ModelSet">
+          </dependsOn>
+       </serviceFactory>
+    </extension>
+    
+    <extension
+          point="org.eclipse.core.expressions.propertyTesters">
+       <propertyTester
+             id="org.eclipse.papyrus.infra.core.serviceRegistryProperties"
+             type="org.eclipse.papyrus.infra.core.services.ServicesRegistry"
+             namespace="org.eclipse.papyrus.infra.core"
+             properties="hasSemanticModel"
+             class="org.eclipse.papyrus.infra.core.internal.expressions.ServiceRegistryPropertyTester">
+       </propertyTester>
+    </extension>
+</plugin>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml
index 372299c142d..1ac9fb4d645 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<artifactId>org.eclipse.papyrus.infra-core</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.core</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/model.exsd b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/model.exsd
index d9644724ac7..e044620c098 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/model.exsd
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/model.exsd
@@ -88,6 +88,13 @@ The class will be registered using the key set in the Model.
                </documentation>
             </annotation>
          </attribute>
+         <attribute name="required" type="boolean">
+            <annotation>
+               <documentation>
+                  Indication of whether the model&apos;s resources are required to be present and loaded in the resource set.  The default if not specified is &lt;tt&gt;false&lt;/tt&gt;.
+               </documentation>
+            </annotation>
+         </attribute>
       </complexType>
    </element>
 
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractModelWithSharedResource.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractModelWithSharedResource.java
index ff8fc7986a3..748ab35ed26 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractModelWithSharedResource.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/AbstractModelWithSharedResource.java
@@ -1,253 +1,257 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2016 LIFL, CEA LIST, Christian W. Damus, and others.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *   LIFL - Initial API and implementation

- *   Christian W. Damus - bug 485220

- *   

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

-package org.eclipse.papyrus.infra.core.resource;

-

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-import java.util.Map;

-

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

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

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

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

-import org.eclipse.papyrus.infra.core.Activator;

-

-/**

- * Base class for models sharing a common {@link Resource}. To share a common {@link Resource}, one of the model should be Master, while the other are

- * slaves. The Master is the one performing the save operation. All the model

- * should use the same file extension. So, {@link #getModelFileExtension()} should return the same value for all models.

- *

- * @author cedric dumoulin

- *

- * @param T

- *            Type of the roots of the model.

- */

-public abstract class AbstractModelWithSharedResource<T extends EObject> extends EMFLogicalModel {

-

-	/**

-	 * Possible type for this model: master or slave

-	 */

-	public enum ModelKind {

-		master, slave

-	}

-

-	/**

-	 * Model kind.

-	 */

-	private ModelKind modelKind;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param modelKind

-	 */

-	public AbstractModelWithSharedResource(ModelKind modelKind) {

-		this.modelKind = modelKind;

-	}

-

-	/**

-	 * By default, we are a slave. Constructor.

-	 *

-	 * @param modelKind

-	 */

-	public AbstractModelWithSharedResource() {

-		this.modelKind = ModelKind.slave;

-	}

-

-	/**

-	 * Attach the model to its resource if this is not already done.

-	 */

-	@Override

-	public void loadModel(URI uriWithoutExtension) {

-		try {

-			// Look for the resource

-			lookupResource(uriWithoutExtension);

-

-			// Check if model is loaded.

-			if (resourceIsSet()) {

-				configureResource(resource);

-				return;

-			}

-			// model is not loaded, do it.

-			super.loadModel(uriWithoutExtension);

-		} catch (Exception ex) {

-			if (modelKind == ModelKind.master) {

-				Activator.log.error(ex);

-			}

-		}

-	}

-

-	/**

-	 * Create the model if this is not already done.

-	 */

-	@Override

-	public void createModel(URI uri) {

-		try {

-			// Look for the resource

-			lookupResource(uri);

-

-			// Check if model is loaded.

-			if (resourceIsSet()) {

-				configureResource(resource);

-				return;

-			}

-			super.createModel(uri);

-		} catch (Exception ex) {

-			if (modelKind == ModelKind.master) {

-				Activator.log.error(ex);

-			}

-		}

-	}

-

-	/**

-	 * Lookup for the resource in the resourceSet.

-	 *

-	 * @param uri

-	 *            the URI (without extension) of the resource to look for

-	 */

-	private void lookupResource(URI uriWithoutExtension) {

-

-		// Compute model URI

-		resourceURI = uriWithoutExtension.appendFileExtension(getModelFileExtension());

-

-		resource = getResourceSet().getResource(resourceURI, false);

-

-	}

-

-	/**

-	 * Do nothing as we are slave. The Resource is save by the master model.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#saveModel()

-	 *

-	 * @throws IOException

-	 */

-	@Override

-	public void saveModel() throws IOException {

-

-		// Do nothing if we are a slave

-		if (modelKind == ModelKind.slave) {

-			return;

-		}

-

-		// Do the save

-		super.saveModel();

-	}

-

-	@Override

-	public void saveCopy(IPath targetPathWithoutExtension, Map<Object, Object> targetMap) {

-		// Do nothing if we are a slave

-		if (modelKind == ModelKind.slave) {

-			return;

-		}

-

-		// Do the save

-		super.saveCopy(targetPathWithoutExtension, targetMap);

-	}

-

-

-	/**

-	 * Get the root of this model. Lookup in the associated {@link Resource} for

-	 * the root.

-	 *

-	 * @return The root of the model, or null if no root exist.

-	 */

-	@SuppressWarnings("unchecked")

-	public T getModelRoot() {

-		Resource resource = getResource();

-		if (resource == null) {

-			return null;

-		}

-

-		for (EObject object : resource.getContents()) {

-

-			if (isModelRoot(object)) {

-				return (T) object;

-			}

-		}

-

-		// Not found

-		return null;

-	}

-

-	/**

-	 * Get the roots of this model. Lookup in the associated {@link Resource} for the roots.

-	 *

-	 * @return A list containing the roots of the model. The list is empty if

-	 *         there is no root.

-	 */

-	@SuppressWarnings("unchecked")

-	public List<T> getModelRoots() {

-

-		List<T> roots = new ArrayList<T>();

-

-		for (EObject object : getResource().getContents()) {

-			if (isModelRoot(object)) {

-				roots.add((T) object);

-			}

-		}

-

-		return roots;

-	}

-

-	@Override

-	public Iterable<? extends EObject> getRootElements() {

-		return getModelRoots();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.resource.EMFLogicalModel#isModelFor(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public boolean isModelFor(Object element) {

-		if (modelKind == ModelKind.slave) {

-			// I'm not the main model for this resource/object

-			return false;

-		}

-		return super.isModelFor(element);

-	}

-

-	/**

-	 * Return true if the provided object is a root of the model, false

-	 * otherwise. This method should be implemented by subclasses.

-	 *

-	 * @param object

-	 * @return

-	 */

-	protected abstract boolean isModelRoot(EObject object);

-

-	/**

-	 * Add a root to this model.

-	 *

-	 * @param root

-	 */

-	public void addModelRoot(T root) {

-		getResource().getContents().add(root);

-	}

-

-	@Override

-	protected Map<Object, Object> getSaveOptions() {

-		if (modelKind == ModelKind.master) {

-			return super.getSaveOptions();

-		} else {

-			return Collections.emptyMap();

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 LIFL, CEA LIST, Christian W. Damus, and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   LIFL - Initial API and implementation
+ *   Christian W. Damus - bug 485220
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.resource;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.papyrus.infra.core.Activator;
+
+/**
+ * Base class for models sharing a common {@link Resource}. To share a common {@link Resource}, one of the model should be Master, while the other are
+ * slaves. The Master is the one performing the save operation. All the model
+ * should use the same file extension. So, {@link #getModelFileExtension()} should return the same value for all models.
+ *
+ * @author cedric dumoulin
+ *
+ * @param T
+ *            Type of the roots of the model.
+ */
+public abstract class AbstractModelWithSharedResource<T extends EObject> extends EMFLogicalModel {
+
+	/**
+	 * Possible type for this model: master or slave
+	 */
+	public enum ModelKind {
+		master, slave
+	}
+
+	/**
+	 * Model kind.
+	 */
+	private ModelKind modelKind;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param modelKind
+	 */
+	public AbstractModelWithSharedResource(ModelKind modelKind) {
+		this.modelKind = modelKind;
+	}
+
+	/**
+	 * By default, we are a slave. Constructor.
+	 *
+	 * @param modelKind
+	 */
+	public AbstractModelWithSharedResource() {
+		this.modelKind = ModelKind.slave;
+	}
+
+	/**
+	 * Attach the model to its resource if this is not already done.
+	 */
+	@Override
+	public void loadModel(URI uriWithoutExtension) {
+		try {
+			// Look for the resource
+			lookupResource(uriWithoutExtension);
+
+			// Check if model is loaded.
+			if (resourceIsSet()) {
+				configureResource(resource);
+				return;
+			}
+			// model is not loaded, do it.
+			super.loadModel(uriWithoutExtension);
+		} catch (Exception ex) {
+			if (modelKind == ModelKind.master) {
+				Activator.log.error(ex);
+			}
+		}
+	}
+
+	/**
+	 * Create the model if this is not already done.
+	 */
+	@Override
+	public void createModel(URI uri) {
+		try {
+			// Look for the resource
+			lookupResource(uri);
+
+			// Check if model is loaded.
+			if (resourceIsSet()) {
+				configureResource(resource);
+				return;
+			}
+			super.createModel(uri);
+		} catch (Exception ex) {
+			if (modelKind == ModelKind.master) {
+				Activator.log.error(ex);
+			}
+		}
+	}
+
+	/**
+	 * Lookup for the resource in the resourceSet.
+	 *
+	 * @param uri
+	 *            the URI (without extension) of the resource to look for
+	 */
+	private void lookupResource(URI uriWithoutExtension) {
+
+		// Compute model URI
+		resourceURI = uriWithoutExtension.appendFileExtension(getModelFileExtension());
+
+		resource = getResourceSet().getResource(resourceURI, false);
+
+	}
+
+	/**
+	 * Do nothing as we are slave. The Resource is save by the master model.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#saveModel()
+	 *
+	 * @throws IOException
+	 */
+	@Override
+	public void saveModel() throws IOException {
+
+		// Do nothing if we are a slave
+		if (modelKind == ModelKind.slave) {
+			return;
+		}
+
+		// Do the save
+		super.saveModel();
+	}
+
+	@Override
+	public void saveCopy(IPath targetPathWithoutExtension, Map<Object, Object> targetMap) {
+		// Do nothing if we are a slave
+		if (modelKind == ModelKind.slave) {
+			return;
+		}
+
+		// Do the save
+		super.saveCopy(targetPathWithoutExtension, targetMap);
+	}
+
+
+	/**
+	 * Get the root of this model. Lookup in the associated {@link Resource} for
+	 * the root.
+	 *
+	 * @return The root of the model, or null if no root exist.
+	 */
+	@SuppressWarnings("unchecked")
+	public T getModelRoot() {
+		Resource resource = getResource();
+		if (resource == null) {
+			return null;
+		}
+
+		for (EObject object : resource.getContents()) {
+
+			if (isModelRoot(object)) {
+				return (T) object;
+			}
+		}
+
+		// Not found
+		return null;
+	}
+
+	/**
+	 * Get the roots of this model. Lookup in the associated {@link Resource} for the roots.
+	 *
+	 * @return A list containing the roots of the model. The list is empty if
+	 *         there is no root.
+	 */
+	@SuppressWarnings("unchecked")
+	public List<T> getModelRoots() {
+
+		List<T> roots = new ArrayList<T>();
+
+		for (EObject object : getResource().getContents()) {
+			if (isModelRoot(object)) {
+				roots.add((T) object);
+			}
+		}
+
+		return roots;
+	}
+
+	@Override
+	public Iterable<? extends EObject> getRootElements() {
+		return getModelRoots();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.resource.EMFLogicalModel#isModelFor(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	public boolean isModelFor(Object element) {
+		if (modelKind == ModelKind.slave) {
+			// I'm not the main model for this resource/object
+			return false;
+		}
+		return super.isModelFor(element);
+	}
+
+	/**
+	 * Return true if the provided object is a root of the model, false
+	 * otherwise. This method should be implemented by subclasses.
+	 *
+	 * @param object
+	 * @return
+	 */
+	protected abstract boolean isModelRoot(EObject object);
+
+	/**
+	 * Add a root to this model.
+	 *
+	 * @param root
+	 */
+	public void addModelRoot(T root) {
+		getResource().getContents().add(root);
+	}
+
+	@Override
+	protected Map<Object, Object> getSaveOptions() {
+		if (modelKind == ModelKind.master) {
+			return super.getSaveOptions();
+		} else {
+			return Collections.emptyMap();
+		}
+	}
+
+	@Override
+	protected boolean isSupportedRoot(EObject object) {
+		return isModelRoot(object);
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/EMFLogicalModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/EMFLogicalModel.java
index 39c41452ec7..b665e30baef 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/EMFLogicalModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/EMFLogicalModel.java
@@ -177,4 +177,24 @@ public abstract class EMFLogicalModel extends AbstractBaseModel implements IEMFM
 				.filter(this::isRootElement)
 				.iterator();
 	}
+
+	/**
+	 * The very basic requirement is that I have a {@link #getResource() resource} in which
+	 * to persist the {@code object}.
+	 */
+	@Override
+	public boolean canPersist(EObject object) {
+		return (getResource() != null) && isSupportedRoot(object);
+	}
+
+	protected abstract boolean isSupportedRoot(EObject object);
+
+	@Override
+	public void persist(EObject object) {
+		if (!canPersist(object)) {
+			throw new IllegalArgumentException("cannot persist " + object); //$NON-NLS-1$
+		}
+
+		getResource().getContents().add(object);
+	}
 }
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IEMFModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IEMFModel.java
index 542c8bd2143..63c5c0324fc 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IEMFModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/IEMFModel.java
@@ -1,59 +1,85 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *  Christian W. Damus - bug 485220

- *  

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

-package org.eclipse.papyrus.infra.core.resource;

-

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

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

-

-/**

- * A IModel which handles EMF Resources

- *

- * @author Camille Letavernier

- *

- */

-public interface IEMFModel extends IModel {

-

-	/**

-	 * Returns the main resource associated to this model

-	 *

-	 * @return

-	 */

-	public Resource getResource();

-

-	/**

-	 * Obtains the top-level model elements in the main resource associated with this model.

-	 * 

-	 * @return the model roots, or an empty iterable if either there definitively are none

-	 *         or they cannot be determined (for example, because the main resource is a controlled

-	 *         unit and the parent unit is not available)

-	 */

-	public Iterable<? extends EObject> getRootElements();

-

-	/**

-	 * Called when a resource is loaded. Implement this method to configure

-	 * the resource or load related resources

-	 *

-	 * @param resource

-	 */

-	public void handle(Resource resource);

-

-	/**

-	 * Returns true if the resource is a controlled resource

-	 *

-	 * @param resource

-	 * @return

-	 */

-	public boolean isControlled(Resource resource);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.resource;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+
+/**
+ * A IModel which handles EMF Resources
+ *
+ * @author Camille Letavernier
+ *
+ */
+public interface IEMFModel extends IModel {
+
+	/**
+	 * Returns the main resource associated to this model
+	 *
+	 * @return
+	 */
+	public Resource getResource();
+
+	/**
+	 * Obtains the top-level model elements in the main resource associated with this model.
+	 * 
+	 * @return the model roots, or an empty iterable if either there definitively are none
+	 *         or they cannot be determined (for example, because the main resource is a controlled
+	 *         unit and the parent unit is not available)
+	 */
+	public Iterable<? extends EObject> getRootElements();
+
+	/**
+	 * Called when a resource is loaded. Implement this method to configure
+	 * the resource or load related resources
+	 *
+	 * @param resource
+	 */
+	public void handle(Resource resource);
+
+	/**
+	 * Returns true if the resource is a controlled resource
+	 *
+	 * @param resource
+	 * @return
+	 */
+	public boolean isControlled(Resource resource);
+
+	/**
+	 * Queries whether I am the primary model in which the specified {@code object}
+	 * should be stored as a root of one of my resources.
+	 * 
+	 * @param object
+	 *            an object that needs to be {@link #persist(EObject) persisted}
+	 * 
+	 * @return whether I should persist the {@code object}
+	 * 
+	 * @see #persist(EObject)
+	 */
+	public boolean canPersist(EObject object);
+
+	/**
+	 * Persists an {@code object} in my most appriopriate resource, if
+	 * I {@link #canPersist(EObject) can persist} it
+	 * 
+	 * @param object
+	 *            an object
+	 * 
+	 * @throws IllegalArgumentException
+	 *             if I cannot persist the {@code object}
+	 * 
+	 * @see #canPersist(EObject)
+	 */
+	public void persist(EObject object);
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java
index 50d98d220ea..ea5967b3683 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java
@@ -1,6 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2008, 2015 CEA LIST, Christian W. Damus, and others.
- *
+ * Copyright (c) 2008, 2016 CEA LIST, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -14,13 +13,10 @@
  *  Christian W. Damus (CEA) - Support read-only state at object level (CDO)
  *  Christian W. Damus (CEA) - Refactoring of Create Model Wizard (CDO)
  *  Christian W. Damus (CEA LIST) - Controlled resources in CDO repositories
- *  Christian W. Damus (CEA) - bug 429826
- *  Christian W. Damus (CEA) - bug 432813
- *  Christian W. Damus (CEA) - bug 437052
+ *  Christian W. Damus (CEA) - bugs 429826, 432813, 437052
  *  Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 436952
  *  Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 436998
- *  Christian W. Damus - bug 436998
- *  Christian W. Damus - bug 468030
+ *  Christian W. Damus - bugs 436998, 468030, 485220
  *
  *****************************************************************************/
 package org.eclipse.papyrus.infra.core.resource;
@@ -1296,4 +1292,21 @@ public class ModelSet extends ResourceSetImpl {
 			languages.clear();
 		}
 	}
+
+	/**
+	 * Obtains the model that should persist an {@code object}.
+	 * 
+	 * @param object
+	 *            an object to be persisted as a new root of a managed EMF {@code Resource}
+	 * 
+	 * @return the model that is best suited to persist the {@code object}, or {@code null} if none
+	 */
+	public IEMFModel getModelToPersist(EObject object) {
+		return models.values().stream()
+				.filter(IEMFModel.class::isInstance)
+				.map(IEMFModel.class::cast)
+				.filter(m -> m.canPersist(object))
+				.findFirst()
+				.orElse(null);
+	}
 }
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelsReader.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelsReader.java
index 1a39d42b88e..ae3edded14d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelsReader.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelsReader.java
@@ -19,7 +19,11 @@ import static org.eclipse.papyrus.infra.core.Activator.log;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Platform;
@@ -71,9 +75,12 @@ public class ModelsReader extends ExtensionUtils {
 	/** name of the attribute "identifier" */
 	public static final String IDENTIFIER_ATTRIBUTE_NAME = "identifier";
 
-	/** Name of the extension indicating the model's canonical file extension. */
+	/** Name of the attribute indicating the model's canonical file extension. */
 	private static final String EXTENSION_ATTRIBUTE = "fileExtension"; //$NON-NLS-1$
 
+	/** Name of the attribute indicating whether the model is required to be available. */
+	private static final String REQUIRED_ATTRIBUTE = "required"; //$NON-NLS-1$
+
 	/** Namespace where to look for the extension points. */
 	protected String extensionPointNamespace;
 
@@ -343,4 +350,51 @@ public class ModelsReader extends ExtensionUtils {
 		model.setAfterLoadModelDependencies(afterLoadModelIdentifiers);
 		model.setBeforeUnloadDependencies(unloadBeforeModelIdentifiers);
 	}
+
+	/**
+	 * Queries the models that are required in their model-set.
+	 * 
+	 * @param modelSet
+	 *            a model-set
+	 * @return ones that are required
+	 */
+	public Set<IModel> getRequiredModels(ModelSet modelSet) {
+		return getRequiredModels(modelSet, IModel.class);
+	}
+
+	/**
+	 * Queries the models that are required in their model-set.
+	 * 
+	 * @param modelSet
+	 *            a model-set
+	 * @param modelType
+	 *            the specific type of models to request
+	 * @return ones that are required
+	 */
+	public <M extends IModel> Set<M> getRequiredModels(ModelSet modelSet, Class<M> modelType) {
+		Set<String> requiredModelClasses = Stream.of(getExtensions())
+				.filter(c -> Boolean.parseBoolean(c.getAttribute(REQUIRED_ATTRIBUTE)))
+				.map(c -> c.getAttribute(CLASSNAME_ATTRIBUTE))
+				.filter(Objects::nonNull)
+				.collect(Collectors.toSet());
+		return modelSet.models.values().stream()
+				.filter(modelType::isInstance)
+				.map(modelType::cast)
+				.filter(instanceOfAny(requiredModelClasses))
+				.collect(Collectors.toSet());
+	}
+
+	private static Predicate<IModel> instanceOfAny(Set<String> classNames) {
+		return model -> {
+			boolean result = false;
+
+			// We don't have to worry about interfaces because the extension point
+			// identifies instantiable classes only
+			for (Class<?> type = model.getClass(); !result && (type != null); type = type.getSuperclass()) {
+				result = classNames.contains(type.getName());
+			}
+
+			return result;
+		};
+	}
 }
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java
index 94a90564047..c853d4b32b7 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java
@@ -1,373 +1,379 @@
-/*****************************************************************************

- * Copyright (c) 2009, 2016 CEA LIST, Christian W. Damus, and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- * 	Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Rewrite the sash model - store in the plugin's PreferenceStore (Bug 429239)

- *  Christian W. Damus (CEA) - bugs 429242, 436468

- * 	Christian W. Damus - bugs 434983, 469188, 485220

- *

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

-package org.eclipse.papyrus.infra.core.resource.sasheditor;

-

-import java.beans.PropertyChangeListener;

-import java.beans.PropertyChangeSupport;

-import java.util.Collections;

-import java.util.Map;

-

-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.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.emf.ecore.xmi.XMIResource;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.papyrus.infra.core.Activator;

-import org.eclipse.papyrus.infra.core.resource.EMFLogicalModel;

-import org.eclipse.papyrus.infra.core.resource.IModel;

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

-import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;

-import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;

-

-import com.google.common.base.Objects;

-

-/**

- * <p>

- * Model for the sash system.

- * </p>

- * <p>

- * It may be stored in the *.di file (Legacy mode) or in a *.sash file in the user

- * preference space (~workspace/.metadata/.plugins/org.eclipse.papyrus.infra.core/)

- * </p>

- * <p>

- * The following properties are observable via Java Beans {@linkplain #addPropertyChangeListener(String, PropertyChangeListener) listeners}:

- * </p>

- * <ul>

- * <li>{@link #isLegacyMode() legacyMode}</li>

- * <li>{@link #getPrivateResourceURI() privateResourceURI}</li>

- * <li>{@link #getSharedResourceURI() sharedResourceURI}</li>

- * </ul>

- *

- * @author Cedric Dumoulin

- * @author Camille Letavernier

- *

- */

-public class SashModel extends EMFLogicalModel implements IModel {

-

-	public static final String PROPERTY_PRIVATE_RESOURCE_URI = "privateResourceURI"; //$NON-NLS-1$

-	public static final String PROPERTY_SHARED_RESOURCE_URI = "sharedResourceURI"; //$NON-NLS-1$

-	public static final String PROPERTY_LEGACY_MODE = "legacyMode"; //$NON-NLS-1$

-

-	private final PropertyChangeSupport bean = new PropertyChangeSupport(this);

-

-	private SashModelProviderManager providerManager;

-

-	private Adapter sashModelStorageAdapter;

-

-	private volatile Boolean legacyMode;

-

-	/**

-	 * File extension.

-	 *

-	 * @deprecated Use {@link DiModel#MODEL_FILE_EXTENSION} instead. The SashModel has been moved to a separate file

-	 */

-	@Deprecated

-	public static final String MODEL_FILE_EXTENSION = "di"; //$NON-NLS-1$

-

-	/**

-	 * File extension for the Sash model

-	 */

-	public static final String SASH_MODEL_FILE_EXTENSION = "sash"; //$NON-NLS-1$

-

-	/**

-	 * Model ID.

-	 */

-	public static final String MODEL_ID = "org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel"; //$NON-NLS-1$

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public SashModel() {

-		super();

-

-		sashModelStorageAdapter = new AdapterImpl() {

-			@Override

-			public void notifyChanged(Notification msg) {

-				if (getResources().contains(msg.getNotifier())) {

-					switch (msg.getFeatureID(Resource.class)) {

-					case Resource.RESOURCE__CONTENTS:

-						invalidateLegacyMode();

-						break;

-					}

-				}

-			}

-		};

-	}

-

-	/**

-	 * Get the file extension used for this model.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getModelFileExtension() {

-		if (isLegacy((resourceURI == null) ? resourceURI : resourceURI.trimFileExtension())) {

-			return DiModel.MODEL_FILE_EXTENSION;

-		} else {

-			return SASH_MODEL_FILE_EXTENSION;

-		}

-	}

-

-	@Override

-	public void init(ModelSet modelSet) {

-		super.init(modelSet);

-

-		this.providerManager = new SashModelProviderManager(modelSet);

-	}

-

-	@Override

-	public void unload() {

-		if (providerManager != null) {

-			providerManager.dispose();

-			providerManager = null;

-		}

-

-		getResources().forEach(res -> res.eAdapters().remove(sashModelStorageAdapter));

-

-		super.unload();

-	}

-

-	@Override

-	protected boolean isRelatedResource(Resource resource) {

-		boolean result = false;

-

-		if (resource != null) {

-			// We only handle the main Sash resource. Imported *.sash are not relevant

-			if (resource == getResource()) {

-				result = true;

-			} else {

-				// We can only calculate these related URIs if the ModelSet is initialized

-				result = resource.getURI().equals(getPrivateResourceURI()) || resource.getURI().equals(getSharedResourceURI());

-			}

-		}

-

-		return result;

-	}

-

-	@Override

-	protected void configureResource(Resource resourceToConfigure) {

-		super.configureResource(resourceToConfigure);

-

-		if (resourceToConfigure != null) {

-			resourceToConfigure.eAdapters().add(sashModelStorageAdapter);

-		}

-	}

-

-	/**

-	 * Get the identifier used to register this model.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()

-	 *

-	 * @return

-	 */

-	@Override

-	public String getIdentifier() {

-		return MODEL_ID;

-	}

-

-	@Override

-	public void loadModel(URI uriWithoutExtension) {

-

-		URI sashModelURI = getSashModelURI(uriWithoutExtension);

-

-		this.resourceURI = sashModelURI;

-

-		try {

-			super.loadModel(sashModelURI.trimFileExtension());

-		} catch (Exception ex) {

-			createModel(sashModelURI.trimFileExtension());

-		}

-

-		if (resource == null) {

-			createModel(sashModelURI.trimFileExtension());

-		}

-	}

-

-	@Override

-	public void createModel(URI uriWithoutExtension) {

-		if (isLegacy(uriWithoutExtension)) {

-			super.createModel(getSashModelStoreURI(uriWithoutExtension).trimFileExtension());

-		} else {

-			super.createModel(uriWithoutExtension);

-		}

-	}

-

-	@Override

-	public void setModelURI(URI uriWithoutExtension) {

-		URI oldPrivateURI = getPrivateResourceURI();

-		URI oldSharedURI = getSharedResourceURI();

-

-		URI newURI;

-		if ((resourceURI != null) && isLegacy(resourceURI.trimFileExtension())) {

-			newURI = getLegacyURI(uriWithoutExtension);

-		} else {

-			newURI = getSashModelStoreURI(uriWithoutExtension);

-		}

-

-		super.setModelURI(newURI.trimFileExtension());

-

-		bean.firePropertyChange(PROPERTY_PRIVATE_RESOURCE_URI, oldPrivateURI, getPrivateResourceURI());

-		bean.firePropertyChange(PROPERTY_SHARED_RESOURCE_URI, oldSharedURI, getSharedResourceURI());

-	}

-

-	protected boolean isLegacy(URI uriWithoutExtension) {

-		if (uriWithoutExtension == null) {

-			return false;

-		}

-		return Objects.equal(uriWithoutExtension, getModelManager().getURIWithoutExtension());

-	}

-

-	/**

-	 * Returns the sash model URI (With file extension)

-	 *

-	 * It may be either the Legacy URI (platform:/resource/model/model.di)

-	 * or the 1.0.0 URI (file:/~workspace/.metadata/.plugins/org.eclipse.papyrus.infra.core/model/model.sash)

-	 *

-	 * @param uriWithoutExtension

-	 * @return

-	 *

-	 */

-	protected URI getSashModelURI(URI uriWithoutExtension) {

-		URIConverter converter = getModelManager().getURIConverter();

-		URI legacyURI = getLegacyURI(uriWithoutExtension);

-

-		// If the DI file exists and contains a SashWindowsMngr, this is a legacy model

-		if (converter.exists(legacyURI, Collections.emptyMap())) {

-			try {

-				Resource diResource = getModelManager().getResource(legacyURI, true);

-				if (DiUtils.lookupSashWindowsMngr(diResource) != null) {

-					return legacyURI;

-				}

-			} catch (Exception ex) {

-				// Temporary workaround: the DI file may exist and be empty

-				// (DiModel is currently disabled and doesn't properly init the di file)

-				// Log the error and continue

-				Activator.log.error(ex);

-			}

-		}

-

-		URI preferenceStoreURI = getSashModelStoreURI(uriWithoutExtension);

-

-		return preferenceStoreURI;

-	}

-

-	protected URI getLegacyURI(URI uriWithoutExtension) {

-		return uriWithoutExtension.appendFileExtension(DiModel.MODEL_FILE_EXTENSION);

-	}

-

-	protected URI getSashModelStoreURI(URI uriWithoutExtension) {

-		URI fullURI = uriWithoutExtension.appendFileExtension(SASH_MODEL_FILE_EXTENSION);

-		return providerManager.getSashModelProvider(fullURI).getSashModelURI(fullURI);

-	}

-

-	@Override

-	protected Map<Object, Object> getSaveOptions() {

-		Map<Object, Object> saveOptions = super.getSaveOptions();

-

-		saveOptions.put(XMIResource.OPTION_USE_XMI_TYPE, Boolean.FALSE);

-		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, Boolean.FALSE);

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-

-		return saveOptions;

-	}

-

-	public boolean isLegacyMode() {

-		if (legacyMode == null) {

-			legacyMode = false; // Assume not

-

-			// Does the shared DI resource contain the sash layout?

-			URI sharedURI = getSharedResourceURI();

-			if (sharedURI != null) {

-				for (Resource next : getResources()) {

-					if (sharedURI.equals(next.getURI())) {

-						legacyMode = DiUtils.lookupSashWindowsMngr(next) != null;

-						break;

-					}

-				}

-			}

-		}

-

-		return legacyMode;

-	}

-

-	void invalidateLegacyMode() {

-		boolean oldValue = isLegacyMode();

-

-		legacyMode = null;

-

-		boolean newValue = isLegacyMode();

-

-		if (oldValue != newValue) {

-			bean.firePropertyChange(PROPERTY_LEGACY_MODE, oldValue, newValue);

-		}

-	}

-

-	/**

-	 * Gets the URI of the sash-model resource in the user private area, irrespective

-	 * of whether that actually is the resource that currently stores the sash model.

-	 * 

-	 * @return the private sash-model resource URI

-	 */

-	public URI getPrivateResourceURI() {

-		URI modelURI = (getModelManager() == null) ? null : getModelManager().getURIWithoutExtension();

-		return (modelURI == null) ? null : getSashModelStoreURI(modelURI);

-	}

-

-	/**

-	 * Gets the URI of the sash-model resource in the shared (collocated with the user model)

-	 * area, irrespective of whether that actually is the resource that currently stores the

-	 * sash model.

-	 * 

-	 * @return the shared sash-model resource URI

-	 */

-	public URI getSharedResourceURI() {

-		URI modelURI = (getModelManager() == null) ? null : getModelManager().getURIWithoutExtension();

-		return (modelURI == null) ? null : modelURI.appendFileExtension(DiModel.MODEL_FILE_EXTENSION);

-	}

-

-	@Override

-	protected boolean isRootElement(EObject object) {

-		return super.isRootElement(object) && (object instanceof SashWindowsMngr);

-	}

-

-	//

-	// Bean API

-	//

-

-	public void addPropertyChangeListener(PropertyChangeListener listener) {

-		bean.addPropertyChangeListener(listener);

-	}

-

-	public void removePropertyChangeListener(PropertyChangeListener listener) {

-		bean.removePropertyChangeListener(listener);

-	}

-

-	public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) {

-		bean.addPropertyChangeListener(propertyName, listener);

-	}

-

-	public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) {

-		bean.removePropertyChangeListener(propertyName, listener);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 	Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Rewrite the sash model - store in the plugin's PreferenceStore (Bug 429239)
+ *  Christian W. Damus (CEA) - bugs 429242, 436468
+ * 	Christian W. Damus - bugs 434983, 469188, 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.resource.sasheditor;
+
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.util.Collections;
+import java.util.Map;
+
+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.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.emf.ecore.xmi.XMIResource;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.papyrus.infra.core.Activator;
+import org.eclipse.papyrus.infra.core.resource.EMFLogicalModel;
+import org.eclipse.papyrus.infra.core.resource.IModel;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;
+import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
+import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;
+
+import com.google.common.base.Objects;
+
+/**
+ * <p>
+ * Model for the sash system.
+ * </p>
+ * <p>
+ * It may be stored in the *.di file (Legacy mode) or in a *.sash file in the user
+ * preference space (~workspace/.metadata/.plugins/org.eclipse.papyrus.infra.core/)
+ * </p>
+ * <p>
+ * The following properties are observable via Java Beans {@linkplain #addPropertyChangeListener(String, PropertyChangeListener) listeners}:
+ * </p>
+ * <ul>
+ * <li>{@link #isLegacyMode() legacyMode}</li>
+ * <li>{@link #getPrivateResourceURI() privateResourceURI}</li>
+ * <li>{@link #getSharedResourceURI() sharedResourceURI}</li>
+ * </ul>
+ *
+ * @author Cedric Dumoulin
+ * @author Camille Letavernier
+ *
+ */
+public class SashModel extends EMFLogicalModel implements IModel {
+
+	public static final String PROPERTY_PRIVATE_RESOURCE_URI = "privateResourceURI"; //$NON-NLS-1$
+	public static final String PROPERTY_SHARED_RESOURCE_URI = "sharedResourceURI"; //$NON-NLS-1$
+	public static final String PROPERTY_LEGACY_MODE = "legacyMode"; //$NON-NLS-1$
+
+	private final PropertyChangeSupport bean = new PropertyChangeSupport(this);
+
+	private SashModelProviderManager providerManager;
+
+	private Adapter sashModelStorageAdapter;
+
+	private volatile Boolean legacyMode;
+
+	/**
+	 * File extension.
+	 *
+	 * @deprecated Use {@link DiModel#MODEL_FILE_EXTENSION} instead. The SashModel has been moved to a separate file
+	 */
+	@Deprecated
+	public static final String MODEL_FILE_EXTENSION = "di"; //$NON-NLS-1$
+
+	/**
+	 * File extension for the Sash model
+	 */
+	public static final String SASH_MODEL_FILE_EXTENSION = "sash"; //$NON-NLS-1$
+
+	/**
+	 * Model ID.
+	 */
+	public static final String MODEL_ID = "org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel"; //$NON-NLS-1$
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public SashModel() {
+		super();
+
+		sashModelStorageAdapter = new AdapterImpl() {
+			@Override
+			public void notifyChanged(Notification msg) {
+				if (getResources().contains(msg.getNotifier())) {
+					switch (msg.getFeatureID(Resource.class)) {
+					case Resource.RESOURCE__CONTENTS:
+						invalidateLegacyMode();
+						break;
+					}
+				}
+			}
+		};
+	}
+
+	/**
+	 * Get the file extension used for this model.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getModelFileExtension() {
+		if (isLegacy((resourceURI == null) ? resourceURI : resourceURI.trimFileExtension())) {
+			return DiModel.MODEL_FILE_EXTENSION;
+		} else {
+			return SASH_MODEL_FILE_EXTENSION;
+		}
+	}
+
+	@Override
+	public void init(ModelSet modelSet) {
+		super.init(modelSet);
+
+		this.providerManager = new SashModelProviderManager(modelSet);
+	}
+
+	@Override
+	public void unload() {
+		if (providerManager != null) {
+			providerManager.dispose();
+			providerManager = null;
+		}
+
+		getResources().forEach(res -> res.eAdapters().remove(sashModelStorageAdapter));
+
+		super.unload();
+	}
+
+	@Override
+	protected boolean isRelatedResource(Resource resource) {
+		boolean result = false;
+
+		if (resource != null) {
+			// We only handle the main Sash resource. Imported *.sash are not relevant
+			if (resource == getResource()) {
+				result = true;
+			} else {
+				// We can only calculate these related URIs if the ModelSet is initialized
+				result = resource.getURI().equals(getPrivateResourceURI()) || resource.getURI().equals(getSharedResourceURI());
+			}
+		}
+
+		return result;
+	}
+
+	@Override
+	protected void configureResource(Resource resourceToConfigure) {
+		super.configureResource(resourceToConfigure);
+
+		if (resourceToConfigure != null) {
+			resourceToConfigure.eAdapters().add(sashModelStorageAdapter);
+		}
+	}
+
+	/**
+	 * Get the identifier used to register this model.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()
+	 *
+	 * @return
+	 */
+	@Override
+	public String getIdentifier() {
+		return MODEL_ID;
+	}
+
+	@Override
+	public void loadModel(URI uriWithoutExtension) {
+
+		URI sashModelURI = getSashModelURI(uriWithoutExtension);
+
+		this.resourceURI = sashModelURI;
+
+		try {
+			super.loadModel(sashModelURI.trimFileExtension());
+		} catch (Exception ex) {
+			createModel(sashModelURI.trimFileExtension());
+		}
+
+		if (resource == null) {
+			createModel(sashModelURI.trimFileExtension());
+		}
+	}
+
+	@Override
+	public void createModel(URI uriWithoutExtension) {
+		if (isLegacy(uriWithoutExtension)) {
+			super.createModel(getSashModelStoreURI(uriWithoutExtension).trimFileExtension());
+		} else {
+			super.createModel(uriWithoutExtension);
+		}
+	}
+
+	@Override
+	public void setModelURI(URI uriWithoutExtension) {
+		URI oldPrivateURI = getPrivateResourceURI();
+		URI oldSharedURI = getSharedResourceURI();
+
+		URI newURI;
+		if ((resourceURI != null) && isLegacy(resourceURI.trimFileExtension())) {
+			newURI = getLegacyURI(uriWithoutExtension);
+		} else {
+			newURI = getSashModelStoreURI(uriWithoutExtension);
+		}
+
+		super.setModelURI(newURI.trimFileExtension());
+
+		bean.firePropertyChange(PROPERTY_PRIVATE_RESOURCE_URI, oldPrivateURI, getPrivateResourceURI());
+		bean.firePropertyChange(PROPERTY_SHARED_RESOURCE_URI, oldSharedURI, getSharedResourceURI());
+	}
+
+	protected boolean isLegacy(URI uriWithoutExtension) {
+		if (uriWithoutExtension == null) {
+			return false;
+		}
+		return Objects.equal(uriWithoutExtension, getModelManager().getURIWithoutExtension());
+	}
+
+	/**
+	 * Returns the sash model URI (With file extension)
+	 *
+	 * It may be either the Legacy URI (platform:/resource/model/model.di)
+	 * or the 1.0.0 URI (file:/~workspace/.metadata/.plugins/org.eclipse.papyrus.infra.core/model/model.sash)
+	 *
+	 * @param uriWithoutExtension
+	 * @return
+	 *
+	 */
+	protected URI getSashModelURI(URI uriWithoutExtension) {
+		URIConverter converter = getModelManager().getURIConverter();
+		URI legacyURI = getLegacyURI(uriWithoutExtension);
+
+		// If the DI file exists and contains a SashWindowsMngr, this is a legacy model
+		if (converter.exists(legacyURI, Collections.emptyMap())) {
+			try {
+				Resource diResource = getModelManager().getResource(legacyURI, true);
+				if (DiUtils.lookupSashWindowsMngr(diResource) != null) {
+					return legacyURI;
+				}
+			} catch (Exception ex) {
+				// Temporary workaround: the DI file may exist and be empty
+				// (DiModel is currently disabled and doesn't properly init the di file)
+				// Log the error and continue
+				Activator.log.error(ex);
+			}
+		}
+
+		URI preferenceStoreURI = getSashModelStoreURI(uriWithoutExtension);
+
+		return preferenceStoreURI;
+	}
+
+	protected URI getLegacyURI(URI uriWithoutExtension) {
+		return uriWithoutExtension.appendFileExtension(DiModel.MODEL_FILE_EXTENSION);
+	}
+
+	protected URI getSashModelStoreURI(URI uriWithoutExtension) {
+		URI fullURI = uriWithoutExtension.appendFileExtension(SASH_MODEL_FILE_EXTENSION);
+		return providerManager.getSashModelProvider(fullURI).getSashModelURI(fullURI);
+	}
+
+	@Override
+	protected Map<Object, Object> getSaveOptions() {
+		Map<Object, Object> saveOptions = super.getSaveOptions();
+
+		saveOptions.put(XMIResource.OPTION_USE_XMI_TYPE, Boolean.FALSE);
+		saveOptions.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, Boolean.FALSE);
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+
+		return saveOptions;
+	}
+
+	public boolean isLegacyMode() {
+		if (legacyMode == null) {
+			legacyMode = false; // Assume not
+
+			// Does the shared DI resource contain the sash layout?
+			URI sharedURI = getSharedResourceURI();
+			if (sharedURI != null) {
+				for (Resource next : getResources()) {
+					if (sharedURI.equals(next.getURI())) {
+						legacyMode = DiUtils.lookupSashWindowsMngr(next) != null;
+						break;
+					}
+				}
+			}
+		}
+
+		return legacyMode;
+	}
+
+	void invalidateLegacyMode() {
+		boolean oldValue = isLegacyMode();
+
+		legacyMode = null;
+
+		boolean newValue = isLegacyMode();
+
+		if (oldValue != newValue) {
+			bean.firePropertyChange(PROPERTY_LEGACY_MODE, oldValue, newValue);
+		}
+	}
+
+	/**
+	 * Gets the URI of the sash-model resource in the user private area, irrespective
+	 * of whether that actually is the resource that currently stores the sash model.
+	 * 
+	 * @return the private sash-model resource URI
+	 */
+	public URI getPrivateResourceURI() {
+		URI modelURI = (getModelManager() == null) ? null : getModelManager().getURIWithoutExtension();
+		return (modelURI == null) ? null : getSashModelStoreURI(modelURI);
+	}
+
+	/**
+	 * Gets the URI of the sash-model resource in the shared (collocated with the user model)
+	 * area, irrespective of whether that actually is the resource that currently stores the
+	 * sash model.
+	 * 
+	 * @return the shared sash-model resource URI
+	 */
+	public URI getSharedResourceURI() {
+		URI modelURI = (getModelManager() == null) ? null : getModelManager().getURIWithoutExtension();
+		return (modelURI == null) ? null : modelURI.appendFileExtension(DiModel.MODEL_FILE_EXTENSION);
+	}
+
+	@Override
+	protected boolean isRootElement(EObject object) {
+		return super.isRootElement(object) && (object instanceof SashWindowsMngr);
+	}
+
+	@Override
+	protected boolean isSupportedRoot(EObject object) {
+		return DiPackage.Literals.SASH_WINDOWS_MNGR.isInstance(object);
+	}
+
+	//
+	// Bean API
+	//
+
+	public void addPropertyChangeListener(PropertyChangeListener listener) {
+		bean.addPropertyChangeListener(listener);
+	}
+
+	public void removePropertyChangeListener(PropertyChangeListener listener) {
+		bean.removePropertyChangeListener(listener);
+	}
+
+	public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) {
+		bean.addPropertyChangeListener(propertyName, listener);
+	}
+
+	public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) {
+		bean.removePropertyChangeListener(propertyName, listener);
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ExtensionServicesRegistry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ExtensionServicesRegistry.java
index 100819ee1ec..a7ce2a07d80 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ExtensionServicesRegistry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ExtensionServicesRegistry.java
@@ -1,6 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2011, 2014 LIFL and others.
- *
+ * Copyright (c) 2011, 2016 LIFL, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,6 +8,7 @@
  *
  * Contributors:
  *  LIFL - Initial API and implementation
+ *  Christian W. Damus - bug 485220
  *
  *****************************************************************************/
 package org.eclipse.papyrus.infra.core.services;
@@ -19,6 +19,7 @@ import java.util.List;
 
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.papyrus.infra.core.Activator;
 import org.eclipse.papyrus.infra.core.services.ServiceDescriptor.ServiceTypeKind;
 
 /**
@@ -55,9 +56,26 @@ public class ExtensionServicesRegistry extends ServicesRegistry {
 	private static final String DEPENDSON_KEY_ATTRIBUTE_NAME = "serviceKeyRef";
 
 	/**
-	 * Constructor.
-	 *
-	 * @throws Exception
+	 * Initializes me with the default extension-point namespace from which to load
+	 * registered services.
+	 * 
+	 * @throws ServiceException
+	 *             on any problem in the loading of service registrations
+	 */
+	public ExtensionServicesRegistry() throws ServiceException {
+		this(Activator.PLUGIN_ID);
+	}
+
+	/**
+	 * Initializes me with the specified extension-point namespace from which to load
+	 * registered services.
+	 * 
+	 * @param extensionPointNamespace
+	 *            the extension point namespace from which to
+	 *            load service registration extensions
+	 * 
+	 * @throws ServiceException
+	 *             on any problem in the loading of service registrations
 	 */
 	public ExtensionServicesRegistry(String extensionPointNamespace) throws ServiceException {
 		this.extensionPointNamespace = extensionPointNamespace;
@@ -119,8 +137,7 @@ public class ExtensionServicesRegistry extends ServicesRegistry {
 		if (exceptions != null) {
 			if (exceptions.size() == 1) {
 				throw exceptions.get(0);
-			}
-			else {
+			} else {
 				throw new ServiceException("Somme services are not started (first is shown)", exceptions.get(0)); //$NON-NLS-1$
 			}
 
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/AbstractServiceUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/AbstractServiceUtils.java
index d52f56b2859..d04e02fcd7f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/AbstractServiceUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/AbstractServiceUtils.java
@@ -1,156 +1,225 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2016 LIFL, CEA LIST, Christian W. Damus, and others.

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation

- *  Christian W. Damus - bug 468030

- *  Christian W. Damus - bug 485220

- *

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

-

-package org.eclipse.papyrus.infra.core.utils;

-

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

-import org.eclipse.papyrus.infra.core.Activator;

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

-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

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

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

-import org.eclipse.papyrus.infra.core.services.spi.IContextualServiceRegistryTracker;

-

-/**

- * Set of utility methods for accessing core Services. This class provide

- * methods to access the Papyrus well known services.

- *

- * <br>

- * This is the base class for concrete classes providing these utility methods.

- * Concrete class need to provide method {@link #getServiceRegistry(Object)} implementing how the ServiceRegistry is retrieved from the provided

- * object.

- * Subclasses can also provide a Singleton pattern (getInstance()) in order to

- * allow access to the utility methods in a static way. <br>

- *

- * @author cedri dumoulin

- *

- */

-public abstract class AbstractServiceUtils<T> {

-

-	/**

-	 * Get the service registry from the specified parameter.

-	 *

-	 * @param from

-	 * @return

-	 */

-	abstract public ServicesRegistry getServiceRegistry(T from) throws ServiceException;

-

-	/**

-	 * Obtains the service registry determined automatically from the context of which

-	 * Papyrus editor or view is active (implying the model that the user is currently editing).

-	 * 

-	 * @return the contextual service registry, or {@code null} if none can be determined

-	 */

-	protected ServicesRegistry getContextualServiceRegistry() {

-		IContextualServiceRegistryTracker tracker = Activator.getDefault().getContextualServiceRegistryTracker();

-		return (tracker == null) ? null : tracker.getServiceRegistry();

-	}

-

-	/**

-	 * Gets the {@link TransactionalEditingDomain} registered in the {@link ServicesRegistry}.

-	 *

-	 * @param from

-	 * @return

-	 * @throws ServiceException

-	 *             If an error occurs while getting the requested service.

-	 */

-	public TransactionalEditingDomain getTransactionalEditingDomain(T from) throws ServiceException {

-		return getServiceRegistry(from).getService(TransactionalEditingDomain.class);

-	}

-

-	/**

-	 * Gets the {@link IPageManager} registered in the {@link ServicesRegistry}.

-	 *

-	 * @param from

-	 * @return

-	 * @throws ServiceException

-	 *             If an error occurs while getting the requested service.

-	 */

-	public IPageManager getIPageManager(T from) throws ServiceException {

-		return getServiceRegistry(from).getService(IPageManager.class);

-	}

-

-	/**

-	 * Gets the {@link IPageMngr} registered in the {@link ServicesRegistry}.

-	 *

-	 * @param from

-	 * @return

-	 * @throws ServiceException

-	 *             If an error occurs while getting the requested service.

-	 */

-	public ModelSet getModelSet(T from) throws ServiceException {

-		return getServiceRegistry(from).getService(ModelSet.class);

-	}

-

-	/**

-	 * Returns an implementation of the requested service, from the specified context

-	 *

-	 * @param service

-	 *            The service for which an implementation is requested

-	 * @param from

-	 *            The context from which the service should be retrieved

-	 * @return

-	 * 		The implementation of the requested service

-	 * @throws ServiceException

-	 *             If an error occurs (e.g. cannot find the ServicesRegistry or the Service)

-	 *

-	 */

-	public <S> S getService(Class<S> service, T from) throws ServiceException {

-		return getServiceRegistry(from).getService(service);

-	}

-

-	/**

-	 * Returns an implementation of the requested service, from the specified context

-	 *

-	 * @param service

-	 *            The service for which an implementation is requested

-	 * @param from

-	 *            The context from which the service should be retrieved

-	 * @return

-	 * 		The implementation of the requested service

-	 * @throws ServiceException

-	 *             If an error occurs (e.g. cannot find the ServicesRegistry or the Service)

-	 *

-	 */

-	public Object getService(Object service, T from) throws ServiceException {

-		return getServiceRegistry(from).getService(service);

-	}

-

-	/**

-	 * Returns an implementation of the requested <em>optional</em> service, from the specified context, if it is available.

-	 *

-	 * @param service

-	 *            The service for which an implementation is requested

-	 * @param from

-	 *            The context from which the service should be retrieved

-	 * @param defaultImpl

-	 *            A default implementation of the requested service API to return if none is available in the registry

-	 *            or if the registered implementation could not be properly initialized. May be {@code null} if the

-	 *            service is <em>optional</em>

-	 * 

-	 * @return

-	 * 		The implementation of the requested service, or the {@code defaultImpl}

-	 */

-	public <S> S getService(Class<S> service, T from, S defaultImpl) {

-		try {

-			// Don't even attempt to get a registry from a null context

-			return (from == null) ? defaultImpl : getServiceRegistry(from).getService(service);

-		} catch (ServiceException e) {

-			// That's OK. It's optional and we have a default

-			return defaultImpl;

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2016 LIFL, CEA LIST, Christian W. Damus, and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation
+ *  Christian W. Damus - bug 468030
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.utils;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.core.Activator;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.services.spi.IContextualServiceRegistryTracker;
+import org.eclipse.papyrus.infra.tools.util.IProgressCallable;
+import org.eclipse.papyrus.infra.tools.util.IProgressRunnable;
+
+/**
+ * Set of utility methods for accessing core Services. This class provide
+ * methods to access the Papyrus well known services.
+ *
+ * <br>
+ * This is the base class for concrete classes providing these utility methods.
+ * Concrete class need to provide method {@link #getServiceRegistry(Object)} implementing how the ServiceRegistry is retrieved from the provided
+ * object.
+ * Subclasses can also provide a Singleton pattern (getInstance()) in order to
+ * allow access to the utility methods in a static way. <br>
+ *
+ * @author cedri dumoulin
+ *
+ */
+public abstract class AbstractServiceUtils<T> {
+
+	/**
+	 * Get the service registry from the specified parameter.
+	 *
+	 * @param from
+	 * @return
+	 */
+	abstract public ServicesRegistry getServiceRegistry(T from) throws ServiceException;
+
+	/**
+	 * Obtains the service registry determined automatically from the context of which
+	 * Papyrus editor or view is active (implying the model that the user is currently editing).
+	 * 
+	 * @return the contextual service registry, or {@code null} if none can be determined
+	 */
+	protected ServicesRegistry getContextualServiceRegistry() {
+		IContextualServiceRegistryTracker tracker = Activator.getDefault().getContextualServiceRegistryTracker();
+		return (tracker == null) ? null : tracker.getServiceRegistry();
+	}
+
+	/**
+	 * Gets the {@link TransactionalEditingDomain} registered in the {@link ServicesRegistry}.
+	 *
+	 * @param from
+	 * @return
+	 * @throws ServiceException
+	 *             If an error occurs while getting the requested service.
+	 */
+	public TransactionalEditingDomain getTransactionalEditingDomain(T from) throws ServiceException {
+		return getServiceRegistry(from).getService(TransactionalEditingDomain.class);
+	}
+
+	/**
+	 * Gets the {@link IPageManager} registered in the {@link ServicesRegistry}.
+	 *
+	 * @param from
+	 * @return
+	 * @throws ServiceException
+	 *             If an error occurs while getting the requested service.
+	 */
+	public IPageManager getIPageManager(T from) throws ServiceException {
+		return getServiceRegistry(from).getService(IPageManager.class);
+	}
+
+	/**
+	 * Gets the {@link IPageMngr} registered in the {@link ServicesRegistry}.
+	 *
+	 * @param from
+	 * @return
+	 * @throws ServiceException
+	 *             If an error occurs while getting the requested service.
+	 */
+	public ModelSet getModelSet(T from) throws ServiceException {
+		return getServiceRegistry(from).getService(ModelSet.class);
+	}
+
+	/**
+	 * Returns an implementation of the requested service, from the specified context
+	 *
+	 * @param service
+	 *            The service for which an implementation is requested
+	 * @param from
+	 *            The context from which the service should be retrieved
+	 * @return
+	 * 		The implementation of the requested service
+	 * @throws ServiceException
+	 *             If an error occurs (e.g. cannot find the ServicesRegistry or the Service)
+	 *
+	 */
+	public <S> S getService(Class<S> service, T from) throws ServiceException {
+		return getServiceRegistry(from).getService(service);
+	}
+
+	/**
+	 * Returns an implementation of the requested service, from the specified context
+	 *
+	 * @param service
+	 *            The service for which an implementation is requested
+	 * @param from
+	 *            The context from which the service should be retrieved
+	 * @return
+	 * 		The implementation of the requested service
+	 * @throws ServiceException
+	 *             If an error occurs (e.g. cannot find the ServicesRegistry or the Service)
+	 *
+	 */
+	public Object getService(Object service, T from) throws ServiceException {
+		return getServiceRegistry(from).getService(service);
+	}
+
+	/**
+	 * Returns an implementation of the requested <em>optional</em> service, from the specified context, if it is available.
+	 *
+	 * @param service
+	 *            The service for which an implementation is requested
+	 * @param from
+	 *            The context from which the service should be retrieved
+	 * @param defaultImpl
+	 *            A default implementation of the requested service API to return if none is available in the registry
+	 *            or if the registered implementation could not be properly initialized. May be {@code null} if the
+	 *            service is <em>optional</em>
+	 * 
+	 * @return
+	 * 		The implementation of the requested service, or the {@code defaultImpl}
+	 */
+	public <S> S getService(Class<S> service, T from, S defaultImpl) {
+		try {
+			// Don't even attempt to get a registry from a null context
+			return (from == null) ? defaultImpl : getServiceRegistry(from).getService(service);
+		} catch (ServiceException e) {
+			// That's OK. It's optional and we have a default
+			return defaultImpl;
+		}
+	}
+
+	/**
+	 * Obtains a Papyrus callable from a plain {@code callable} with the registry
+	 * context derived {@code from} the given context object.
+	 * 
+	 * @param callable
+	 *            a callable to encapsulate
+	 * @param from
+	 *            the Papyrus context from which to derive the registry
+	 * 
+	 * @return the Papyrus callable
+	 */
+	public <V> IPapyrusCallable<V> callable(IProgressCallable<V> callable, T from) {
+		return new IPapyrusCallable<V>() {
+			@Override
+			public V call(IProgressMonitor monitor) throws Exception {
+				return callable.call(monitor);
+			}
+
+			@Override
+			public ServicesRegistry getServiceRegistry() {
+				ServicesRegistry result = null;
+
+				try {
+					result = AbstractServiceUtils.this.getServiceRegistry(from);
+				} catch (ServiceException e) {
+					Activator.log.error(e);
+				}
+
+				return result;
+			}
+		};
+	}
+
+	/**
+	 * Obtains a Papyrus runnable from a plain {@code runnable} with the registry
+	 * context derived {@code from} the given context object.
+	 * 
+	 * @param runnable
+	 *            a runnable to encapsulate
+	 * @param from
+	 *            the Papyrus context from which to derive the registry
+	 * 
+	 * @return the Papyrus runnable
+	 */
+	public IPapyrusRunnable runnable(IProgressRunnable runnable, T from) {
+		return new IPapyrusRunnable() {
+			@Override
+			public void run(IProgressMonitor monitor) {
+				runnable.run(monitor);
+			}
+
+			@Override
+			public ServicesRegistry getServiceRegistry() {
+				ServicesRegistry result = null;
+
+				try {
+					result = AbstractServiceUtils.this.getServiceRegistry(from);
+				} catch (ServiceException e) {
+					Activator.log.error(e);
+				}
+
+				return result;
+			}
+		};
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IPapyrusCallable.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IPapyrusCallable.java
new file mode 100644
index 00000000000..5d7b6edd304
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IPapyrusCallable.java
@@ -0,0 +1,49 @@
+/*****************************************************************************
+ * Copyright (c) 2016 Christian W. Damus and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.utils;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.tools.util.IProgressCallable;
+
+/**
+ * Protocol for a callable in the Papyrus context.
+ */
+@FunctionalInterface
+public interface IPapyrusCallable<V> extends IProgressCallable<V>, IServiceRegistryProvider {
+
+	@Override
+	default ServicesRegistry getServiceRegistry() {
+		try {
+			return ServiceUtils.getInstance().getServiceRegistry(null);
+		} catch (ServiceException e) {
+			return null;
+		}
+	}
+
+	static <V> IPapyrusCallable<V> inContext(ServicesRegistry registry, IPapyrusCallable<V> callable) {
+		return new IPapyrusCallable<V>() {
+			@Override
+			public V call(IProgressMonitor monitor) throws Exception {
+				return callable.call(monitor);
+			}
+
+			@Override
+			public ServicesRegistry getServiceRegistry() {
+				return registry;
+			}
+		};
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IPapyrusRunnable.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IPapyrusRunnable.java
new file mode 100644
index 00000000000..4c8d2f1d008
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IPapyrusRunnable.java
@@ -0,0 +1,49 @@
+/*****************************************************************************
+ * Copyright (c) 2016 Christian W. Damus and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.utils;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.tools.util.IProgressRunnable;
+
+/**
+ * Protocol for a runnable in the Papyrus context.
+ */
+@FunctionalInterface
+public interface IPapyrusRunnable extends IProgressRunnable, IServiceRegistryProvider {
+
+	@Override
+	default ServicesRegistry getServiceRegistry() {
+		try {
+			return ServiceUtils.getInstance().getServiceRegistry(null);
+		} catch (ServiceException e) {
+			return null;
+		}
+	}
+
+	static IPapyrusRunnable inContext(ServicesRegistry registry, IPapyrusRunnable runnable) {
+		return new IPapyrusRunnable() {
+			@Override
+			public void run(IProgressMonitor monitor) {
+				runnable.run(monitor);
+			}
+
+			@Override
+			public ServicesRegistry getServiceRegistry() {
+				return registry;
+			}
+		};
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IServiceRegistryProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IServiceRegistryProvider.java
new file mode 100644
index 00000000000..36c50087af5
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/IServiceRegistryProvider.java
@@ -0,0 +1,30 @@
+/*****************************************************************************
+ * Copyright (c) 2016 Christian W. Damus and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.utils;
+
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+
+/**
+ * A protocol for any object that can provide the context of a Papyrus
+ * {@link ServicesRegistry} in which it is exists.
+ */
+@FunctionalInterface
+public interface IServiceRegistryProvider {
+	/**
+	 * Obtains my contextual service registry.
+	 * 
+	 * @return my service registry
+	 */
+	ServicesRegistry getServiceRegistry();
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/ServiceUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/ServiceUtils.java
index 4ee47baabbd..9712f639a46 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/ServiceUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/ServiceUtils.java
@@ -1,57 +1,57 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2016 LIFL, CEA LIST, Christian W. Damus, and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *

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

-

-package org.eclipse.papyrus.infra.core.utils;

-

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

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

-

-/**

- * @author cedric dumoulin

- *

- */

-public class ServiceUtils extends AbstractServiceUtils<ServicesRegistry> {

-

-	private final static ServiceUtils instance = new ServiceUtils();

-

-	/**

-	 * Get the singleton instance of the class.

-	 *

-	 * @return

-	 */

-	public static final ServiceUtils getInstance() {

-		return instance;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.utils.AbstractServiceUtils#getServiceRegistry(java.lang.Object)

-	 *

-	 * @param from

-	 *            the service registry, or {@code null} to try to get the contextual default service registry

-	 * @return

-	 * @throws ServiceException

-	 */

-	@Override

-	public ServicesRegistry getServiceRegistry(ServicesRegistry from) throws ServiceException {

-		if (from != null) {

-			return from;

-		}

-		ServicesRegistry contextual = getContextualServiceRegistry();

-		if (contextual == null) {

-			throw new ServiceException("The Service Registry could not be found");

-		}

-		return contextual;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2016 LIFL, CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.utils;
+
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+
+/**
+ * @author cedric dumoulin
+ *
+ */
+public class ServiceUtils extends AbstractServiceUtils<ServicesRegistry> {
+
+	private final static ServiceUtils instance = new ServiceUtils();
+
+	/**
+	 * Get the singleton instance of the class.
+	 *
+	 * @return
+	 */
+	public static final ServiceUtils getInstance() {
+		return instance;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.utils.AbstractServiceUtils#getServiceRegistry(java.lang.Object)
+	 *
+	 * @param from
+	 *            the service registry, or {@code null} to try to get the contextual default service registry
+	 * @return
+	 * @throws ServiceException
+	 */
+	@Override
+	public ServicesRegistry getServiceRegistry(ServicesRegistry from) throws ServiceException {
+		if (from != null) {
+			return from;
+		}
+		ServicesRegistry contextual = getContextualServiceRegistry();
+		if (contextual == null) {
+			throw new ServiceException("The Service Registry could not be found");
+		}
+		return contextual;
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/TransactionHelper.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/TransactionHelper.java
index add383bc3fe..29fcefbed91 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/TransactionHelper.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/TransactionHelper.java
@@ -1,460 +1,522 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.

- *

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

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

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

- *  Christian W. Damus (CEA) - bugs 429826, 408491, 433320

- *  Christian W. Damus - bugs 451557, 457560, 461629, 463564, 466997, 465416, 485220

- *

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

-package org.eclipse.papyrus.infra.core.utils;

-

-import java.util.Collections;

-import java.util.Map;

-import java.util.Set;

-import java.util.concurrent.Executor;

-

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

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

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

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

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

-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;

-import org.eclipse.emf.transaction.impl.TransactionImpl;

-import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;

-

-import com.google.common.collect.Maps;

-import com.google.common.collect.Sets;

-

-

-/**

- * This helper can be used to run (safe) transactions outside the CommandStack

- *

- * @author Camille Letavernier

- *

- */

-public class TransactionHelper {

-

-	// Refactoring needed. The sasheditor contentprovider should have dependencies to infra.EMF...

-

-	public static final String TRANSACTION_OPTION_READ_ONLY_AXIS = "papyrus.read_only_axis"; //$NON-NLS-1$

-

-	/**

-	 * @deprecated Since 1.1 M7 read-only state of resources is always cached and the cache lifecycle is not tied to transactions.

-	 */

-	@Deprecated

-	public static final String TRANSACTION_OPTION_NO_READ_ONLY_CACHE = "papyrus.no_read_only_cache"; //$NON-NLS-1$

-

-	public static final String TRANSACTION_OPTION_INTERACTIVE = "papyrus.interactive"; //$NON-NLS-1$

-

-	public static final String TRANSACTION_OPTION_MERGE_NESTED_READ = "papyrus.merge_nested_read"; //$NON-NLS-1$

-

-	public static void run(EditingDomain domain, Runnable writeOperation) throws InterruptedException, RollbackException {

-		if (domain instanceof TransactionalEditingDomain) {

-			run((TransactionalEditingDomain) domain, writeOperation);

-		} else {

-			writeOperation.run();

-		}

-	}

-

-	public static void run(TransactionalEditingDomain domain, final Runnable writeOperation) throws InterruptedException, RollbackException {

-		if (domain instanceof InternalTransactionalEditingDomain) {

-			run((InternalTransactionalEditingDomain) domain, writeOperation);

-		} else {

-			// Shouldn't happen, as all TransactionalEditingDomain implementations should also implement InternalTransactionalEditingDomain

-			domain.getCommandStack().execute(new RecordingCommand(domain) {

-

-				@Override

-				protected void doExecute() {

-					writeOperation.run();

-				}

-			});

-		}

-	}

-

-	public static void run(InternalTransactionalEditingDomain domain, Runnable writeOperation) throws InterruptedException, RollbackException {

-		Transaction transaction = domain.startTransaction(false, Collections.emptyMap());

-		try {

-			writeOperation.run();

-		} finally {

-			transaction.commit();

-		}

-	}

-

-	/**

-	 * Queries whether an editing {@code domain} has been disposed.

-	 *

-	 * @param domain

-	 *            an editing domain

-	 *

-	 * @return whether the {@code domain} is {@code null} (which presumably implies disposed) or has been disposed

-	 */

-	public static boolean isDisposed(TransactionalEditingDomain domain) {

-		// A disposed editing domain (and only a disposed editing domain) has no command stack

-		return (domain == null) || (domain.getCommandStack() == null);

-	}

-

-	/**

-	 * Merges the read-only {@code axis} option into an existing map of {@code options}.

-	 *

-	 * @param options

-	 *            an existing (non-{@code null}) options map

-	 * @param axis

-	 *            the axis option to merge

-	 * @return the augmented {@code options}

-	 */

-	public static Map<String, Object> mergeReadOnlyAxisOption(Map<String, Object> options, ReadOnlyAxis axis) {

-		return mergeReadOnlyAxisOption(options, Collections.singleton(axis));

-	}

-

-	/**

-	 * Merges the read-only {@code axes} option into an existing map of {@code options}.

-	 *

-	 * @param options

-	 *            an existing (non-{@code null}) options map

-	 * @param axes

-	 *            the axes option to merge

-	 * @return the augmented {@code options}

-	 */

-	public static Map<String, Object> mergeReadOnlyAxisOption(Map<String, Object> options, Set<ReadOnlyAxis> axes) {

-		options.put(TRANSACTION_OPTION_READ_ONLY_AXIS, axes);

-		return options;

-	}

-

-	/**

-	 * Adds the read-only {@code axis} option to a transaction's {@code options}.

-	 *

-	 * @param options

-	 *            an options map, which may be {@code null} or immutable

-	 * @param axis

-	 *            the axis option to add

-	 * @return a new map based on the {@code options} and including the {@code axis}

-	 */

-	public static Map<String, Object> addReadOnlyAxisOption(Map<String, ?> options, ReadOnlyAxis axis) {

-		return addReadOnlyAxisOption(options, Collections.singleton(axis));

-	}

-

-	/**

-	 * Adds the read-only {@code axes} option to a transaction's {@code options}.

-	 *

-	 * @param options

-	 *            an options map, which may be {@code null} or immutable

-	 * @param axes

-	 *            the axes option to add

-	 * @return a new map based on the {@code options} and including the {@code axes}

-	 */

-	public static Map<String, Object> addReadOnlyAxisOption(Map<String, ?> options, Set<ReadOnlyAxis> axes) {

-		Map<String, Object> result = (options == null) ? Maps.<String, Object> newHashMap() : Maps.newHashMap(options);

-		result.put(TRANSACTION_OPTION_READ_ONLY_AXIS, axes);

-		return result;

-	}

-

-	/**

-	 * Creates a new mutable transaction options map with a read-only {@code axis}.

-	 *

-	 * @param axis

-	 *            the axis option

-	 * @return a new mutable map including the {@code axis}

-	 */

-	public static Map<String, Object> readOnlyAxisOption(ReadOnlyAxis axis) {

-		return readOnlyAxisOption(Collections.singleton(axis));

-	}

-

-	/**

-	 * Creates a new mutable transaction options map with a read-only {@code axes}.

-	 *

-	 * @param axes

-	 *            the axes option

-	 * @return a new mutable map including the {@code axes}

-	 */

-	public static Map<String, Object> readOnlyAxisOption(Set<ReadOnlyAxis> axes) {

-		return addReadOnlyAxisOption(null, axes);

-	}

-

-	/**

-	 * Queries the read-only axes to be enforced by a {@code transaction}.

-	 *

-	 * @param transaction

-	 *            a transaction

-	 * @return its read-only axes, which are {@linkplain ReadOnlyAxis#anyAxis() all of them} by default if the option is absent

-	 */

-	@SuppressWarnings("unchecked")

-	public static Set<ReadOnlyAxis> getReadOnlyAxisOption(Transaction transaction) {

-		Set<ReadOnlyAxis> result;

-

-		Object value = transaction.getOptions().get(TRANSACTION_OPTION_READ_ONLY_AXIS);

-		if (value instanceof Set<?>) {

-			result = (Set<ReadOnlyAxis>) value;

-		} else if (value instanceof Iterable<?>) {

-			result = Sets.immutableEnumSet((Iterable<ReadOnlyAxis>) value);

-		} else {

-			result = ReadOnlyAxis.anyAxis();

-		}

-

-		return result;

-	}

-

-	/**

-	 * Merges the option to disable read-only state caching into an existing map of {@code options}.

-	 *

-	 * @param options

-	 *            an existing (non-{@code null}) options map

-	 * @param disableCache

-	 *            whether to disable read-only caching

-	 * @return the augmented {@code options}

-	 * @deprecated Since 1.1 M7 read-only state of resources is always cached and the cache lifecycle is not tied to transactions.

-	 */

-	@Deprecated

-	public static Map<String, Object> mergeDisableReadOnlyOption(Map<String, Object> options, boolean disableCache) {

-		options.put(TRANSACTION_OPTION_NO_READ_ONLY_CACHE, disableCache);

-		return options;

-	}

-

-	/**

-	 * Adds the option to disable read-only state caching to a transaction's {@code options}.

-	 *

-	 * @param options

-	 *            an options map, which may be {@code null} or immutable

-	 * @param disableCache

-	 *            whether to disable read-only caching

-	 * @return a new map based on the {@code options} and including the {@code disableCache} option

-	 * @deprecated Since 1.1 M7 read-only state of resources is always cached and the cache lifecycle is not tied to transactions.

-	 */

-	@Deprecated

-	public static Map<String, Object> addDisableReadOnlyCacheOption(Map<String, ?> options, boolean disableCache) {

-		Map<String, Object> result = (options == null) ? Maps.<String, Object> newHashMap() : Maps.newHashMap(options);

-		result.put(TRANSACTION_OPTION_NO_READ_ONLY_CACHE, disableCache);

-		return result;

-	}

-

-	/**

-	 * Creates a new mutable transaction options map with the option to disable caching of read-only state for objects and resources.

-	 *

-	 * @param disableCache

-	 *            whether to disable read-only caching

-	 * @return a new mutable map including the {@code disableCache} option

-	 * @deprecated Since 1.1 M7 read-only state of resources is always cached and the cache lifecycle is not tied to transactions.

-	 */

-	@Deprecated

-	public static Map<String, Object> disableReadOnlyCacheOption(boolean disableCache) {

-		return addDisableReadOnlyCacheOption(null, disableCache);

-	}

-

-	/**

-	 * Queries whether a {@code transaction} is running with caching of read-only state of objects and resources disabled.

-	 *

-	 * @param transaction

-	 *            a transaction

-	 * @return {@code true} if the {@code transaction} has the {@linkplain #TRANSACTION_OPTION_NO_READ_ONLY_CACHE interactive option} set {@code true}; {@code false}, otherwise (including the default case of no option set)

-	 * @deprecated Since 1.1 M7 read-only state of resources is always cached and the cache lifecycle is not tied to transactions.

-	 */

-	@Deprecated

-	public static boolean isReadOnlyCacheDisabled(Transaction transaction) {

-		Object value = transaction.getOptions().get(TRANSACTION_OPTION_NO_READ_ONLY_CACHE);

-		return (value instanceof Boolean) ? (Boolean) value : false;

-	}

-

-	/**

-	 * Merges the option to merge nested read-only transactions with parent write transactions into an existing map of {@code options}.

-	 * This option on a write transaction affects this behaviour of subsequent child read-only transactions.

-	 *

-	 * @param options

-	 *            an existing (non-{@code null}) options map

-	 * @param mergeReadOnly

-	 *            whether to merge read-only transactions into parent write transactions

-	 * @return the augmented {@code options}

-	 */

-	public static Map<String, Object> mergeMergeReadOnlyOption(Map<String, Object> options, boolean mergeReadOnly) {

-		options.put(TRANSACTION_OPTION_MERGE_NESTED_READ, mergeReadOnly);

-		return options;

-	}

-

-	/**

-	 * Adds the option to merge nested read-only transactions with parent write transactions to a transaction's {@code options}.

-	 * This option on a write transaction affects this behaviour of subsequent child read-only transactions.

-	 *

-	 * @param options

-	 *            an options map, which may be {@code null} or immutable

-	 * @param mergeReadOnly

-	 *            whether to merge read-only transactions into parent write transactions

-	 * @return a new map based on the {@code options} and including the {@code mergeReadOnly} option

-	 */

-	public static Map<String, Object> addMergeReadOnlyOption(Map<String, ?> options, boolean mergeReadOnly) {

-		Map<String, Object> result = (options == null) ? Maps.<String, Object> newHashMap() : Maps.newHashMap(options);

-		result.put(TRANSACTION_OPTION_MERGE_NESTED_READ, mergeReadOnly);

-		return result;

-	}

-

-	/**

-	 * Creates a new mutable transaction options map with the option to merge nested read-only transactions with parent write transactions.

-	 * This option on a write transaction affects this behaviour of subsequent child read-only transactions.

-	 *

-	 * @param mergeReadOnly

-	 *            whether to merge read-only transactions into parent write transactions

-	 * @return a new mutable map including the {@code mergeReadOnly} option

-	 */

-	public static Map<String, Object> mergeReadOnlyOption(boolean mergeReadOnly) {

-		return addMergeReadOnlyOption(null, mergeReadOnly);

-	}

-

-	/**

-	 * Queries whether a {@code transaction} is running with merging of nested read-only transactions with parent write transactions enabled.

-	 *

-	 * @param transaction

-	 *            a transaction

-	 * @return {@code true} if the {@code transaction} has the {@linkplain #TRANSACTION_OPTION_MERGE_NESTED_READ interactive option} set {@code true}; {@code false}, otherwise (including the default case of no option set)

-	 */

-	public static boolean isMergeReadOnly(Transaction transaction) {

-		Object value = transaction.getOptions().get(TRANSACTION_OPTION_MERGE_NESTED_READ);

-		return (value instanceof Boolean) ? (Boolean) value : false;

-	}

-

-	/**

-	 * Merges the {@code interactive} transaction option into an existing map of {@code options}.

-	 *

-	 * @param options

-	 *            an existing (non-{@code null}) options map

-	 * @param interactive

-	 *            whether the transaction is in an user-interactive context

-	 * @return the augmented {@code options}

-	 */

-	public static Map<String, Object> mergeInteractiveOption(Map<String, Object> options, boolean interactive) {

-		options.put(TRANSACTION_OPTION_INTERACTIVE, interactive);

-		return options;

-	}

-

-	/**

-	 * Adds the {@code interactive} option option to a transaction's {@code options}.

-	 *

-	 * @param options

-	 *            an options map, which may be {@code null} or immutable

-	 * @param interactive

-	 *            whether the transaction is in an user-interactive context

-	 * @return a new map based on the {@code options} and including the {@code interactive} option

-	 */

-	public static Map<String, Object> addInteractiveOption(Map<String, ?> options, boolean interactive) {

-		Map<String, Object> result = (options == null) ? Maps.<String, Object> newHashMap() : Maps.newHashMap(options);

-		result.put(TRANSACTION_OPTION_INTERACTIVE, interactive);

-		return result;

-	}

-

-	/**

-	 * Creates a new mutable transaction options map with an {@code interactive} option.

-	 *

-	 * @param interactive

-	 *            whether the transaction is in an user-interactive context

-	 * @return a new mutable map including the {@code interactive} option

-	 */

-	public static Map<String, Object> interactiveOption(boolean interactive) {

-		return addInteractiveOption(null, interactive);

-	}

-

-	/**

-	 * Queries whether a {@code transaction} is running in a user-interactive context. In practice, this means that it would be appropriate to

-	 * prompt the user to make resources/objects writable if necessary.

-	 *

-	 * @param transaction

-	 *            a transaction

-	 * @return {@code false} if the {@code transaction} has the {@linkplain #TRANSACTION_OPTION_INTERACTIVE interactive option} set {@code false}; {@code true}, otherwise (including the default case of no option set)

-	 */

-	public static boolean isInteractive(Transaction transaction) {

-		Object value = transaction.getOptions().get(TRANSACTION_OPTION_INTERACTIVE);

-		return (value instanceof Boolean) ? (Boolean) value : true;

-	}

-

-	/**

-	 * Queries whether a {@code transaction} is one that is executing or that executed triggers, or is perhaps

-	 * the read-only post-commit transaction that tells listeners about the changes made by a trigger transaction.

-	 * 

-	 * @param transaction

-	 *            a transaction

-	 * @return whether it is a trigger transaction

-	 */

-	public static boolean isTriggerTransaction(Transaction transaction) {

-		Object value = transaction.getOptions().get(TransactionImpl.OPTION_IS_TRIGGER_TRANSACTION);

-		return (value instanceof Boolean) ? (Boolean) value : false;

-	}

-

-	/**

-	 * Creates an {@link Executor} that executes {@link Runnable}s at the pre-commit phase of the active write

-	 * transaction of the specified editing {@code domain} or at some other time if no write transaction is active.

-	 * 

-	 * @param domain

-	 *            a transactional editing domain. May not be {@code null}

-	 * @param fallback

-	 *            an executor to use for scheduling tasks when the {@code domain} does not have a

-	 *            write transaction open. May not be {@code null}

-	 */

-	public static Executor createTransactionExecutor(TransactionalEditingDomain domain, Executor fallback) {

-		return createTransactionExecutor(domain, fallback, null, null);

-	}

-

-	/**

-	 * Creates an {@link Executor} that executes {@link Runnable}s at the pre-commit phase of the active write

-	 * transaction of the specified editing {@code domain} or at some other time if no write transaction is active.

-	 * The specified {@code policy}, if any, may determine whether for some task the {@code fallback} should be preferred

-	 * over the transaction executor or vice-versa (such as to handle special requirements like tasks needing to run

-	 * on the UI thread).

-	 * 

-	 * @param domain

-	 *            a transactional editing domain. May not be {@code null}

-	 * @param fallback

-	 *            an executor to use for scheduling tasks when the {@code domain} does not have a

-	 *            write transaction open. May not be {@code null}

-	 * @param policy

-	 *            an optional executor selection policy (may be {@code null}). The policy is queried for ranking of both

-	 *            the transaction executor and the {@code fallback}, unless there is no transaction active, which always excludes the

-	 *            transaction executor. In the event of a tie, the transaction executor is always selected

-	 */

-	public static Executor createTransactionExecutor(TransactionalEditingDomain domain, Executor fallback, IExecutorPolicy policy) {

-		return createTransactionExecutor(domain, fallback, policy, null);

-	}

-

-	/**

-	 * Creates an {@link Executor} that executes {@link Runnable}s at the pre-commit phase of the active write

-	 * transaction of the specified editing {@code domain} or at some other time if no write transaction is active.

-	 * 

-	 * @param domain

-	 *            a transactional editing domain. May not be {@code null}

-	 * @param fallback

-	 *            an executor to use for scheduling tasks when the {@code domain} does not have a

-	 *            write transaction open. May not be {@code null}

-	 * @param options

-	 *            a map of options to apply to the nested transaction in which tasks are executed. May be {@code null} if not needed

-	 */

-	public static Executor createTransactionExecutor(TransactionalEditingDomain domain, Executor fallback, Map<?, ?> options) {

-		return createTransactionExecutor(domain, fallback, null, options);

-	}

-

-	/**

-	 * Creates an {@link Executor} that executes {@link Runnable}s at the pre-commit phase of the active write

-	 * transaction of the specified editing {@code domain} or at some other time if no write transaction is active.

-	 * The specified {@code policy}, if any, may determine whether for some task the {@code fallback} should be preferred

-	 * over the transaction executor or vice-versa (such as to handle special requirements like tasks needing to run

-	 * on the UI thread).

-	 * 

-	 * @param domain

-	 *            a transactional editing domain. May not be {@code null}

-	 * @param fallback

-	 *            an executor to use for scheduling tasks when the {@code domain} does not have a

-	 *            write transaction open. May not be {@code null}

-	 * @param policy

-	 *            an optional executor selection policy (may be {@code null}). The policy is queried for ranking of both

-	 *            the transaction executor and the {@code fallback}, unless there is no transaction active, which always excludes the

-	 *            transaction executor. In the event of a tie, the transaction executor is always selected

-	 * @param options

-	 *            a map of options to apply to the nested transaction in which tasks are executed. May be {@code null} if not needed

-	 */

-	public static Executor createTransactionExecutor(TransactionalEditingDomain domain, Executor fallback, IExecutorPolicy policy, Map<?, ?> options) {

-		if ((domain == null) || (fallback == null)) {

-			throw new NullPointerException();

-		}

-

-		return new TransactionPrecommitExecutor(domain, fallback, policy, options);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * 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
+ *  Christian W. Damus (CEA) - bugs 429826, 408491, 433320
+ *  Christian W. Damus - bugs 451557, 457560, 461629, 463564, 466997, 465416, 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.utils;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RollbackException;
+import org.eclipse.emf.transaction.Transaction;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
+import org.eclipse.emf.transaction.impl.TransactionImpl;
+import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;
+import org.eclipse.papyrus.infra.tools.util.IExecutorService;
+import org.eclipse.papyrus.infra.tools.util.IProgressCallable;
+import org.eclipse.papyrus.infra.tools.util.IProgressRunnable;
+
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+
+
+/**
+ * This helper can be used to run (safe) transactions outside the CommandStack
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class TransactionHelper {
+
+	// Refactoring needed. The sasheditor contentprovider should have dependencies to infra.EMF...
+
+	public static final String TRANSACTION_OPTION_READ_ONLY_AXIS = "papyrus.read_only_axis"; //$NON-NLS-1$
+
+	/**
+	 * @deprecated Since 1.1 M7 read-only state of resources is always cached and the cache lifecycle is not tied to transactions.
+	 */
+	@Deprecated
+	public static final String TRANSACTION_OPTION_NO_READ_ONLY_CACHE = "papyrus.no_read_only_cache"; //$NON-NLS-1$
+
+	public static final String TRANSACTION_OPTION_INTERACTIVE = "papyrus.interactive"; //$NON-NLS-1$
+
+	public static final String TRANSACTION_OPTION_MERGE_NESTED_READ = "papyrus.merge_nested_read"; //$NON-NLS-1$
+
+	public static void run(EditingDomain domain, Runnable writeOperation) throws InterruptedException, RollbackException {
+		if (domain instanceof TransactionalEditingDomain) {
+			run((TransactionalEditingDomain) domain, writeOperation);
+		} else {
+			writeOperation.run();
+		}
+	}
+
+	public static void run(TransactionalEditingDomain domain, final Runnable writeOperation) throws InterruptedException, RollbackException {
+		if (domain instanceof InternalTransactionalEditingDomain) {
+			run((InternalTransactionalEditingDomain) domain, writeOperation);
+		} else {
+			// Shouldn't happen, as all TransactionalEditingDomain implementations should also implement InternalTransactionalEditingDomain
+			domain.getCommandStack().execute(new RecordingCommand(domain) {
+
+				@Override
+				protected void doExecute() {
+					writeOperation.run();
+				}
+			});
+		}
+	}
+
+	public static void run(InternalTransactionalEditingDomain domain, Runnable writeOperation) throws InterruptedException, RollbackException {
+		Transaction transaction = domain.startTransaction(false, Collections.emptyMap());
+		try {
+			writeOperation.run();
+		} finally {
+			transaction.commit();
+		}
+	}
+
+	/**
+	 * Queries whether an editing {@code domain} has been disposed.
+	 *
+	 * @param domain
+	 *            an editing domain
+	 *
+	 * @return whether the {@code domain} is {@code null} (which presumably implies disposed) or has been disposed
+	 */
+	public static boolean isDisposed(TransactionalEditingDomain domain) {
+		// A disposed editing domain (and only a disposed editing domain) has no command stack
+		return (domain == null) || (domain.getCommandStack() == null);
+	}
+
+	/**
+	 * Merges the read-only {@code axis} option into an existing map of {@code options}.
+	 *
+	 * @param options
+	 *            an existing (non-{@code null}) options map
+	 * @param axis
+	 *            the axis option to merge
+	 * @return the augmented {@code options}
+	 */
+	public static Map<String, Object> mergeReadOnlyAxisOption(Map<String, Object> options, ReadOnlyAxis axis) {
+		return mergeReadOnlyAxisOption(options, Collections.singleton(axis));
+	}
+
+	/**
+	 * Merges the read-only {@code axes} option into an existing map of {@code options}.
+	 *
+	 * @param options
+	 *            an existing (non-{@code null}) options map
+	 * @param axes
+	 *            the axes option to merge
+	 * @return the augmented {@code options}
+	 */
+	public static Map<String, Object> mergeReadOnlyAxisOption(Map<String, Object> options, Set<ReadOnlyAxis> axes) {
+		options.put(TRANSACTION_OPTION_READ_ONLY_AXIS, axes);
+		return options;
+	}
+
+	/**
+	 * Adds the read-only {@code axis} option to a transaction's {@code options}.
+	 *
+	 * @param options
+	 *            an options map, which may be {@code null} or immutable
+	 * @param axis
+	 *            the axis option to add
+	 * @return a new map based on the {@code options} and including the {@code axis}
+	 */
+	public static Map<String, Object> addReadOnlyAxisOption(Map<String, ?> options, ReadOnlyAxis axis) {
+		return addReadOnlyAxisOption(options, Collections.singleton(axis));
+	}
+
+	/**
+	 * Adds the read-only {@code axes} option to a transaction's {@code options}.
+	 *
+	 * @param options
+	 *            an options map, which may be {@code null} or immutable
+	 * @param axes
+	 *            the axes option to add
+	 * @return a new map based on the {@code options} and including the {@code axes}
+	 */
+	public static Map<String, Object> addReadOnlyAxisOption(Map<String, ?> options, Set<ReadOnlyAxis> axes) {
+		Map<String, Object> result = (options == null) ? Maps.<String, Object> newHashMap() : Maps.newHashMap(options);
+		result.put(TRANSACTION_OPTION_READ_ONLY_AXIS, axes);
+		return result;
+	}
+
+	/**
+	 * Creates a new mutable transaction options map with a read-only {@code axis}.
+	 *
+	 * @param axis
+	 *            the axis option
+	 * @return a new mutable map including the {@code axis}
+	 */
+	public static Map<String, Object> readOnlyAxisOption(ReadOnlyAxis axis) {
+		return readOnlyAxisOption(Collections.singleton(axis));
+	}
+
+	/**
+	 * Creates a new mutable transaction options map with a read-only {@code axes}.
+	 *
+	 * @param axes
+	 *            the axes option
+	 * @return a new mutable map including the {@code axes}
+	 */
+	public static Map<String, Object> readOnlyAxisOption(Set<ReadOnlyAxis> axes) {
+		return addReadOnlyAxisOption(null, axes);
+	}
+
+	/**
+	 * Queries the read-only axes to be enforced by a {@code transaction}.
+	 *
+	 * @param transaction
+	 *            a transaction
+	 * @return its read-only axes, which are {@linkplain ReadOnlyAxis#anyAxis() all of them} by default if the option is absent
+	 */
+	@SuppressWarnings("unchecked")
+	public static Set<ReadOnlyAxis> getReadOnlyAxisOption(Transaction transaction) {
+		Set<ReadOnlyAxis> result;
+
+		Object value = transaction.getOptions().get(TRANSACTION_OPTION_READ_ONLY_AXIS);
+		if (value instanceof Set<?>) {
+			result = (Set<ReadOnlyAxis>) value;
+		} else if (value instanceof Iterable<?>) {
+			result = Sets.immutableEnumSet((Iterable<ReadOnlyAxis>) value);
+		} else {
+			result = ReadOnlyAxis.anyAxis();
+		}
+
+		return result;
+	}
+
+	/**
+	 * Merges the option to disable read-only state caching into an existing map of {@code options}.
+	 *
+	 * @param options
+	 *            an existing (non-{@code null}) options map
+	 * @param disableCache
+	 *            whether to disable read-only caching
+	 * @return the augmented {@code options}
+	 * @deprecated Since 1.1 M7 read-only state of resources is always cached and the cache lifecycle is not tied to transactions.
+	 */
+	@Deprecated
+	public static Map<String, Object> mergeDisableReadOnlyOption(Map<String, Object> options, boolean disableCache) {
+		options.put(TRANSACTION_OPTION_NO_READ_ONLY_CACHE, disableCache);
+		return options;
+	}
+
+	/**
+	 * Adds the option to disable read-only state caching to a transaction's {@code options}.
+	 *
+	 * @param options
+	 *            an options map, which may be {@code null} or immutable
+	 * @param disableCache
+	 *            whether to disable read-only caching
+	 * @return a new map based on the {@code options} and including the {@code disableCache} option
+	 * @deprecated Since 1.1 M7 read-only state of resources is always cached and the cache lifecycle is not tied to transactions.
+	 */
+	@Deprecated
+	public static Map<String, Object> addDisableReadOnlyCacheOption(Map<String, ?> options, boolean disableCache) {
+		Map<String, Object> result = (options == null) ? Maps.<String, Object> newHashMap() : Maps.newHashMap(options);
+		result.put(TRANSACTION_OPTION_NO_READ_ONLY_CACHE, disableCache);
+		return result;
+	}
+
+	/**
+	 * Creates a new mutable transaction options map with the option to disable caching of read-only state for objects and resources.
+	 *
+	 * @param disableCache
+	 *            whether to disable read-only caching
+	 * @return a new mutable map including the {@code disableCache} option
+	 * @deprecated Since 1.1 M7 read-only state of resources is always cached and the cache lifecycle is not tied to transactions.
+	 */
+	@Deprecated
+	public static Map<String, Object> disableReadOnlyCacheOption(boolean disableCache) {
+		return addDisableReadOnlyCacheOption(null, disableCache);
+	}
+
+	/**
+	 * Queries whether a {@code transaction} is running with caching of read-only state of objects and resources disabled.
+	 *
+	 * @param transaction
+	 *            a transaction
+	 * @return {@code true} if the {@code transaction} has the {@linkplain #TRANSACTION_OPTION_NO_READ_ONLY_CACHE interactive option} set {@code true}; {@code false}, otherwise (including the default case of no option set)
+	 * @deprecated Since 1.1 M7 read-only state of resources is always cached and the cache lifecycle is not tied to transactions.
+	 */
+	@Deprecated
+	public static boolean isReadOnlyCacheDisabled(Transaction transaction) {
+		Object value = transaction.getOptions().get(TRANSACTION_OPTION_NO_READ_ONLY_CACHE);
+		return (value instanceof Boolean) ? (Boolean) value : false;
+	}
+
+	/**
+	 * Merges the option to merge nested read-only transactions with parent write transactions into an existing map of {@code options}.
+	 * This option on a write transaction affects this behaviour of subsequent child read-only transactions.
+	 *
+	 * @param options
+	 *            an existing (non-{@code null}) options map
+	 * @param mergeReadOnly
+	 *            whether to merge read-only transactions into parent write transactions
+	 * @return the augmented {@code options}
+	 */
+	public static Map<String, Object> mergeMergeReadOnlyOption(Map<String, Object> options, boolean mergeReadOnly) {
+		options.put(TRANSACTION_OPTION_MERGE_NESTED_READ, mergeReadOnly);
+		return options;
+	}
+
+	/**
+	 * Adds the option to merge nested read-only transactions with parent write transactions to a transaction's {@code options}.
+	 * This option on a write transaction affects this behaviour of subsequent child read-only transactions.
+	 *
+	 * @param options
+	 *            an options map, which may be {@code null} or immutable
+	 * @param mergeReadOnly
+	 *            whether to merge read-only transactions into parent write transactions
+	 * @return a new map based on the {@code options} and including the {@code mergeReadOnly} option
+	 */
+	public static Map<String, Object> addMergeReadOnlyOption(Map<String, ?> options, boolean mergeReadOnly) {
+		Map<String, Object> result = (options == null) ? Maps.<String, Object> newHashMap() : Maps.newHashMap(options);
+		result.put(TRANSACTION_OPTION_MERGE_NESTED_READ, mergeReadOnly);
+		return result;
+	}
+
+	/**
+	 * Creates a new mutable transaction options map with the option to merge nested read-only transactions with parent write transactions.
+	 * This option on a write transaction affects this behaviour of subsequent child read-only transactions.
+	 *
+	 * @param mergeReadOnly
+	 *            whether to merge read-only transactions into parent write transactions
+	 * @return a new mutable map including the {@code mergeReadOnly} option
+	 */
+	public static Map<String, Object> mergeReadOnlyOption(boolean mergeReadOnly) {
+		return addMergeReadOnlyOption(null, mergeReadOnly);
+	}
+
+	/**
+	 * Queries whether a {@code transaction} is running with merging of nested read-only transactions with parent write transactions enabled.
+	 *
+	 * @param transaction
+	 *            a transaction
+	 * @return {@code true} if the {@code transaction} has the {@linkplain #TRANSACTION_OPTION_MERGE_NESTED_READ interactive option} set {@code true}; {@code false}, otherwise (including the default case of no option set)
+	 */
+	public static boolean isMergeReadOnly(Transaction transaction) {
+		Object value = transaction.getOptions().get(TRANSACTION_OPTION_MERGE_NESTED_READ);
+		return (value instanceof Boolean) ? (Boolean) value : false;
+	}
+
+	/**
+	 * Merges the {@code interactive} transaction option into an existing map of {@code options}.
+	 *
+	 * @param options
+	 *            an existing (non-{@code null}) options map
+	 * @param interactive
+	 *            whether the transaction is in an user-interactive context
+	 * @return the augmented {@code options}
+	 */
+	public static Map<String, Object> mergeInteractiveOption(Map<String, Object> options, boolean interactive) {
+		options.put(TRANSACTION_OPTION_INTERACTIVE, interactive);
+		return options;
+	}
+
+	/**
+	 * Adds the {@code interactive} option option to a transaction's {@code options}.
+	 *
+	 * @param options
+	 *            an options map, which may be {@code null} or immutable
+	 * @param interactive
+	 *            whether the transaction is in an user-interactive context
+	 * @return a new map based on the {@code options} and including the {@code interactive} option
+	 */
+	public static Map<String, Object> addInteractiveOption(Map<String, ?> options, boolean interactive) {
+		Map<String, Object> result = (options == null) ? Maps.<String, Object> newHashMap() : Maps.newHashMap(options);
+		result.put(TRANSACTION_OPTION_INTERACTIVE, interactive);
+		return result;
+	}
+
+	/**
+	 * Creates a new mutable transaction options map with an {@code interactive} option.
+	 *
+	 * @param interactive
+	 *            whether the transaction is in an user-interactive context
+	 * @return a new mutable map including the {@code interactive} option
+	 */
+	public static Map<String, Object> interactiveOption(boolean interactive) {
+		return addInteractiveOption(null, interactive);
+	}
+
+	/**
+	 * Queries whether a {@code transaction} is running in a user-interactive context. In practice, this means that it would be appropriate to
+	 * prompt the user to make resources/objects writable if necessary.
+	 *
+	 * @param transaction
+	 *            a transaction
+	 * @return {@code false} if the {@code transaction} has the {@linkplain #TRANSACTION_OPTION_INTERACTIVE interactive option} set {@code false}; {@code true}, otherwise (including the default case of no option set)
+	 */
+	public static boolean isInteractive(Transaction transaction) {
+		Object value = transaction.getOptions().get(TRANSACTION_OPTION_INTERACTIVE);
+		return (value instanceof Boolean) ? (Boolean) value : true;
+	}
+
+	/**
+	 * Queries whether a {@code transaction} is one that is executing or that executed triggers, or is perhaps
+	 * the read-only post-commit transaction that tells listeners about the changes made by a trigger transaction.
+	 * 
+	 * @param transaction
+	 *            a transaction
+	 * @return whether it is a trigger transaction
+	 */
+	public static boolean isTriggerTransaction(Transaction transaction) {
+		Object value = transaction.getOptions().get(TransactionImpl.OPTION_IS_TRIGGER_TRANSACTION);
+		return (value instanceof Boolean) ? (Boolean) value : false;
+	}
+
+	/**
+	 * Creates an {@link Executor} that executes {@link Runnable}s at the pre-commit phase of the active write
+	 * transaction of the specified editing {@code domain} or at some other time if no write transaction is active.
+	 * 
+	 * @param domain
+	 *            a transactional editing domain. May not be {@code null}
+	 * @param fallback
+	 *            an executor to use for scheduling tasks when the {@code domain} does not have a
+	 *            write transaction open. May not be {@code null}
+	 */
+	public static Executor createTransactionExecutor(TransactionalEditingDomain domain, Executor fallback) {
+		return createTransactionExecutor(domain, fallback, null, null);
+	}
+
+	/**
+	 * Creates an {@link Executor} that executes {@link Runnable}s at the pre-commit phase of the active write
+	 * transaction of the specified editing {@code domain} or at some other time if no write transaction is active.
+	 * The specified {@code policy}, if any, may determine whether for some task the {@code fallback} should be preferred
+	 * over the transaction executor or vice-versa (such as to handle special requirements like tasks needing to run
+	 * on the UI thread).
+	 * 
+	 * @param domain
+	 *            a transactional editing domain. May not be {@code null}
+	 * @param fallback
+	 *            an executor to use for scheduling tasks when the {@code domain} does not have a
+	 *            write transaction open. May not be {@code null}
+	 * @param policy
+	 *            an optional executor selection policy (may be {@code null}). The policy is queried for ranking of both
+	 *            the transaction executor and the {@code fallback}, unless there is no transaction active, which always excludes the
+	 *            transaction executor. In the event of a tie, the transaction executor is always selected
+	 */
+	public static Executor createTransactionExecutor(TransactionalEditingDomain domain, Executor fallback, IExecutorPolicy policy) {
+		return createTransactionExecutor(domain, fallback, policy, null);
+	}
+
+	/**
+	 * Creates an {@link Executor} that executes {@link Runnable}s at the pre-commit phase of the active write
+	 * transaction of the specified editing {@code domain} or at some other time if no write transaction is active.
+	 * 
+	 * @param domain
+	 *            a transactional editing domain. May not be {@code null}
+	 * @param fallback
+	 *            an executor to use for scheduling tasks when the {@code domain} does not have a
+	 *            write transaction open. May not be {@code null}
+	 * @param options
+	 *            a map of options to apply to the nested transaction in which tasks are executed. May be {@code null} if not needed
+	 */
+	public static Executor createTransactionExecutor(TransactionalEditingDomain domain, Executor fallback, Map<?, ?> options) {
+		return createTransactionExecutor(domain, fallback, null, options);
+	}
+
+	/**
+	 * Creates an {@link Executor} that executes {@link Runnable}s at the pre-commit phase of the active write
+	 * transaction of the specified editing {@code domain} or at some other time if no write transaction is active.
+	 * The specified {@code policy}, if any, may determine whether for some task the {@code fallback} should be preferred
+	 * over the transaction executor or vice-versa (such as to handle special requirements like tasks needing to run
+	 * on the UI thread).
+	 * 
+	 * @param domain
+	 *            a transactional editing domain. May not be {@code null}
+	 * @param fallback
+	 *            an executor to use for scheduling tasks when the {@code domain} does not have a
+	 *            write transaction open. May not be {@code null}
+	 * @param policy
+	 *            an optional executor selection policy (may be {@code null}). The policy is queried for ranking of both
+	 *            the transaction executor and the {@code fallback}, unless there is no transaction active, which always excludes the
+	 *            transaction executor. In the event of a tie, the transaction executor is always selected
+	 * @param options
+	 *            a map of options to apply to the nested transaction in which tasks are executed. May be {@code null} if not needed
+	 */
+	public static Executor createTransactionExecutor(TransactionalEditingDomain domain, Executor fallback, IExecutorPolicy policy, Map<?, ?> options) {
+		if ((domain == null) || (fallback == null)) {
+			throw new NullPointerException();
+		}
+
+		return new TransactionPrecommitExecutor(domain, fallback, policy, options);
+	}
+
+	/**
+	 * Create a privileged progress runnable, which is like a regular {@linkplain TransactionalEditingDomain#createPrivilegedRunnable(Runnable)
+	 * privileged runnable} except that it is given a progress monitor for progress reporting.
+	 *
+	 * @param domain
+	 *            an editing domain
+	 * @param runnable
+	 *            a progress runnable that is to borrow the {@code domain}'s active transaction on the modal context thread
+	 * @return the privileged runnable, ready to pass into the {@link IExecutorService} or other such API
+	 */
+	public static IProgressRunnable createPrivilegedRunnable(TransactionalEditingDomain domain, final IProgressRunnable runnable) {
+		IProgressMonitor monitorHolder[] = { null };
+
+		Runnable privileged = domain.createPrivilegedRunnable(() -> runnable.run(monitorHolder[0]));
+
+		return monitor -> {
+			monitorHolder[0] = monitor;
+			privileged.run();
+		};
+	}
+
+	/**
+	 * Create a privileged progress callable, which is like a {@linkplain TransactionalEditingDomain#createPrivilegedRunnable(Runnable)
+	 * privileged runnable} except that it is given a progress monitor for progress reporting and it computes a result.
+	 *
+	 * @param callable
+	 *            an editing domain
+	 * @param callable
+	 *            a progress callable that is to borrow the {@code domain}'s active transaction on the modal context thread
+	 * @return the privileged callable, ready to pass into the {@link IExecutorService} or other such API
+	 */
+	public static <V> IProgressCallable<V> createPrivilegedCallable(TransactionalEditingDomain domain, final IProgressCallable<V> callable) {
+		IProgressMonitor monitorHolder[] = { null };
+		AtomicReference<V> resultHolder = new AtomicReference<V>();
+		Exception failHolder[] = { null };
+
+		Runnable privileged = domain.createPrivilegedRunnable(() -> {
+			try {
+				resultHolder.set(callable.call(monitorHolder[0]));
+			} catch (Exception e) {
+				failHolder[0] = e;
+			}
+		});
+
+		return monitor -> {
+			monitorHolder[0] = monitor;
+
+			privileged.run();
+
+			if (failHolder[0] != null) {
+				throw failHolder[0];
+			}
+
+			return resultHolder.get();
+		};
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/.classpath b/plugins/infra/core/org.eclipse.papyrus.infra.tools/.classpath
index eca7bdba8f0..eca7bdba8f0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/.classpath
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/.classpath
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/.project b/plugins/infra/core/org.eclipse.papyrus.infra.tools/.project
index c539737c29a..29096480f24 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/.project
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.tools</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>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.tools</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/org.eclipse.papyrus.infra.constraints/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/core/org.eclipse.papyrus.infra.tools/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

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

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

-org.eclipse.jdt.core.compiler.compliance=1.8

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

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

-org.eclipse.jdt.core.compiler.source=1.8

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/core/org.eclipse.papyrus.infra.tools/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
index 5a22ad17ab7..6960891c38a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
@@ -1,21 +1,22 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.tools,

- org.eclipse.papyrus.infra.tools.comparator,

- org.eclipse.papyrus.infra.tools.databinding,

- org.eclipse.papyrus.infra.tools.spi,

- org.eclipse.papyrus.infra.tools.util

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

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

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

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

- org.eclipse.core.expressions;bundle-version="3.4.500",

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

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Eclipse-BuddyPolicy: dependent

-Bundle-Name: %Bundle-Name

-Bundle-Activator: org.eclipse.papyrus.infra.tools.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.tools

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.tools,
+ org.eclipse.papyrus.infra.tools.comparator,
+ org.eclipse.papyrus.infra.tools.databinding,
+ org.eclipse.papyrus.infra.tools.notify,
+ org.eclipse.papyrus.infra.tools.spi,
+ org.eclipse.papyrus.infra.tools.util
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.core.databinding;bundle-version="1.4.1",
+ org.eclipse.emf.ecore.xmi;bundle-version="2.9.0",
+ org.eclipse.core.expressions;bundle-version="3.4.500",
+ com.google.guava;bundle-version="11.0.0"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Eclipse-BuddyPolicy: dependent
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.infra.tools.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.tools
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/OSGI-INF/l10n/bundle.properties b/plugins/infra/core/org.eclipse.papyrus.infra.tools/OSGI-INF/l10n/bundle.properties
index bab8a23dcb6..a09eb7ffd46 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/OSGI-INF/l10n/bundle.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.infra.tools

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.infra.tools
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Papyrus Tools
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/about.html b/plugins/infra/core/org.eclipse.papyrus.infra.tools/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.editor/about.html
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/about.html
@@ -1,28 +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>

+<!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/infra/org.eclipse.papyrus.infra.tools/build.properties b/plugins/infra/core/org.eclipse.papyrus.infra.tools/build.properties
index 8b7b2f0fc1a..0565497ea41 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/build.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/build.properties
@@ -1,7 +1,7 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               OSGI-INF/

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               OSGI-INF/
+src.includes = about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.tools/pom.xml
index 0b57a9be782..6c56c86b074 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/pom.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<artifactId>org.eclipse.papyrus.infra-core</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.tools</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/Activator.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/Activator.java
index 8e02b953718..4c598486f70 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/Activator.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/Activator.java
@@ -1,80 +1,93 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus = bug 485220

- *  

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

-package org.eclipse.papyrus.infra.tools;

-

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

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

-import org.eclipse.papyrus.infra.tools.util.IExecutorService;

-import org.osgi.framework.BundleContext;

-

-/**

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

- */

-public class Activator extends Plugin {

-

-	/**

-	 * The plug-in ID

-	 */

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.tools"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * The plug-in's logger

-	 */

-	public static LogHelper log;

-

-	private DelegatingUIExecutorService uiExecutorService;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		if (uiExecutorService != null) {

-			uiExecutorService.shutdown(context);

-			uiExecutorService = null;

-		}

-

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-	public synchronized IExecutorService getUIExecutorService() {

-		if (uiExecutorService == null) {

-			uiExecutorService = new DelegatingUIExecutorService(getBundle().getBundleContext());

-		}

-		return uiExecutorService;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus = bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.tools;
+
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.papyrus.infra.tools.spi.INotificationBuilderFactory;
+import org.eclipse.papyrus.infra.tools.util.IExecutorService;
+import org.osgi.framework.BundleContext;
+import org.osgi.util.tracker.ServiceTracker;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends Plugin {
+
+	/**
+	 * The plug-in ID
+	 */
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.tools"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/**
+	 * The plug-in's logger
+	 */
+	public static LogHelper log;
+
+	private DelegatingUIExecutorService uiExecutorService;
+
+	private ServiceTracker<INotificationBuilderFactory, INotificationBuilderFactory> notificationBuilderTracker;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+
+		notificationBuilderTracker = new ServiceTracker<>(context, INotificationBuilderFactory.class, null);
+		notificationBuilderTracker.open();
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		notificationBuilderTracker.close();
+
+		if (uiExecutorService != null) {
+			uiExecutorService.shutdown(context);
+			uiExecutorService = null;
+		}
+
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	public synchronized IExecutorService getUIExecutorService() {
+		if (uiExecutorService == null) {
+			uiExecutorService = new DelegatingUIExecutorService(getBundle().getBundleContext());
+		}
+		return uiExecutorService;
+	}
+
+	public INotificationBuilderFactory getNotificationBuilderFactory() {
+		return notificationBuilderTracker.getService();
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/DelegatingUIExecutorService.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/DelegatingUIExecutorService.java
index cfd9fd08e8d..2efa8fc0ede 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/DelegatingUIExecutorService.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/DelegatingUIExecutorService.java
@@ -23,8 +23,11 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.papyrus.infra.tools.spi.IExecutorServiceFactory;
 import org.eclipse.papyrus.infra.tools.util.IExecutorService;
+import org.eclipse.papyrus.infra.tools.util.IProgressCallable;
+import org.eclipse.papyrus.infra.tools.util.IProgressRunnable;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.util.tracker.ServiceTracker;
@@ -188,4 +191,45 @@ class DelegatingUIExecutorService implements IExecutorService, ServiceTrackerCus
 			return future.get();
 		}
 	}
+
+	@Override
+	public Future<?> submit(IProgressRunnable task) {
+		if (delegate instanceof IExecutorService) {
+			return ((IExecutorService) delegate).submit(task);
+		} else {
+			return delegate.submit(() -> task.run(new NullProgressMonitor()));
+		}
+	}
+
+	@Override
+	public <V> Future<V> submit(IProgressCallable<V> callable) {
+		if (delegate instanceof IExecutorService) {
+			return ((IExecutorService) delegate).submit(callable);
+		} else {
+			return delegate.submit(() -> callable.call(new NullProgressMonitor()));
+		}
+	}
+
+	@Override
+	public void syncExec(IProgressRunnable task) throws InterruptedException, ExecutionException {
+		if (delegate instanceof IExecutorService) {
+			((IExecutorService) delegate).syncExec(task);
+		} else {
+			Future<?> future = delegate.submit(() -> task.run(new NullProgressMonitor()));
+			// Wait for it
+			future.get();
+		}
+	}
+
+	@Override
+	public <V> V syncCall(IProgressCallable<V> callable) throws InterruptedException, ExecutionException {
+		if (delegate instanceof IExecutorService) {
+			return ((IExecutorService) delegate).syncCall(callable);
+		} else {
+			Future<V> future = delegate.submit(() -> callable.call(new NullProgressMonitor()));
+			// Wait for it
+			return future.get();
+		}
+	}
+
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/comparator/CompositeComparator.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/comparator/CompositeComparator.java
index 6eb375843e1..535294eb0df 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/comparator/CompositeComparator.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/comparator/CompositeComparator.java
@@ -1,63 +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:

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

- *

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

-package org.eclipse.papyrus.infra.tools.comparator;

-

-import java.util.Comparator;

-import java.util.Iterator;

-import java.util.List;

-

-/**

- * This class allows to compare elements on several levels

- *

- * @author vl222926

- * @param <T>

- *

- */

-

-public class CompositeComparator<T> implements Comparator<T> {

-

-	/**

-	 * the list of the comparator

-	 */

-	private final List<Comparator<T>> comparators;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param comparators

-	 */

-	public CompositeComparator(final List<Comparator<T>> comparators) {

-		this.comparators = comparators;

-	}

-

-	/**

-	 *

-	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)

-	 *

-	 * @param o1

-	 * @param o2

-	 * @return

-	 */

-	public int compare(T o1, T o2) {

-		int res = 0;

-		final Iterator<Comparator<T>> iter = comparators.iterator();

-		while (iter.hasNext() && res == 0) {

-			final Comparator<T> current = iter.next();

-			res = current.compare(o1, o2);

-		}

-		return res;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.comparator;
+
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * This class allows to compare elements on several levels
+ *
+ * @author vl222926
+ * @param <T>
+ *
+ */
+
+public class CompositeComparator<T> implements Comparator<T> {
+
+	/**
+	 * the list of the comparator
+	 */
+	private final List<Comparator<T>> comparators;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param comparators
+	 */
+	public CompositeComparator(final List<Comparator<T>> comparators) {
+		this.comparators = comparators;
+	}
+
+	/**
+	 *
+	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+	 *
+	 * @param o1
+	 * @param o2
+	 * @return
+	 */
+	public int compare(T o1, T o2) {
+		int res = 0;
+		final Iterator<Comparator<T>> iter = comparators.iterator();
+		while (iter.hasNext() && res == 0) {
+			final Comparator<T> current = iter.next();
+			res = current.compare(o1, o2);
+		}
+		return res;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/AggregatedObservable.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/AggregatedObservable.java
index 8a8f3f311ae..7b59541b4f0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/AggregatedObservable.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/AggregatedObservable.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

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

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

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

-package org.eclipse.papyrus.infra.tools.databinding;

-

-import org.eclipse.core.databinding.observable.IObservable;

-

-/**

- * An interface to aggregate many IObservables in a single one.

- * A modification on the aggregated observable should be dispatched to all

- * the encapsulated observables.

- *

- * @author Camille Letavernier

- */

-public interface AggregatedObservable extends IObservable {

-

-	/**

-	 * Aggregates the current Observable with the given observable.

-	 * Returns the aggregated Observable, or null if the aggregation is not

-	 * possible

-	 *

-	 * Typically, only IObservable with similar ValueTypes can be

-	 * aggregated.

-	 *

-	 * @param observable

-	 *            The IObservable to aggregate to the current IObservable

-	 * @return

-	 *         The aggregated IObservable, or null if the aggregation is not

-	 *         possible

-	 */

-	public AggregatedObservable aggregate(IObservable observable);

-

-	/**

-	 * Tests if the sub-observables have different values

-	 *

-	 * @return true if the sub-observables have different values

-	 */

-	public boolean hasDifferentValues();

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.tools.databinding;
+
+import org.eclipse.core.databinding.observable.IObservable;
+
+/**
+ * An interface to aggregate many IObservables in a single one.
+ * A modification on the aggregated observable should be dispatched to all
+ * the encapsulated observables.
+ *
+ * @author Camille Letavernier
+ */
+public interface AggregatedObservable extends IObservable {
+
+	/**
+	 * Aggregates the current Observable with the given observable.
+	 * Returns the aggregated Observable, or null if the aggregation is not
+	 * possible
+	 *
+	 * Typically, only IObservable with similar ValueTypes can be
+	 * aggregated.
+	 *
+	 * @param observable
+	 *            The IObservable to aggregate to the current IObservable
+	 * @return
+	 *         The aggregated IObservable, or null if the aggregation is not
+	 *         possible
+	 */
+	public AggregatedObservable aggregate(IObservable observable);
+
+	/**
+	 * Tests if the sub-observables have different values
+	 *
+	 * @return true if the sub-observables have different values
+	 */
+	public boolean hasDifferentValues();
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/CommandBasedObservable.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/CommandBasedObservable.java
new file mode 100644
index 00000000000..1e10dec5a1e
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/CommandBasedObservable.java
@@ -0,0 +1,27 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.tools.databinding;
+
+import org.eclipse.core.databinding.observable.IObservable;
+import org.eclipse.emf.common.command.Command;
+
+
+public interface CommandBasedObservable extends IObservable {
+
+	/**
+	 * Returns the EMF Command for modifying this Observable's value
+	 *
+	 * @param value
+	 * @return
+	 */
+	public Command getCommand(Object value);
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/CommandBasedObservableValue.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/CommandBasedObservableValue.java
new file mode 100644
index 00000000000..06450cf6856
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/CommandBasedObservableValue.java
@@ -0,0 +1,19 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.tools.databinding;
+
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+
+
+public interface CommandBasedObservableValue extends CommandBasedObservable, IObservableValue {
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingInvocationHandler.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingInvocationHandler.java
index 838c6a36a93..838c6a36a93 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingInvocationHandler.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingInvocationHandler.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservable.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservable.java
index 7f2f0206e20..7f2f0206e20 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservable.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservable.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableCollection.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableCollection.java
index 88c1079029b..88c1079029b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableCollection.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableCollection.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableList.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableList.java
index f7e9fc0e752..f7e9fc0e752 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableList.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableList.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableSet.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableSet.java
index c91aa4f2ed4..c91aa4f2ed4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableSet.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableSet.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableValue.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableValue.java
index 9b935c26f36..9b935c26f36 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableValue.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableValue.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/IDelegatingObservable.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/IDelegatingObservable.java
index 81bc3f9cd2b..81bc3f9cd2b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/IDelegatingObservable.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/IDelegatingObservable.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/IMultipleObservableValue.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/IMultipleObservableValue.java
index b2fd4b1cfeb..b2fd4b1cfeb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/IMultipleObservableValue.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/IMultipleObservableValue.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableValue.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableValue.java
index faaf6b23c6f..fb683dbc4c2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableValue.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableValue.java
@@ -1,181 +1,181 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 CEA LIST and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *  Christian W. Damus (CEA) - bug 417409

- *  Christian W. Damus (CEA) - bug 444227

- *

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

-package org.eclipse.papyrus.infra.tools.databinding;

-

-import java.util.Collection;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.databinding.observable.ChangeEvent;

-import org.eclipse.core.databinding.observable.IChangeListener;

-import org.eclipse.core.databinding.observable.IObservable;

-import org.eclipse.core.databinding.observable.value.IObservableValue;

-import org.eclipse.core.databinding.observable.value.ValueDiff;

-

-/**

- * MultipleObservableValue is used to map a single element

- * to a collection of model elements.

- *

- * It is especially used when displaying a Property View for multiple elements,

- * when we want to edit the same property for all of them.

- *

- * All sub-elements will be edited at the same time, with the same value.

- */

-// TODO : Add listeners on sub-observables, and remove them on dispose

-public class MultipleObservableValue extends ReferenceCountedObservable.Value implements IMultipleObservableValue, IChangeListener {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param values

-	 *            The collection of sub-elements for this MultipleObservableValue

-	 *

-	 */

-	public MultipleObservableValue(Collection<IObservableValue> values) {

-		if (values != null) {

-			observableValues.addAll(values);

-		}

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public MultipleObservableValue() {

-

-	}

-

-	public Object getValueType() {

-		if (observableValues.isEmpty()) {

-			return null;

-		}

-

-		return observableValues.get(0).getValueType();

-	}

-

-	/**

-	 * If all objects have the same value, returns this value

-	 * Otherwise, returns the defaultGetValue

-	 * If the defaultGetValue hasn't been set, returns null

-	 */

-	@Override

-	protected Object doGetValue() {

-		if (hasDifferentValues() || observableValues.isEmpty()) {

-			return null;

-		}

-

-		return observableValues.get(0).getValue();

-	}

-

-	private boolean equals(Object value, Object currentValue) {

-		if (value == currentValue) {

-			return true;

-		}

-		if (value == null) {

-			return false;

-		}

-		return value.equals(currentValue);

-	}

-

-	@Override

-	protected void doSetValue(Object value) {

-		for (IObservableValue observable : observableValues) {

-			observable.setValue(value);

-		}

-	}

-

-	public AggregatedObservable aggregate(IObservable observable) {

-		if (observable instanceof IObservableValue) {

-			ReferenceCountedObservable.Util.retain(observable);

-			observableValues.add((IObservableValue) observable);

-			observable.addChangeListener(this);

-			return this;

-		}

-		return null;

-	}

-

-	public List<IObservableValue> getObservableValues() {

-		return observableValues;

-	}

-

-	public List<Object> getObservedValues() {

-		List<Object> result = new LinkedList<Object>();

-		for (IObservableValue value : getObservableValues()) {

-			result.add(value.getValue());

-		}

-		return result;

-	}

-

-	@Override

-	public synchronized void dispose() {

-		super.dispose();

-		for (IObservableValue observable : observableValues) {

-			observable.removeChangeListener(this);

-

-			// I don't own my observables, so I just release them

-			ReferenceCountedObservable.Util.release(observable);

-		}

-

-		observableValues.clear();

-	}

-

-	/**

-	 * The {@link IObservableValue}s aggregated by this Observable

-	 */

-	protected List<IObservableValue> observableValues = new LinkedList<IObservableValue>();

-

-	public boolean hasDifferentValues() {

-		if (observableValues.isEmpty()) {

-			return false;

-		}

-

-		Object currentValue = null;

-		boolean firstValue = true;

-		for (IObservableValue observable : observableValues) {

-			if (firstValue) {

-				firstValue = false;

-				currentValue = observable.getValue();

-			} else {

-				Object value = observable.getValue();

-				if (equals(value, currentValue)) {

-					continue;

-				}

-				return true;

-			}

-		}

-

-		return false;

-	}

-

-	public void handleChange(ChangeEvent event) {

-		// We're not interested in the old and new values

-		// We just return two different values so that a change event is fired

-		super.fireValueChange(new ValueDiff() {

-

-			@Override

-			public Object getOldValue() {

-				return true;

-			}

-

-			@Override

-			public Object getNewValue() {

-				return false;

-			}

-		});

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *  Christian W. Damus (CEA) - bug 444227
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.tools.databinding;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.databinding.observable.ChangeEvent;
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.core.databinding.observable.IObservable;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.ValueDiff;
+
+/**
+ * MultipleObservableValue is used to map a single element
+ * to a collection of model elements.
+ *
+ * It is especially used when displaying a Property View for multiple elements,
+ * when we want to edit the same property for all of them.
+ *
+ * All sub-elements will be edited at the same time, with the same value.
+ */
+// TODO : Add listeners on sub-observables, and remove them on dispose
+public class MultipleObservableValue extends ReferenceCountedObservable.Value implements IMultipleObservableValue, IChangeListener {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param values
+	 *            The collection of sub-elements for this MultipleObservableValue
+	 *
+	 */
+	public MultipleObservableValue(Collection<IObservableValue> values) {
+		if (values != null) {
+			observableValues.addAll(values);
+		}
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public MultipleObservableValue() {
+
+	}
+
+	public Object getValueType() {
+		if (observableValues.isEmpty()) {
+			return null;
+		}
+
+		return observableValues.get(0).getValueType();
+	}
+
+	/**
+	 * If all objects have the same value, returns this value
+	 * Otherwise, returns the defaultGetValue
+	 * If the defaultGetValue hasn't been set, returns null
+	 */
+	@Override
+	protected Object doGetValue() {
+		if (hasDifferentValues() || observableValues.isEmpty()) {
+			return null;
+		}
+
+		return observableValues.get(0).getValue();
+	}
+
+	private boolean equals(Object value, Object currentValue) {
+		if (value == currentValue) {
+			return true;
+		}
+		if (value == null) {
+			return false;
+		}
+		return value.equals(currentValue);
+	}
+
+	@Override
+	protected void doSetValue(Object value) {
+		for (IObservableValue observable : observableValues) {
+			observable.setValue(value);
+		}
+	}
+
+	public AggregatedObservable aggregate(IObservable observable) {
+		if (observable instanceof IObservableValue) {
+			ReferenceCountedObservable.Util.retain(observable);
+			observableValues.add((IObservableValue) observable);
+			observable.addChangeListener(this);
+			return this;
+		}
+		return null;
+	}
+
+	public List<IObservableValue> getObservableValues() {
+		return observableValues;
+	}
+
+	public List<Object> getObservedValues() {
+		List<Object> result = new LinkedList<Object>();
+		for (IObservableValue value : getObservableValues()) {
+			result.add(value.getValue());
+		}
+		return result;
+	}
+
+	@Override
+	public synchronized void dispose() {
+		super.dispose();
+		for (IObservableValue observable : observableValues) {
+			observable.removeChangeListener(this);
+
+			// I don't own my observables, so I just release them
+			ReferenceCountedObservable.Util.release(observable);
+		}
+
+		observableValues.clear();
+	}
+
+	/**
+	 * The {@link IObservableValue}s aggregated by this Observable
+	 */
+	protected List<IObservableValue> observableValues = new LinkedList<IObservableValue>();
+
+	public boolean hasDifferentValues() {
+		if (observableValues.isEmpty()) {
+			return false;
+		}
+
+		Object currentValue = null;
+		boolean firstValue = true;
+		for (IObservableValue observable : observableValues) {
+			if (firstValue) {
+				firstValue = false;
+				currentValue = observable.getValue();
+			} else {
+				Object value = observable.getValue();
+				if (equals(value, currentValue)) {
+					continue;
+				}
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	public void handleChange(ChangeEvent event) {
+		// We're not interested in the old and new values
+		// We just return two different values so that a change event is fired
+		super.fireValueChange(new ValueDiff() {
+
+			@Override
+			public Object getOldValue() {
+				return true;
+			}
+
+			@Override
+			public Object getNewValue() {
+				return false;
+			}
+		});
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/ReferenceCountedObservable.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/ReferenceCountedObservable.java
index d96f2694f0c..d96f2694f0c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/ReferenceCountedObservable.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/ReferenceCountedObservable.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/TouchableValue.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/TouchableValue.java
index 438f111b664..438f111b664 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/TouchableValue.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/TouchableValue.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/WritableListWithIterator.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/WritableListWithIterator.java
index 236d80cfcef..236d80cfcef 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/WritableListWithIterator.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/WritableListWithIterator.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/IContext.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/IContext.java
index 72ec7318e35..93d0e10e3dc 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/IContext.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/IContext.java
@@ -1,61 +1,65 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.infra.widgets.toolbox.notification.builders;

-

-import java.util.HashMap;

-import java.util.Map;

-

-

-/**

- * The Class Context.

- */

-public interface IContext {

-

-	/**

-	 * This constant identifies developper strings to indicate the code location

-	 */

-	public static String STRING_FOR_DEVELOPER = "_please_check_IContext_Constant";

-

-	/**

-	 * This constant allows the user to retrieve the composite created if he filled a ICreationComposite

-	 */

-	public static String COMPOSITE_CREATED = "composite_created" + STRING_FOR_DEVELOPER;

-

-	/**

-	 * This constant allows the user to retrieve the notification if he needs to close it

-	 */

-	public static String NOTIFICATION_OBJECT = "notification_object" + STRING_FOR_DEVELOPER;

-

-	/**

-	 * This constant determines an action id to the current context

-	 */

-	public static String ACTION_ID = "action_id";

-

-	public void put(String s, Object o);

-

-	public Object get(String s);

-

-	public static class Context implements IContext {

-

-		private Map<String, Object> objects = new HashMap<String, Object>();;

-

-		public void put(String s, Object o) {

-			objects.put(s, o);

-		}

-

-		public Object get(String s) {

-			return objects.get(s);

-		}

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2016 ATOS ORIGIN, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.tools.notify;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * The Class Context.
+ */
+public interface IContext {
+
+	/**
+	 * This constant identifies developper strings to indicate the code location
+	 */
+	public static String STRING_FOR_DEVELOPER = "_please_check_IContext_Constant";
+
+	/**
+	 * This constant allows the user to retrieve the composite created if he filled a ICreationComposite
+	 */
+	public static String COMPOSITE_CREATED = "composite_created" + STRING_FOR_DEVELOPER;
+
+	/**
+	 * This constant allows the user to retrieve the notification if he needs to close it
+	 */
+	public static String NOTIFICATION_OBJECT = "notification_object" + STRING_FOR_DEVELOPER;
+
+	/**
+	 * This constant determines an action id to the current context
+	 */
+	public static String ACTION_ID = "action_id";
+
+	public void put(String s, Object o);
+
+	public Object get(String s);
+
+	public static class Context implements IContext {
+
+		private Map<String, Object> objects = new HashMap<String, Object>();;
+
+		@Override
+		public void put(String s, Object o) {
+			objects.put(s, o);
+		}
+
+		@Override
+		public Object get(String s) {
+			return objects.get(s);
+		}
+
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/INotification.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/INotification.java
index 28e9284c022..55bc0f2f8cf 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/INotification.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/INotification.java
@@ -1,30 +1,32 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

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

-package org.eclipse.papyrus.infra.widgets.toolbox.notification;

-

-

-/**

- * The Interface INotification.

- * offers some services for a notification

- */

-public interface INotification {

-

-	/** delete the current notification */

-	void delete();

-

-	/**

-	 * whether the current notification is deleted

-	 *

-	 * @return true if notification is deleted

-	 */

-	boolean isDeleted();

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2016 ATOS ORIGIN, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.tools.notify;
+
+
+/**
+ * The Interface INotification.
+ * offers some services for a notification
+ */
+public interface INotification {
+
+	/** delete the current notification */
+	void delete();
+
+	/**
+	 * whether the current notification is deleted
+	 *
+	 * @return true if notification is deleted
+	 */
+	boolean isDeleted();
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/INotificationBuilder.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/INotificationBuilder.java
new file mode 100644
index 00000000000..84bb3b4ace6
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/INotificationBuilder.java
@@ -0,0 +1,132 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 ATOS ORIGIN, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.tools.notify;
+
+/**
+ * Protocol of a pluggable notification builder.
+ */
+public interface INotificationBuilder {
+	/** asynchronous, determines if the message needs or not to be synchronous with the notification */
+	String ASYNCHRONOUS = "asynchronous";
+
+	/** a message displayed in the notification */
+	String MESSAGE = "message";
+
+	/** a default action in the notification */
+	String ACTION = "default_action";
+
+	/** a delay to display if it is a temporary notification */
+	String DELAY = "delay";
+
+	/** determines if the notification is temporary */
+	String TEMPORARY = "temporary";
+
+	/** a title displayed in the notification */
+	String TITLE = "title";
+
+	/** determines if there is html content in the notification */
+	String HTML = "html";
+
+	/** determines the type according to {@link Type} */
+	String TYPE = "type";
+
+	/**
+	 * Set a message for the notification
+	 *
+	 * @param message
+	 *            , the message to display
+	 * @return this
+	 */
+	INotificationBuilder setMessage(String message);
+
+	/**
+	 * Determines if the notification is asynchronous (don't force the user to read the notification immediately)
+	 *
+	 * @param asynchronous
+	 *            , true if it asynchronous
+	 * @return this
+	 */
+	INotificationBuilder setAsynchronous(boolean asynchronous);
+
+	/**
+	 * Set a default action for the notification
+	 *
+	 * @param runnable
+	 *            , a runnable triggered when default action of the notification is selected
+	 *            The first action added is the default One
+	 * @return this
+	 */
+	INotificationBuilder addAction(NotificationRunnable runnable);
+
+	/**
+	 * Set a delay if the notification is temporary
+	 *
+	 * @param delayMs
+	 *            , the delay in ms for visibility
+	 * @return this
+	 */
+	INotificationBuilder setDelay(long delayMs);
+
+	/**
+	 * Set true if the notification is temporary
+	 *
+	 * @param temporary
+	 * @return this
+	 */
+	INotificationBuilder setTemporary(boolean temporary);
+
+	/**
+	 * Set a title for the notification
+	 *
+	 * @param title
+	 *            , the title
+	 * @return this
+	 */
+	INotificationBuilder setTitle(String title);
+
+	/**
+	 * Set if the notification has to understand HTML
+	 *
+	 * @param useHTML
+	 * @return this
+	 */
+	INotificationBuilder setHTML(boolean useHTML);
+
+	/**
+	 * Set the type of the notification according to {@link Type}
+	 *
+	 * @param type
+	 *            , the desired type
+	 * @return this
+	 */
+	INotificationBuilder setType(Type type);
+
+	/**
+	 * Allows the developer to use a specific parameter
+	 *
+	 * @param name
+	 *            , the key of the parameter
+	 * @param value
+	 *            , the value
+	 * @return this
+	 */
+	INotificationBuilder setParameter(String name, Object value);
+
+	/**
+	 * Creates a notification according to different parameters
+	 */
+	INotification run();
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/LogNotification.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/LogNotification.java
new file mode 100644
index 00000000000..a4554cb06ed
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/LogNotification.java
@@ -0,0 +1,56 @@
+/*****************************************************************************
+ * Copyright (c) 2016 Christian W. Damus and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.tools.notify;
+
+import org.eclipse.papyrus.infra.tools.Activator;
+
+/**
+ * A simple notification that just emits a message to the log.
+ */
+public class LogNotification implements INotification {
+
+	public LogNotification(Type type, String message) {
+		super();
+
+		// No message? No log
+		if (message != null) {
+			if (type == null) {
+				type = Type.WARNING;
+			}
+			switch (type) {
+			case ERROR:
+				Activator.log.error(message, null);
+				break;
+			case WARNING:
+				Activator.log.warn(message);
+				break;
+			default:
+				Activator.log.info(message);
+				break;
+			}
+		}
+	}
+
+	@Override
+	public void delete() {
+		// A log message is not presented in the UI, so it is always deleted
+	}
+
+	@Override
+	public boolean isDeleted() {
+		// A log message is not presented in the UI, so it is always deleted
+		return true;
+	}
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/NotificationBuilder.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/NotificationBuilder.java
new file mode 100644
index 00000000000..9d54d4204d9
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/NotificationBuilder.java
@@ -0,0 +1,388 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 ATOS ORIGIN, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.tools.notify;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+
+import org.eclipse.papyrus.infra.tools.Activator;
+import org.eclipse.papyrus.infra.tools.spi.INotificationBuilderFactory;
+
+
+/**
+ * A class creating a notification,
+ * the run method launch the message according to the value of the attributes
+ *
+ * @author tristan faure
+ *
+ */
+public class NotificationBuilder implements INotificationBuilder {
+
+	/** The parameters of the notification with the corresponding values */
+	protected Map<String, Object> parameters = new HashMap<String, Object>();
+
+	private static final int YES = 1 << 6; // SWT.YES
+
+	private static final int NO = 1 << 7; // SWT.NO
+
+	/**
+	 * Set a message for the notification
+	 *
+	 * @param message
+	 *            , the message to display
+	 * @return this
+	 */
+	@Override
+	public NotificationBuilder setMessage(String message) {
+		parameters.put(MESSAGE, message);
+		return this;
+	}
+
+	/**
+	 * Determines if the notification is asynchronous (don't force the user to read the notification immediately)
+	 *
+	 * @param asynchronous
+	 *            , true if it asynchronous
+	 * @return this
+	 */
+	@Override
+	public NotificationBuilder setAsynchronous(boolean asynchronous) {
+		parameters.put(ASYNCHRONOUS, asynchronous);
+		return this;
+	}
+
+	/**
+	 * Set a default action for the notification
+	 *
+	 * @param runnable
+	 *            , a runnable triggered when default action of the notification is selected
+	 *            The first action added is the default One
+	 * @return this
+	 */
+	@Override
+	@SuppressWarnings("unchecked")
+	public NotificationBuilder addAction(NotificationRunnable runnable) {
+		Collection<NotificationRunnable> runnables = (Collection<NotificationRunnable>) parameters.get(ACTION);
+		if (runnables == null) {
+			runnables = new LinkedList<NotificationRunnable>();
+			parameters.put(ACTION, runnables);
+		}
+		runnables.add(runnable);
+		return this;
+	}
+
+	/**
+	 * Set a delay if the notification is temporary
+	 *
+	 * @param delayMs
+	 *            , the delay in ms for visibility
+	 * @return this
+	 */
+	@Override
+	public NotificationBuilder setDelay(long delayMs) {
+		parameters.put(DELAY, delayMs);
+		return this;
+	}
+
+	/**
+	 * Set true if the notification is temporary
+	 *
+	 * @param temporary
+	 * @return this
+	 */
+	@Override
+	public NotificationBuilder setTemporary(boolean temporary) {
+		parameters.put(TEMPORARY, temporary);
+		return this;
+	}
+
+	/**
+	 * Set a title for the notification
+	 *
+	 * @param title
+	 *            , the title
+	 * @return this
+	 */
+	@Override
+	public NotificationBuilder setTitle(String title) {
+		parameters.put(TITLE, title);
+		return this;
+	}
+
+	/**
+	 * Set if the notification has to understand HTML
+	 *
+	 * @param useHTML
+	 * @return this
+	 */
+	@Override
+	public NotificationBuilder setHTML(boolean useHTML) {
+		parameters.put(HTML, useHTML);
+		return this;
+	}
+
+	/**
+	 * Set the type of the notification according to {@link Type}
+	 *
+	 * @param type
+	 *            , the desired type
+	 * @return this
+	 */
+	@Override
+	public NotificationBuilder setType(Type type) {
+		parameters.put(TYPE, type);
+		return this;
+	}
+
+	/**
+	 * Allows the developer to use a specific parameter
+	 *
+	 * @param name
+	 *            , the key of the parameter
+	 * @param value
+	 *            , the value
+	 * @return this
+	 */
+	@Override
+	public NotificationBuilder setParameter(String name, Object value) {
+		parameters.put(name, value);
+		return this;
+	}
+
+	/**
+	 * Creates a notification according to different parameters
+	 */
+	@Override
+	public INotification run() {
+		INotification result;
+
+		INotificationBuilderFactory delegator = Activator.getDefault().getNotificationBuilderFactory();
+		if (delegator != null) {
+			// Create the delegate
+			INotificationBuilder delegate = delegator.createNotificationBuilder();
+
+			// Fill it up
+			parameters.forEach(delegate::setParameter);
+
+			// And run it
+			result = delegate.run();
+		} else {
+			// Just a simple log notification
+			result = new LogNotification(
+					(Type) parameters.get(TYPE),
+					(String) parameters.get(MESSAGE));
+		}
+
+		return result;
+	}
+
+	/**
+	 * Creates a notification builder already configured to display an information builder
+	 *
+	 * @return a notification builder
+	 */
+	public static NotificationBuilder createInformationBuilder() {
+		NotificationBuilder builder = new NotificationBuilder();
+		return builder;
+	}
+
+	/**
+	 * Creates a notification builder already configured to display an asynchronous popup
+	 *
+	 * @param text
+	 *            , the text to display
+	 * @return a notification builder
+	 */
+	public static NotificationBuilder createAsyncPopup(String text) {
+		return new NotificationBuilder().setAsynchronous(true).setTemporary(true).setMessage(text).setDelay(2000);
+	}
+
+	/**
+	 * Creates a notification builder already configured to display an asynchronous popup with a specified title
+	 *
+	 * @param text
+	 *            , the text to display
+	 * @param title
+	 *            , the title of the popup
+	 * @return a notification builder
+	 */
+	public static NotificationBuilder createAsyncPopup(String title, String text) {
+		return new NotificationBuilder().setAsynchronous(true).setTemporary(true).setMessage(text).setTitle(title).setDelay(2000);
+	}
+
+	/**
+	 * Creates a notification builder already configured to display an information popup
+	 *
+	 * @param text
+	 *            , the text to display
+	 * @return a notification builder
+	 */
+	public static NotificationBuilder createInfoPopup(String text) {
+		return new NotificationBuilder().setAsynchronous(false).setTemporary(false).setMessage(text).setType(Type.INFO);
+	}
+
+	/**
+	 * Creates a notification builder already configured to display an warning popup
+	 *
+	 * @param text
+	 *            , the text to display
+	 * @return a notification builder
+	 */
+	public static NotificationBuilder createWarningPopup(String text) {
+		return new NotificationBuilder().setAsynchronous(false).setTemporary(false).setMessage(text).setType(Type.WARNING);
+	}
+
+	/**
+	 * Creates a notification builder already configured to display a popup with question icon
+	 *
+	 * @param text
+	 *            , the text to display
+	 * @return a notification builder
+	 */
+	public static NotificationBuilder createQuestionPopup(String text) {
+		return new NotificationBuilder().setAsynchronous(false).setTemporary(false).setMessage(text).setType(Type.QUESTION);
+	}
+
+	/**
+	 * Creates a notification builder already configured to display a popup with error icon
+	 *
+	 * @param text
+	 *            , the text to display
+	 * @return a notification builder
+	 */
+	public static NotificationBuilder createErrorPopup(String text) {
+		return new NotificationBuilder().setAsynchronous(false).setTemporary(false).setMessage(text).setType(Type.ERROR);
+	}
+
+	/**
+	 * Creates a notification builder already configured to display a yes no question
+	 *
+	 * @param yes
+	 *            , the action to launch if yes is selected
+	 * @param no
+	 *            , the action to launch if no is selected
+	 * @return a notification builder
+	 */
+	public static NotificationBuilder createYesNo(String message, final Runnable yes, final Runnable no) {
+		return new NotificationBuilder().setType(Type.QUESTION).setAsynchronous(false).setTemporary(false).setMessage(message).addAction(new NotificationRunnable() {
+
+			@Override
+			public void run(IContext context) {
+				if (yes != null) {
+					context.put(IContext.ACTION_ID, YES);
+					yes.run();
+				}
+			}
+
+			@Override
+			public String getLabel() {
+				return "Yes";
+			}
+		}).addAction(new NotificationRunnable() {
+
+			@Override
+			public void run(IContext context) {
+				if (no != null) {
+					context.put(IContext.ACTION_ID, NO);
+					no.run();
+				}
+			}
+
+			@Override
+			public String getLabel() {
+				return "No";
+			}
+		});
+	}
+
+	/**
+	 * Creates a notification builder already configured to display a yes no question, no runnables are necesary as the user just want the
+	 * PopupNotification result
+	 * This NotificationRunnable is not intended to be changed to an asynchronous notification for example
+	 * When the run method is called use getRsult method in {@link PopupNotification} and test if the value is SWT.YES or SWT.NO
+	 *
+	 * @param message
+	 *            , the message to display
+	 *
+	 * @return a notification builder
+	 */
+	public static NotificationBuilder createYesNo(String message) {
+		return new NotificationBuilder().setType(Type.QUESTION).setAsynchronous(false).setTemporary(false).setMessage(message).addAction(new NotificationRunnable() {
+
+			@Override
+			public void run(IContext context) {
+				context.put(IContext.ACTION_ID, YES);
+			}
+
+			@Override
+			public String getLabel() {
+				return "Yes";
+			}
+		}).addAction(new NotificationRunnable() {
+
+			@Override
+			public void run(IContext context) {
+				context.put(IContext.ACTION_ID, NO);
+			}
+
+			@Override
+			public String getLabel() {
+				return "No";
+			}
+		});
+	}
+
+	/**
+	 * Creates a notification builder already configured to display a yes no question
+	 *
+	 * @param yes
+	 *            , the action to launch if yes is selected
+	 * @param no
+	 *            , the action to launch if no is selected
+	 * @return a notification builder
+	 */
+	public static NotificationBuilder createYesNo(String message, final NotificationRunnable yes, final NotificationRunnable no) {
+		return new NotificationBuilder().setType(Type.QUESTION).setAsynchronous(false).setTemporary(false).setMessage(message).addAction(new NotificationRunnable() {
+
+			@Override
+			public void run(IContext context) {
+				if (yes != null) {
+					context.put(IContext.ACTION_ID, YES);
+					yes.run(context);
+				}
+			}
+
+			@Override
+			public String getLabel() {
+				return "Yes";
+			}
+		}).addAction(new NotificationRunnable() {
+
+			@Override
+			public void run(IContext context) {
+				if (no != null) {
+					context.put(IContext.ACTION_ID, NO);
+					no.run(context);
+				}
+			}
+
+			@Override
+			public String getLabel() {
+				return "No";
+			}
+		});
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/NotificationRunnable.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/NotificationRunnable.java
new file mode 100644
index 00000000000..3df50c005ab
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/NotificationRunnable.java
@@ -0,0 +1,36 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 ATOS ORIGIN, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.tools.notify;
+
+/**
+ * a runnable
+ *
+ */
+public interface NotificationRunnable {
+
+	/**
+	 * Run the runnable
+	 *
+	 * @param context
+	 *            , used to fill properties, can contain data
+	 */
+	void run(IContext context);
+
+	/**
+	 * The label of the runnable
+	 *
+	 * @return the label
+	 */
+	String getLabel();
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/Type.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/Type.java
new file mode 100644
index 00000000000..61c73981778
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/notify/Type.java
@@ -0,0 +1,29 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 ATOS ORIGIN, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.tools.notify;
+
+
+/**
+ * The different types of Notifications
+ * <li>INFO</i>
+ * <li>WARNING</i>
+ * <li>ERROR</i>
+ * <li>QUESTION</i>
+ *
+ * @author tristan faure
+ *
+ */
+public enum Type {
+	INFO, WARNING, ERROR, QUESTION
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/spi/IExecutorServiceFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/spi/IExecutorServiceFactory.java
index cc2ff542665..cc2ff542665 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/spi/IExecutorServiceFactory.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/spi/IExecutorServiceFactory.java
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/spi/INotificationBuilderFactory.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/spi/INotificationBuilderFactory.java
new file mode 100644
index 00000000000..a527ec3c592
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/spi/INotificationBuilderFactory.java
@@ -0,0 +1,26 @@
+/*****************************************************************************
+ * Copyright (c) 2016 Christian W. Damus and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.tools.spi;
+
+import org.eclipse.papyrus.infra.tools.notify.INotificationBuilder;
+
+/**
+ * An OSGi service protocol for creation of a notification builder
+ * (preferably for UI presentation).
+ */
+@FunctionalInterface
+public interface INotificationBuilderFactory {
+	/** Creates notification builder that presents notifications in the UI. */
+	INotificationBuilder createNotificationBuilder();
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/BooleanHelper.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/BooleanHelper.java
index 5e86cd35cae..296c4751c96 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/BooleanHelper.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/BooleanHelper.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

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

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

- *

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

-

-package org.eclipse.papyrus.infra.tools.util;

-

-/**

- *

- * This class provides an useful methods for boolean

- *

- */

-public class BooleanHelper {

-

-	private BooleanHelper() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @param str

-	 *            a string

-	 * @return

-	 *         <code>true</code> if the string represents a boolean value

-	 */

-	public static final boolean isBoolean(final String str) {

-		return "true".equalsIgnoreCase(str) || "false".equalsIgnoreCase(str); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.tools.util;
+
+/**
+ *
+ * This class provides an useful methods for boolean
+ *
+ */
+public class BooleanHelper {
+
+	private BooleanHelper() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 * @param str
+	 *            a string
+	 * @return
+	 *         <code>true</code> if the string represents a boolean value
+	 */
+	public static final boolean isBoolean(final String str) {
+		return "true".equalsIgnoreCase(str) || "false".equalsIgnoreCase(str); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClassLoaderHelper.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClassLoaderHelper.java
index 68104980af7..46751c90c81 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClassLoaderHelper.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClassLoaderHelper.java
@@ -1,152 +1,152 @@
-/*****************************************************************************

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

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

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

-package org.eclipse.papyrus.infra.tools.util;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.papyrus.infra.tools.Activator;

-

-/**

- * A Helper class for Class Loading.

- *

- * @author Camille Letavernier

- */

-// This class needs the "BuddyPolicy" set to "dependent" in the Manifest.MF,

-// in order to be able to retrieve the classes it loads

-//

-// This is the org.eclipse.papyrus.infra.tools class loader which is used for loading

-// a class, instead of each caller's ClassLoader

-//

-// Plug-ins using this class should also either set their Buddy-policy to dependent or

-// reexport the dependency to oep.infra.tools

-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.

-	 *

-	 * @param className

-	 *            The qualified name of the Class to load.

-	 * @return

-	 *         The loaded Class, or null if an error occured

-	 */

-	public static Class<?> loadClass(String className) {

-		try {

-			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) {

-			Activator.log.error("Cannot load class " + className, ex); //$NON-NLS-1$

-		}

-

-		return null;

-	}

-

-	/**

-	 * Loads and returns the class denoted by the given className.

-	 * Checks that the loaded class is a subtype of the given Class.

-	 *

-	 * @param className

-	 *            The qualified name of the class to be loaded

-	 * @param asSubClass

-	 *            The interface or class that the loaded class must implement or extend

-	 * @return

-	 *         The loaded class, or null if the class doesn't exist or is invalid.

-	 *         In such a case, the exception is logged.

-	 */

-	public static <T> Class<? extends T> loadClass(String className, Class<T> asSubClass) {

-		Class<?> theClass = loadClass(className);

-		if (theClass == null) {

-			return null;

-		}

-

-		try {

-			Class<? extends T> typedClass = theClass.asSubclass(asSubClass);

-			return typedClass;

-		} catch (ClassCastException ex) {

-			Activator.log.error(String.format("The class %1$s doesn't extend or implement %2$s", className, asSubClass.getName()), ex); //$NON-NLS-1$

-		}

-

-		return null;

-	}

-

-	/**

-	 * Creates a new instance of class denoted by the given className.

-	 * Checks that the instantiated class is a subtype of the given class

-	 *

-	 * @param className

-	 *            The qualified name of the class to be instantiated

-	 * @param asSubclass

-	 *            The interface or class that the loaded class must implement or extend

-	 * @return

-	 *         An instance of the loaded class, or null if a valid instance

-	 *         cannot be created. In such a case, the exception is logged.

-	 */

-	public static <T> T newInstance(String className, Class<T> asSubclass) {

-		Class<? extends T> typedClass = loadClass(className, asSubclass);

-		if (typedClass == null) {

-			return null;

-		}

-

-		return newInstance(typedClass);

-	}

-

-	/**

-	 * Returns a new Instance of the given class

-	 *

-	 * @param className

-	 *            The qualified name of the Class to instantiate

-	 * @return

-	 *         A new instance of the given class, or null if the class couldn't be

-	 *         instantiated

-	 */

-	public static Object newInstance(String className) {

-		return newInstance(loadClass(className));

-	}

-

-	/**

-	 * Returns a new Instance of the given class

-	 *

-	 * @param theClass

-	 *            The Class to instantiate

-	 * @return

-	 *         A new instance of the given class, or null if the class couldn't be

-	 *         instantiated

-	 */

-	public static <T extends Object> T newInstance(Class<T> theClass) {

-		if (theClass == null) {

-			return null;

-		}

-

-		try {

-			return theClass.newInstance();

-		} catch (IllegalAccessException ex) {

-			Activator.log.error("Cannot find a valid public constructor for the class " + theClass.getName(), ex); //$NON-NLS-1$

-		} catch (InstantiationException ex) {

-			Activator.log.error(String.format("The class %s cannot be instantiated.", theClass.getName()), ex); //$NON-NLS-1$

-		}

-

-		return null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.tools.util;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.papyrus.infra.tools.Activator;
+
+/**
+ * A Helper class for Class Loading.
+ *
+ * @author Camille Letavernier
+ */
+// This class needs the "BuddyPolicy" set to "dependent" in the Manifest.MF,
+// in order to be able to retrieve the classes it loads
+//
+// This is the org.eclipse.papyrus.infra.tools class loader which is used for loading
+// a class, instead of each caller's ClassLoader
+//
+// Plug-ins using this class should also either set their Buddy-policy to dependent or
+// reexport the dependency to oep.infra.tools
+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.
+	 *
+	 * @param className
+	 *            The qualified name of the Class to load.
+	 * @return
+	 *         The loaded Class, or null if an error occured
+	 */
+	public static Class<?> loadClass(String className) {
+		try {
+			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) {
+			Activator.log.error("Cannot load class " + className, ex); //$NON-NLS-1$
+		}
+
+		return null;
+	}
+
+	/**
+	 * Loads and returns the class denoted by the given className.
+	 * Checks that the loaded class is a subtype of the given Class.
+	 *
+	 * @param className
+	 *            The qualified name of the class to be loaded
+	 * @param asSubClass
+	 *            The interface or class that the loaded class must implement or extend
+	 * @return
+	 *         The loaded class, or null if the class doesn't exist or is invalid.
+	 *         In such a case, the exception is logged.
+	 */
+	public static <T> Class<? extends T> loadClass(String className, Class<T> asSubClass) {
+		Class<?> theClass = loadClass(className);
+		if (theClass == null) {
+			return null;
+		}
+
+		try {
+			Class<? extends T> typedClass = theClass.asSubclass(asSubClass);
+			return typedClass;
+		} catch (ClassCastException ex) {
+			Activator.log.error(String.format("The class %1$s doesn't extend or implement %2$s", className, asSubClass.getName()), ex); //$NON-NLS-1$
+		}
+
+		return null;
+	}
+
+	/**
+	 * Creates a new instance of class denoted by the given className.
+	 * Checks that the instantiated class is a subtype of the given class
+	 *
+	 * @param className
+	 *            The qualified name of the class to be instantiated
+	 * @param asSubclass
+	 *            The interface or class that the loaded class must implement or extend
+	 * @return
+	 *         An instance of the loaded class, or null if a valid instance
+	 *         cannot be created. In such a case, the exception is logged.
+	 */
+	public static <T> T newInstance(String className, Class<T> asSubclass) {
+		Class<? extends T> typedClass = loadClass(className, asSubclass);
+		if (typedClass == null) {
+			return null;
+		}
+
+		return newInstance(typedClass);
+	}
+
+	/**
+	 * Returns a new Instance of the given class
+	 *
+	 * @param className
+	 *            The qualified name of the Class to instantiate
+	 * @return
+	 *         A new instance of the given class, or null if the class couldn't be
+	 *         instantiated
+	 */
+	public static Object newInstance(String className) {
+		return newInstance(loadClass(className));
+	}
+
+	/**
+	 * Returns a new Instance of the given class
+	 *
+	 * @param theClass
+	 *            The Class to instantiate
+	 * @return
+	 *         A new instance of the given class, or null if the class couldn't be
+	 *         instantiated
+	 */
+	public static <T extends Object> T newInstance(Class<T> theClass) {
+		if (theClass == null) {
+			return null;
+		}
+
+		try {
+			return theClass.newInstance();
+		} catch (IllegalAccessException ex) {
+			Activator.log.error("Cannot find a valid public constructor for the class " + theClass.getName(), ex); //$NON-NLS-1$
+		} catch (InstantiationException ex) {
+			Activator.log.error(String.format("The class %s cannot be instantiated.", theClass.getName()), ex); //$NON-NLS-1$
+		}
+
+		return null;
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/CompositeServiceTracker.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/CompositeServiceTracker.java
new file mode 100644
index 00000000000..2dab30d9eba
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/CompositeServiceTracker.java
@@ -0,0 +1,92 @@
+/*****************************************************************************
+ * Copyright (c) 2016 Christian W. Damus and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.tools.util;
+
+import java.lang.reflect.Array;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BinaryOperator;
+import java.util.stream.Stream;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.util.tracker.ServiceTracker;
+
+/**
+ * A service tracker that provides a single service as a composite of
+ * registered service implementations.
+ */
+public class CompositeServiceTracker<S> extends ServiceTracker<S, S> {
+	private final AtomicReference<S> delegate = new AtomicReference<>();
+
+	private final Class<S> serviceType;
+	private final S identity;
+	private final BinaryOperator<S> composer;
+
+	/**
+	 * Initializes me with the bundle context in which I track resolver services,
+	 * an identity service that generally performs trivially (e.g., no-ops or default behaviour),
+	 * and an operator that composes two service instances.
+	 * 
+	 * @param context
+	 *            the bundle context
+	 * @param serviceType
+	 *            the service protocol type
+	 * @param identity
+	 *            the basic no-op or default service instance
+	 * @param composer
+	 *            an operator that composes two services instances into one
+	 */
+	public CompositeServiceTracker(BundleContext context, Class<S> serviceType, S identity, BinaryOperator<S> composer) {
+		super(context, serviceType, null);
+
+		this.serviceType = serviceType;
+		this.identity = identity;
+		this.composer = composer;
+	}
+
+	@Override
+	public final S getService() {
+		S result = this.delegate.get();
+		if (result == null) {
+			// Recompute
+			@SuppressWarnings("unchecked")
+			S[] services = (S[]) Array.newInstance(serviceType, getTrackingCount());
+			result = Stream.of(getServices(services))
+					.filter(Objects::nonNull) // If the array has more slots than we have services
+					.reduce(identity, composer);
+			this.delegate.set(result);
+		}
+
+		return result;
+	}
+
+	@Override
+	public S addingService(ServiceReference<S> reference) {
+		S result = super.addingService(reference);
+
+		// We will have to recompute our delegates
+		delegate.set(null);
+
+		return result;
+	}
+
+	@Override
+	public void removedService(ServiceReference<S> reference, S service) {
+		super.removedService(reference, service);
+
+		// We will have to recompute our delegates
+		delegate.set(null);
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/CoreExecutors.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/CoreExecutors.java
index 14604007bc2..14604007bc2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/CoreExecutors.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/CoreExecutors.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/FileUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/FileUtils.java
index 9697b8cabfa..ca804c1bc0f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/FileUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/FileUtils.java
@@ -1,129 +1,129 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

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

-

-package org.eclipse.papyrus.infra.tools.util;

-

-import java.io.BufferedReader;

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.InputStreamReader;

-import java.net.URL;

-

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

-import org.eclipse.papyrus.infra.tools.Activator;

-

-/**

- * @author VL222926

- *

- */

-public class FileUtils {

-

-	public static final String PLATFORM_STRING = "platform"; //$NON-NLS-1$

-

-	public static final String PLUGIN_STRING = "plugin"; //$NON-NLS-1$

-

-	public static final String SLASH_STRING = "/"; //$NON-NLS-1$

-

-	public static final String COLON_STRING = ":"; //$NON-NLS-1$

-

-	public static final String DOT_STRING = ".";//$NON-NLS-1$

-

-	public static final String TEXT_EXTENSION = "txt";//$NON-NLS-1$

-

-	public static final String CSV_EXTENSIOn = "csv";//$NON-NLS-1$

-

-	public static final String UNDERSCORE = "_";//$NON-NLS-1$

-

-	public static final String LINE_SEPARATOR = "line.separator";//$NON-NLS-1$

-

-	private FileUtils() {

-		// to prevent instanciation

-	}

-	

-	/**

-	 * return the system property line seperator

-	 */

-	public static final String getSystemPropertyLineSeparator(){

-		return System.getProperty(LINE_SEPARATOR);

-	}

-

-	/**

-	 * this method read a file and return a string, the line separator used will we System.getProperty("line.separator")

-	 * 

-	 * @param pluginName

-	 *            the name of the plugin owning the file

-	 * @param filePath

-	 *            the path of the file

-	 * @param fileNameWithExtension

-	 *            the name fo the file with its extension

-	 * @return

-	 */

-	public static final String getStringFromPlatformFile(final String pluginName, final String filePath, final String fileNameWithExtension) {

-		return getStringFromPlatformFile(pluginName, filePath, fileNameWithExtension, System.getProperty("line.separator")); //$NON-NLS-1$

-	}

-

-	/**

-	 * 

-	 * @param pluginName

-	 *            the name of the plugin owning the file

-	 * @param filePath

-	 *            the path of the file

-	 * @param fileNameWithExtension

-	 *            the name fo the file with its extension

-	 * @param lineSeparator

-	 *            the line separator to use

-	 * @return

-	 */

-	public static final String getStringFromPlatformFile(final String pluginName, final String filePath, final String fileNameWithExtension, final String lineSeparator) {

-		Assert.isNotNull(pluginName);

-		Assert.isNotNull(filePath);

-		Assert.isNotNull(fileNameWithExtension);

-		StringBuilder pathBuilder = new StringBuilder();

-		pathBuilder.append(PLATFORM_STRING);

-		pathBuilder.append(COLON_STRING);

-		pathBuilder.append(SLASH_STRING);

-		pathBuilder.append(PLUGIN_STRING);

-		pathBuilder.append(SLASH_STRING);

-		pathBuilder.append(pluginName);

-		if (!filePath.startsWith(SLASH_STRING)) {

-			pathBuilder.append(SLASH_STRING);

-		}

-		pathBuilder.append(filePath);

-		if (!filePath.endsWith(SLASH_STRING)) {

-			pathBuilder.append(SLASH_STRING);

-		}

-		pathBuilder.append(fileNameWithExtension);

-		StringBuilder builder = new StringBuilder();

-		URL url;

-		try {

-			url = new URL(pathBuilder.toString());

-			InputStream inputStream = url.openConnection().getInputStream();

-			BufferedReader in = new BufferedReader(new InputStreamReader(inputStream));

-			String inputLine = in.readLine();

-

-			while (inputLine != null) {

-				builder.append(inputLine);

-				inputLine = in.readLine();

-				if (inputLine != null) {

-					builder.append(lineSeparator); // $NON-NLS-1$

-				}

-			}

-

-			in.close();

-

-		} catch (IOException e) {

-			Activator.log.error(e);

-		}

-		return builder.toString();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.tools.util;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.papyrus.infra.tools.Activator;
+
+/**
+ * @author VL222926
+ *
+ */
+public class FileUtils {
+
+	public static final String PLATFORM_STRING = "platform"; //$NON-NLS-1$
+
+	public static final String PLUGIN_STRING = "plugin"; //$NON-NLS-1$
+
+	public static final String SLASH_STRING = "/"; //$NON-NLS-1$
+
+	public static final String COLON_STRING = ":"; //$NON-NLS-1$
+
+	public static final String DOT_STRING = ".";//$NON-NLS-1$
+
+	public static final String TEXT_EXTENSION = "txt";//$NON-NLS-1$
+
+	public static final String CSV_EXTENSIOn = "csv";//$NON-NLS-1$
+
+	public static final String UNDERSCORE = "_";//$NON-NLS-1$
+
+	public static final String LINE_SEPARATOR = "line.separator";//$NON-NLS-1$
+
+	private FileUtils() {
+		// to prevent instanciation
+	}
+	
+	/**
+	 * return the system property line seperator
+	 */
+	public static final String getSystemPropertyLineSeparator(){
+		return System.getProperty(LINE_SEPARATOR);
+	}
+
+	/**
+	 * this method read a file and return a string, the line separator used will we System.getProperty("line.separator")
+	 * 
+	 * @param pluginName
+	 *            the name of the plugin owning the file
+	 * @param filePath
+	 *            the path of the file
+	 * @param fileNameWithExtension
+	 *            the name fo the file with its extension
+	 * @return
+	 */
+	public static final String getStringFromPlatformFile(final String pluginName, final String filePath, final String fileNameWithExtension) {
+		return getStringFromPlatformFile(pluginName, filePath, fileNameWithExtension, System.getProperty("line.separator")); //$NON-NLS-1$
+	}
+
+	/**
+	 * 
+	 * @param pluginName
+	 *            the name of the plugin owning the file
+	 * @param filePath
+	 *            the path of the file
+	 * @param fileNameWithExtension
+	 *            the name fo the file with its extension
+	 * @param lineSeparator
+	 *            the line separator to use
+	 * @return
+	 */
+	public static final String getStringFromPlatformFile(final String pluginName, final String filePath, final String fileNameWithExtension, final String lineSeparator) {
+		Assert.isNotNull(pluginName);
+		Assert.isNotNull(filePath);
+		Assert.isNotNull(fileNameWithExtension);
+		StringBuilder pathBuilder = new StringBuilder();
+		pathBuilder.append(PLATFORM_STRING);
+		pathBuilder.append(COLON_STRING);
+		pathBuilder.append(SLASH_STRING);
+		pathBuilder.append(PLUGIN_STRING);
+		pathBuilder.append(SLASH_STRING);
+		pathBuilder.append(pluginName);
+		if (!filePath.startsWith(SLASH_STRING)) {
+			pathBuilder.append(SLASH_STRING);
+		}
+		pathBuilder.append(filePath);
+		if (!filePath.endsWith(SLASH_STRING)) {
+			pathBuilder.append(SLASH_STRING);
+		}
+		pathBuilder.append(fileNameWithExtension);
+		StringBuilder builder = new StringBuilder();
+		URL url;
+		try {
+			url = new URL(pathBuilder.toString());
+			InputStream inputStream = url.openConnection().getInputStream();
+			BufferedReader in = new BufferedReader(new InputStreamReader(inputStream));
+			String inputLine = in.readLine();
+
+			while (inputLine != null) {
+				builder.append(inputLine);
+				inputLine = in.readLine();
+				if (inputLine != null) {
+					builder.append(lineSeparator); // $NON-NLS-1$
+				}
+			}
+
+			in.close();
+
+		} catch (IOException e) {
+			Activator.log.error(e);
+		}
+		return builder.toString();
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IExecutorService.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IExecutorService.java
index 4e833f8bf76..e816ade859c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IExecutorService.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IExecutorService.java
@@ -54,4 +54,54 @@ public interface IExecutorService extends ExecutorService {
 	 *             on failed execution, as per {@link Future#get()}
 	 */
 	<V> V syncCall(Callable<V> callable) throws InterruptedException, ExecutionException;
+
+	/**
+	 * Submits a {@code task} with support for progress reporting.
+	 * 
+	 * @param task
+	 *            the progress-metered task to execute
+	 * 
+	 * @return a future of undefined type that can be used, for example, to wait for the {@code task} to complete
+	 */
+	Future<?> submit(IProgressRunnable task);
+
+	/**
+	 * Submits a {@code callable} with support for progress reporting.
+	 * 
+	 * @param task
+	 *            the progress-metered task to execute
+	 * 
+	 * @return the future result of the {@code callable}
+	 */
+	<V> Future<V> submit(IProgressCallable<V> callable);
+
+	/**
+	 * Synchronously executes a progress-monitored {code task}. The task will run on the
+	 * appropriate executor thread, as usual, but control will return
+	 * to the caller only when its execution is complete.
+	 * 
+	 * @param task
+	 *            the task to execute
+	 * 
+	 * @throws InterruptedException
+	 *             on interruption, as per {@link Future#get()}
+	 * @throws ExecutionException
+	 *             on failed execution, as per {@link Future#get()}
+	 */
+	void syncExec(IProgressRunnable task) throws InterruptedException, ExecutionException;
+
+	/**
+	 * Synchronously invokes a progress-monitored {code callable}. The callable will run on the
+	 * appropriate executor thread, as usual, but control will return
+	 * to the caller only when its execution is complete.
+	 * 
+	 * @param callable
+	 *            the task to execute
+	 * 
+	 * @throws InterruptedException
+	 *             on interruption, as per {@link Future#get()}
+	 * @throws ExecutionException
+	 *             on failed execution, as per {@link Future#get()}
+	 */
+	<V> V syncCall(IProgressCallable<V> callable) throws InterruptedException, ExecutionException;
 }
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IProgressCallable.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IProgressCallable.java
new file mode 100644
index 00000000000..ff2601ca8ad
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IProgressCallable.java
@@ -0,0 +1,68 @@
+/*****************************************************************************
+ * Copyright (c) 2016 Christian W. Damus and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.tools.util;
+
+import java.util.concurrent.Callable;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+
+/**
+ * An analogue of the Eclipse JFace {@code IRunnableWithProgress} interface,
+ * a protocol for executable computations that can report measurable progress.
+ * Implementations of the {@link IExecutorService} can supply suitable progress
+ * reporting to these callables.
+ * 
+ * @see IExecutorService
+ */
+@FunctionalInterface
+public interface IProgressCallable<V> {
+	/**
+	 * Computes a result.
+	 * 
+	 * @param monitor
+	 *            for reporting of progress of the task
+	 * 
+	 * @return the result of the computation
+	 * 
+	 * @throws Exception
+	 *             if the computation fails unrecoverably
+	 */
+	V call(IProgressMonitor monitor) throws Exception;
+
+	/**
+	 * Adapts a plain Java {@code runnable} task to a progress-runnable task.
+	 * 
+	 * @param label
+	 *            an user-presentable label for the task
+	 * @param runnable
+	 *            a plain runnable
+	 * 
+	 * @return a progress runnable decorating the plain {@code runnable}
+	 */
+	static <V> IProgressCallable<V> convert(String label, Callable<V> callable) {
+		return progress -> {
+			if (progress != null) {
+				progress.beginTask(label, IProgressMonitor.UNKNOWN);
+			}
+
+			try {
+				return callable.call();
+			} finally {
+				if (progress != null) {
+					progress.done();
+				}
+			}
+		};
+	}
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IProgressRunnable.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IProgressRunnable.java
new file mode 100644
index 00000000000..124099a64fc
--- /dev/null
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IProgressRunnable.java
@@ -0,0 +1,61 @@
+/*****************************************************************************
+ * Copyright (c) 2016 Christian W. Damus and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.tools.util;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+
+/**
+ * An analogue of the Eclipse JFace {@code IRunnableWithProgress} interface,
+ * a protocol for executable tasks that can report measurable progress.
+ * Implementations of the {@link IExecutorService} can supply suitable progress
+ * reporting to these runnables.
+ * 
+ * @see IExecutorService
+ */
+@FunctionalInterface
+public interface IProgressRunnable {
+	/**
+	 * Executes the task.
+	 * 
+	 * @param monitor
+	 *            for reporting of progress of the task
+	 */
+	void run(IProgressMonitor monitor);
+
+	/**
+	 * Adapts a plain Java {@code runnable} task to a progress-runnable task.
+	 * 
+	 * @param label
+	 *            an user-presentable label for the task
+	 * @param runnable
+	 *            a plain runnable
+	 * 
+	 * @return a progress runnable decorating the plain {@code runnable}
+	 */
+	static IProgressRunnable convert(String label, Runnable runnable) {
+		return progress -> {
+			if (progress != null) {
+				progress.beginTask(label, IProgressMonitor.UNKNOWN);
+			}
+
+			try {
+				runnable.run();
+			} finally {
+				if (progress != null) {
+					progress.done();
+				}
+			}
+		};
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IntegerAndSpreadsheetNumberConverter.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IntegerAndSpreadsheetNumberConverter.java
index 6c988dafbd1..3c4f5f265c6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IntegerAndSpreadsheetNumberConverter.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IntegerAndSpreadsheetNumberConverter.java
@@ -1,90 +1,90 @@
-/*****************************************************************************

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

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

- *

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

-package org.eclipse.papyrus.infra.tools.util;

-

-/**

- *

- * This class allows to converter an int into a String like a spreadsheet numerotation and vice-versa. Fox example :

- * <ul>

- * <li>1 <-> A</li>

- * <li>26 <-> Z</li>

- * <li>27 <-> AA</li>

- * <li>28<-> AB</li>

- * </ul>

- *

- *

- *

- *

- */

-// adapted code from http://www.developpez.net/forums/d1197058/dotnet/general-dotnet/contribuez/extensions-types-int-string-conversion-format-colonne-excel/

-public class IntegerAndSpreadsheetNumberConverter {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	private IntegerAndSpreadsheetNumberConverter() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @param number

-	 *            an integer

-	 * @return

-	 *         the string representing this integer in a spreedsheet

-	 */

-	public static String toString(int number) {

-		if (number <= 0) {

-			throw new NumberFormatException();

-		}

-		int tmp = number;

-		String string = ""; //$NON-NLS-1$

-		while (tmp > 0) {

-			final int r = (tmp - 1) % 26;

-			string = (char) ('A' + r) + string;

-			tmp = (tmp - r) / 26;

-		}

-

-		return string;

-	}

-

-	/**

-	 *

-	 * @unused

-	 * @param string

-	 *            a string

-	 * @return

-	 *         the number corresponding to the string

-	 */

-	public static int toInt(String string) {

-		if (string == null || string.length() == 0) {

-			throw new NumberFormatException();

-		}

-		string = string.toUpperCase();

-		int multiplier = 1;

-		int columnNumber = 0;

-		for (int i = string.length() - 1; i >= 0; i--) {

-			final char c = string.charAt(i);

-			if (c < 'A' || c > 'Z') {

-				throw new NumberFormatException();

-			}

-			final int value = (c - 'A' + 1) * multiplier;

-			columnNumber += value;

-			multiplier *= 26;

-		}

-		return columnNumber;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.tools.util;
+
+/**
+ *
+ * This class allows to converter an int into a String like a spreadsheet numerotation and vice-versa. Fox example :
+ * <ul>
+ * <li>1 <-> A</li>
+ * <li>26 <-> Z</li>
+ * <li>27 <-> AA</li>
+ * <li>28<-> AB</li>
+ * </ul>
+ *
+ *
+ *
+ *
+ */
+// adapted code from http://www.developpez.net/forums/d1197058/dotnet/general-dotnet/contribuez/extensions-types-int-string-conversion-format-colonne-excel/
+public class IntegerAndSpreadsheetNumberConverter {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	private IntegerAndSpreadsheetNumberConverter() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 * @param number
+	 *            an integer
+	 * @return
+	 *         the string representing this integer in a spreedsheet
+	 */
+	public static String toString(int number) {
+		if (number <= 0) {
+			throw new NumberFormatException();
+		}
+		int tmp = number;
+		String string = ""; //$NON-NLS-1$
+		while (tmp > 0) {
+			final int r = (tmp - 1) % 26;
+			string = (char) ('A' + r) + string;
+			tmp = (tmp - r) / 26;
+		}
+
+		return string;
+	}
+
+	/**
+	 *
+	 * @unused
+	 * @param string
+	 *            a string
+	 * @return
+	 *         the number corresponding to the string
+	 */
+	public static int toInt(String string) {
+		if (string == null || string.length() == 0) {
+			throw new NumberFormatException();
+		}
+		string = string.toUpperCase();
+		int multiplier = 1;
+		int columnNumber = 0;
+		for (int i = string.length() - 1; i >= 0; i--) {
+			final char c = string.charAt(i);
+			if (c < 'A' || c > 'Z') {
+				throw new NumberFormatException();
+			}
+			final int value = (c - 'A' + 1) * multiplier;
+			columnNumber += value;
+			multiplier *= 26;
+		}
+		return columnNumber;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/Iterables2.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/Iterables2.java
index 826a0fbf094..826a0fbf094 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/Iterables2.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/Iterables2.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/Iterators2.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/Iterators2.java
index bd10ef4e9d7..bd10ef4e9d7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/Iterators2.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/Iterators2.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ListHelper.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ListHelper.java
index b845f3dcb05..382c964daa5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ListHelper.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ListHelper.java
@@ -1,81 +1,81 @@
-/*****************************************************************************

- * 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.tools.util;

-

-import java.util.ArrayList;

-import java.util.List;

-

-public class ListHelper {

-

-	/**

-	 * Converts an array to a List

-	 *

-	 * This method is similar to Arrays.asList, except that it returns

-	 * a writeable list

-	 *

-	 * @param array

-	 *            The array to transform into a List

-	 * @return

-	 *         A List containing the same elements as the array

-	 */

-	public static <T> List<T> asList(T[] array) {

-		if (array == null) {

-			return new ArrayList<T>();

-		}

-

-		List<T> result = new ArrayList<T>(array.length);

-		for (T t : array) {

-			result.add(t);

-		}

-		return result;

-	}

-

-	/**

-	 * Invokes the toString() method recursively on this list's elements.

-	 * The values are separated by ", "

-	 *

-	 * @param list

-	 *            The list whose string representation to return

-	 * @return

-	 *

-	 * @see #deepToString(List, String)

-	 */

-	public static String deepToString(List<?> list) {

-		return deepToString(list, ", ");

-	}

-

-	/**

-	 * Invokes the toString() method recursively on this list's elements.

-	 * The values are separated by the given separator

-	 *

-	 * @param list

-	 *            The list whose string representation to return

-	 * @param separator

-	 *            The string to insert between each element's string representation

-	 * @return

-	 *

-	 * @see #deepToString(List)

-	 */

-	public static String deepToString(List<?> list, String separator) {

-		boolean firstElement = true;

-		String result = "";

-		for (Object item : list) {

-			if (firstElement) {

-				firstElement = false;

-			} else {

-				result += separator;

-			}

-			result += item == null ? null : item.toString();

-		}

-		return result;

-	}

-}

+/*****************************************************************************
+ * 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.tools.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ListHelper {
+
+	/**
+	 * Converts an array to a List
+	 *
+	 * This method is similar to Arrays.asList, except that it returns
+	 * a writeable list
+	 *
+	 * @param array
+	 *            The array to transform into a List
+	 * @return
+	 *         A List containing the same elements as the array
+	 */
+	public static <T> List<T> asList(T[] array) {
+		if (array == null) {
+			return new ArrayList<T>();
+		}
+
+		List<T> result = new ArrayList<T>(array.length);
+		for (T t : array) {
+			result.add(t);
+		}
+		return result;
+	}
+
+	/**
+	 * Invokes the toString() method recursively on this list's elements.
+	 * The values are separated by ", "
+	 *
+	 * @param list
+	 *            The list whose string representation to return
+	 * @return
+	 *
+	 * @see #deepToString(List, String)
+	 */
+	public static String deepToString(List<?> list) {
+		return deepToString(list, ", ");
+	}
+
+	/**
+	 * Invokes the toString() method recursively on this list's elements.
+	 * The values are separated by the given separator
+	 *
+	 * @param list
+	 *            The list whose string representation to return
+	 * @param separator
+	 *            The string to insert between each element's string representation
+	 * @return
+	 *
+	 * @see #deepToString(List)
+	 */
+	public static String deepToString(List<?> list, String separator) {
+		boolean firstElement = true;
+		String result = "";
+		for (Object item : list) {
+			if (firstElement) {
+				firstElement = false;
+			} else {
+				result += separator;
+			}
+			result += item == null ? null : item.toString();
+		}
+		return result;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/PlatformHelper.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/PlatformHelper.java
index 9c9f9d514e9..316b4683f9a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/PlatformHelper.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/PlatformHelper.java
@@ -1,141 +1,141 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   Christian W. Damus - bug 479999

- *   Christian W. Damus - bug 469188

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

-package org.eclipse.papyrus.infra.tools.util;

-

-import static com.google.common.collect.Iterables.filter;

-import static com.google.common.collect.Iterables.find;

-

-import java.util.function.Supplier;

-

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

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

-import org.eclipse.emf.common.notify.Notifier;

-

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

-

-

-public class PlatformHelper {

-

-	/**

-	 * Attempt to get an adapter of the specified target {@code type} from an {@code object}

-	 * by any means available.

-	 *

-	 * @param object

-	 *            an object to adapt

-	 * @param type

-	 *            the type of adapter to get

-	 *

-	 * @return the best-effort adapter of the given {@code type} or {@code null} if no

-	 *         adapter is available

-	 */

-	public static <T> T getAdapter(Object object, Class<T> type) {

-		T result = null;

-

-		// Don't provide adapters for null

-		if (object != null) {

-			if (type.isInstance(object)) {

-				result = type.cast(object);

-			} else if (object instanceof IAdaptable) {

-				result = getIntrinsicAdapter((IAdaptable) object, type);

-			}

-

-			if (result == null) {

-				result = getExtrinsicAdapter(object, type);

-

-				if ((result == null) && (object instanceof Notifier)) {

-					result = getEMFAdapter((Notifier) object, type);

-				}

-			}

-		}

-

-		return result;

-	}

-

-	private static <T> T getIntrinsicAdapter(IAdaptable adaptable, Class<T> type) {

-		T result = null;

-

-		Object attempt = adaptable.getAdapter(type);

-		if (type.isInstance(attempt)) {

-			result = type.cast(attempt);

-		}

-

-		return result;

-	}

-

-	private static <T> T getExtrinsicAdapter(Object object, Class<T> type) {

-		T result = null;

-

-		Object attempt = Platform.getAdapterManager().getAdapter(object, type);

-		if (type.isInstance(attempt)) {

-			result = type.cast(attempt);

-		}

-

-		return result;

-	}

-

-	private static <T> T getEMFAdapter(Notifier notifier, Class<T> type) {

-		return find(filter(notifier.eAdapters(), type), Predicates.alwaysTrue(), null);

-	}

-

-	/**

-	 * Get an adapter of the specified target {@code type} from an {@code object} by any means available.

-	 *

-	 * @param object

-	 *            an object to adapt. May be {@code null}, in which case the {@code defaultAdapter} is returned

-	 * @param type

-	 *            the type of adapter to get

-	 * @param defaultAdapter

-	 *            a default adapter to return if none can be obtained (may be {@code null}

-	 *

-	 * @return the best-effort adapter of the given {@code type}, else the {@code defaultAdapter}

-	 */

-	public static <T> T getAdapter(Object object, Class<T> type, T defaultAdapter) {

-		T result = defaultAdapter;

-

-		if (object != null) {

-			T adapter = getAdapter(object, type);

-			if (adapter != null) {

-				result = adapter;

-			}

-		}

-

-		return result;

-	}

-

-	/**

-	 * Get an adapter of the specified target {@code type} from an {@code object} by any means available.

-	 *

-	 * @param object

-	 *            an object to adapt. May be {@code null}, in which case the {@code defaultAdapter} is returned

-	 * @param type

-	 *            the type of adapter to get

-	 * @param defaultSupplier

-	 *            a supplier to consult for a default adapter in the case that none can be

-	 *            obtained by the usual means (may be {@code null}

-	 *

-	 * @return the best-effort adapter of the given {@code type}, else the {@code defaultAdapter}

-	 */

-	public static <T> T getAdapter(Object object, Class<T> type, Supplier<T> defaultAdapter) {

-		T result = null;

-

-		if (object != null) {

-			T adapter = getAdapter(object, type);

-			if (adapter != null) {

-				result = adapter;

-			}

-		}

-

-		return (result != null) ? result : defaultAdapter.get();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   Christian W. Damus - bug 479999
+ *   Christian W. Damus - bug 469188
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.tools.util;
+
+import static com.google.common.collect.Iterables.filter;
+import static com.google.common.collect.Iterables.find;
+
+import java.util.function.Supplier;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.notify.Notifier;
+
+import com.google.common.base.Predicates;
+
+
+public class PlatformHelper {
+
+	/**
+	 * Attempt to get an adapter of the specified target {@code type} from an {@code object}
+	 * by any means available.
+	 *
+	 * @param object
+	 *            an object to adapt
+	 * @param type
+	 *            the type of adapter to get
+	 *
+	 * @return the best-effort adapter of the given {@code type} or {@code null} if no
+	 *         adapter is available
+	 */
+	public static <T> T getAdapter(Object object, Class<T> type) {
+		T result = null;
+
+		// Don't provide adapters for null
+		if (object != null) {
+			if (type.isInstance(object)) {
+				result = type.cast(object);
+			} else if (object instanceof IAdaptable) {
+				result = getIntrinsicAdapter((IAdaptable) object, type);
+			}
+
+			if (result == null) {
+				result = getExtrinsicAdapter(object, type);
+
+				if ((result == null) && (object instanceof Notifier)) {
+					result = getEMFAdapter((Notifier) object, type);
+				}
+			}
+		}
+
+		return result;
+	}
+
+	private static <T> T getIntrinsicAdapter(IAdaptable adaptable, Class<T> type) {
+		T result = null;
+
+		Object attempt = adaptable.getAdapter(type);
+		if (type.isInstance(attempt)) {
+			result = type.cast(attempt);
+		}
+
+		return result;
+	}
+
+	private static <T> T getExtrinsicAdapter(Object object, Class<T> type) {
+		T result = null;
+
+		Object attempt = Platform.getAdapterManager().getAdapter(object, type);
+		if (type.isInstance(attempt)) {
+			result = type.cast(attempt);
+		}
+
+		return result;
+	}
+
+	private static <T> T getEMFAdapter(Notifier notifier, Class<T> type) {
+		return find(filter(notifier.eAdapters(), type), Predicates.alwaysTrue(), null);
+	}
+
+	/**
+	 * Get an adapter of the specified target {@code type} from an {@code object} by any means available.
+	 *
+	 * @param object
+	 *            an object to adapt. May be {@code null}, in which case the {@code defaultAdapter} is returned
+	 * @param type
+	 *            the type of adapter to get
+	 * @param defaultAdapter
+	 *            a default adapter to return if none can be obtained (may be {@code null}
+	 *
+	 * @return the best-effort adapter of the given {@code type}, else the {@code defaultAdapter}
+	 */
+	public static <T> T getAdapter(Object object, Class<T> type, T defaultAdapter) {
+		T result = defaultAdapter;
+
+		if (object != null) {
+			T adapter = getAdapter(object, type);
+			if (adapter != null) {
+				result = adapter;
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Get an adapter of the specified target {@code type} from an {@code object} by any means available.
+	 *
+	 * @param object
+	 *            an object to adapt. May be {@code null}, in which case the {@code defaultAdapter} is returned
+	 * @param type
+	 *            the type of adapter to get
+	 * @param defaultSupplier
+	 *            a supplier to consult for a default adapter in the case that none can be
+	 *            obtained by the usual means (may be {@code null}
+	 *
+	 * @return the best-effort adapter of the given {@code type}, else the {@code defaultAdapter}
+	 */
+	public static <T> T getAdapter(Object object, Class<T> type, Supplier<T> defaultAdapter) {
+		T result = null;
+
+		if (object != null) {
+			T adapter = getAdapter(object, type);
+			if (adapter != null) {
+				result = adapter;
+			}
+		}
+
+		return (result != null) ? result : defaultAdapter.get();
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ReferenceCounted.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ReferenceCounted.java
index 6c0444c3086..6c0444c3086 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ReferenceCounted.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ReferenceCounted.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ReflectHelper.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ReflectHelper.java
index feb9538cc9b..da91097bbc2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ReflectHelper.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ReflectHelper.java
@@ -1,55 +1,55 @@
-/*****************************************************************************

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

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

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

-package org.eclipse.papyrus.infra.tools.util;

-

-import java.lang.reflect.Method;

-

-/**

- *

- * This helper provides methods to get methods reflectively

- * It is not the better way to access to method, but sometimes it can be interested to avoid to duplicate

- * lot of code

- *

- */

-public class ReflectHelper {

-

-	/**

-	 *

-	 * Should not be instantiated

-	 *

-	 */

-	private ReflectHelper() {

-		// prevents instantiation

-	}

-

-	/**

-	 * Warning : each call of this method should be tested with a JUnit test, in order to know

-	 * when the API has changed

-	 *

-	 * @param aClass

-	 *            a class

-	 * @param methodName

-	 *            the name of the method to find

-	 * @param parameterTypes

-	 *            an array owning the type of the parameters of the called method

-	 * @return

-	 *         the wanted method

-	 * @throws NoSuchMethodException

-	 * @throws SecurityException

-	 */

-	public static Method getMethod(final Class<?> aClass, final String methodName, Class<?>[] parameterTypes) throws SecurityException, NoSuchMethodException {

-		Method m = null;

-		m = aClass.getDeclaredMethod(methodName, parameterTypes);

-		m.setAccessible(true);

-		return m;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.tools.util;
+
+import java.lang.reflect.Method;
+
+/**
+ *
+ * This helper provides methods to get methods reflectively
+ * It is not the better way to access to method, but sometimes it can be interested to avoid to duplicate
+ * lot of code
+ *
+ */
+public class ReflectHelper {
+
+	/**
+	 *
+	 * Should not be instantiated
+	 *
+	 */
+	private ReflectHelper() {
+		// prevents instantiation
+	}
+
+	/**
+	 * Warning : each call of this method should be tested with a JUnit test, in order to know
+	 * when the API has changed
+	 *
+	 * @param aClass
+	 *            a class
+	 * @param methodName
+	 *            the name of the method to find
+	 * @param parameterTypes
+	 *            an array owning the type of the parameters of the called method
+	 * @return
+	 *         the wanted method
+	 * @throws NoSuchMethodException
+	 * @throws SecurityException
+	 */
+	public static Method getMethod(final Class<?> aClass, final String methodName, Class<?>[] parameterTypes) throws SecurityException, NoSuchMethodException {
+		Method m = null;
+		m = aClass.getDeclaredMethod(methodName, parameterTypes);
+		m.setAccessible(true);
+		return m;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/StringHelper.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/StringHelper.java
index e59c1d01b9a..9513da778c5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/StringHelper.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/StringHelper.java
@@ -1,174 +1,174 @@
-/*****************************************************************************

- * Copyright (c) 2008-2013 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

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

-package org.eclipse.papyrus.infra.tools.util;

-

-/**

- * A library of static helpers for string-related operations

- */

-public class StringHelper {

-

-	/**

-	 * Compares two strings. Two Strings are equal if they are both null,

-	 * or if s1.equals(s2)

-	 *

-	 * @param s1

-	 * @param s2

-	 * @return

-	 */

-	public static boolean equals(String s1, String s2) {

-		if (s1 == s2) {

-			return true;

-		}

-

-		if (s1 == null) {

-			return false;

-		}

-

-		return s1.equals(s2);

-	}

-

-	/**

-	 * Converts a camelCase name to a human-readable Label

-	 *

-	 * Example: aUMLElement -> A UML element

-	 *

-	 * @param camelCaseName

-	 * @return

-	 *         A formatted version of the given variable name

-	 */

-	public static String camelCaseToLabel(String camelCaseName) {

-		// "CamelCase" to "Natural case"

-		String formattedValue = camelCaseName;

-

-		// replace fooBar by foo Bar

-		formattedValue = formattedValue.replaceAll("([a-z])([A-Z])", "$1 $2"); //$NON-NLS-1$ //$NON-NLS-2$

-

-		// replace FOOAndBar by FOO And Bar

-		formattedValue = formattedValue.replaceAll("([A-Z]+)([A-Z])([a-z])", "$1 $2$3"); //$NON-NLS-1$ //$NON-NLS-2$

-

-		// Capitalize the first word and lower the other ones : foo Bar -> Foo bar

-		// Keep the upper case for acronyms FOO Bar -> FOO bar

-		String[] words = formattedValue.split("\\s+"); //$NON-NLS-1$

-		formattedValue = firstToUpper(words[0]);

-		for (int i = 1; i < words.length; i++) {

-			formattedValue += " "; //$NON-NLS-1$

-			if (words[i].matches("^[A-Z]{2,}")) { //$NON-NLS-1$

-				formattedValue += words[i];

-			} else {

-				formattedValue += firstToLower(words[i]);

-			}

-		}

-

-		//Activator.log.debug("\"" + formattedValue + "\""); //$NON-NLS-1$ //$NON-NLS-2$

-		return formattedValue;

-	}

-

-	/**

-	 * @param source

-	 * @return

-	 *         the given String with the first letter capitalized

-	 */

-	public static String firstToUpper(String source) {

-		if (source.length() == 0) {

-			return source;

-		}

-		return source.substring(0, 1).toUpperCase() + source.substring(1);

-	}

-

-	/**

-	 * @param source

-	 * @return

-	 *         the given String with the first letter lowered

-	 */

-	public static String firstToLower(String source) {

-		if (source.length() == 0) {

-			return source;

-		}

-		return source.substring(0, 1).toLowerCase() + source.substring(1);

-	}

-

-	/**

-	 * Returns the same string, except for "null" which is converted to the empty string

-	 *

-	 * @param str

-	 * @return

-	 */

-	public static String trimToEmpty(String str) {

-		return str == null ? "" : str; //$NON-NLS-1$

-	}

-

-

-	/*

-	 *

-	 * The following methods have been copied from UML2Util (org.eclipse.uml2.common.util/UML2Util)

-	 */

-

-

-	/**

-	 * Obtains a valid Java identifier based on the specified name.

-	 *

-	 * @param name

-	 *            The name from which to obtain a valid identifier.

-	 * @return A valid (Java) identifier.

-	 */

-	public static String toJavaIdentifier(String label) {

-		return getValidJavaIdentifier(label, new StringBuffer()).toString();

-	}

-

-	/**

-	 * Appends a valid Java identifier based on the specified name to the

-	 * specified buffer.

-	 *

-	 * @param name

-	 *            The name from which to obtain the valid identifier.

-	 * @param validJavaIdentifier

-	 *            The buffer to which to append the valid identifier.

-	 * @return The buffer.

-	 */

-	protected static StringBuffer getValidJavaIdentifier(String name, StringBuffer validJavaIdentifier) {

-

-		if (isEmpty(name)) {

-			validJavaIdentifier.append('_');

-		} else {

-			char char_0 = name.charAt(0);

-

-			if (Character.isJavaIdentifierStart(char_0)) {

-				validJavaIdentifier.append(char_0);

-			} else {

-				validJavaIdentifier.append('_');

-

-				if (Character.isJavaIdentifierPart(char_0)) {

-					validJavaIdentifier.append(char_0);

-				}

-			}

-

-			for (int i = 1; i < name.length(); i++) {

-				char char_i = name.charAt(i);

-

-				if (Character.isJavaIdentifierPart(char_i)) {

-					validJavaIdentifier.append(char_i);

-				}

-			}

-		}

-

-		return validJavaIdentifier;

-	}

-

-	/**

-	 * Determines whether the specified string is empty, i.e. is <code>null</code> or has a length of zero.

-	 *

-	 * @param string

-	 *            The string in question.

-	 * @return <code>true</code> if the string is empty; <code>false</code> otherwise.

-	 */

-	public static boolean isEmpty(String string) {

-		return string == null || string.length() == 0;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2008-2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.tools.util;
+
+/**
+ * A library of static helpers for string-related operations
+ */
+public class StringHelper {
+
+	/**
+	 * Compares two strings. Two Strings are equal if they are both null,
+	 * or if s1.equals(s2)
+	 *
+	 * @param s1
+	 * @param s2
+	 * @return
+	 */
+	public static boolean equals(String s1, String s2) {
+		if (s1 == s2) {
+			return true;
+		}
+
+		if (s1 == null) {
+			return false;
+		}
+
+		return s1.equals(s2);
+	}
+
+	/**
+	 * Converts a camelCase name to a human-readable Label
+	 *
+	 * Example: aUMLElement -> A UML element
+	 *
+	 * @param camelCaseName
+	 * @return
+	 *         A formatted version of the given variable name
+	 */
+	public static String camelCaseToLabel(String camelCaseName) {
+		// "CamelCase" to "Natural case"
+		String formattedValue = camelCaseName;
+
+		// replace fooBar by foo Bar
+		formattedValue = formattedValue.replaceAll("([a-z])([A-Z])", "$1 $2"); //$NON-NLS-1$ //$NON-NLS-2$
+
+		// replace FOOAndBar by FOO And Bar
+		formattedValue = formattedValue.replaceAll("([A-Z]+)([A-Z])([a-z])", "$1 $2$3"); //$NON-NLS-1$ //$NON-NLS-2$
+
+		// Capitalize the first word and lower the other ones : foo Bar -> Foo bar
+		// Keep the upper case for acronyms FOO Bar -> FOO bar
+		String[] words = formattedValue.split("\\s+"); //$NON-NLS-1$
+		formattedValue = firstToUpper(words[0]);
+		for (int i = 1; i < words.length; i++) {
+			formattedValue += " "; //$NON-NLS-1$
+			if (words[i].matches("^[A-Z]{2,}")) { //$NON-NLS-1$
+				formattedValue += words[i];
+			} else {
+				formattedValue += firstToLower(words[i]);
+			}
+		}
+
+		//Activator.log.debug("\"" + formattedValue + "\""); //$NON-NLS-1$ //$NON-NLS-2$
+		return formattedValue;
+	}
+
+	/**
+	 * @param source
+	 * @return
+	 *         the given String with the first letter capitalized
+	 */
+	public static String firstToUpper(String source) {
+		if (source.length() == 0) {
+			return source;
+		}
+		return source.substring(0, 1).toUpperCase() + source.substring(1);
+	}
+
+	/**
+	 * @param source
+	 * @return
+	 *         the given String with the first letter lowered
+	 */
+	public static String firstToLower(String source) {
+		if (source.length() == 0) {
+			return source;
+		}
+		return source.substring(0, 1).toLowerCase() + source.substring(1);
+	}
+
+	/**
+	 * Returns the same string, except for "null" which is converted to the empty string
+	 *
+	 * @param str
+	 * @return
+	 */
+	public static String trimToEmpty(String str) {
+		return str == null ? "" : str; //$NON-NLS-1$
+	}
+
+
+	/*
+	 *
+	 * The following methods have been copied from UML2Util (org.eclipse.uml2.common.util/UML2Util)
+	 */
+
+
+	/**
+	 * Obtains a valid Java identifier based on the specified name.
+	 *
+	 * @param name
+	 *            The name from which to obtain a valid identifier.
+	 * @return A valid (Java) identifier.
+	 */
+	public static String toJavaIdentifier(String label) {
+		return getValidJavaIdentifier(label, new StringBuffer()).toString();
+	}
+
+	/**
+	 * Appends a valid Java identifier based on the specified name to the
+	 * specified buffer.
+	 *
+	 * @param name
+	 *            The name from which to obtain the valid identifier.
+	 * @param validJavaIdentifier
+	 *            The buffer to which to append the valid identifier.
+	 * @return The buffer.
+	 */
+	protected static StringBuffer getValidJavaIdentifier(String name, StringBuffer validJavaIdentifier) {
+
+		if (isEmpty(name)) {
+			validJavaIdentifier.append('_');
+		} else {
+			char char_0 = name.charAt(0);
+
+			if (Character.isJavaIdentifierStart(char_0)) {
+				validJavaIdentifier.append(char_0);
+			} else {
+				validJavaIdentifier.append('_');
+
+				if (Character.isJavaIdentifierPart(char_0)) {
+					validJavaIdentifier.append(char_0);
+				}
+			}
+
+			for (int i = 1; i < name.length(); i++) {
+				char char_i = name.charAt(i);
+
+				if (Character.isJavaIdentifierPart(char_i)) {
+					validJavaIdentifier.append(char_i);
+				}
+			}
+		}
+
+		return validJavaIdentifier;
+	}
+
+	/**
+	 * Determines whether the specified string is empty, i.e. is <code>null</code> or has a length of zero.
+	 *
+	 * @param string
+	 *            The string in question.
+	 * @return <code>true</code> if the string is empty; <code>false</code> otherwise.
+	 */
+	public static boolean isEmpty(String string) {
+		return string == null || string.length() == 0;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/Suppliers2.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/Suppliers2.java
index 4dbfd0ecebf..4dbfd0ecebf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/Suppliers2.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/Suppliers2.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/TypeUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/TypeUtils.java
index e3d63288b9a..05439dcf825 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/TypeUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/TypeUtils.java
@@ -1,185 +1,185 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   Christian W. Damus - bug 433206

- *   

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

-

-package org.eclipse.papyrus.infra.tools.util;

-

-import java.math.BigDecimal;

-import java.util.regex.Matcher;

-import java.util.regex.Pattern;

-

-/**

- * @author VL222926

- *

- */

-public class TypeUtils {

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	private TypeUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * 

-	 * @param str

-	 *            a string representing a boolean

-	 * @return

-	 *         <code>true</code> if the string represents a valid boolean

-	 */

-	public static final boolean isBooleanValue(String str) {

-		return "true".equalsIgnoreCase(str) || "false".equalsIgnoreCase(str); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * 

-	 * @param str

-	 *            a string representing a boolean

-	 * @return

-	 *         <code>true</code> if the string represents a valid boolean

-	 */

-	public static final boolean isIntegerValue(String str) {

-		/** the pattern that checks visual ids are valid integers */

-		Pattern digit = Pattern.compile("-?\\d+"); //$NON-NLS-1$

-		boolean result = false;

-		Matcher matcher = digit.matcher(str);

-		if (matcher != null) {

-			result = matcher.matches();

-		}

-		return result;

-	}

-

-	/**

-	 * 

-	 * @param str

-	 *            a string

-	 * @return

-	 *         <code>true</code> if the string represents a double

-	 */

-	public static final boolean isDoubleValue(String str) {

-		try {

-			new BigDecimal(str);

-		} catch (Exception e) {

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * 

-	 * @param str

-	 *            a string

-	 * @return

-	 *         <code>true</code> if the string represents a double

-	 */

-	public static final boolean isNaturalValue(String str) {

-		boolean res = isIntegerValue(str);

-		if (res) {

-			int tmp = Integer.parseInt(str);

-			return tmp >= 0;

-		}

-		return res;

-	}

-

-	/**

-	 * 

-	 * @param object

-	 *            an object

-	 * @return

-	 *         <code>true</code> if the object represents a numeric value

-	 */

-	public static final boolean isNumericValue(Object object) {

-		if (object instanceof String) {

-			try {

-				new BigDecimal((String) object);

-			} catch (Exception e) {

-				return false;

-			}

-			return true;

-		}

-		if (object instanceof Integer || object instanceof Double || object instanceof Float) {

-			return true;

-		}

-		return false;

-

-	}

-

-	/**

-	 * Attempts to cast an {@code object} as the required {@code type}.

-	 * 

-	 * @param object

-	 *            an object to cast

-	 * @param type

-	 *            the type to cast it to

-	 * 

-	 * @return the {@code object} or {@code null} if it is not of the required {@code type}

-	 */

-	public static <T> T as(Object object, Class<T> type) {

-		T result = null;

-

-		if (type.isInstance(object)) {

-			result = type.cast(object);

-		}

-

-		return result;

-	}

-

-	/**

-	 * Attempts to cast an {@code object} as an instance of the type implied by the given {@code default_}.

-	 * 

-	 * @param object

-	 *            an object to cast

-	 * @param default_

-	 *            the default value to return if it is not of the required type. May not be {@code null}

-	 * 

-	 * @return the {@code object} or {@code default_} if it is not of the required type

-	 * 

-	 * @throws NullPointerException

-	 *             if {@code default_} is {@code null}

-	 */

-	@SuppressWarnings("unchecked")

-	public static <T> T as(Object object, T default_) {

-		T result = default_;

-

-		if (default_.getClass().isInstance(object)) {

-			result = (T) object;

-		}

-

-		return result;

-	}

-

-	/**

-	 * Attempts to cast the object at an {@code index} of an {@code array} as the required {@code type}.

-	 * 

-	 * @param array

-	 *            an array of objects

-	 * @param index

-	 *            the position of an object in the {@code array}

-	 * @param type

-	 *            the type to cast it to

-	 * 

-	 * @return the {@code index}-th object in the {@code array} or {@code null} if it is not of the required {@code type} or the {@code array} has no such {@code index}

-	 */

-	public static <T> T as(Object[] array, int index, Class<T> type) {

-		Object object = ((index >= 0) && (index < array.length)) ? array[index] : null;

-		T result = null;

-

-		if (type.isInstance(object)) {

-			result = type.cast(object);

-		}

-

-		return result;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   Christian W. Damus - bug 433206
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.tools.util;
+
+import java.math.BigDecimal;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author VL222926
+ *
+ */
+public class TypeUtils {
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	private TypeUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * 
+	 * @param str
+	 *            a string representing a boolean
+	 * @return
+	 *         <code>true</code> if the string represents a valid boolean
+	 */
+	public static final boolean isBooleanValue(String str) {
+		return "true".equalsIgnoreCase(str) || "false".equalsIgnoreCase(str); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * 
+	 * @param str
+	 *            a string representing a boolean
+	 * @return
+	 *         <code>true</code> if the string represents a valid boolean
+	 */
+	public static final boolean isIntegerValue(String str) {
+		/** the pattern that checks visual ids are valid integers */
+		Pattern digit = Pattern.compile("-?\\d+"); //$NON-NLS-1$
+		boolean result = false;
+		Matcher matcher = digit.matcher(str);
+		if (matcher != null) {
+			result = matcher.matches();
+		}
+		return result;
+	}
+
+	/**
+	 * 
+	 * @param str
+	 *            a string
+	 * @return
+	 *         <code>true</code> if the string represents a double
+	 */
+	public static final boolean isDoubleValue(String str) {
+		try {
+			new BigDecimal(str);
+		} catch (Exception e) {
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * 
+	 * @param str
+	 *            a string
+	 * @return
+	 *         <code>true</code> if the string represents a double
+	 */
+	public static final boolean isNaturalValue(String str) {
+		boolean res = isIntegerValue(str);
+		if (res) {
+			int tmp = Integer.parseInt(str);
+			return tmp >= 0;
+		}
+		return res;
+	}
+
+	/**
+	 * 
+	 * @param object
+	 *            an object
+	 * @return
+	 *         <code>true</code> if the object represents a numeric value
+	 */
+	public static final boolean isNumericValue(Object object) {
+		if (object instanceof String) {
+			try {
+				new BigDecimal((String) object);
+			} catch (Exception e) {
+				return false;
+			}
+			return true;
+		}
+		if (object instanceof Integer || object instanceof Double || object instanceof Float) {
+			return true;
+		}
+		return false;
+
+	}
+
+	/**
+	 * Attempts to cast an {@code object} as the required {@code type}.
+	 * 
+	 * @param object
+	 *            an object to cast
+	 * @param type
+	 *            the type to cast it to
+	 * 
+	 * @return the {@code object} or {@code null} if it is not of the required {@code type}
+	 */
+	public static <T> T as(Object object, Class<T> type) {
+		T result = null;
+
+		if (type.isInstance(object)) {
+			result = type.cast(object);
+		}
+
+		return result;
+	}
+
+	/**
+	 * Attempts to cast an {@code object} as an instance of the type implied by the given {@code default_}.
+	 * 
+	 * @param object
+	 *            an object to cast
+	 * @param default_
+	 *            the default value to return if it is not of the required type. May not be {@code null}
+	 * 
+	 * @return the {@code object} or {@code default_} if it is not of the required type
+	 * 
+	 * @throws NullPointerException
+	 *             if {@code default_} is {@code null}
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T> T as(Object object, T default_) {
+		T result = default_;
+
+		if (default_.getClass().isInstance(object)) {
+			result = (T) object;
+		}
+
+		return result;
+	}
+
+	/**
+	 * Attempts to cast the object at an {@code index} of an {@code array} as the required {@code type}.
+	 * 
+	 * @param array
+	 *            an array of objects
+	 * @param index
+	 *            the position of an object in the {@code array}
+	 * @param type
+	 *            the type to cast it to
+	 * 
+	 * @return the {@code index}-th object in the {@code array} or {@code null} if it is not of the required {@code type} or the {@code array} has no such {@code index}
+	 */
+	public static <T> T as(Object[] array, int index, Class<T> type) {
+		Object object = ((index >= 0) && (index < array.length)) ? array[index] : null;
+		T result = null;
+
+		if (type.isInstance(object)) {
+			result = type.cast(object);
+		}
+
+		return result;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/TypesConstants.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/TypesConstants.java
index 075a32bdd6e..b4c256c14a5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/TypesConstants.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/TypesConstants.java
@@ -1,38 +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.tools.util;

-

-/**

- *

- * This class provides some constants used to identify java types

- *

- * @author vl222926

- *

- */

-public class TypesConstants {

-

-

-	private TypesConstants() {

-		// to prevent instanciation

-	}

-

-	public static final String STRING = "String"; //$NON-NLS-1$

-

-	public static final String BOOLEAN = "Boolean"; //$NON-NLS-1$

-

-	public static final String INTEGER = "Integer"; //$NON-NLS-1$

-

-	public static final String DOUBLE = "Double"; //$NON-NLS-1$

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.util;
+
+/**
+ *
+ * This class provides some constants used to identify java types
+ *
+ * @author vl222926
+ *
+ */
+public class TypesConstants {
+
+
+	private TypesConstants() {
+		// to prevent instanciation
+	}
+
+	public static final String STRING = "String"; //$NON-NLS-1$
+
+	public static final String BOOLEAN = "Boolean"; //$NON-NLS-1$
+
+	public static final String INTEGER = "Integer"; //$NON-NLS-1$
+
+	public static final String DOUBLE = "Double"; //$NON-NLS-1$
+
+}
diff --git a/plugins/infra/core/pom.xml b/plugins/infra/core/pom.xml
new file mode 100644
index 00000000000..575e5d7aaef
--- /dev/null
+++ b/plugins/infra/core/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.infra-core</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+	<name>Papyrus Infra Core</name>
+	<description>Core frameworks for Papyrus, including the Service Registry, Editor, and logging and other utilities.</description>
+
+	<modules>
+		<module>org.eclipse.papyrus.infra.core</module>
+		<module>org.eclipse.papyrus.infra.core.log</module>
+		<module>org.eclipse.papyrus.infra.core.pluginexplorer</module>
+		<module>org.eclipse.papyrus.infra.core.sasheditor</module>
+		<module>org.eclipse.papyrus.infra.core.sasheditor.di</module>
+		<module>org.eclipse.papyrus.infra.core.sashwindows.di</module>
+		<module>org.eclipse.papyrus.infra.tools</module>
+	</modules>
+</project>
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/pom.xml b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/pom.xml
index c7984779117..882afbd71f6 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/pom.xml
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-discovery</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.discovery.ui.menu</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/pom.xml b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/pom.xml
index b3736566cb2..355261cb978 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/pom.xml
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-discovery</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.discovery.ui</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/pom.xml b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/pom.xml
index 53d271ccd7e..0b080f317ce 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/pom.xml
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-discovery</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.discovery</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/discovery/pom.xml b/plugins/infra/discovery/pom.xml
new file mode 100644
index 00000000000..6ec06efdf5e
--- /dev/null
+++ b/plugins/infra/discovery/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.infra-discovery</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <name>Papyrus Discovery UI</name>
+	<description>Model and UI for Papyrus Component Discovery catalogue and installer.</description>
+
+	<modules>
+		<module>org.eclipse.papyrus.infra.discovery</module>
+		<module>org.eclipse.papyrus.infra.discovery.ui</module>
+		<module>org.eclipse.papyrus.infra.discovery.ui.menu</module>
+	</modules>
+</project>
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF
index c450e20c54b..8acb2478870 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.services.navigation;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.editor.welcome;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0",
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/model/general/ui/SingleLanguages.xwt b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/model/general/ui/SingleLanguages.xwt
index bc24cfadfc6..c3ab8bedc29 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/model/general/ui/SingleLanguages.xwt
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/model/general/ui/SingleLanguages.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
 	xmlns:x="http://www.eclipse.org/xwt"
 	xmlns:ppew="clr-namespace:org.eclipse.papyrus.infra.editor.welcome.nattable.internal.widgets"
 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/plugin.xml b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/plugin.xml
index dad3b350c76..6bd3f53df61 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/plugin.xml
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/plugin.xml
@@ -19,7 +19,7 @@
       </context>
    </extension>
    <extension
-         point="org.eclipse.papyrus.views.properties.context">
+         point="org.eclipse.papyrus.infra.properties.ui.context">
       <preferencePageBinding
             context="welcome-languages"
             page="org.eclipse.papyrus.infra.editor.welcome.content">
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/pom.xml b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/pom.xml
index e4cc773674d..f6ba2328c99 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/pom.xml
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-editor</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.editor.welcome.nattable</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/src/org/eclipse/papyrus/infra/editor/welcome/nattable/widgets/FormTable.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/src/org/eclipse/papyrus/infra/editor/welcome/nattable/widgets/FormTable.java
index c462564f8d8..655719ea4c0 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/src/org/eclipse/papyrus/infra/editor/welcome/nattable/widgets/FormTable.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/src/org/eclipse/papyrus/infra/editor/welcome/nattable/widgets/FormTable.java
@@ -49,11 +49,11 @@ import org.eclipse.papyrus.infra.editor.welcome.nattable.sorting.EventListObserv
 import org.eclipse.papyrus.infra.editor.welcome.nattable.sorting.PapyrusGlazedListEventsLayer;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.DataSource;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.ModelElement;
 import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
 import org.eclipse.papyrus.infra.services.navigation.service.NavigationService;
 import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.views.properties.modelelement.DataSource;
-import org.eclipse.papyrus.views.properties.modelelement.ModelElement;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF
index 4c4e96432bc..9dc8a6d97c7 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
  org.eclipse.ui;bundle-version="3.100.0",
  org.eclipse.ui.forms;bundle-version="3.7.0",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.6.0",
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/general/ui/SinglePageLayout.xwt b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/general/ui/SinglePageLayout.xwt
index 1962afdc7c2..e909789973a 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/general/ui/SinglePageLayout.xwt
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/general/ui/SinglePageLayout.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
 	xmlns:x="http://www.eclipse.org/xwt"
 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">
 	<Composite.layout>
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/general/ui/SingleViewLinks.xwt b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/general/ui/SingleViewLinks.xwt
index b1c595802be..5f223d17724 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/general/ui/SingleViewLinks.xwt
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/model/general/ui/SingleViewLinks.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
 	xmlns:ppew="clr-namespace:org.eclipse.papyrus.infra.editor.welcome.internal.widgets"
 	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
 	xmlns="http://www.eclipse.org/xwt/presentation">
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/plugin.xml b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/plugin.xml
index dcc041ef167..f01798ab786 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/plugin.xml
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/plugin.xml
@@ -160,7 +160,7 @@
       </context>
    </extension>
    <extension
-         point="org.eclipse.papyrus.views.properties.context">
+         point="org.eclipse.papyrus.infra.properties.ui.context">
       <preferencePageBinding
             context="welcome-general"
             page="org.eclipse.papyrus.infra.editor.welcome.content">
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/pom.xml b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/pom.xml
index 8ad03b63171..ec1b679a968 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/pom.xml
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-editor</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.editor.welcome</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/WelcomePage.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/WelcomePage.java
index baf0be3dd79..a3332bd2a88 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/WelcomePage.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/WelcomePage.java
@@ -23,15 +23,15 @@ import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.infra.constraints.runtime.ConstraintEngine;
 import org.eclipse.papyrus.infra.constraints.runtime.ConstraintEngineListener;
 import org.eclipse.papyrus.infra.core.sasheditor.editor.ICloseablePart;
 import org.eclipse.papyrus.infra.editor.welcome.IWelcomePageService;
 import org.eclipse.papyrus.infra.properties.contexts.Section;
 import org.eclipse.papyrus.infra.properties.contexts.View;
-import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;
-import org.eclipse.papyrus.views.properties.runtime.DefaultDisplayEngine;
-import org.eclipse.papyrus.views.properties.runtime.ViewConstraintEngine;
-import org.eclipse.papyrus.views.properties.xwt.XWTSection;
+import org.eclipse.papyrus.infra.properties.ui.runtime.DefaultDisplayEngine;
+import org.eclipse.papyrus.infra.properties.ui.runtime.PropertiesRuntime;
+import org.eclipse.papyrus.infra.properties.ui.xwt.XWTSection;
 import org.eclipse.swt.layout.FormLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -49,7 +49,7 @@ public class WelcomePage implements ICloseablePart {
 	private final Object model;
 
 	private FormToolkit toolkit;
-	private ViewConstraintEngine constraintEngine;
+	private ConstraintEngine<View> constraintEngine;
 	private ConstraintEngineListener constraintsListener;
 	private DefaultDisplayEngine displayEngine;
 	private ScrolledForm form;
@@ -94,7 +94,7 @@ public class WelcomePage implements ICloseablePart {
 
 	public Composite createControl(Composite parent) {
 		toolkit = new FormToolkit(parent.getDisplay());
-		constraintEngine = ConfigurationManager.getInstance().getConstraintEngine();
+		constraintEngine = PropertiesRuntime.getConstraintEngine();
 		displayEngine = new DefaultDisplayEngine(false);
 		attachConstraintEngine(constraintEngine);
 
@@ -114,7 +114,7 @@ public class WelcomePage implements ICloseablePart {
 		return form;
 	}
 
-	protected void attachConstraintEngine(ViewConstraintEngine engine) {
+	protected void attachConstraintEngine(ConstraintEngine<? extends View> engine) {
 		constraintsListener = event -> rebuildSections(form.getBody());
 		engine.addConstraintEngineListener(constraintsListener);
 	}
@@ -148,8 +148,7 @@ public class WelcomePage implements ICloseablePart {
 	}
 
 	protected void createSections(Composite parent) {
-		IStructuredSelection selection = new StructuredSelection(model);
-		Set<View> views = constraintEngine.getViews(selection);
+		Set<View> views = constraintEngine.getDisplayUnits(model);
 
 		// Get the unique tabs
 		Map<String, WelcomeTab> tabProxies = new HashMap<>();
@@ -177,6 +176,7 @@ public class WelcomePage implements ICloseablePart {
 			next.filterSections(views);
 		}
 
+		IStructuredSelection selection = new StructuredSelection(model);
 		for (WelcomeTab tab : tabs) {
 			for (Section section : tab.getSections()) {
 				XWTSection xwtSection = new XWTSection(section, tab.getView(section), displayEngine);
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/WelcomeModelElement.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/WelcomeModelElement.java
index d532ec98dcb..f80a66b83c8 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/WelcomeModelElement.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/WelcomeModelElement.java
@@ -17,7 +17,7 @@ import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement;
 
 /**
  * @author damus
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/WelcomeModelElementFactory.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/WelcomeModelElementFactory.java
index e0daf707530..0c194ed6a9f 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/WelcomeModelElementFactory.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/modelelements/WelcomeModelElementFactory.java
@@ -15,10 +15,10 @@ package org.eclipse.papyrus.infra.editor.welcome.internal.modelelements;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.papyrus.infra.editor.welcome.internal.Activator;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
-import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.modelelement.AbstractEMFModelElementFactory;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.AbstractEMFModelElementFactory;
 
 /**
  * @author damus
diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/preferences/WelcomeContentPreferencePage.java b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/preferences/WelcomeContentPreferencePage.java
index e981eb4cbda..887f0793977 100644
--- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/preferences/WelcomeContentPreferencePage.java
+++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/src/org/eclipse/papyrus/infra/editor/welcome/internal/preferences/WelcomeContentPreferencePage.java
@@ -18,7 +18,7 @@ import java.io.IOException;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.papyrus.infra.editor.welcome.internal.Activator;
-import org.eclipse.papyrus.views.properties.preferences.Preferences;
+import org.eclipse.papyrus.infra.properties.ui.preferences.Preferences;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
diff --git a/plugins/infra/editor/pom.xml b/plugins/infra/editor/pom.xml
new file mode 100644
index 00000000000..cecfbde54b6
--- /dev/null
+++ b/plugins/infra/editor/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.infra-editor</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+	<name>Papyrus Editor Welcome Page</name>
+	<description>Model and implementation of the extensible Welcome Page of the Papyrus Editor.</description>
+	
+	<modules>
+		<module>org.eclipse.papyrus.infra.editor.welcome</module>
+		<module>org.eclipse.papyrus.infra.editor.welcome.nattable</module>
+	</modules>
+</project>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/pom.xml
index d9a0cdd53d4..d30fa69c8f1 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/pom.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-emf</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.emf.appearance</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/META-INF/MANIFEST.MF
index e4acf402212..f1bffdb6c75 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/META-INF/MANIFEST.MF
@@ -1,23 +1,23 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.emf.diagram.common,

- org.eclipse.papyrus.infra.emf.diagram.common.handler

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

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

- org.eclipse.emf.transaction;bundle-version="1.4.0",

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

- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",

- org.eclipse.core.commands;bundle-version="3.6.1",

- org.eclipse.ui,

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

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

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

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-Activator: org.eclipse.papyrus.infra.emf.diagram.common.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.diagram.common;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.emf.diagram.common,
+ org.eclipse.papyrus.infra.emf.diagram.common.handler
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
+ org.eclipse.emf.transaction;bundle-version="1.4.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
+ org.eclipse.core.commands;bundle-version="3.6.1",
+ org.eclipse.ui,
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-Activator: org.eclipse.papyrus.infra.emf.diagram.common.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.diagram.common;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/pom.xml
index 3e7fe363b0e..a288294b391 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/pom.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-emf</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.emf.diagram.common</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/src/org/eclipse/papyrus/infra/emf/diagram/common/handler/CreateDiagramHandler.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/src/org/eclipse/papyrus/infra/emf/diagram/common/handler/CreateDiagramHandler.java
index ae4978c24d0..3e2912620d5 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/src/org/eclipse/papyrus/infra/emf/diagram/common/handler/CreateDiagramHandler.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/src/org/eclipse/papyrus/infra/emf/diagram/common/handler/CreateDiagramHandler.java
@@ -1,149 +1,149 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

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

-package org.eclipse.papyrus.infra.emf.diagram.common.handler;

-

-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.emf.ecore.EObject;

-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.NotationFactory;

-import org.eclipse.papyrus.infra.core.Activator;

-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

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

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

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;

-import org.eclipse.papyrus.infra.ui.extension.diagrameditor.IPluggableEditorFactory;

-import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForHandlers;

-

-/**

- * Base class for create diagram Handlers.

- *

- * @author cedric dumoulin

- *

- */

-// FIXME: Refactoring. This should not depend on GMF (NotationUtils depends on GMF).

-// This class is not in the Papyrus Build in 0.10

-public abstract class CreateDiagramHandler extends AbstractHandler implements IHandler {

-

-	/**

-	 *

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

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	public Object execute(final ExecutionEvent event) throws ExecutionException {

-

-		final ServicesRegistry registry;

-

-		TransactionalEditingDomain editingDomain;

-

-		try {

-			registry = ServiceUtilsForHandlers.getInstance().getServiceRegistry(event);

-			editingDomain = ServiceUtils.getInstance().getTransactionalEditingDomain(registry);

-		} catch (ServiceException ex) {

-			Activator.log.error(ex);

-			return null;

-		}

-

-		RecordingCommand command = new RecordingCommand(editingDomain, "Create EMF Diagram") {

-

-			@Override

-			protected void doExecute() {

-				addNewDiagram(registry);

-			}

-

-		};

-

-		editingDomain.getCommandStack().execute(command);

-		return null;

-	}

-

-	/**

-	 *

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

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	public Object execute(final ServicesRegistry servicesRegistry) throws ExecutionException {

-

-		TransactionalEditingDomain editingDomain;

-

-		try {

-			editingDomain = ServiceUtils.getInstance().getTransactionalEditingDomain(servicesRegistry);

-		} catch (ServiceException ex) {

-			Activator.log.error(ex);

-			return null;

-		}

-

-		RecordingCommand command = new RecordingCommand(editingDomain, "Create EMF Diagram") {

-

-			@Override

-			protected void doExecute() {

-				addNewDiagram(servicesRegistry);

-			}

-

-		};

-

-		editingDomain.getCommandStack().execute(command);

-		return null;

-	}

-

-	/**

-	 * Subclasses should implements this method.

-	 */

-	protected abstract void addNewDiagram(ServicesRegistry registry);

-

-	/**

-	 * Add a new Diagram to the graphical model.

-	 *

-	 * @param diagram

-	 *            The diagram to add to graphical model. This will be the diagram provided to {@link IPluggableEditorFactory#createIPageModel(Object, org.eclipse.papyrus.infra.core.services.ServicesRegistry)}

-	 */

-	protected void addNewDiagram(String name, String type, EObject diagram, ServicesRegistry registry) {

-

-		// TODO Create a special node inside the sash model (di) instead of introducing

-		// a dependence on notation.

-		// This implies to change the factory also.

-		// The special node creation should be done by methods from sash

-		// create di2node

-		Diagram di2Diagram = NotationFactory.eINSTANCE.createDiagram();

-		di2Diagram.setVisible(true);

-		di2Diagram.setType(type);

-		if (name != null) {

-			di2Diagram.setName(name);

-		}

-

-		// Add it to resource, so that it will be saved.

-		// NotationUtils.getNotationResource().getContents().add(di2Diagram);

-		NotationUtils.getNotationModel().addDiagram(di2Diagram);

-

-		// Attach to sash in order to show it

-		// Add the diagram as a page to the current sash folder

-		try {

-			registry.getService(IPageManager.class).openPage(di2Diagram);

-		} catch (ServiceException ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.diagram.common.handler;
+
+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.emf.ecore.EObject;
+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.NotationFactory;
+import org.eclipse.papyrus.infra.core.Activator;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.ui.extension.diagrameditor.IPluggableEditorFactory;
+import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForHandlers;
+
+/**
+ * Base class for create diagram Handlers.
+ *
+ * @author cedric dumoulin
+ *
+ */
+// FIXME: Refactoring. This should not depend on GMF (NotationUtils depends on GMF).
+// This class is not in the Papyrus Build in 0.10
+public abstract class CreateDiagramHandler extends AbstractHandler implements IHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	public Object execute(final ExecutionEvent event) throws ExecutionException {
+
+		final ServicesRegistry registry;
+
+		TransactionalEditingDomain editingDomain;
+
+		try {
+			registry = ServiceUtilsForHandlers.getInstance().getServiceRegistry(event);
+			editingDomain = ServiceUtils.getInstance().getTransactionalEditingDomain(registry);
+		} catch (ServiceException ex) {
+			Activator.log.error(ex);
+			return null;
+		}
+
+		RecordingCommand command = new RecordingCommand(editingDomain, "Create EMF Diagram") {
+
+			@Override
+			protected void doExecute() {
+				addNewDiagram(registry);
+			}
+
+		};
+
+		editingDomain.getCommandStack().execute(command);
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 *
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	public Object execute(final ServicesRegistry servicesRegistry) throws ExecutionException {
+
+		TransactionalEditingDomain editingDomain;
+
+		try {
+			editingDomain = ServiceUtils.getInstance().getTransactionalEditingDomain(servicesRegistry);
+		} catch (ServiceException ex) {
+			Activator.log.error(ex);
+			return null;
+		}
+
+		RecordingCommand command = new RecordingCommand(editingDomain, "Create EMF Diagram") {
+
+			@Override
+			protected void doExecute() {
+				addNewDiagram(servicesRegistry);
+			}
+
+		};
+
+		editingDomain.getCommandStack().execute(command);
+		return null;
+	}
+
+	/**
+	 * Subclasses should implements this method.
+	 */
+	protected abstract void addNewDiagram(ServicesRegistry registry);
+
+	/**
+	 * Add a new Diagram to the graphical model.
+	 *
+	 * @param diagram
+	 *            The diagram to add to graphical model. This will be the diagram provided to {@link IPluggableEditorFactory#createIPageModel(Object, org.eclipse.papyrus.infra.core.services.ServicesRegistry)}
+	 */
+	protected void addNewDiagram(String name, String type, EObject diagram, ServicesRegistry registry) {
+
+		// TODO Create a special node inside the sash model (di) instead of introducing
+		// a dependence on notation.
+		// This implies to change the factory also.
+		// The special node creation should be done by methods from sash
+		// create di2node
+		Diagram di2Diagram = NotationFactory.eINSTANCE.createDiagram();
+		di2Diagram.setVisible(true);
+		di2Diagram.setType(type);
+		if (name != null) {
+			di2Diagram.setName(name);
+		}
+
+		// Attach to sash in order to show it
+		// Add the diagram as a page to the current sash folder
+		try {
+			// Persist the new diagram. This should find the Notation Model.
+			// If there is no Notation Model, we shouldn't even be here
+			registry.getService(ModelSet.class).getModelToPersist(di2Diagram).persist(di2Diagram);
+
+			registry.getService(IPageManager.class).openPage(di2Diagram);
+		} catch (ServiceException ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/.classpath b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.classpath
index eca7bdba8f0..eca7bdba8f0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/.classpath
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.classpath
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.project b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.project
new file mode 100644
index 00000000000..d198355a356
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.emf.gmf</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/org.eclipse.papyrus.infra.tools/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

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

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

-org.eclipse.jdt.core.compiler.compliance=1.8

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

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

-org.eclipse.jdt.core.compiler.source=1.8

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..36c601e282b
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.emf.gmf.command,
+ org.eclipse.papyrus.infra.emf.gmf.util,
+ org.eclipse.papyrus.infra.emf.internal.gmf;x-internal:=true
+Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.core.expressions;bundle-version="3.4.400",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.emf.internal.gmf.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.gmf;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/about.html b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints.edit/about.html
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/about.html
@@ -1,28 +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>

+<!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/infra/emf/org.eclipse.papyrus.infra.emf.gmf/build.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/build.properties
new file mode 100644
index 00000000000..525a89f2c33
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/build.properties
@@ -0,0 +1,10 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               build.properties,\
+               plugin.xml,\
+               schema/
+src.includes = about.html,\
+               schema/
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/plugin.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/plugin.properties
new file mode 100644
index 00000000000..a9f119d526c
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/plugin.properties
@@ -0,0 +1,14 @@
+#
+# Copyright (c) 2016 Christian W. Damus and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Christian W. Damus - initial API and implementation
+#
+
+pluginName = Papyrus GMF Run-time Core
+providerName = Eclipse Modeling Project
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/plugin.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/plugin.xml
new file mode 100644
index 00000000000..035a271ff6f
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/plugin.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<!--
+ Copyright (c) 2016 Christian W. Damus and others.
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+ 
+ Contributors:
+   Christian W. Damus - Initial API and implementation
+   
+-->
+<plugin>
+   <extension-point id="operationApprovers" name="Operation Approvers" schema="schema/operationApprovers.exsd"/>
+   <extension-point id="historyListeners" name="Operation History Listeners" schema="schema/historyListeners.exsd"/>
+
+</plugin>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/pom.xml
new file mode 100644
index 00000000000..89242377479
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-emf</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.emf.gmf</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/schema/historyListeners.exsd b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/schema/historyListeners.exsd
new file mode 100644
index 00000000000..89364178775
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/schema/historyListeners.exsd
@@ -0,0 +1,91 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.commands" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.commands" id="historyListeners" name="historyListeners"/>
+      </appinfo>
+      <documentation>
+         Registration of history listeners to be attached to the operation history used by the Papyrus GMF diagrams (and transactional editing domains in general).
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="historyListener" 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="historyListener">
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The Java class implementing of the history listener.
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.core.commands.operations.IOperationHistoryListener"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         2.0
+      </documentation>
+   </annotation>
+
+
+
+
+   <annotation>
+      <appinfo>
+         <meta.section type="copyright"/>
+      </appinfo>
+      <documentation>
+         Copyright (c) 2014 CEA and others.
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/schema/operationApprovers.exsd b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/schema/operationApprovers.exsd
new file mode 100644
index 00000000000..cfb6863fcb5
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/schema/operationApprovers.exsd
@@ -0,0 +1,78 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.emf.gmf" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.emf.gmf" id="operationApprovers" name="Operation Approviders"/>
+      </appinfo>
+      <documentation>
+         
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="operationApprover" minOccurs="0" 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="operationApprover">
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.core.commands.operations.IOperationApprover2"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+         <attribute name="priority" type="string">
+            <annotation>
+               <documentation>
+                  An integer value representing the priority of the operationApprover.
+High value means the operationApprover will be checked before those with lower value.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+
+
+
+
+
+</schema>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/command/CheckedOperationHistory.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/command/CheckedOperationHistory.java
new file mode 100644
index 00000000000..a9cc62ba62a
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/command/CheckedOperationHistory.java
@@ -0,0 +1,352 @@
+/*****************************************************************************
+ * Copyright (c) 2011, 2016 Atos, CEA, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mathieu Velten (Atos) - Initial API and implementation
+ *  Christian W. Damus (CEA) - bugs 357250, 323802
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.gmf.command;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.operations.ICompositeOperation;
+import org.eclipse.core.commands.operations.IOperationApprover;
+import org.eclipse.core.commands.operations.IOperationApprover2;
+import org.eclipse.core.commands.operations.IOperationHistory;
+import org.eclipse.core.commands.operations.IOperationHistoryListener;
+import org.eclipse.core.commands.operations.IUndoContext;
+import org.eclipse.core.commands.operations.IUndoableOperation;
+import org.eclipse.core.commands.operations.OperationHistoryFactory;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.workspace.EMFCommandOperation;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.infra.emf.internal.gmf.Activator;
+
+import com.google.common.collect.ObjectArrays;
+
+public class CheckedOperationHistory implements IOperationHistory {
+
+	private static class CheckedOperationHistoryHolder {
+
+		public static final CheckedOperationHistory instance = new CheckedOperationHistory();
+	}
+
+	public static CheckedOperationHistory getInstance() {
+		return CheckedOperationHistoryHolder.instance;
+	}
+
+	protected static final IOperationApprover2[] approversArray;
+
+	protected IOperationHistory history;
+
+	private static class ApproverPriorityPair implements Comparable<ApproverPriorityPair> {
+
+		public IOperationApprover2 approver;
+
+		public int priority;
+
+		@Override
+		public int compareTo(ApproverPriorityPair o) {
+			if (o.priority > priority) {
+				return 1;
+			} else if (o.priority < priority) {
+				return -1;
+			} else {
+				return 0;
+			}
+		}
+
+	}
+
+	static {
+		IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(Activator.PLUGIN_ID, "operationApprovers"); //$NON-NLS-1$
+		// Pre-2.0 extension point
+		IConfigurationElement[] legacyElements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.papyrus.infra.gmfdiag.commands", "operationApprover"); // Platform.getExtensionRegistry().getConfigurationElementsFor(Activator.PLUGIN_ID, //$NON-NLS-1$
+																																													// "operationApprover");
+		configElements = ObjectArrays.concat(configElements, legacyElements, IConfigurationElement.class);
+
+		List<ApproverPriorityPair> approverPriorityPairs = new LinkedList<ApproverPriorityPair>();
+		for (IConfigurationElement elem : configElements) {
+			if ("operationApprover".equals(elem.getName())) { //$NON-NLS-1$
+				try {
+					ApproverPriorityPair approverPriorityPair = new ApproverPriorityPair();
+					approverPriorityPair.approver = (IOperationApprover2) elem.createExecutableExtension("class"); //$NON-NLS-1$
+					approverPriorityPair.priority = Integer.parseInt(elem.getAttribute("priority")); //$NON-NLS-1$
+
+					approverPriorityPairs.add(approverPriorityPair);
+				} catch (Exception e) {
+					Activator.log.error("Uncaught exception in instantiation of operation approver.", e); //$NON-NLS-1$
+				}
+			}
+		}
+
+		Collections.sort(approverPriorityPairs);
+
+		approversArray = new IOperationApprover2[approverPriorityPairs.size()];
+
+		for (int i = 0; i < approversArray.length; i++) {
+			approversArray[i] = approverPriorityPairs.get(i).approver;
+		}
+	}
+
+	private CheckedOperationHistory() {
+		history = OperationHistoryFactory.getOperationHistory();
+
+		addRegisteredListeners(history);
+	}
+
+	/*
+	 * Consult the IOperationApprovers to see if the proposed redo should be
+	 * allowed.
+	 */
+	protected IStatus getRedoApproval(IUndoableOperation operation, IAdaptable info) {
+		operation = unwrap(operation);
+		for (int i = 0; i < approversArray.length; i++) {
+			IStatus approval = approversArray[i].proceedRedoing(operation, this, info);
+			if (!approval.isOK()) {
+				return approval;
+			}
+		}
+		return Status.OK_STATUS;
+	}
+
+	/*
+	 * Consult the IOperationApprovers to see if the proposed undo should be
+	 * allowed.
+	 */
+	protected IStatus getUndoApproval(IUndoableOperation operation, IAdaptable info) {
+		operation = unwrap(operation);
+		for (int i = 0; i < approversArray.length; i++) {
+			IStatus approval = approversArray[i].proceedUndoing(operation, this, info);
+			if (!approval.isOK()) {
+				return approval;
+			}
+		}
+		return Status.OK_STATUS;
+	}
+
+	/*
+	 * Consult the IOperationApprovers to see if the proposed execution should
+	 * be allowed.
+	 *
+	 * @since 3.2
+	 */
+	protected IStatus getExecuteApproval(IUndoableOperation operation, IAdaptable info) {
+		operation = unwrap(operation);
+		for (int i = 0; i < approversArray.length; i++) {
+			IStatus approval = approversArray[i].proceedExecuting(operation, this, info);
+			if (!approval.isOK()) {
+				return approval;
+			}
+		}
+		return Status.OK_STATUS;
+	}
+
+	/**
+	 * the unified command stack wraps ICommand GMFtoEMFCommandWrapper
+	 * which are wrapped in EMFCommandOperation,
+	 * unwrap it before validation
+	 *
+	 * @param operation
+	 * @return
+	 */
+	protected IUndoableOperation unwrap(IUndoableOperation operation) {
+		if (operation instanceof EMFCommandOperation) {
+			Command emfCommand = ((EMFCommandOperation) operation).getCommand();
+			if (emfCommand instanceof GMFtoEMFCommandWrapper) {
+				ICommand gmfCommand = ((GMFtoEMFCommandWrapper) emfCommand).getGMFCommand();
+				if (gmfCommand != null) {
+					return gmfCommand;
+				}
+			}
+		}
+
+		return operation;
+	}
+
+	@Override
+	public IStatus execute(IUndoableOperation operation, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		// check with the operation approvers
+		IStatus status = getExecuteApproval(operation, info);
+		if (!status.isOK()) {
+			// not approved. No notifications are sent, just return the status.
+			return status;
+		}
+		return history.execute(operation, monitor, info);
+	}
+
+	@Override
+	public IStatus undo(IUndoContext context, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		Assert.isNotNull(context);
+		IUndoableOperation operation = getUndoOperation(context);
+
+		// info if there is no operation
+		if (operation == null) {
+			return IOperationHistory.NOTHING_TO_UNDO_STATUS;
+		}
+
+		// check with the operation approvers
+		IStatus status = getUndoApproval(operation, info);
+		if (!status.isOK()) {
+			// not approved. No notifications are sent, just return the status.
+			return status;
+		}
+		return history.undo(context, monitor, info);
+	}
+
+	@Override
+	public IStatus redo(IUndoContext context, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		Assert.isNotNull(context);
+		IUndoableOperation operation = getRedoOperation(context);
+
+		// info if there is no operation
+		if (operation == null) {
+			return IOperationHistory.NOTHING_TO_REDO_STATUS;
+		}
+
+		// check with the operation approvers
+		IStatus status = getRedoApproval(operation, info);
+		if (!status.isOK()) {
+			// not approved. No notifications are sent, just return the status.
+			return status;
+		}
+		return history.redo(context, monitor, info);
+	}
+
+	private static void addRegisteredListeners(IOperationHistory history) {
+		IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(Activator.PLUGIN_ID, "historyListeners"); //$NON-NLS-1$
+		// Pre-2.0 extension point
+		IConfigurationElement[] legacyElements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.papyrus.infra.gmfdiag.commands", "historyListeners"); //$NON-NLS-1$
+		configElements = ObjectArrays.concat(configElements, legacyElements, IConfigurationElement.class);
+
+		for (IConfigurationElement elem : configElements) {
+			if ("historyListener".equals(elem.getName())) { //$NON-NLS-1$
+				try {
+					IOperationHistoryListener listener = (IOperationHistoryListener) elem.createExecutableExtension("class"); //$NON-NLS-1$
+					history.addOperationHistoryListener(listener);
+				} catch (Exception e) {
+					Activator.log.error("Uncaught exception in instantiation of operation history listener.", e); //$NON-NLS-1$
+				}
+			}
+		}
+	}
+
+	// all the following methods are pure delegation
+
+	@Override
+	public IStatus undoOperation(IUndoableOperation operation, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		return history.undoOperation(operation, monitor, info);
+	}
+
+	@Override
+	public void setLimit(IUndoContext context, int limit) {
+		history.setLimit(context, limit);
+	}
+
+	@Override
+	public void replaceOperation(IUndoableOperation operation, IUndoableOperation[] replacements) {
+		history.replaceOperation(operation, replacements);
+	}
+
+	@Override
+	public void removeOperationHistoryListener(IOperationHistoryListener listener) {
+		history.removeOperationHistoryListener(listener);
+	}
+
+	@Override
+	public void removeOperationApprover(IOperationApprover approver) {
+		history.removeOperationApprover(approver);
+	}
+
+	@Override
+	public IStatus redoOperation(IUndoableOperation operation, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		return history.redoOperation(operation, monitor, info);
+	}
+
+	@Override
+	public void operationChanged(IUndoableOperation operation) {
+		history.operationChanged(operation);
+	}
+
+	@Override
+	public void openOperation(ICompositeOperation operation, int mode) {
+		history.openOperation(operation, mode);
+	}
+
+	@Override
+	public IUndoableOperation getUndoOperation(IUndoContext context) {
+		return history.getUndoOperation(context);
+	}
+
+	@Override
+	public IUndoableOperation[] getUndoHistory(IUndoContext context) {
+		return history.getUndoHistory(context);
+	}
+
+	@Override
+	public IUndoableOperation getRedoOperation(IUndoContext context) {
+		return history.getRedoOperation(context);
+	}
+
+	@Override
+	public IUndoableOperation[] getRedoHistory(IUndoContext context) {
+		return history.getRedoHistory(context);
+	}
+
+	@Override
+	public int getLimit(IUndoContext context) {
+		return history.getLimit(context);
+	}
+
+	@Override
+	public void dispose(IUndoContext context, boolean flushUndo, boolean flushRedo, boolean flushContext) {
+		history.dispose(context, flushUndo, flushRedo, flushContext);
+	}
+
+	@Override
+	public void closeOperation(boolean operationOK, boolean addToHistory, int mode) {
+		history.closeOperation(operationOK, addToHistory, mode);
+	}
+
+	@Override
+	public boolean canUndo(IUndoContext context) {
+		return history.canUndo(context);
+	}
+
+	@Override
+	public boolean canRedo(IUndoContext context) {
+		return history.canRedo(context);
+	}
+
+	@Override
+	public void addOperationHistoryListener(IOperationHistoryListener listener) {
+		history.addOperationHistoryListener(listener);
+	}
+
+	@Override
+	public void addOperationApprover(IOperationApprover approver) {
+		history.addOperationApprover(approver);
+	}
+
+	@Override
+	public void add(IUndoableOperation operation) {
+		history.add(operation);
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/command/EMFtoGMFCommandWrapper.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/command/EMFtoGMFCommandWrapper.java
new file mode 100644
index 00000000000..ca30d10d1cf
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/command/EMFtoGMFCommandWrapper.java
@@ -0,0 +1,204 @@
+/***************************************************************************
+ * Copyright (c) 2007, 2016 Conselleria de Infraestructuras y Transporte, Generalitat de la Comunitat Valenciana, CEA, Christian W. Damus, and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: Mario Cervera Ubeda (Prodevelop)
+ *    Christian W. Damus (CEA) - bug 430701
+ *    Christian W. Damus - bug 485220
+ *
+ ******************************************************************************/
+package org.eclipse.papyrus.infra.emf.gmf.command;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.function.Function;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
+import org.eclipse.gmf.runtime.common.core.command.AbstractCommand;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+
+/**
+ * A GMF Command that wraps an EMF command. Each method is redirected to the EMF one.
+ */
+public class EMFtoGMFCommandWrapper extends AbstractCommand implements ICommandWrapper<Command> {
+
+	private static Function<Command, ICommand> wrapperFunction = EMFtoGMFCommandWrapper::new;
+	private static Function<Command, ICommand> ndWrapperFunction = NonDirtying::new;
+
+	/**
+	 * The wrapped EMF Command. Package-level visibility so that the command stack wrapper can
+	 * access the field.
+	 */
+	protected Command emfCommand;
+
+	/**
+	 * This variable is used to avoid reentrant call in canUndo/undo/redo
+	 *
+	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=389382
+	 */
+	protected boolean isBusy;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param emfCommand
+	 *            the emf command
+	 */
+	public EMFtoGMFCommandWrapper(Command emfCommand) {
+		super(emfCommand.getLabel());
+		this.emfCommand = emfCommand;
+	}
+
+	/**
+	 * Wraps the given {@code command}, accounting for possible non-dirty state.
+	 *
+	 * @param command
+	 *            a command to wrap
+	 * @return the best wrapper for the {@code command}
+	 */
+	public static ICommand wrap(Command command) {
+		if (command instanceof org.eclipse.emf.common.command.AbstractCommand.NonDirtying) {
+			return ndWrapperFunction.apply(command);
+		}
+		return wrapperFunction.apply(command);
+	}
+
+	/**
+	 * Returns the wrapped EMF command.
+	 *
+	 * @return the EMF command
+	 */
+	public Command getEMFCommand() {
+		return emfCommand;
+	}
+
+	@Override
+	public Command getWrappedCommand() {
+		return getEMFCommand();
+	}
+
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+
+		emfCommand.execute();
+
+		return CommandResult.newOKCommandResult();
+	}
+
+	@Override
+	protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+
+		if (!isBusy) {
+			isBusy = true;
+			emfCommand.redo();
+			isBusy = false;
+		}
+
+		return CommandResult.newOKCommandResult();
+	}
+
+	@Override
+	protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+
+		if (!isBusy) {
+			isBusy = true;
+			emfCommand.undo();
+			isBusy = false;
+		}
+
+		return CommandResult.newOKCommandResult();
+	}
+
+	@Override
+	public boolean canExecute() {
+		return emfCommand.canExecute();
+	}
+
+	@Override
+	public void dispose() {
+		emfCommand.dispose();
+	}
+
+	@Override
+	public boolean canUndo() {
+		if (!isBusy) {
+			isBusy = true;
+			boolean res = emfCommand.canUndo();
+			isBusy = false;
+			return res;
+		} else {
+			return true;
+		}
+	}
+
+	@Override
+	public List getAffectedFiles() {
+		ArrayList affectedFiles = new ArrayList();
+		Collection<?> affectedObjects = emfCommand.getAffectedObjects();
+		if (affectedObjects != null) {
+			for (Object o : affectedObjects) {
+				if (o instanceof EObject) {
+					o = ((EObject) o).eResource();
+				}
+				if (o instanceof Resource) {
+					o = WorkspaceSynchronizer.getFile((Resource) o);
+				}
+				if (o instanceof IFile) {
+					affectedFiles.add(o);
+				}
+			}
+		}
+		return affectedFiles;
+	}
+
+	@Override
+	public CommandResult getCommandResult() {
+		Collection<?> res = emfCommand.getResult();
+		if (res != null && !res.isEmpty()) {
+			if (res.size() == 1) {
+				return CommandResult.newOKCommandResult(res.iterator().next());
+			}
+			return CommandResult.newOKCommandResult(res);
+		}
+		return CommandResult.newOKCommandResult();
+	}
+
+	protected static void setWrapperFunction(Function<Command, ICommand> wrapperFunction) {
+		EMFtoGMFCommandWrapper.wrapperFunction = wrapperFunction;
+	}
+
+	protected static void setNonDirtyingWrapperFunction(Function<Command, ICommand> wrapperFunction) {
+		EMFtoGMFCommandWrapper.ndWrapperFunction = wrapperFunction;
+	}
+
+	//
+	// Nested types
+	//
+
+	/**
+	 * A non-dirtying wrapper for non-dirtying commands.
+	 */
+	public static class NonDirtying extends EMFtoGMFCommandWrapper implements INonDirtying {
+
+		public NonDirtying(org.eclipse.emf.common.command.Command command) {
+			super(command);
+
+			if (!(command instanceof org.eclipse.emf.common.command.AbstractCommand.NonDirtying)) {
+				throw new IllegalArgumentException("Wrapped command is not non-dirtying"); //$NON-NLS-1$
+			}
+		}
+
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/command/GMFtoEMFCommandWrapper.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/command/GMFtoEMFCommandWrapper.java
new file mode 100644
index 00000000000..3aa00f20abd
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/command/GMFtoEMFCommandWrapper.java
@@ -0,0 +1,183 @@
+/***************************************************************************
+ * Copyright (c) 2007, 2016 Conselleria de Infraestructuras y Transporte, Generalitat de la Comunitat Valenciana, CEA, Christian W. Damus, and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: Mario Cervera Ubeda (Prodevelop)
+ *    Christian W. Damus (CEA) - bug 430701
+ *    Christian W. Damus - bug 485220
+ *
+ ******************************************************************************/
+package org.eclipse.papyrus.infra.emf.gmf.command;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.function.Function;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.AbstractCommand;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+
+/**
+ * A EMF Command that wraps a GMF command. Each method is redirected to the GMF one.
+ */
+public class GMFtoEMFCommandWrapper extends AbstractCommand implements ICommandWrapper<ICommand> {
+
+	private static Function<ICommand, Command> wrapperFunction = GMFtoEMFCommandWrapper::new;
+	private static Function<ICommand, Command> ndWrapperFunction = NonDirtying::new;
+
+	/**
+	 *
+	 * Wraps the GMF command return value to be returned by this method.
+	 *
+	 * @return the possible return value from the GMF command
+	 */
+	@Override
+	public Collection<?> getResult() {
+
+		Collection<Object> result = new ArrayList<Object>();
+		if (getGMFReturnValue() != null) {
+			result.add(getGMFReturnValue());
+		} // else return an empty collection
+
+		return result;
+	}
+
+	private Object getGMFReturnValue() {
+		if (getGMFCommand().getCommandResult() != null) {
+			return getGMFCommand().getCommandResult().getReturnValue();
+		}
+
+		return null;
+	}
+
+	/**
+	 * The wrapped GMF Command. Package-level visibility so that the command stack wrapper can
+	 * access the field.
+	 */
+	private final ICommand gmfCommand;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param gmfCommand
+	 *            the gmf command
+	 */
+	public GMFtoEMFCommandWrapper(ICommand gmfCommand) {
+		super(gmfCommand.getLabel());
+		this.gmfCommand = gmfCommand;
+	}
+
+	/**
+	 * Wraps the given {@code command}, accounting for possible non-dirty state.
+	 *
+	 * @param command
+	 *            a command to wrap
+	 * @return the best wrapper for the {@code command}
+	 */
+	public static Command wrap(ICommand command) {
+		if (command instanceof INonDirtying) {
+			return ndWrapperFunction.apply(command);
+		}
+		return wrapperFunction.apply(command);
+	}
+
+	/**
+	 * Returns the wrapped GMF command.
+	 *
+	 * @return the GMF command
+	 */
+	public ICommand getGMFCommand() {
+		return gmfCommand;
+	}
+
+	@Override
+	public ICommand getWrappedCommand() {
+		return getGMFCommand();
+	}
+
+	@Override
+	public boolean canExecute() {
+		return gmfCommand.canExecute();
+	}
+
+	@Override
+	public void dispose() {
+		gmfCommand.dispose();
+	}
+
+	@Override
+	public boolean canUndo() {
+		return gmfCommand.canUndo();
+	}
+
+	@Override
+	public void execute() {
+		try {
+			gmfCommand.execute(new NullProgressMonitor(), null);
+		} catch (ExecutionException e) {
+		}
+
+	}
+
+	@Override
+	public void redo() {
+		try {
+			gmfCommand.redo(new NullProgressMonitor(), null);
+		} catch (ExecutionException e) {
+		}
+
+	}
+
+	@Override
+	public void undo() {
+		try {
+			gmfCommand.undo(new NullProgressMonitor(), null);
+		} catch (ExecutionException e) {
+		}
+
+	}
+
+	@Override
+	public Collection<?> getAffectedObjects() {
+		return gmfCommand.getAffectedFiles();
+	}
+
+	@Override
+	public String getDescription() {
+		return gmfCommand.getLabel();
+	}
+
+	protected static void setWrapperFunction(Function<ICommand, Command> wrapperFunction) {
+		GMFtoEMFCommandWrapper.wrapperFunction = wrapperFunction;
+	}
+
+	protected static void setNonDirtyingWrapperFunction(Function<ICommand, Command> wrapperFunction) {
+		GMFtoEMFCommandWrapper.ndWrapperFunction = wrapperFunction;
+	}
+
+
+	//
+	// Nested types
+	//
+
+	/**
+	 * A non-dirtying wrapper for non-dirtying commands.
+	 */
+	public static class NonDirtying extends GMFtoEMFCommandWrapper implements AbstractCommand.NonDirtying {
+
+		public NonDirtying(ICommand command) {
+			super(command);
+
+			if (!(command instanceof INonDirtying)) {
+				throw new IllegalArgumentException("Wrapped command is not non-dirtying"); //$NON-NLS-1$
+			}
+		}
+
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/command/ICommandWrapper.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/command/ICommandWrapper.java
new file mode 100644
index 00000000000..74737ff7b6c
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/command/ICommandWrapper.java
@@ -0,0 +1,184 @@
+/*****************************************************************************
+ * Copyright (c) 2016 Christian W. Damus and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.emf.gmf.command;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.function.Function;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+
+/**
+ * A protocol for wrappers that adapt commands of one framework to another.
+ *
+ * @param <T>
+ *            the wrapped command type
+ */
+public interface ICommandWrapper<T> {
+	Registry REGISTRY = new Registry();
+
+	/**
+	 * Unwraps the wrapper to get the wrapped command of the other framework.
+	 * 
+	 * @return the wrapped command (never {@code null})
+	 */
+	T getWrappedCommand();
+
+	/**
+	 * Wraps a {@code command} as another {@code type}. This also handles wrappers
+	 * that are not {@link ICommandWrapper}s, such as those provided by GMF or
+	 * other projects externally to Papyrus.
+	 * 
+	 * @param command
+	 *            a command to wrap
+	 * @param type
+	 *            the command type to obtain
+	 * 
+	 * @return the wrapped command
+	 * 
+	 * @throws IllegalArgumentException
+	 *             if no wrapper is available of the required {@code type}
+	 */
+	static <F, T> T wrap(F command, Class<T> type) {
+		return REGISTRY.getWrapper(command, type).apply(command);
+	}
+
+	/**
+	 * Queries whether a {@code command} is a wrapper of some other type of command.
+	 * This also handles wrappers that are not {@link ICommandWrapper}s, such as
+	 * those provided by GMF or other projects externally to Papyrus.
+	 * 
+	 * @param command
+	 *            a command to wrapper
+	 * @param type
+	 *            the command type that perhaps it wraps
+	 * 
+	 * @return the wrapped command
+	 * 
+	 * @throws IllegalArgumentException
+	 *             if no wrapper is available of the required {@code type}
+	 */
+	static <F, T> boolean isWrapper(T command, Class<F> ofType) {
+		return REGISTRY.hasUnwrapper(command, ofType);
+	}
+
+	/**
+	 * Unwraps a {@code command} as another {@code type}. This also handles wrappers
+	 * that are not {@link ICommandWrapper}s, such as those provided by GMF or
+	 * other projects externally to Papyrus.
+	 * 
+	 * @param command
+	 *            a command to unwrap
+	 * @param type
+	 *            the command type to obtain
+	 * 
+	 * @return the wrapped command
+	 * 
+	 * @throws IllegalArgumentException
+	 *             if no wrapper is available of the required {@code type}
+	 */
+	static <F, T> F unwrap(T command, Class<F> type) {
+		return REGISTRY.getUnwrapper(command, type).apply(command);
+	}
+
+	//
+	// Nested types
+	//
+
+	class Registry {
+		private final ConcurrentMap<Class<?>, ConcurrentMap<Class<?>, Function<?, ?>>> wrappers = new ConcurrentHashMap<>();
+		private final ConcurrentMap<Class<?>, ConcurrentMap<Class<?>, Function<?, ?>>> unwrappers = new ConcurrentHashMap<>();
+
+		private Registry() {
+			super();
+
+			registerWrapper(Command.class, ICommand.class, EMFtoGMFCommandWrapper::wrap);
+			registerUnwrapper(EMFtoGMFCommandWrapper.class, Command.class, EMFtoGMFCommandWrapper::getWrappedCommand);
+			registerWrapper(ICommand.class, Command.class, GMFtoEMFCommandWrapper::wrap);
+			registerUnwrapper(GMFtoEMFCommandWrapper.class, ICommand.class, GMFtoEMFCommandWrapper::getWrappedCommand);
+		}
+
+		/**
+		 * Registers a functions to wrap commands of a source type as a target type.
+		 * 
+		 * @param fromType
+		 *            the source command type
+		 * @param toType
+		 *            the target command type
+		 * @param wrapper
+		 *            the wrapper function
+		 * 
+		 * @throws IllegalStateException
+		 *             if this pair of {@code fromType} and {@code toType} already has a wrapper registered
+		 */
+		public <F, T> void registerWrapper(Class<F> fromType, Class<T> toType, Function<? super F, ? extends T> wrapper) {
+			ConcurrentMap<Class<?>, Function<?, ?>> wrappers = this.wrappers.computeIfAbsent(fromType, key -> new ConcurrentHashMap<>());
+			if (wrappers.putIfAbsent(toType, wrapper) != null) {
+				throw new IllegalStateException(String.format("Wrapper already registered for %s -> %s", fromType.getSimpleName(), toType.getSimpleName()));
+			}
+		}
+
+		/**
+		 * Registers a function to unwrap commands of a source type to obtain the original command type.
+		 * 
+		 * @param fromType
+		 *            the source command type
+		 * @param toType
+		 *            the target command type
+		 * @param unwrapper
+		 *            the unwrapper function
+		 * 
+		 * @throws IllegalStateException
+		 *             if this pair of {@code fromType} and {@code toType} already has an unwrapper registered
+		 */
+		public <F, T> void registerUnwrapper(Class<F> fromType, Class<T> toType, Function<? super F, ? extends T> unwrapper) {
+			ConcurrentMap<Class<?>, Function<?, ?>> unwrappers = this.unwrappers.computeIfAbsent(fromType, key -> new ConcurrentHashMap<>());
+			if (unwrappers.putIfAbsent(toType, unwrapper) != null) {
+				throw new IllegalStateException(String.format("Unwrapper already registered for %s <- %s", toType.getSimpleName(), fromType.getSimpleName()));
+			}
+		}
+
+		@SuppressWarnings("unchecked")
+		<F, T> Function<F, T> getWrapper(F command, Class<T> type) {
+			return (Function<F, T>) wrappers.entrySet().stream()
+					.filter(e -> e.getKey().isInstance(command))
+					.flatMap(e -> e.getValue().entrySet().stream())
+					.filter(e -> type.isAssignableFrom(e.getKey()))
+					.map(Map.Entry::getValue)
+					.findFirst()
+					.orElseThrow(IllegalArgumentException::new);
+		}
+
+		<F, T> Function<T, F> getUnwrapper(T command, Class<F> type) {
+			return maybeGetUnwrapper(command, type).orElseThrow(IllegalArgumentException::new);
+		}
+
+		boolean hasUnwrapper(Object command, Class<?> type) {
+			return maybeGetUnwrapper(command, type).isPresent();
+		}
+
+		@SuppressWarnings({ "unchecked", "rawtypes" })
+		<F, T> Optional<Function<T, F>> maybeGetUnwrapper(T command, Class<F> type) {
+			return (Optional) unwrappers.entrySet().stream()
+					.filter(e -> e.getKey().isInstance(command))
+					.flatMap(e -> e.getValue().entrySet().stream())
+					.filter(e -> type.isAssignableFrom(e.getKey()))
+					.map(Map.Entry::getValue)
+					.findFirst();
+		}
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/command/INonDirtying.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/command/INonDirtying.java
new file mode 100644
index 00000000000..d00aec01d7d
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/command/INonDirtying.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2014 CEA and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus (CEA) - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.emf.gmf.command;
+
+import org.eclipse.emf.common.command.AbstractCommand;
+import org.eclipse.emf.common.command.Command;
+
+
+/**
+ * A marker interface for GMF and GEF commands that are non-dirtying. For EMF {@link Command}s, use the {@link AbstractCommand.NonDirtying} interface.
+ *
+ * @see AbstractCommand.NonDirtying
+ */
+public interface INonDirtying {
+	// Just a marker interface
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/command/NestingNotifyingWorkspaceCommandStack.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/command/NestingNotifyingWorkspaceCommandStack.java
new file mode 100644
index 00000000000..e2d94ddabed
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/command/NestingNotifyingWorkspaceCommandStack.java
@@ -0,0 +1,231 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - adapted for self-nesting behaviour
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.gmf.command;
+
+import org.eclipse.core.commands.operations.IOperationHistory;
+import org.eclipse.core.commands.operations.IUndoContext;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.transaction.RollbackException;
+
+
+public class NestingNotifyingWorkspaceCommandStack extends NotifyingWorkspaceCommandStack {
+
+	private NestingNotifyingWorkspaceCommandStack childCommandStack;
+
+	private final boolean nested;
+
+	private boolean executing;
+
+	protected IUndoContext defaultUndoContext;
+
+	public NestingNotifyingWorkspaceCommandStack(IOperationHistory history) {
+		this(false, history, null);
+	}
+
+	protected NestingNotifyingWorkspaceCommandStack(boolean nested, IOperationHistory history, IUndoContext defaultUndoContext) {
+		super(history);
+		this.nested = nested;
+		this.defaultUndoContext = defaultUndoContext;
+	}
+
+	protected NestingNotifyingWorkspaceCommandStack(boolean nested, IOperationHistory history) {
+		this(nested, history, computeNestedUndoContext());
+	}
+
+	private static IUndoContext computeNestedUndoContext() {
+		return new IUndoContext() {
+
+			public boolean matches(IUndoContext context) {
+				return context == this;
+			}
+
+			public String getLabel() {
+				return "Nested Undo Context";
+			}
+		};
+	}
+
+	@Override
+	public IUndoContext getDefaultUndoContext() {
+		if (defaultUndoContext == null) {
+			return super.getDefaultUndoContext();
+		}
+		return defaultUndoContext;
+	}
+
+	protected NestingNotifyingWorkspaceCommandStack getTopMostCommandStack() {
+		if (childCommandStack == null) {
+			return this;
+		}
+		return childCommandStack.getTopMostCommandStack();
+	}
+
+	protected void startNestedTransaction(Command command) {
+		if (childCommandStack != null) {
+			// Forwards to the current stack
+			childCommandStack.startNestedTransaction(command);
+		} else {
+			// Start a new nested transaction in a new nested Stack
+			childCommandStack = createNestedCommandStack(getOperationHistory());
+			childCommandStack.setEditingDomain(getDomain());
+
+			childCommandStack.execute(command);
+		}
+	}
+
+	protected NestingNotifyingWorkspaceCommandStack createNestedCommandStack(IOperationHistory history) {
+		return new NestingNotifyingWorkspaceCommandStack(true, history);
+	}
+
+	public void commit() {
+		if (childCommandStack != null) {
+			disposeLastCommandStack();
+		}
+	}
+
+	private boolean disposeLastCommandStack() {
+		if (childCommandStack == null) {
+			// I'm the last command stack
+			dispose();
+			return true;
+		}
+
+		// Propagates
+		if (childCommandStack.disposeLastCommandStack()) {
+			childCommandStack = null;
+		}
+
+		return false;
+	}
+
+	public void rollback() {
+		if (childCommandStack != null) {
+			while (canUndo()) {
+				undo();
+			}
+			disposeLastCommandStack();
+		}
+	}
+
+	@Override
+	public void execute(Command command) {
+		if (childCommandStack == null) {
+			if (!executing) {
+				executing = true;
+
+				try {
+					super.execute(command);
+				} finally {
+					executing = false;
+				}
+			} else {
+				// Re-entrant command execution goes on a nested stack
+				try {
+					startNestedTransaction(command);
+					commit();
+				} catch (OperationCanceledException e) {
+					rollback();
+					// Propagate
+					throw e;
+				}
+			}
+		} else {
+			childCommandStack.execute(command);
+		}
+	}
+
+	@Override
+	protected void handleError(Exception exception) {
+		if (nested && (exception instanceof RollbackException)) {
+			// A nested transaction rolled back
+			RollbackException rbe = (RollbackException) exception;
+			if (rbe.getStatus().getSeverity() == IStatus.CANCEL) {
+				// Propagate
+				throw new OperationCanceledException();
+			}
+		}
+
+		if (exception instanceof OperationCanceledException) {
+			rollback();
+		} else {
+			super.handleError(exception);
+		}
+	}
+
+	@Override
+	public Command getMostRecentCommand() {
+		if (childCommandStack == null) {
+			return super.getMostRecentCommand();
+		} else {
+			return childCommandStack.getMostRecentCommand();
+		}
+	}
+
+	@Override
+	public Command getRedoCommand() {
+		if (childCommandStack == null) {
+			return super.getRedoCommand();
+		} else {
+			return childCommandStack.getRedoCommand();
+		}
+	}
+
+	@Override
+	public Command getUndoCommand() {
+		if (childCommandStack == null) {
+			return super.getUndoCommand();
+		} else {
+			return childCommandStack.getUndoCommand();
+		}
+	}
+
+	@Override
+	public void undo() {
+		if (childCommandStack == null) {
+			super.undo();
+		} else {
+			childCommandStack.undo();
+		}
+	}
+
+	@Override
+	public boolean canUndo() {
+		if (childCommandStack == null) {
+			return super.canUndo();
+		} else {
+			return childCommandStack.canUndo();
+		}
+	}
+
+	@Override
+	public boolean canRedo() {
+		if (childCommandStack == null) {
+			return super.canRedo();
+		} else {
+			return childCommandStack.canRedo();
+		}
+	}
+
+	@Override
+	public void redo() {
+		if (childCommandStack == null) {
+			super.redo();
+		} else {
+			childCommandStack.redo();
+		}
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/command/NotifyingWorkspaceCommandStack.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/command/NotifyingWorkspaceCommandStack.java
new file mode 100644
index 00000000000..59dabfcca16
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/command/NotifyingWorkspaceCommandStack.java
@@ -0,0 +1,670 @@
+/*****************************************************************************
+ * Copyright (c) 2011, 2015 Atos, CEA, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mathieu Velten (Atos) - Initial API and implementation
+ *  Arthur Daussy (Atos) - 363826: [Model Explorer] Drag and drop and undo, incorrect behavior
+ *  Christian W. Damus (CEA) - 404220: Add contexts for tracking objects changed by operations (CDO)
+ *  Christian W. Damus (CEA) - bug 402525
+ *  Christian W. Damus (CEA) - bug 430648
+ *  Christian W. Damus (CEA) - bug 431023
+ *  Christian W. Damus (CEA) - bug 384169
+ *  Christian W. Damus - bug 459746
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.gmf.command;
+
+import static org.eclipse.papyrus.infra.emf.gmf.util.OperationUtils.anyDirtying;
+import static org.eclipse.papyrus.infra.emf.gmf.util.OperationUtils.isDirty;
+
+import java.util.Collection;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.operations.IOperationHistory;
+import org.eclipse.core.commands.operations.IOperationHistoryListener;
+import org.eclipse.core.commands.operations.IUndoContext;
+import org.eclipse.core.commands.operations.IUndoableOperation;
+import org.eclipse.core.commands.operations.OperationHistoryEvent;
+import org.eclipse.core.commands.operations.UndoContext;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.NotificationFilter;
+import org.eclipse.emf.transaction.ResourceSetChangeEvent;
+import org.eclipse.emf.transaction.ResourceSetListenerImpl;
+import org.eclipse.emf.transaction.RollbackException;
+import org.eclipse.emf.transaction.Transaction;
+import org.eclipse.emf.transaction.impl.AbstractTransactionalCommandStack;
+import org.eclipse.emf.transaction.impl.EMFCommandTransaction;
+import org.eclipse.emf.transaction.impl.InternalTransaction;
+import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
+import org.eclipse.emf.transaction.impl.TriggerCommandTransaction;
+import org.eclipse.emf.transaction.util.TriggerCommand;
+import org.eclipse.emf.workspace.EMFCommandOperation;
+import org.eclipse.emf.workspace.IResourceUndoContextPolicy;
+import org.eclipse.emf.workspace.IWorkspaceCommandStack;
+import org.eclipse.emf.workspace.ResourceUndoContext;
+import org.eclipse.emf.workspace.impl.EMFOperationTransaction;
+import org.eclipse.emf.workspace.impl.WorkspaceCommandStackImpl;
+import org.eclipse.emf.workspace.internal.EMFWorkspacePlugin;
+import org.eclipse.emf.workspace.internal.EMFWorkspaceStatusCodes;
+import org.eclipse.emf.workspace.internal.Tracing;
+import org.eclipse.emf.workspace.internal.l10n.Messages;
+import org.eclipse.gmf.runtime.emf.commands.core.command.EditingDomainUndoContext;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.emf.gmf.util.CommandUtils;
+
+/**
+ * Copied from WorkspaceCommandStackImpl but modify in order to change the
+ * IUndoContext. We want to make it point the the TransactionalEditingDomain. To
+ * see what really change in this class from original implementation look for
+ * "HAS CHANGE FROM ORIGINAL IMPLEMENTATION" in Java Doc.
+ *
+ */
+public class NotifyingWorkspaceCommandStack extends AbstractTransactionalCommandStack// AbstractTransactionalCommandStack
+		implements IWorkspaceCommandStack {
+
+	private final IOperationHistory history;
+
+	private DomainListener domainListener;
+
+	private IResourceUndoContextPolicy undoContextPolicy = IResourceUndoContextPolicy.DEFAULT;
+
+	private IUndoableOperation currentOperation;
+
+	private Set<Resource> historyAffectedResources;
+
+	/**
+	 * HAS CHANGE FROM ORIGINAL IMPLEMENTATION TO USE {@link EditingDomainUndoContext}
+	 */
+	private IUndoContext defaultContext = null;
+
+	private IUndoContext savedContext = null;
+
+	private IUndoableOperation mostRecentOperation;
+
+	/**
+	 * Initializes me with the operation history to which I delegate command
+	 * execution.
+	 *
+	 * @param history
+	 *            my operation history
+	 */
+	public NotifyingWorkspaceCommandStack(IOperationHistory history) {
+		super();
+		this.history = history;
+		domainListener = new DomainListener();
+		defaultContext = new UndoContext() {
+
+			@Override
+			public String getLabel() {
+				return getDefaultUndoContextLabel();
+			}
+
+			@Override
+			public String toString() {
+				return getLabel();
+			}
+		};
+	}
+
+	/**
+	 * map with registered listeners and the corresponding proxy registered to
+	 * actual map
+	 */
+	private Map<CommandStackListener, IOperationHistoryListener> proxyOperationListeners = new HashMap<CommandStackListener, IOperationHistoryListener>();
+
+	@Override
+	public void addCommandStackListener(final CommandStackListener listener) {
+		removeCommandStackListener(listener);
+		IOperationHistoryListener proxy = new IOperationHistoryListener() {
+
+			@Override
+			public void historyNotification(OperationHistoryEvent event) {
+				int type = event.getEventType();
+				// emf stack only needs to be notified when an operation is
+				// finished
+				if (OperationHistoryEvent.DONE == type || OperationHistoryEvent.REDONE == type || OperationHistoryEvent.UNDONE == type) {
+					listener.commandStackChanged(new EventObject(NotifyingWorkspaceCommandStack.this));
+				}
+			}
+		};
+		getOperationHistory().addOperationHistoryListener(proxy);
+		proxyOperationListeners.put(listener, proxy);
+	}
+
+	@Override
+	public void removeCommandStackListener(CommandStackListener listener) {
+		IOperationHistoryListener proxy = proxyOperationListeners.remove(listener);
+		if (proxy != null) {
+			getOperationHistory().removeOperationHistoryListener(proxy);
+		}
+	}
+
+	/**
+	 * Extends the superclass implementation to add/remove listeners on the
+	 * editing domain. HAS CHANGE FROM ORIGINAL IMPLEMENTATION TO USE {@link EditingDomainUndoContext}
+	 */
+	@Override
+	public void setEditingDomain(InternalTransactionalEditingDomain domain) {
+		InternalTransactionalEditingDomain oldDomain = getDomain();
+		if (oldDomain != null) {
+			oldDomain.removeResourceSetListener(domainListener);
+			history.removeOperationHistoryListener(domainListener);
+		}
+		super.setEditingDomain(domain);
+		/*
+		 * HAS CHANGE FROM ORIGINAL IMPLEMENTATION TO USE {@link
+		 * EditingDomainUndoContext}
+		 */
+		if (getDomain() != null) {
+			boolean domainHasChanged = oldDomain == null || !oldDomain.equals(getDomain());
+			if (domainHasChanged) {
+				defaultContext = new EditingDomainUndoContext(domain, getDefaultUndoContextLabel());
+			}
+		}
+		if (domain != null) {
+			history.addOperationHistoryListener(domainListener);
+			domain.addResourceSetListener(domainListener);
+		}
+	}
+
+	// Documentation copied from the method specification
+	@Override
+	public final IOperationHistory getOperationHistory() {
+		return history;
+	}
+
+	// Documentation copied from the method specification
+	@Override
+	public IUndoContext getDefaultUndoContext() {
+		return defaultContext;
+	}
+
+	/**
+	 * Obtains the label to display for the default undo context that I apply to
+	 * operations executed through me as {@link Command}s. Subclasses may
+	 * override to customize the label.
+	 *
+	 * @return my default undo context label
+	 *
+	 * @since 1.2
+	 */
+	protected String getDefaultUndoContextLabel() {
+		String domainID = (getDomain() == null) ? null : getDomain().getID();
+		if (domainID == null) {
+			domainID = String.valueOf(domainID); // guaranteed to be safe
+		}
+		return NLS.bind(Messages.cmdStkCtxLabel, domainID);
+	}
+
+	private final IUndoContext getSavedContext() {
+		if (savedContext == null) {
+			savedContext = new UndoContext() {
+
+				@Override
+				public String getLabel() {
+					return getSavepointUndoContextLabel();
+				}
+
+				@Override
+				public String toString() {
+					return getLabel();
+				}
+			};
+		}
+		return savedContext;
+	}
+
+	/**
+	 * Obtains the label to display for the save-point undo context that I apply
+	 * to the last operation in my {@linkplain #getDefaultUndoContext() default
+	 * undo context} that was executed at the time save was performed (as
+	 * indicated by invocation of the {@link #saveIsDone()} method). Subclasses
+	 * may override to customize the label.
+	 *
+	 * @return my save-point undo context label
+	 *
+	 * @since 1.2
+	 */
+	protected String getSavepointUndoContextLabel() {
+		String domainID = (getDomain() == null) ? null : getDomain().getID();
+		if (domainID == null) {
+			domainID = String.valueOf(domainID); // guaranteed to be safe
+		}
+		return NLS.bind(Messages.cmdStkSaveCtxLabel, domainID);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @since 1.1
+	 */
+	@Override
+	protected void doExecute(Command command, Map<?, ?> options) throws InterruptedException, RollbackException {
+		IUndoableOperation oper = CommandUtils.wrap(getDomain(), command, options);
+		// add the appropriate context
+		oper.addContext(getDefaultUndoContext());
+		try {
+			IStatus status = history.execute(oper, new NullProgressMonitor(), null);
+			if (status.getSeverity() >= IStatus.ERROR) {
+				// the transaction must have rolled back if the status was
+				// error or worse
+				RollbackException exc = new RollbackException(status);
+				Tracing.throwing(WorkspaceCommandStackImpl.class, "execute", exc); //$NON-NLS-1$
+				throw exc;
+			}
+			notifyListeners();
+		} catch (ExecutionException e) {
+			Tracing.catching(WorkspaceCommandStackImpl.class, "execute", e); //$NON-NLS-1$
+			command.dispose();
+			if (e.getCause() instanceof RollbackException) {
+				// throw the rollback
+				RollbackException exc = (RollbackException) e.getCause();
+				Tracing.throwing(WorkspaceCommandStackImpl.class, "execute", exc); //$NON-NLS-1$
+				throw exc;
+			} else if (e.getCause() instanceof RuntimeException) {
+				// throw the programming error
+				RuntimeException exc = (RuntimeException) e.getCause();
+				Tracing.throwing(WorkspaceCommandStackImpl.class, "execute", exc); //$NON-NLS-1$
+				throw exc;
+			} else {
+				// log the problem. We can't rethrow whatever it was
+				handleError(e);
+			}
+		}
+	}
+
+	/**
+	 * Queries whether we can undo my default undo context in my operation
+	 * history.
+	 */
+	@Override
+	public boolean canUndo() {
+		return getOperationHistory().canUndo(getDefaultUndoContext());
+	}
+
+	/**
+	 * Undoes my default undo context in my operation history.
+	 */
+	@Override
+	public void undo() {
+		try {
+			getOperationHistory().undo(getDefaultUndoContext(), new NullProgressMonitor(), null);
+		} catch (ExecutionException e) {
+			Tracing.catching(WorkspaceCommandStackImpl.class, "undo", e); //$NON-NLS-1$
+			// can't throw anything from this method
+			handleError(e);
+		} finally {
+			// notify even if there was an error; clients should check to see
+			// that the command stack is flushed
+			notifyListeners();
+		}
+	}
+
+	/**
+	 * Queries whether we can redo my default undo context in my operation
+	 * history.
+	 */
+	@Override
+	public boolean canRedo() {
+		return getOperationHistory().canRedo(getDefaultUndoContext());
+	}
+
+	/**
+	 * Redoes my default undo context in my operation history.
+	 */
+	@Override
+	public void redo() {
+		try {
+			getOperationHistory().redo(getDefaultUndoContext(), new NullProgressMonitor(), null);
+		} catch (ExecutionException e) {
+			Tracing.catching(WorkspaceCommandStackImpl.class, "redo", e); //$NON-NLS-1$
+			// can't throw anything from this method
+			handleError(e);
+		} finally {
+			// notify even if there was an error; clients should check to see
+			// that the command stack is flushed
+			notifyListeners();
+		}
+	}
+
+	/**
+	 * Disposes my default undo context in my operation history.
+	 */
+	@Override
+	public void flush() {
+		getOperationHistory().dispose(getDefaultUndoContext(), true, true, true);
+		if (savedContext != null) {
+			getOperationHistory().dispose(getSavedContext(), true, true, true);
+			savedContext = null;
+		}
+	}
+
+	/**
+	 * Gets the command from the most recently executed, done, or redone
+	 * operation.
+	 */
+	@Override
+	public Command getMostRecentCommand() {
+		Command result = null;
+		if (mostRecentOperation instanceof EMFCommandOperation) {
+			result = ((EMFCommandOperation) mostRecentOperation).getCommand();
+		}
+		return result;
+	}
+
+	/**
+	 * Gets the command from the top of the undo history, if any.
+	 */
+	@Override
+	public Command getUndoCommand() {
+		Command result = null;
+		IUndoableOperation topOperation = getOperationHistory().getUndoOperation(getDefaultUndoContext());
+		if (topOperation instanceof EMFCommandOperation) {
+			result = ((EMFCommandOperation) topOperation).getCommand();
+		}
+		return result;
+	}
+
+	/**
+	 * Gets the command from the top of the redo history, if any.
+	 */
+	@Override
+	public Command getRedoCommand() {
+		Command result = null;
+		IUndoableOperation topOperation = getOperationHistory().getRedoOperation(getDefaultUndoContext());
+		if (topOperation instanceof EMFCommandOperation) {
+			result = ((EMFCommandOperation) topOperation).getCommand();
+		}
+		return result;
+	}
+
+	// Documentation copied from the method specification
+	@Override
+	public EMFCommandTransaction createTransaction(Command command, Map<?, ?> options) throws InterruptedException {
+		EMFCommandTransaction result;
+		if (command instanceof TriggerCommand) {
+			result = new TriggerCommandTransaction((TriggerCommand) command, getDomain(), options);
+		} else {
+			result = new EMFOperationTransaction(command, getDomain(), options);
+		}
+		result.start();
+		return result;
+	}
+
+	// Documentation copied from the method specification
+	@Override
+	public void executeTriggers(Command command, List<Command> triggers, Map<?, ?> options) throws InterruptedException, RollbackException {
+		if (!triggers.isEmpty()) {
+			TriggerCommand trigger = (command == null) ? new TriggerCommand(triggers) : new TriggerCommand(command, triggers);
+			InternalTransaction tx = createTransaction(trigger, makeTriggerTransactionOptions(options));
+			try {
+				trigger.execute();
+				InternalTransaction parent = (InternalTransaction) tx.getParent();
+				// shouldn't be null if we're executing triggers!
+				if (parent != null) {
+					parent.addTriggers(trigger);
+				}
+				// commit the transaction now
+				tx.commit();
+			} catch (RuntimeException e) {
+				Tracing.catching(WorkspaceCommandStackImpl.class, "executeTriggers", e); //$NON-NLS-1$
+				IStatus status;
+				if (e instanceof OperationCanceledException) {
+					status = Status.CANCEL_STATUS;
+				} else {
+					status = new Status(IStatus.ERROR, EMFWorkspacePlugin.getPluginId(), EMFWorkspaceStatusCodes.PRECOMMIT_FAILED, Messages.precommitFailed, e);
+				}
+				RollbackException rbe = new RollbackException(status);
+				Tracing.throwing(WorkspaceCommandStackImpl.class, "executeTriggers", rbe); //$NON-NLS-1$
+				throw rbe;
+			} finally {
+				if ((tx != null) && (tx.isActive())) {
+					// roll back because an uncaught exception occurred
+					rollback(tx);
+				}
+			}
+		}
+	}
+
+	// Documentation copied from the method specification
+	@Override
+	public void dispose() {
+		setEditingDomain(null); // remove listeners
+		domainListener = null;
+		historyAffectedResources = null;
+		mostRecentOperation = null;
+
+		// remove listeners registered in opertationHistory
+		Collection<IOperationHistoryListener> values = proxyOperationListeners.values();
+		for (IOperationHistoryListener proxy : values) {
+			getOperationHistory().removeOperationHistoryListener(proxy);
+		}
+		proxyOperationListeners.clear();
+
+		// Flush default and savepoint undo contexts
+		flush();
+	}
+
+	/**
+	 * Obtains my resource undo-context policy.
+	 *
+	 * @return my resource undo-context policy
+	 *
+	 * @since 1.3
+	 */
+	public IResourceUndoContextPolicy getResourceUndoContextPolicy() {
+		return undoContextPolicy;
+	}
+
+	/**
+	 * Sets my resource undo-context policy.
+	 *
+	 * @param policy
+	 *            my new policy, or <code>null</code> to restore the default
+	 *
+	 * @since 1.3
+	 */
+	public void setResourceUndoContextPolicy(IResourceUndoContextPolicy policy) {
+		this.undoContextPolicy = policy;
+	}
+
+	/**
+	 * A listener on the editing domain and operation history that tracks which
+	 * resources are changed by an operation and attaches the appropriate {@link ResourceUndoContext} to it when it completes.
+	 *
+	 * @author Christian W. Damus (cdamus)
+	 */
+	private class DomainListener extends ResourceSetListenerImpl implements IOperationHistoryListener {
+
+		@Override
+		public void historyNotification(OperationHistoryEvent event) {
+			final IUndoableOperation operation = event.getOperation();
+			switch (event.getEventType()) {
+			case OperationHistoryEvent.ABOUT_TO_EXECUTE:
+				// set up to remember affected resources in case we make EMF
+				// changes
+				currentOperation = operation;
+				historyAffectedResources = new java.util.HashSet<Resource>();
+				break;
+			case OperationHistoryEvent.DONE:
+				if ((historyAffectedResources != null) && !historyAffectedResources.isEmpty()) {
+					// add my undo context to the operation that has
+					// completed, but only if the operation actually changed
+					// any of my resources (in case this history is shared
+					// with other domains)
+					for (Resource next : historyAffectedResources) {
+						operation.addContext(new ResourceUndoContext(getDomain(), next));
+					}
+				}
+				currentOperation = null;
+				historyAffectedResources = null;
+				if (operation.hasContext(getDefaultUndoContext())) {
+					mostRecentOperation = operation;
+				}
+				break;
+			case OperationHistoryEvent.OPERATION_NOT_OK:
+				// just forget about the context because this operation
+				// failed
+				currentOperation = null;
+				historyAffectedResources = null;
+				break;
+			case OperationHistoryEvent.UNDONE:
+			case OperationHistoryEvent.REDONE:
+				if (operation.hasContext(getDefaultUndoContext())) {
+					mostRecentOperation = operation;
+				}
+				break;
+			case OperationHistoryEvent.OPERATION_REMOVED:
+				if (operation == mostRecentOperation) {
+					mostRecentOperation = null;
+				}
+				break;
+			}
+		}
+
+		@Override
+		public void resourceSetChanged(ResourceSetChangeEvent event) {
+			IUndoableOperation operation = null;
+			Set<Resource> unloaded = getUnloadedResources(event.getNotifications());
+			if (unloaded != null) {
+				// dispose their undo contexts
+				for (Resource next : unloaded) {
+					getOperationHistory().dispose(new ResourceUndoContext(getDomain(), next), true, true, true);
+				}
+			}
+			Transaction tx = event.getTransaction();
+			if (tx != null) {
+				operation = (IUndoableOperation) tx.getOptions().get(EMFWorkspacePlugin.OPTION_OWNING_OPERATION);
+			}
+			if (operation == null) {
+				operation = currentOperation;
+			}
+			if (operation != null) {
+				Set<Resource> affectedResources = getResourceUndoContextPolicy().getContextResources(operation, event.getNotifications());
+				if (unloaded != null) {
+					// don't add these resources to the operation
+					affectedResources.removeAll(unloaded);
+				}
+				if (!affectedResources.isEmpty()) {
+					// add any resource undo contexts to this operation that are
+					// not already applied
+					for (Resource next : affectedResources) {
+						ResourceUndoContext ctx = new ResourceUndoContext(getDomain(), next);
+						if (!operation.hasContext(ctx)) {
+							operation.addContext(ctx);
+						}
+					}
+				}
+				if (historyAffectedResources != null) {
+					// there is an operation executing on our history that is
+					// affecting my editing domain. Remember the affected
+					// resources.
+					historyAffectedResources.addAll(affectedResources);
+				}
+
+				hookUndoContexts(operation, event);
+			}
+		}
+
+		/**
+		 * Finds resources that have sent unload notifications.
+		 *
+		 * @param notifications
+		 *            notifications received from a transaction
+		 * @return a set of resources that the notifications indicate have been
+		 *         unloaded, or <code>null</code> if none
+		 */
+		private Set<Resource> getUnloadedResources(Collection<Notification> notifications) {
+			Set<Resource> result = null;
+			for (Notification next : notifications) {
+				if (NotificationFilter.RESOURCE_UNLOADED.matches(next)) {
+					if (result == null) {
+						result = new java.util.HashSet<Resource>();
+					}
+					result.add((Resource) next.getNotifier());
+				}
+			}
+			return result;
+		}
+
+		@Override
+		public boolean isPostcommitOnly() {
+			// only interested in post-commit "resourceSetChanged" event
+			return true;
+		}
+	}
+
+	/**
+	 * A hook for subclasses to attach additional undo-contexts to an {@code operation} based on changes
+	 * in the resource set.
+	 *
+	 * @param operation
+	 *            an operation that has been executed (never {@code null})
+	 * @param event
+	 *            the description of changes made by the {@code operation} in the resource set
+	 */
+	protected void hookUndoContexts(IUndoableOperation operation, ResourceSetChangeEvent event) {
+		// pass
+	}
+
+
+	@Override
+	public boolean isSaveNeeded() {
+		// This class inherits from AbstractTransactionalCommandStack which in turn inherits from BasicCommandStack.
+
+		// The operation isSaveNeeded is defined in BasicCommandStack. In order to work, it requires an update of the
+		// variables "saveIndex" and "top" which is done in BasicCommandStack::execute. However, this operation is overridden
+		// in method AbstractTransactionalCommandStack::execute which never calls the superclass method BasicCommandStack::execute.
+		// Thus, we cannot rely on the super class method of isSaveNeeded (although it seems to work in some cases).
+		// => so we have to implement the isSaveNeeded method here.
+		IUndoableOperation nextUndoableOperation = history.getUndoOperation(getDefaultUndoContext());
+		if (nextUndoableOperation == null) {
+			// this is the last undoable operation. But the document might have been saved at some operation now on the redo stack
+			return savedContext != null;
+		}
+		return savedContext != null ? !nextUndoableOperation.hasContext(getSavedContext()) && isDirty(history.getUndoHistory(getDefaultUndoContext()), history.getRedoHistory(getDefaultUndoContext()), history.getUndoOperation(savedContext))
+				: anyDirtying(history.getUndoHistory(getDefaultUndoContext()));
+	}
+
+	@Override
+	public void saveIsDone() {
+		// See comment for isSaveNeeded
+		if (savedContext != null) {
+			// The save context is only stored on one operation. We must
+			// remove it from any other operation that may have contained it
+			// before.
+			IUndoableOperation[] undoableOperations = history.getUndoHistory(getSavedContext());
+			for (int i = 0; i < undoableOperations.length; i++) {
+				undoableOperations[i].removeContext(getSavedContext());
+			}
+			IUndoableOperation[] redoableOperations = history.getRedoHistory(getSavedContext());
+			for (int i = 0; i < redoableOperations.length; i++) {
+				redoableOperations[i].removeContext(getSavedContext());
+			}
+		}
+		IUndoableOperation nextUndoableOperation = history.getUndoOperation(getDefaultUndoContext());
+		if (nextUndoableOperation == null) {
+			// We no longer have any operation that was saved
+			savedContext = null;
+			return;
+		}
+		nextUndoableOperation.addContext(getSavedContext());
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/util/CommandTreeIterator.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/util/CommandTreeIterator.java
new file mode 100644
index 00000000000..6f58619012f
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/util/CommandTreeIterator.java
@@ -0,0 +1,175 @@
+/*****************************************************************************
+ * Copyright (c) 2015 Christian W. Damus and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.emf.gmf.util;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.infra.emf.gmf.command.ICommandWrapper;
+
+/**
+ * An iterator over the tree structure of EMF, GEF, and GMF commands that returns leaf commands of one or all of these kinds,
+ * with accounting for the various kinds of wrappers employed to intermix them. This iterator does not support the
+ * optional {@link Iterator#remove()} operation.
+ */
+public class CommandTreeIterator<C> implements Iterator<C> {
+	private final Class<C> type;
+
+	private Iterator<?> current;
+	private List<Iterator<?>> iterators = new ArrayList<Iterator<?>>();
+
+	private C preparedNext;
+
+	private CommandTreeIterator(Object root, Class<C> type) {
+		super();
+
+		this.type = type;
+
+		root = unwrap(root);
+
+		if (isCompound(root)) {
+			pushIterator(root);
+		} else {
+			prepareNext(root);
+		}
+	}
+
+	public static CommandTreeIterator<Command> iterateEMF(Object command) {
+		return iterate(command, Command.class);
+	}
+
+	public static CommandTreeIterator<ICommand> iterateGMF(Object command) {
+		return iterate(command, ICommand.class);
+	}
+
+	public static CommandTreeIterator<?> iterate(Object command) {
+		return iterate(command, Object.class);
+	}
+
+	public static <C> CommandTreeIterator<C> iterate(Object command, Class<C> leafCommandType) {
+		return new CommandTreeIterator<C>(command, leafCommandType);
+	}
+
+	private boolean prepareNext(Object command) {
+		if (type.isInstance(command)) {
+			preparedNext = type.cast(command);
+		}
+
+		return preparedNext != null;
+	}
+
+	private Iterator<?> pushIterator(Object compoundCommand) {
+		if (current != null) {
+			iterators.add(current);
+		}
+		current = iterator(compoundCommand);
+		return current;
+	}
+
+	private Iterator<?> popIterator() {
+		if (iterators.isEmpty()) {
+			current = null;
+		} else {
+			current = iterators.remove(iterators.size() - 1);
+		}
+
+		return current;
+	}
+
+	private Object internalNext() {
+		Object result = null;
+
+		while ((result == null) && (current != null)) {
+			if (current.hasNext()) {
+				Object next = unwrap(current.next());
+				if (isCompound(next)) {
+					// Dive into it
+					pushIterator(next);
+				} else {
+					// We have the next leaf
+					result = next;
+				}
+			} else {
+				popIterator();
+			}
+		}
+
+		return result;
+	}
+
+	boolean isDone() {
+		return (current == null) && iterators.isEmpty();
+	}
+
+	@Override
+	public boolean hasNext() {
+		while (!isDone() && (preparedNext == null)) {
+			Object next = internalNext();
+			if (type.isInstance(next)) {
+				preparedNext = type.cast(next);
+			}
+		}
+
+		return preparedNext != null;
+	}
+
+	@Override
+	public C next() {
+		if (!hasNext()) {
+			throw new NoSuchElementException();
+		}
+
+		C result = preparedNext;
+		preparedNext = null;
+		return result;
+	}
+
+	/**
+	 * Remove is not supported.
+	 */
+	@Override
+	public void remove() {
+		throw new UnsupportedOperationException("remove"); //$NON-NLS-1$
+	}
+
+	private Object unwrap(Object command) {
+		Object result = command;
+
+		if (command instanceof ICommandWrapper<?>) {
+			return ((ICommandWrapper<?>) command).getWrappedCommand();
+		} else if (ICommandWrapper.isWrapper(command, Object.class)) {
+			// Try a registered foreign wrapper
+			return ICommandWrapper.unwrap(command, Object.class);
+		}
+
+		if (result != command) {
+			// Could be turtles all the way down
+			result = unwrap(result);
+		}
+
+		return result;
+	}
+
+	private boolean isCompound(Object command) {
+		return CommandUtils.isCompound(command);
+	}
+
+	private Iterator<?> iterator(Object compoundCommand) {
+		return CommandUtils.getChildren(compoundCommand).iterator();
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/util/CommandUtils.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/util/CommandUtils.java
new file mode 100644
index 00000000000..5048c89d699
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/util/CommandUtils.java
@@ -0,0 +1,291 @@
+/*
+ * Copyright (c) 2014, 2016 CEA, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus (CEA) - Initial API and implementation
+ *   Christian W. Damus - bug 485220
+ *
+ */
+package org.eclipse.papyrus.infra.emf.gmf.util;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+import org.eclipse.core.commands.operations.IUndoableOperation;
+import org.eclipse.emf.common.command.AbstractCommand;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.workspace.EMFCommandOperation;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;
+import org.eclipse.papyrus.infra.emf.gmf.command.INonDirtying;
+
+
+/**
+ * Utilities for working with potentially non-dirtying EMF, GEF, and GMF commands.
+ *
+ * @see INonDirtying
+ * @see AbstractCommand.NonDirtying
+ */
+public class CommandUtils {
+
+	public static final Registry REGISTRY = new Registry();
+
+	/**
+	 * Not instantiable by clients.
+	 */
+	private CommandUtils() {
+		super();
+	}
+
+	public static String getLabel(Object command) {
+		return REGISTRY.getLabeller(command).apply(command);
+	}
+
+	public static boolean isCompound(Object command) {
+		return REGISTRY.hasDecomposer(command);
+	}
+
+	public static <T, C extends T> Iterable<T> getChildren(C compoundCommand) {
+		return REGISTRY.<T, C> getDecomposer(compoundCommand).apply(compoundCommand);
+	}
+
+	public static <T> T chain(T command1, T command2) {
+		return REGISTRY.getComposer(command1).apply(command1, command2);
+	}
+
+	public static boolean isNonDirtying(Object command) {
+		return (command instanceof INonDirtying)
+				|| (command instanceof AbstractCommand.NonDirtying);
+	}
+
+	public static IUndoableOperation wrap(TransactionalEditingDomain domain, Command command) {
+		if (command instanceof AbstractCommand.NonDirtying) {
+			return new NonDirtyingEMFCommandOperation(domain, command);
+		}
+		return new EMFCommandOperation(domain, command);
+	}
+
+	public static IUndoableOperation wrap(TransactionalEditingDomain domain, Command command, Map<?, ?> options) {
+		if (command instanceof AbstractCommand.NonDirtying) {
+			return new NonDirtyingEMFCommandOperation(domain, command, options);
+		}
+		return new EMFCommandOperation(domain, command, options);
+	}
+
+	public static CompoundCommand nonDirtyingEMFCompound() {
+		return new NonDirtyingEMFCompoundCommand();
+	}
+
+	public static Command chain(Command command1, Command command2) {
+		if ((command1 instanceof AbstractCommand.NonDirtying) && (command2 instanceof AbstractCommand.NonDirtying)) {
+			return new NonDirtyingEMFCompoundCommand().chain(command1).chain(command2);
+		}
+		return command1.chain(command2);
+	}
+
+	public static CompositeCommand nonDirtyingGMFComposite(String label) {
+		return new NonDirtyingGMFCompositeCommand(label);
+	}
+
+	public static ICommand compose(ICommand command1, ICommand command2) {
+		if ((command1 instanceof INonDirtying) && (command2 instanceof INonDirtying)) {
+			return new NonDirtyingGMFCompositeCommand(command1.getLabel()).compose(command1).compose(command2);
+		}
+		return command1.compose(command2);
+	}
+
+	//
+	// Nested types
+	//
+
+	private static class NonDirtyingEMFCommandOperation extends EMFCommandOperation implements INonDirtying {
+
+		NonDirtyingEMFCommandOperation(TransactionalEditingDomain domain, Command command, Map<?, ?> options) {
+			super(domain, checkCommand(command), options);
+		}
+
+		NonDirtyingEMFCommandOperation(TransactionalEditingDomain domain, Command command) {
+			super(domain, checkCommand(command));
+		}
+
+		static Command checkCommand(Command command) {
+			if (!(command instanceof AbstractCommand.NonDirtying)) {
+				throw new IllegalStateException("Attempt to wrap dirtying command in a non-dirtying operation."); //$NON-NLS-1$
+			}
+			return command;
+		}
+	}
+
+	private static class NonDirtyingEMFCompoundCommand extends CompoundCommand implements AbstractCommand.NonDirtying {
+
+		@Override
+		public void append(Command command) {
+			checkNonDirtying(command);
+			super.append(command);
+		}
+
+		@Override
+		public boolean appendAndExecute(Command command) {
+			checkNonDirtying(command);
+			return super.appendAndExecute(command);
+		}
+
+		@Override
+		public boolean appendIfCanExecute(Command command) {
+			checkNonDirtying(command);
+			return super.appendIfCanExecute(command);
+		}
+
+		@Override
+		public Command chain(Command command) {
+			append(command);
+			return this;
+		}
+
+		private void checkNonDirtying(Command command) {
+			if (!(command instanceof AbstractCommand.NonDirtying)) {
+				throw new IllegalArgumentException("Attempt to append a dirtying command to a non-dirtying compound."); //$NON-NLS-1$
+			}
+		}
+	}
+
+	private static class NonDirtyingGMFCompositeCommand extends CompositeCommand implements INonDirtying {
+
+		NonDirtyingGMFCompositeCommand(String label) {
+			super(label);
+		}
+
+		@Override
+		public void add(IUndoableOperation operation) {
+			checkNonDirtying(operation);
+			super.add(operation);
+		}
+
+		private void checkNonDirtying(IUndoableOperation operation) {
+			if (!(operation instanceof INonDirtying)) {
+				throw new IllegalArgumentException("Attempt to append a dirtying operation to a non-dirtying composite."); //$NON-NLS-1$
+			}
+		}
+	}
+
+	//
+	// Nested types
+	//
+
+	public static class Registry {
+		private final ConcurrentMap<Class<?>, BiFunction<?, ?, ?>> composers = new ConcurrentHashMap<>();
+		private final ConcurrentMap<Class<?>, Function<?, ? extends Iterable<?>>> decomposers = new ConcurrentHashMap<>();
+		private final ConcurrentMap<Class<?>, Function<?, String>> labellers = new ConcurrentHashMap<>();
+
+		@SuppressWarnings("unchecked")
+		private Registry() {
+			super();
+
+			registerComposer(Command.class, CommandUtils::chain);
+			registerDecomposer(CompoundCommand.class, CompoundCommand::getCommandList);
+			registerLabeller(Command.class, Command::getLabel);
+
+			registerComposer(ICommand.class, CommandUtils::compose);
+			this.<ICommand, ICompositeCommand> registerDecomposer(ICompositeCommand.class, c -> () -> c.iterator());
+			registerLabeller(IUndoableOperation.class, IUndoableOperation::getLabel);
+		}
+
+		/**
+		 * Registers a function to compose two commands together into a compound of some sort.
+		 * 
+		 * @param commandType
+		 *            the composable command type
+		 * @param composer
+		 *            the composer function
+		 * 
+		 * @throws IllegalStateException
+		 *             if this {@code commandType} already has a composer registered
+		 */
+		public <T, C extends T> void registerComposer(Class<T> commandType, BiFunction<? super T, ? super T, ? extends C> composer) {
+			if (composers.putIfAbsent(commandType, composer) != null) {
+				throw new IllegalStateException(String.format("Composer already registered for %s", commandType.getSimpleName()));
+			}
+		}
+
+		/**
+		 * Registers a function to decompose compounds commands of some type to obtain the composed commands.
+		 * 
+		 * @param compoundType
+		 *            the compound command type
+		 * @param decomposer
+		 *            the decomposer function
+		 * 
+		 * @throws IllegalStateException
+		 *             if this {@code compoundType} already has ae decomposer registered
+		 */
+		public <T, C extends T> void registerDecomposer(Class<C> compoundType, Function<? super C, ? extends Iterable<? extends T>> decomposer) {
+			if (decomposers.putIfAbsent(compoundType, decomposer) != null) {
+				throw new IllegalStateException(String.format("Decomposer already registered for %s", compoundType.getSimpleName()));
+			}
+		}
+
+		/**
+		 * Registers a function to get the label of a command.
+		 * 
+		 * @param commandType
+		 *            the labelled command type
+		 * @param labeller
+		 *            the labeller function
+		 * 
+		 * @throws IllegalStateException
+		 *             if this {@code commandType} already has a labeller registered
+		 */
+		public <T> void registerLabeller(Class<T> commandType, Function<? super T, String> labeller) {
+			if (labellers.putIfAbsent(commandType, labeller) != null) {
+				throw new IllegalStateException(String.format("Labeller already registered for %s", commandType.getSimpleName()));
+			}
+		}
+
+		@SuppressWarnings("unchecked")
+		<T, C extends T> BiFunction<T, T, C> getComposer(T command) {
+			return (BiFunction<T, T, C>) composers.entrySet().stream()
+					.filter(e -> e.getKey().isInstance(command))
+					.map(Map.Entry::getValue)
+					.findFirst()
+					.orElseThrow(IllegalArgumentException::new);
+		}
+
+		<T, C extends T> Function<? super C, ? extends Iterable<T>> getDecomposer(T command) {
+			return maybeGetDecomposer(command).orElseThrow(IllegalArgumentException::new);
+		}
+
+		boolean hasDecomposer(Object command) {
+			return maybeGetDecomposer(command).isPresent();
+		}
+
+		@SuppressWarnings({ "unchecked", "rawtypes" })
+		<T, C extends T> Optional<Function<? super C, ? extends Iterable<T>>> maybeGetDecomposer(C compound) {
+			return (Optional) decomposers.entrySet().stream()
+					.filter(e -> e.getKey().isInstance(compound))
+					.map(Map.Entry::getValue)
+					.findFirst();
+		}
+
+		@SuppressWarnings("unchecked")
+		<T> Function<T, String> getLabeller(T command) {
+			return (Function<T, String>) labellers.entrySet().stream()
+					.filter(e -> e.getKey().isInstance(command))
+					.map(Map.Entry::getValue)
+					.findFirst()
+					.orElse(Object::toString);
+		}
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/util/GMFUnsafe.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/util/GMFUnsafe.java
new file mode 100644
index 00000000000..dccad9b8d38
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/util/GMFUnsafe.java
@@ -0,0 +1,314 @@
+/*
+ * Copyright (c) 2014 CEA and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus (CEA) - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.emf.gmf.util;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.AbstractCommand;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.WrappedException;
+import org.eclipse.emf.transaction.RollbackException;
+import org.eclipse.emf.transaction.Transaction;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.infra.emf.internal.gmf.Activator;
+
+
+/**
+ * Utilities for operations in the GMF context that we might consider as "unsafe" or exceptional cases.
+ */
+public class GMFUnsafe {
+
+	/**
+	 * Not instantiable by clients.
+	 */
+	private GMFUnsafe() {
+		super();
+	}
+
+	/**
+	 * Performs an unsafe write to the model. The editing domain may or may not already have an active transaction, which may or may not be read-only;
+	 * it does not matter. In any case, the changes performed will not be recorded for undo/redo or roll-back. Thus, this is appropriate only for use
+	 * cases such as synchronization of canonical views, which are not considered logically as abstract model edits (though they be concrete changes).
+	 *
+	 * @param domain
+	 *            an editing domain that may or may not have a transaction in progress
+	 * @param writeOperation
+	 *            an operation that will make unchecked/unsafe changes to the editing {@code domain}
+	 *
+	 * @throws RollbackException
+	 *             if the unprotected write transaction fails to commit. Note that this could occlude an uncaught exception thrown by the {@code writeOperation} runnable
+	 * @throws InterruptedException
+	 *             if the current thread is interrupted while waiting for the unprotected write transaction to start
+	 */
+	public static void write(TransactionalEditingDomain domain, Runnable writeOperation) throws InterruptedException, RollbackException {
+		runUnprotected(domain, writeOperation);
+	}
+
+	private static void runUnprotected(TransactionalEditingDomain domain, Runnable writeOperation) throws InterruptedException, RollbackException {
+		InternalTransactionalEditingDomain internalDomain = (InternalTransactionalEditingDomain) domain;
+		Transaction unprotected = internalDomain.startTransaction(false, Collections.singletonMap(Transaction.OPTION_UNPROTECTED, true));
+		try {
+			writeOperation.run();
+		} finally {
+			unprotected.commit();
+		}
+	}
+
+	/**
+	 * Executes an unsafe command on the model. The editing domain may or may not already have an active transaction, which may or may not be
+	 * read-only; it does not matter. In any case, the changes performed will not be recorded for undo/redo or roll-back. Thus, this is appropriate
+	 * only for use cases such as synchronization of canonical views, which are not considered logically as abstract model edits (though they be
+	 * concrete changes).
+	 *
+	 * @param domain
+	 *            an editing domain that may or may not have a transaction in progress
+	 * @param command
+	 *            a command that will make unchecked/unsafe changes to the editing {@code domain}
+	 *
+	 * @throws RollbackException
+	 *             if the unprotected write transaction fails to commit. Note that this could occlude an uncaught exception thrown by the {@code writeOperation} runnable
+	 * @throws InterruptedException
+	 *             if the current thread is interrupted while waiting for the unprotected write transaction to start
+	 *
+	 * @see #write(TransactionalEditingDomain, Runnable)
+	 */
+	public static void write(TransactionalEditingDomain domain, Command command) throws InterruptedException, RollbackException {
+		write(domain, new CommandRunnable(command));
+	}
+
+	/**
+	 * Executes an unsafe command on the model. The editing domain may or may not already have an active transaction, which may or may not be
+	 * read-only; it does not matter. In any case, the changes performed will not be recorded for undo/redo or roll-back. Thus, this is appropriate
+	 * only for use cases such as synchronization of canonical views, which are not considered logically as abstract model edits (though they be
+	 * concrete changes).
+	 *
+	 * @param domain
+	 *            an editing domain that may or may not have a transaction in progress
+	 * @param command
+	 *            a command that will make unchecked/unsafe changes to the editing {@code domain}
+	 *
+	 * @throws RollbackException
+	 *             if the unprotected write transaction fails to commit. Note that this could occlude an uncaught exception thrown by the {@code writeOperation} runnable
+	 * @throws InterruptedException
+	 *             if the current thread is interrupted while waiting for the unprotected write transaction to start
+	 * @throws ExecutionException
+	 *             if the {@code command} fails to execute
+	 *
+	 * @see #write(TransactionalEditingDomain, Runnable)
+	 */
+	public static void write(TransactionalEditingDomain domain, ICommand command) throws InterruptedException, RollbackException, ExecutionException {
+		try {
+			write(domain, new GMFCommandRunnable(command));
+		} catch (WrappedException e) {
+			if (e.exception() instanceof ExecutionException) {
+				throw (ExecutionException) e.exception();
+			} else {
+				// It must have been an unchecked RuntimeException of some kind
+				throw (RuntimeException) e.exception();
+			}
+		}
+	}
+
+	/**
+	 * Wraps a command for unprotected execution, undo, and redo on the command stack.
+	 *
+	 * @param domain
+	 *            a transactional editing domain on which the {@code command} operates
+	 * @param command
+	 *            a command to wrap
+	 * @return the wrapped command
+	 */
+	public static Command wrap(TransactionalEditingDomain domain, Command command) {
+		return new UnsafeCommandWrapper(domain, command);
+	}
+
+	//
+	// Nested types
+	//
+
+	/**
+	 * A useful base class for commands that need to execute, undo, and redo in unprotected mode on the command stack.
+	 */
+	public static abstract class UnsafeCommand extends AbstractCommand {
+
+		private final TransactionalEditingDomain domain;
+
+		protected UnsafeCommand(TransactionalEditingDomain domain) {
+			this.domain = domain;
+		}
+
+		protected UnsafeCommand(TransactionalEditingDomain domain, String label, String description) {
+			super(label, description);
+
+			this.domain = domain;
+		}
+
+		protected UnsafeCommand(TransactionalEditingDomain domain, String label) {
+			super(label);
+
+			this.domain = domain;
+		}
+
+		@Override
+		public final void execute() {
+			try {
+				runUnprotected(domain, new Runnable() {
+
+					@Override
+					public void run() {
+						doExecute();
+					}
+				});
+			} catch (Exception e) {
+				handleException(e);
+			}
+		}
+
+		protected abstract void doExecute();
+
+		@Override
+		public final void undo() {
+			try {
+				runUnprotected(domain, new Runnable() {
+
+					@Override
+					public void run() {
+						doUndo();
+					}
+				});
+			} catch (Exception e) {
+				handleException(e);
+			}
+		}
+
+		protected void doUndo() {
+			// Pass. Usually, unprotected changes are not undoable
+		}
+
+		@Override
+		public final void redo() {
+			try {
+				runUnprotected(domain, new Runnable() {
+
+					@Override
+					public void run() {
+						doRedo();
+					}
+				});
+			} catch (Exception e) {
+				handleException(e);
+			}
+		}
+
+		protected void doRedo() {
+			// Pass. Usually, unprotected changes are not undoable
+		}
+
+		void handleException(Exception e) {
+			Activator.log.error(e);
+		}
+	}
+
+	private static class UnsafeCommandWrapper extends UnsafeCommand {
+
+		private final Command command;
+
+		UnsafeCommandWrapper(TransactionalEditingDomain domain, Command command) {
+			super(domain, command.getLabel(), command.getDescription());
+
+			this.command = command;
+		}
+
+		@Override
+		public void dispose() {
+			command.dispose();
+		}
+
+		@Override
+		public boolean canExecute() {
+			return command.canExecute();
+		}
+
+		@Override
+		protected void doExecute() {
+			command.execute();
+		}
+
+		@Override
+		public boolean canUndo() {
+			return command.canUndo();
+		}
+
+		@Override
+		protected void doUndo() {
+			command.undo();
+		}
+
+		@Override
+		protected void doRedo() {
+			command.redo();
+		}
+
+		@Override
+		public Collection<?> getAffectedObjects() {
+			return command.getAffectedObjects();
+		}
+
+		@Override
+		public Collection<?> getResult() {
+			return command.getResult();
+		}
+
+		@Override
+		public String toString() {
+			return String.format("Unsafe(%s)", command.toString()); //$NON-NLS-1$
+		}
+	}
+
+	private static class CommandRunnable implements Runnable {
+
+		private final Command command;
+
+		CommandRunnable(Command command) {
+			this.command = command;
+		}
+
+		@Override
+		public void run() {
+			command.execute();
+		}
+	}
+
+	private static class GMFCommandRunnable implements Runnable {
+
+		private final ICommand command;
+
+		GMFCommandRunnable(ICommand command) {
+			this.command = command;
+		}
+
+		@Override
+		public void run() {
+			try {
+				command.execute(new NullProgressMonitor(), null);
+			} catch (ExecutionException e) {
+				throw new WrappedException(e);
+			}
+		}
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/util/OperationHistoryDirtyState.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/util/OperationHistoryDirtyState.java
new file mode 100644
index 00000000000..1bbfd926c5a
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/util/OperationHistoryDirtyState.java
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2014 CEA and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus (CEA) - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.emf.gmf.util;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.BiFunction;
+
+import org.eclipse.core.commands.operations.IOperationHistory;
+import org.eclipse.core.commands.operations.IOperationHistoryListener;
+import org.eclipse.core.commands.operations.IUndoContext;
+import org.eclipse.core.commands.operations.IUndoableOperation;
+import org.eclipse.core.commands.operations.OperationHistoryEvent;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.papyrus.infra.emf.gmf.command.INonDirtying;
+
+
+/**
+ * A utility class for tracking the dirty state of an operation history. It works in the
+ * same fashion as the EMF {@link BasicCommandStack}, accounting for operations that {@linkplain INonDirtying do not dirty} the editor.
+ */
+public class OperationHistoryDirtyState {
+
+	private static final Map<IUndoContext, OperationHistoryDirtyState> instances = new HashMap<IUndoContext, OperationHistoryDirtyState>();
+
+	private final AtomicInteger refCount = new AtomicInteger(0);
+
+	private final IUndoContext context;
+
+	private final IOperationHistory history;
+
+	private IOperationHistoryListener listener;
+
+	private IUndoableOperation savepoint;
+
+	private boolean forceDirty;
+
+	protected OperationHistoryDirtyState(IUndoContext context, IOperationHistory history) {
+		this.context = context;
+		this.history = history;
+
+		history.addOperationHistoryListener(createOperationHistoryListener());
+	}
+
+	/**
+	 * Create a delegating dirty state, usually for legacy compatibility.
+	 *
+	 * @param delegate
+	 *            the real dirty state
+	 */
+	OperationHistoryDirtyState(OperationHistoryDirtyState delegate) {
+		this.context = delegate.context;
+		this.history = delegate.history;
+	}
+
+	/**
+	 * Obtains a new operation history dirty-state tracker. Every result of this call must eventually be {@linkplain #dispose() disposed},
+	 * even if it is actually the same instance as returned by an earlier call, because instances are reference-counted.
+	 */
+	public static OperationHistoryDirtyState newInstance(IUndoContext context, IOperationHistory history) {
+		return getInstance(context, history, OperationHistoryDirtyState::new);
+	}
+
+	protected static OperationHistoryDirtyState getInstance(IUndoContext context, IOperationHistory history, BiFunction<? super IUndoContext, ? super IOperationHistory, ? extends OperationHistoryDirtyState> factory) {
+		OperationHistoryDirtyState result;
+
+		synchronized (instances) {
+			result = instances.get(context);
+			if (result == null) {
+				result = factory.apply(context, history);
+				instances.put(context, result);
+			}
+		}
+
+		result.retain();
+		return result;
+	}
+
+	private IOperationHistoryListener createOperationHistoryListener() {
+		this.listener = new IOperationHistoryListener() {
+
+			@Override
+			public void historyNotification(OperationHistoryEvent event) {
+				switch (event.getEventType()) {
+				case OperationHistoryEvent.DONE:
+				case OperationHistoryEvent.UNDONE:
+				case OperationHistoryEvent.REDONE:
+				case OperationHistoryEvent.OPERATION_CHANGED:
+					// Check on our savepoint, if any
+					if ((savepoint != null) && !savepoint.hasContext(context)) {
+						// Our savepoint has been removed from the context (our undo/redo stack), so it
+						// is effectively lost
+						savepoint = null;
+					}
+					break;
+				case OperationHistoryEvent.OPERATION_REMOVED:
+					IUndoableOperation removed = event.getOperation();
+					if (removed != null) {
+						if (removed == savepoint) {
+							// the savepoint was removed, so now we can never return to it
+							savepoint = null;
+						} else if ((savepoint == null) && removed.hasContext(context) && !OperationUtils.isNonDirtying(removed)) {
+							// A dirtying operation has been lost from the history, so we will not now be able to return
+							// to a state equivalent to the savepoint
+							forceDirty = true;
+						}
+					}
+					break;
+				}
+			}
+		};
+
+		return this.listener;
+	}
+
+	private OperationHistoryDirtyState retain() {
+		refCount.incrementAndGet();
+		return this;
+	}
+
+	private boolean release() {
+		return refCount.decrementAndGet() == 0;
+	}
+
+	public void dispose() {
+		synchronized (instances) {
+			if (release()) {
+				instances.remove(context);
+
+				if (listener != null) {
+					history.removeOperationHistoryListener(listener);
+					listener = null;
+				}
+
+				savepoint = null;
+			}
+		}
+	}
+
+	public boolean isDirty() {
+		return forceDirty || OperationUtils.isDirty(history.getUndoHistory(context), history.getRedoHistory(context), savepoint);
+	}
+
+	public void saved() {
+		this.savepoint = history.getUndoOperation(context);
+		this.forceDirty = false;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		return (obj instanceof Delegator) ? equals(((Delegator) obj).delegate) : super.equals(obj);
+	}
+
+	//
+	// Nested types
+	//
+
+	public static class Delegator extends OperationHistoryDirtyState {
+		private final OperationHistoryDirtyState delegate;
+
+		protected Delegator(IUndoContext context, IOperationHistory history) {
+			this(newInstance(context, history));
+		}
+
+		protected Delegator(OperationHistoryDirtyState delegate) {
+			super(delegate);
+
+			this.delegate = delegate;
+
+			// And replace it
+			synchronized (instances) {
+				instances.put(delegate.context, this);
+			}
+		}
+
+		@Override
+		public boolean isDirty() {
+			return delegate.isDirty();
+		}
+
+		@Override
+		public void dispose() {
+			delegate.dispose();
+		}
+
+		@Override
+		public void saved() {
+			delegate.saved();
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			return delegate.equals(obj);
+		}
+
+		@Override
+		public int hashCode() {
+			return delegate.hashCode();
+		}
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/util/OperationUtils.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/util/OperationUtils.java
new file mode 100644
index 00000000000..7878f6155ca
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/gmf/util/OperationUtils.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2014 CEA and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus (CEA) - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.emf.gmf.util;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.commands.operations.IUndoableOperation;
+import org.eclipse.emf.common.command.AbstractCommand;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.workspace.EMFCommandOperation;
+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.INonDirtying;
+
+
+/**
+ * Utilities for working with undoable operations.
+ */
+public class OperationUtils {
+
+	/**
+	 * Not instantiable by clients.
+	 */
+	private OperationUtils() {
+		super();
+	}
+
+	public static boolean anyDirtying(IUndoableOperation[] undoHistory) {
+		boolean result = false;
+
+		if ((undoHistory != null) && (undoHistory.length > 0)) {
+			for (int i = 0; i < undoHistory.length; i++) {
+				if (!isNonDirtying(undoHistory[i])) {
+					result = true;
+					break;
+				}
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Queries whether an operation is non-dirtying. The only known non-dirtying operations, currently, are those that wrap a {@link AbstractCommand.NonDirtying}.
+	 *
+	 * @param operation
+	 *            an undoable operation
+	 *
+	 * @return whether it is a non-dirtying operation
+	 */
+	public static boolean isNonDirtying(IUndoableOperation operation) {
+		boolean result = operation instanceof INonDirtying;
+		if (!result) {
+			Command command = unwrap(operation);
+			result = command instanceof AbstractCommand.NonDirtying;
+		}
+		return result;
+	}
+
+	/**
+	 * Obtains the singular EMF {@link Command} that is wrapped by an {@code operation}, if it is a command wrapper of some kind.
+	 *
+	 * @param operation
+	 *            an operation
+	 *
+	 * @return the {@link Command} that it wraps, or {@code null} if it does not wrap a singular EMF command
+	 */
+	public static Command unwrap(IUndoableOperation operation) {
+		Command result = null;
+
+		if (operation instanceof EMFCommandOperation) {
+			result = ((EMFCommandOperation) operation).getCommand();
+		} else if (operation instanceof EMFtoGMFCommandWrapper) {
+			result = ((EMFtoGMFCommandWrapper) operation).getWrappedCommand();
+		}
+
+		return result;
+	}
+
+	public static boolean isDirty(IUndoableOperation[] undoHistory, IUndoableOperation[] redoHistory, IUndoableOperation savepoint) {
+		boolean result = false;
+
+		if (savepoint == null) {
+			result = anyDirtying(undoHistory);
+		} else {
+			List<IUndoableOperation> undos = ((undoHistory == null) || (undoHistory.length == 0)) ? Collections.<IUndoableOperation> emptyList() : Arrays.asList(undoHistory);
+			List<IUndoableOperation> redos = ((redoHistory == null) || (redoHistory.length == 0)) ? Collections.<IUndoableOperation> emptyList() : Arrays.asList(redoHistory);
+
+			if (undos.contains(savepoint)) {
+				// See whether there is any dirtying command after the savepoint in the undo stack
+				int i = 0;
+
+				for (; i < undoHistory.length; i++) {
+					if (undoHistory[i] == savepoint) {
+						i++; // Advance over the save point to start testing
+						break;
+					}
+				}
+
+				for (; i < undoHistory.length; i++) {
+					if (!isNonDirtying(undoHistory[i])) {
+						result = true;
+						break;
+					}
+				}
+			} else if (redos.contains(savepoint)) {
+				// See whether there is any dirtying command before the savepoint in the redo stack
+				for (int i = redoHistory.length - 1; i >= 0; i--) {
+					if (!isNonDirtying(redoHistory[i])) {
+						result = true;
+						break;
+					}
+					if (redoHistory[i] == savepoint) {
+						// Done scanning. Everything up to and including the savepoint is non-dirtying
+						break;
+					}
+				}
+			} else {
+				// If we have no history but we have a savepoint, then we cannot undo nor redo to that savepoint
+				// (the history has been flushed) so evidently some change was made that invalidated the history,
+				// therefore we are dirty
+				result = true;
+			}
+		}
+
+		return result;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/Activator.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/internal/gmf/Activator.java
index fe0be7a33db..cffec0820a5 100644
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/Activator.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/src/org/eclipse/papyrus/infra/emf/internal/gmf/Activator.java
@@ -1,75 +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:

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

- *

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

-package org.eclipse.papyrus.eclipse.project.editors;

-

-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.eclipse.project.editors"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see

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

-	 * )

-	 */

-	@Override

-	public void start(final 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

-	 * )

-	 */

-	@Override

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

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.internal.gmf;
+
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends Plugin {
+
+	/**
+	 * The plug-in ID
+	 */
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.emf,gmf"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/**
+	 * The plug-in's logger
+	 */
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+		super();
+	}
+
+	@Override
+	public void start(final BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	@Override
+	public void stop(final 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/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF
index ea8d0941c57..09cd9998ca9 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF
@@ -1,23 +1,23 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.emf.readonly,

- org.eclipse.papyrus.infra.emf.readonly.internal;x-friends:="org.eclipse.papyrus.infra.ui.emf",

- org.eclipse.papyrus.infra.emf.readonly.spi

-Require-Bundle: org.eclipse.papyrus.infra.onefile;bundle-version="1.2.0",

- org.eclipse.core.expressions;bundle-version="3.4.300",

- org.eclipse.emf.workspace;bundle-version="1.4.0",

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

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

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

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

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

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

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

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.emf.readonly.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.readonly;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.emf.readonly,
+ org.eclipse.papyrus.infra.emf.readonly.internal;x-friends:="org.eclipse.papyrus.infra.ui.emf",
+ org.eclipse.papyrus.infra.emf.readonly.spi
+Require-Bundle: org.eclipse.papyrus.infra.onefile;bundle-version="1.2.0",
+ org.eclipse.core.expressions;bundle-version="3.4.300",
+ org.eclipse.emf.workspace;bundle-version="1.4.0",
+ org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.2.0"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.emf.readonly.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.readonly;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/plugin.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/plugin.xml
index 9d985cdebac..30a5894ceec 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/plugin.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/plugin.xml
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

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

-   <extension

-         point="org.eclipse.papyrus.infra.emf.readonly.readOnlyHandler">

-      <readOnlyHandler

-            class="org.eclipse.papyrus.infra.emf.readonly.EMFReadOnlyHandler"

-            id="org.eclipse.papyrus.infra.emf.readonly.EMFReadOnlyHandler"

-            priority="5">

-         <affinity

-               axis="permission">

-         </affinity>

-      </readOnlyHandler>

-      <readOnlyHandler

-            class="org.eclipse.papyrus.infra.emf.readonly.SashModelReadOnlyHandler"

-            priority="20">

-         <affinity

-               axis="discretion">

-         </affinity>

-      </readOnlyHandler>

-   </extension>

-<extension

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

-   <transactionalEditingDomainProvider

-         class="org.eclipse.papyrus.infra.emf.readonly.PapyrusROTransactionalEditingDomainProvider"

-         priority="10">

-   </transactionalEditingDomainProvider>

-</extension>

-<extension

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

-   <propertyTester

-         class="org.eclipse.papyrus.infra.emf.readonly.ReadOnlyTester"

-         id="org.eclipse.papyrus.infra.emf.readonly.tester"

-         namespace="org.eclipse.papyrus.infra.emf.readonly.tester"

-         properties="isReadOnly,canMakeWritable"

-         type="org.eclipse.emf.ecore.EObject">

-   </propertyTester>

-</extension>

-<extension

-      point="org.eclipse.papyrus.infra.gmfdiag.commands.operationApprover">

-   <operationApprover

-         class="org.eclipse.papyrus.infra.emf.readonly.ReadOnlyOneFileApprover"

-         priority="10">

-   </operationApprover>

-</extension>

-<extension

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

-   <factory

-         adaptableType="org.eclipse.emf.edit.domain.EditingDomain"

-         class="org.eclipse.papyrus.infra.emf.readonly.ReadOnlyAdapterFactory">

-      <adapter

-            type="org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler">

-      </adapter>

-      <adapter

-            type="org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler2">

-      </adapter>

-   </factory>

-</extension>

-<!-- commented for Papyrus M4 build -->

-<!--   <extension

-         point="org.eclipse.papyrus.editor.perspectiveconfiguration">

-      <configuration

-            perspectiveID="org.eclipse.papyrus.infra.core.perspective">

-         <toolbar

-               toolbarID="org.eclipse.papyrus.infra.emf.readonly.toolbar">

-         </toolbar>

-         <command

-               commandID="org.eclipse.papyrus.infra.emf.readonly.EnableWriteCommand">

-         </command>

-      </configuration>

-   </extension>

-   -->

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension-point id="readOnlyHandler" name="readOnlyHandler" schema="schema/readOnlyHandler.exsd"/>
+   <extension
+         point="org.eclipse.papyrus.infra.emf.readonly.readOnlyHandler">
+      <readOnlyHandler
+            class="org.eclipse.papyrus.infra.emf.readonly.EMFReadOnlyHandler"
+            id="org.eclipse.papyrus.infra.emf.readonly.EMFReadOnlyHandler"
+            priority="5">
+         <affinity
+               axis="permission">
+         </affinity>
+      </readOnlyHandler>
+      <readOnlyHandler
+            class="org.eclipse.papyrus.infra.emf.readonly.SashModelReadOnlyHandler"
+            priority="20">
+         <affinity
+               axis="discretion">
+         </affinity>
+      </readOnlyHandler>
+   </extension>
+<extension
+      point="org.eclipse.papyrus.infra.core.transactionalEditingDomainProvider">
+   <transactionalEditingDomainProvider
+         class="org.eclipse.papyrus.infra.emf.readonly.PapyrusROTransactionalEditingDomainProvider"
+         priority="10">
+   </transactionalEditingDomainProvider>
+</extension>
+<extension
+      point="org.eclipse.core.expressions.propertyTesters">
+   <propertyTester
+         class="org.eclipse.papyrus.infra.emf.readonly.ReadOnlyTester"
+         id="org.eclipse.papyrus.infra.emf.readonly.tester"
+         namespace="org.eclipse.papyrus.infra.emf.readonly.tester"
+         properties="isReadOnly,canMakeWritable"
+         type="org.eclipse.emf.ecore.EObject">
+   </propertyTester>
+</extension>
+<extension
+      point="org.eclipse.papyrus.infra.emf.gmf.operationApprovers">
+   <operationApprover
+         class="org.eclipse.papyrus.infra.emf.readonly.ReadOnlyOneFileApprover"
+         priority="10">
+   </operationApprover>
+</extension>
+<extension
+      point="org.eclipse.core.runtime.adapters">
+   <factory
+         adaptableType="org.eclipse.emf.edit.domain.EditingDomain"
+         class="org.eclipse.papyrus.infra.emf.readonly.ReadOnlyAdapterFactory">
+      <adapter
+            type="org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler">
+      </adapter>
+      <adapter
+            type="org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler2">
+      </adapter>
+   </factory>
+</extension>
+<!-- commented for Papyrus M4 build -->
+<!--   <extension
+         point="org.eclipse.papyrus.editor.perspectiveconfiguration">
+      <configuration
+            perspectiveID="org.eclipse.papyrus.infra.core.perspective">
+         <toolbar
+               toolbarID="org.eclipse.papyrus.infra.emf.readonly.toolbar">
+         </toolbar>
+         <command
+               commandID="org.eclipse.papyrus.infra.emf.readonly.EnableWriteCommand">
+         </command>
+      </configuration>
+   </extension>
+   -->
+</plugin>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/pom.xml
index 9ddcb10a820..ead630febec 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/pom.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-emf</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.emf.readonly</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/PapyrusROTransactionalEditingDomainProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/PapyrusROTransactionalEditingDomainProvider.java
index 74cf0fee03c..e31c6bbf1f3 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/PapyrusROTransactionalEditingDomainProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/PapyrusROTransactionalEditingDomainProvider.java
@@ -1,46 +1,46 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2014 Atos Origin, CEA, and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 402525

- *

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

-package org.eclipse.papyrus.infra.emf.readonly;

-

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

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

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

-import org.eclipse.emf.workspace.IResourceUndoContextPolicy;

-import org.eclipse.emf.workspace.WorkspaceEditingDomainFactory;

-import org.eclipse.papyrus.commands.CheckedOperationHistory;

-import org.eclipse.papyrus.commands.NestingNotifyingWorkspaceCommandStack;

-import org.eclipse.papyrus.commands.NotifyingWorkspaceCommandStack;

-import org.eclipse.papyrus.infra.core.resource.ITransactionalEditingDomainProvider;

-

-/**

- * Editing Domain created using this provider will use handlers registered on readOnlyHandler extension

- * to determine if a resource is read only.

- *

- * @author mvelten

- *

- */

-public class PapyrusROTransactionalEditingDomainProvider implements ITransactionalEditingDomainProvider {

-

-	public TransactionalEditingDomain createTransactionalEditingDomain(ResourceSet resourceSet) {

-		NotifyingWorkspaceCommandStack stack = new NestingNotifyingWorkspaceCommandStack(CheckedOperationHistory.getInstance());

-		stack.setResourceUndoContextPolicy(IResourceUndoContextPolicy.DEFAULT);

-

-		TransactionalEditingDomain result = new PapyrusROTransactionalEditingDomain(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), stack, resourceSet);

-

-		WorkspaceEditingDomainFactory.INSTANCE.mapResourceSet(result);

-

-		return result;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2014 Atos Origin, CEA, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 402525
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.readonly;
+
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.workspace.IResourceUndoContextPolicy;
+import org.eclipse.emf.workspace.WorkspaceEditingDomainFactory;
+import org.eclipse.papyrus.infra.core.resource.ITransactionalEditingDomainProvider;
+import org.eclipse.papyrus.infra.emf.gmf.command.CheckedOperationHistory;
+import org.eclipse.papyrus.infra.emf.gmf.command.NestingNotifyingWorkspaceCommandStack;
+import org.eclipse.papyrus.infra.emf.gmf.command.NotifyingWorkspaceCommandStack;
+
+/**
+ * Editing Domain created using this provider will use handlers registered on readOnlyHandler extension
+ * to determine if a resource is read only.
+ *
+ * @author mvelten
+ *
+ */
+public class PapyrusROTransactionalEditingDomainProvider implements ITransactionalEditingDomainProvider {
+
+	public TransactionalEditingDomain createTransactionalEditingDomain(ResourceSet resourceSet) {
+		NotifyingWorkspaceCommandStack stack = new NestingNotifyingWorkspaceCommandStack(CheckedOperationHistory.getInstance());
+		stack.setResourceUndoContextPolicy(IResourceUndoContextPolicy.DEFAULT);
+
+		TransactionalEditingDomain result = new PapyrusROTransactionalEditingDomain(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), stack, resourceSet);
+
+		WorkspaceEditingDomainFactory.INSTANCE.mapResourceSet(result);
+
+		return result;
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyOneFileApprover.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyOneFileApprover.java
index bc3162db449..80415983e91 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyOneFileApprover.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyOneFileApprover.java
@@ -1,200 +1,203 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2014 Atos Origin, CEA, and others.

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

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

- *  Christian W. Damus (CEA) - bug 429826

- *

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

-package org.eclipse.papyrus.infra.emf.readonly;

-

-import java.io.File;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.Set;

-

-import org.eclipse.core.commands.operations.IOperationApprover2;

-import org.eclipse.core.commands.operations.IOperationHistory;

-import org.eclipse.core.commands.operations.IUndoableOperation;

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

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

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

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

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

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

-import org.eclipse.emf.common.command.CompoundCommand;

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

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

-import org.eclipse.emf.workspace.AbstractEMFOperation;

-import org.eclipse.emf.workspace.EMFCommandOperation;

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

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

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

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

-import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler2;

-import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;

-import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

-import org.eclipse.papyrus.infra.onefile.model.PapyrusModelHelper;

-import org.eclipse.papyrus.infra.onefile.utils.OneFileUtils;

-

-import com.google.common.base.Optional;

-

-public class ReadOnlyOneFileApprover implements IOperationApprover2 {

-

-	public IStatus proceedRedoing(IUndoableOperation operation, IOperationHistory history, IAdaptable info) {

-		return proceedExecuting(operation, history, info);

-	}

-

-	public IStatus proceedUndoing(IUndoableOperation operation, IOperationHistory history, IAdaptable info) {

-		return proceedExecuting(operation, history, info);

-	}

-

-	public IStatus proceedExecuting(IUndoableOperation operation, IOperationHistory history, IAdaptable info) {

-		HashSet<URI> filesToCheckForLock = new HashSet<URI>();

-

-		Set<IFile> affectedFiles = getAffectedFiles(operation);

-

-		if (!affectedFiles.isEmpty()) {

-			for (IFile affectedFile : affectedFiles) {

-				if (affectedFile == null) {

-					continue;

-				}

-

-				if (affectedFile.exists()) {

-					// the file is in the workspace

-					IPapyrusFile papFile = PapyrusModelHelper.getPapyrusModelFactory().createIPapyrusFile(affectedFile);

-					for (IFile f : OneFileUtils.getAssociatedFiles(papFile)) {

-						filesToCheckForLock.add(URI.createPlatformResourceURI(f.getFullPath().toString(), true));

-					}

-				} else {

-					// the file is not in the workspace

-					IPath path = affectedFile.getRawLocation();

-					if (path == null) {

-						// cancel if we can't find the file

-						if (operation instanceof ICommand) {

-							setCommandResult((ICommand) operation, Status.CANCEL_STATUS);

-						}

-						return Status.CANCEL_STATUS;

-					}

-					File file = path.toFile();

-					if (file != null && file.exists() && !file.canWrite()) {

-						// cancel if we find a read-only file outside the

-						// workspace

-						if (operation instanceof ICommand) {

-							setCommandResult((ICommand) operation, Status.CANCEL_STATUS);

-						}

-						return Status.CANCEL_STATUS;

-					}

-				}

-			}

-		}

-

-		EditingDomain editingDomain = getEditingDomain(operation);

-

-		URI[] filesToCheckForLockArray = filesToCheckForLock.toArray(new URI[filesToCheckForLock.size()]);

-		IReadOnlyHandler2 roHandler = ReadOnlyManager.getReadOnlyHandler(editingDomain);

-		if (roHandler.anyReadOnly(ReadOnlyAxis.anyAxis(), filesToCheckForLockArray).get()) {

-			Optional<Boolean> ok = roHandler.makeWritable(ReadOnlyAxis.anyAxis(), filesToCheckForLockArray);

-			if (!ok.get()) {

-				return Status.CANCEL_STATUS;

-			}

-		}

-

-		return Status.OK_STATUS;

-	}

-

-	protected EditingDomain getEditingDomain(IUndoableOperation command) {

-		EditingDomain editingDomain = null;

-		if (command instanceof AbstractEMFOperation) {

-			editingDomain = ((AbstractEMFOperation) command).getEditingDomain();

-		}

-

-		if (editingDomain == null && command instanceof ICompositeCommand) {

-			Iterator<?> it = ((ICompositeCommand) command).iterator();

-			while (editingDomain == null && it.hasNext()) {

-				IUndoableOperation c = (IUndoableOperation) it.next();

-				editingDomain = getEditingDomain(c);

-			}

-		}

-		return editingDomain;

-	}

-

-	/**

-	 * Sets the command result of the specified command to a CommandResult

-	 * having the specified status.

-	 *

-	 * @param command

-	 *            ICommand to set the CommandResult for

-	 * @param status

-	 *            IStatus of the CommandResult that will be set on the

-	 *            command

-	 */

-	@SuppressWarnings("restriction")

-	protected void setCommandResult(ICommand command, IStatus status) {

-		if (command instanceof org.eclipse.gmf.runtime.common.core.internal.command.ICommandWithSettableResult) {

-			((org.eclipse.gmf.runtime.common.core.internal.command.ICommandWithSettableResult) command).internalSetResult(new CommandResult(status));

-		}

-	}

-

-	protected Set<IFile> getAffectedFiles(IUndoableOperation operation) {

-		Set<IFile> result = getAffectedFiles(operation, null);

-		return (result == null) ? Collections.<IFile> emptySet() : result;

-	}

-

-	protected Set<IFile> getAffectedFiles(IUndoableOperation operation, Set<IFile> result) {

-		if (operation instanceof ICommand) {

-			@SuppressWarnings("unchecked")

-			Collection<IFile> files = ((ICommand) operation).getAffectedFiles();

-			result = appendFiles(result, files);

-		} else if (operation instanceof GMFtoEMFCommandWrapper) {

-			result = getAffectedFiles(((GMFtoEMFCommandWrapper) operation).getGMFCommand(), result);

-		} else if (operation instanceof EMFCommandOperation) {

-			result = getAffectedFiles(((EMFCommandOperation) operation).getCommand(), result);

-		}

-

-		return result;

-	}

-

-	private Set<IFile> appendFiles(Set<IFile> result, Collection<IFile> files) {

-		if ((files != null) && !files.isEmpty()) {

-			if (result == null) {

-				result = new HashSet<IFile>(files);

-			} else {

-				result.addAll(files);

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * Dig into an EMF command to find wrapped GMF commands and get their affected files. As commands are generally provided by GMF edit-helpers, this

-	 * should turn up useful results.

-	 *

-	 * @param command

-	 *            a command to mine for affected files

-	 * @param result

-	 *            an accumulator of affected files

-	 * @return the {@code result} if it already exists, a non-empty set containing affected files, or {@code null}

-	 */

-	protected Set<IFile> getAffectedFiles(Command command, Set<IFile> result) {

-		if (command instanceof CompoundCommand) {

-			for (Command next : ((CompoundCommand) command).getCommandList()) {

-				// accumulate affected files

-				result = getAffectedFiles(next, result);

-			}

-		} else if (command instanceof GMFtoEMFCommandWrapper) {

-			result = getAffectedFiles(((GMFtoEMFCommandWrapper) command).getGMFCommand(), result);

-		}

-

-		return result;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2014 Atos Origin, CEA, and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 323802
+ *  Christian W. Damus (CEA) - bug 429826
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.readonly;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.eclipse.core.commands.operations.IOperationApprover2;
+import org.eclipse.core.commands.operations.IOperationHistory;
+import org.eclipse.core.commands.operations.IUndoableOperation;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.workspace.AbstractEMFOperation;
+import org.eclipse.emf.workspace.EMFCommandOperation;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;
+import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler2;
+import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;
+import org.eclipse.papyrus.infra.onefile.model.PapyrusModelHelper;
+import org.eclipse.papyrus.infra.onefile.utils.OneFileUtils;
+
+import com.google.common.base.Optional;
+
+public class ReadOnlyOneFileApprover implements IOperationApprover2 {
+
+	@Override
+	public IStatus proceedRedoing(IUndoableOperation operation, IOperationHistory history, IAdaptable info) {
+		return proceedExecuting(operation, history, info);
+	}
+
+	@Override
+	public IStatus proceedUndoing(IUndoableOperation operation, IOperationHistory history, IAdaptable info) {
+		return proceedExecuting(operation, history, info);
+	}
+
+	@Override
+	public IStatus proceedExecuting(IUndoableOperation operation, IOperationHistory history, IAdaptable info) {
+		HashSet<URI> filesToCheckForLock = new HashSet<URI>();
+
+		Set<IFile> affectedFiles = getAffectedFiles(operation);
+
+		if (!affectedFiles.isEmpty()) {
+			for (IFile affectedFile : affectedFiles) {
+				if (affectedFile == null) {
+					continue;
+				}
+
+				if (affectedFile.exists()) {
+					// the file is in the workspace
+					IPapyrusFile papFile = PapyrusModelHelper.getPapyrusModelFactory().createIPapyrusFile(affectedFile);
+					for (IFile f : OneFileUtils.getAssociatedFiles(papFile)) {
+						filesToCheckForLock.add(URI.createPlatformResourceURI(f.getFullPath().toString(), true));
+					}
+				} else {
+					// the file is not in the workspace
+					IPath path = affectedFile.getRawLocation();
+					if (path == null) {
+						// cancel if we can't find the file
+						if (operation instanceof ICommand) {
+							setCommandResult((ICommand) operation, Status.CANCEL_STATUS);
+						}
+						return Status.CANCEL_STATUS;
+					}
+					File file = path.toFile();
+					if (file != null && file.exists() && !file.canWrite()) {
+						// cancel if we find a read-only file outside the
+						// workspace
+						if (operation instanceof ICommand) {
+							setCommandResult((ICommand) operation, Status.CANCEL_STATUS);
+						}
+						return Status.CANCEL_STATUS;
+					}
+				}
+			}
+		}
+
+		EditingDomain editingDomain = getEditingDomain(operation);
+
+		URI[] filesToCheckForLockArray = filesToCheckForLock.toArray(new URI[filesToCheckForLock.size()]);
+		IReadOnlyHandler2 roHandler = ReadOnlyManager.getReadOnlyHandler(editingDomain);
+		if (roHandler.anyReadOnly(ReadOnlyAxis.anyAxis(), filesToCheckForLockArray).get()) {
+			Optional<Boolean> ok = roHandler.makeWritable(ReadOnlyAxis.anyAxis(), filesToCheckForLockArray);
+			if (!ok.get()) {
+				return Status.CANCEL_STATUS;
+			}
+		}
+
+		return Status.OK_STATUS;
+	}
+
+	protected EditingDomain getEditingDomain(IUndoableOperation command) {
+		EditingDomain editingDomain = null;
+		if (command instanceof AbstractEMFOperation) {
+			editingDomain = ((AbstractEMFOperation) command).getEditingDomain();
+		}
+
+		if (editingDomain == null && command instanceof ICompositeCommand) {
+			Iterator<?> it = ((ICompositeCommand) command).iterator();
+			while (editingDomain == null && it.hasNext()) {
+				IUndoableOperation c = (IUndoableOperation) it.next();
+				editingDomain = getEditingDomain(c);
+			}
+		}
+		return editingDomain;
+	}
+
+	/**
+	 * Sets the command result of the specified command to a CommandResult
+	 * having the specified status.
+	 *
+	 * @param command
+	 *            ICommand to set the CommandResult for
+	 * @param status
+	 *            IStatus of the CommandResult that will be set on the
+	 *            command
+	 */
+	@SuppressWarnings("restriction")
+	protected void setCommandResult(ICommand command, IStatus status) {
+		if (command instanceof org.eclipse.gmf.runtime.common.core.internal.command.ICommandWithSettableResult) {
+			((org.eclipse.gmf.runtime.common.core.internal.command.ICommandWithSettableResult) command).internalSetResult(new CommandResult(status));
+		}
+	}
+
+	protected Set<IFile> getAffectedFiles(IUndoableOperation operation) {
+		Set<IFile> result = getAffectedFiles(operation, null);
+		return (result == null) ? Collections.<IFile> emptySet() : result;
+	}
+
+	protected Set<IFile> getAffectedFiles(IUndoableOperation operation, Set<IFile> result) {
+		if (operation instanceof ICommand) {
+			@SuppressWarnings("unchecked")
+			Collection<IFile> files = ((ICommand) operation).getAffectedFiles();
+			result = appendFiles(result, files);
+		} else if (operation instanceof GMFtoEMFCommandWrapper) {
+			result = getAffectedFiles(((GMFtoEMFCommandWrapper) operation).getGMFCommand(), result);
+		} else if (operation instanceof EMFCommandOperation) {
+			result = getAffectedFiles(((EMFCommandOperation) operation).getCommand(), result);
+		}
+
+		return result;
+	}
+
+	private Set<IFile> appendFiles(Set<IFile> result, Collection<IFile> files) {
+		if ((files != null) && !files.isEmpty()) {
+			if (result == null) {
+				result = new HashSet<IFile>(files);
+			} else {
+				result.addAll(files);
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Dig into an EMF command to find wrapped GMF commands and get their affected files. As commands are generally provided by GMF edit-helpers, this
+	 * should turn up useful results.
+	 *
+	 * @param command
+	 *            a command to mine for affected files
+	 * @param result
+	 *            an accumulator of affected files
+	 * @return the {@code result} if it already exists, a non-empty set containing affected files, or {@code null}
+	 */
+	protected Set<IFile> getAffectedFiles(Command command, Set<IFile> result) {
+		if (command instanceof CompoundCommand) {
+			for (Command next : ((CompoundCommand) command).getCommandList()) {
+				// accumulate affected files
+				result = getAffectedFiles(next, result);
+			}
+		} else if (command instanceof GMFtoEMFCommandWrapper) {
+			result = getAffectedFiles(((GMFtoEMFCommandWrapper) command).getGMFCommand(), result);
+		}
+
+		return result;
+	}
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml
index 63ffd3757a1..cc4360ddd2d 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-emf</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.emf</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/Activator.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/Activator.java
index fe845446d23..a3c0e69cc06 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/Activator.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/Activator.java
@@ -1,130 +1,129 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *  Christian W. Damus - bug 485220

- *

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

-package org.eclipse.papyrus.infra.emf;

-

-import java.util.ArrayList;

-

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

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

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

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

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

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

-import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager;

-import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManagerFactory;

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

-import org.eclipse.papyrus.infra.emf.spi.resolver.EObjectResolverService;

-import org.eclipse.papyrus.infra.emf.spi.resolver.IEObjectResolver;

-import org.osgi.framework.BundleContext;

-

-/**

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

- */

-public class Activator extends Plugin {

-

-	/**

-	 * The plug-in ID

-	 */

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.emf"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * The plug-in's logger

-	 */

-	public static LogHelper log;

-

-	private ICustomizationManager fCustomizationManager;

-	// temp resourceSet

-	private ResourceSet facetRecsourceSet = new ResourceSetImpl();

-

-	private EObjectResolverService resolverService;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-		super();

-	}

-

-	@Override

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

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-

-		resolverService = new EObjectResolverService(context);

-		resolverService.open();

-	}

-

-	@Override

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

-		resolverService.close();

-		resolverService = null;

-

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-	/**

-	 *

-	 * @return the customization manager in charge to adapt element in modisco

-	 */

-	public ICustomizationManager getCustomizationManager() {

-		if (this.fCustomizationManager == null) {

-			this.fCustomizationManager = ICustomizationManagerFactory.DEFAULT.getOrCreateICustomizationManager(facetRecsourceSet);

-		}

-		return this.fCustomizationManager;

-	}

-

-	/** @return the qualified name of the given metaclass */

-	public static String getMetaclassQualifiedName(final EClassifier eClass) {

-		final ArrayList<String> qualifiedNameParts = new ArrayList<String>();

-		final StringBuilder builder = new StringBuilder();

-

-		EPackage ePackage = eClass.getEPackage();

-		while (ePackage != null) {

-			qualifiedNameParts.add(ePackage.getName());

-			ePackage = ePackage.getESuperPackage();

-		}

-

-		for (int i = qualifiedNameParts.size() - 1; i >= 0; i--) {

-			builder.append(qualifiedNameParts.get(i) + "."); //$NON-NLS-1$

-		}

-

-		builder.append(eClass.getName());

-

-		return builder.toString();

-	}

-

-	/**

-	 * Obtain the instance of the {@link EObject} resolver service, if any.

-	 * 

-	 * @return the object resolver service (never {@code null} while this bundle is active)

-	 */

-	public IEObjectResolver getEObjectResolver() {

-		return resolverService;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf;
+
+import java.util.ArrayList;
+
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager;
+import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManagerFactory;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.papyrus.infra.emf.spi.resolver.EObjectResolverService;
+import org.eclipse.papyrus.infra.emf.spi.resolver.IEObjectResolver;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends Plugin {
+
+	/**
+	 * The plug-in ID
+	 */
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.emf"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/**
+	 * The plug-in's logger
+	 */
+	public static LogHelper log;
+
+	private ICustomizationManager fCustomizationManager;
+	// temp resourceSet
+	private ResourceSet facetRecsourceSet = new ResourceSetImpl();
+
+	private EObjectResolverService resolverService;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+		super();
+	}
+
+	@Override
+	public void start(final BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+
+		resolverService = new EObjectResolverService(context);
+	}
+
+	@Override
+	public void stop(final BundleContext context) throws Exception {
+		resolverService.dispose();
+		resolverService = null;
+
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/**
+	 *
+	 * @return the customization manager in charge to adapt element in modisco
+	 */
+	public ICustomizationManager getCustomizationManager() {
+		if (this.fCustomizationManager == null) {
+			this.fCustomizationManager = ICustomizationManagerFactory.DEFAULT.getOrCreateICustomizationManager(facetRecsourceSet);
+		}
+		return this.fCustomizationManager;
+	}
+
+	/** @return the qualified name of the given metaclass */
+	public static String getMetaclassQualifiedName(final EClassifier eClass) {
+		final ArrayList<String> qualifiedNameParts = new ArrayList<String>();
+		final StringBuilder builder = new StringBuilder();
+
+		EPackage ePackage = eClass.getEPackage();
+		while (ePackage != null) {
+			qualifiedNameParts.add(ePackage.getName());
+			ePackage = ePackage.getESuperPackage();
+		}
+
+		for (int i = qualifiedNameParts.size() - 1; i >= 0; i--) {
+			builder.append(qualifiedNameParts.get(i) + "."); //$NON-NLS-1$
+		}
+
+		builder.append(eClass.getName());
+
+		return builder.toString();
+	}
+
+	/**
+	 * Obtain the instance of the {@link EObject} resolver service, if any.
+	 * 
+	 * @return the object resolver service (never {@code null} while this bundle is active)
+	 */
+	public IEObjectResolver getEObjectResolver() {
+		return resolverService;
+	}
+
+}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/spi/resolver/EObjectResolverService.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/spi/resolver/EObjectResolverService.java
index 9b2e0ecb239..dd9f1e67d95 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/spi/resolver/EObjectResolverService.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/spi/resolver/EObjectResolverService.java
@@ -13,20 +13,15 @@
 
 package org.eclipse.papyrus.infra.emf.spi.resolver;
 
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Stream;
-
+import org.eclipse.papyrus.infra.tools.util.CompositeServiceTracker;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.util.tracker.ServiceTracker;
 
 /**
  * A resolver that delegates to registered OSGi services in a <em>Chain of Command</em>
  * pattern to provide the first available service result.
  */
-public class EObjectResolverService extends ServiceTracker<IEObjectResolver, IEObjectResolver> implements IEObjectResolver {
-	private final AtomicReference<IEObjectResolver> delegate = new AtomicReference<>(IEObjectResolver.identity());
+public class EObjectResolverService implements IEObjectResolver {
+	private final CompositeServiceTracker<IEObjectResolver> tracker;
 
 	/**
 	 * Initializes me with the bundle context in which I track resolver services.
@@ -35,38 +30,21 @@ public class EObjectResolverService extends ServiceTracker<IEObjectResolver, IEO
 	 *            the bundle context
 	 */
 	public EObjectResolverService(BundleContext context) {
-		super(context, IEObjectResolver.class, null);
-	}
-
-	@Override
-	public Object resolve(Object object) {
-		IEObjectResolver delegate = this.delegate.get();
-		if (delegate == null) {
-			// Recompute
-			delegate = Stream.of(getServices(new IEObjectResolver[getTrackingCount()]))
-					.filter(Objects::nonNull) // If the array has more slots than we have services
-					.reduce(IEObjectResolver.identity(), IEObjectResolver::compose);
-			this.delegate.set(delegate);
-		}
+		super();
 
-		return delegate.resolve(object);
+		tracker = new CompositeServiceTracker<>(context,
+				IEObjectResolver.class,
+				IEObjectResolver.identity(),
+				IEObjectResolver::compose);
+		tracker.open();
 	}
 
-	@Override
-	public IEObjectResolver addingService(ServiceReference<IEObjectResolver> reference) {
-		IEObjectResolver result = super.addingService(reference);
-
-		// We will have to recompute our delegates
-		delegate.set(null);
-
-		return result;
+	public void dispose() {
+		tracker.close();
 	}
 
 	@Override
-	public void removedService(ServiceReference<IEObjectResolver> reference, IEObjectResolver service) {
-		super.removedService(reference, service);
-
-		// We will have to recompute our delegates
-		delegate.set(null);
+	public Object resolve(Object object) {
+		return tracker.getService().resolve(object);
 	}
 }
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/pom.xml
index 8e34b9157d6..b5fbae85035 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/pom.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-emf</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.ui.emf</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/utils/ProviderHelper.java b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/utils/ProviderHelper.java
index 77704b242af..5e6acf0d429 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/utils/ProviderHelper.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/utils/ProviderHelper.java
@@ -13,16 +13,25 @@
  *****************************************************************************/
 package org.eclipse.papyrus.infra.ui.emf.utils;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Objects;
+
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager;
+import org.eclipse.papyrus.infra.core.language.ILanguageService;
+import org.eclipse.papyrus.infra.core.resource.IModel;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.emf.utils.HistoryUtil;
 import org.eclipse.papyrus.infra.ui.emf.providers.EMFGraphicalContentProvider;
 import org.eclipse.papyrus.infra.ui.emf.providers.strategy.ContainmentBrowseStrategy;
+import org.eclipse.papyrus.infra.ui.emf.providers.strategy.SemanticEMFContentProvider;
 import org.eclipse.papyrus.infra.ui.internal.emf.Activator;
+import org.eclipse.papyrus.infra.ui.providers.ISemanticContentProviderFactory;
 import org.eclipse.papyrus.infra.widgets.strategy.ProviderBasedBrowseStrategy;
 import org.eclipse.papyrus.infra.widgets.strategy.StrategyBasedContentProvider;
 import org.eclipse.papyrus.infra.widgets.strategy.TreeBrowseStrategy;
@@ -70,4 +79,38 @@ public class ProviderHelper {
 		ResourceSet rs = editedEObject == null ? null : editedEObject.eResource() == null ? null : editedEObject.eResource().getResourceSet();
 		return encapsulateProvider(provider, rs, HistoryUtil.getHistoryID(editedEObject, feature));
 	}
+
+	/**
+	 * Obtain the best available semantic content provider factory for a given resource set.
+	 * 
+	 * @param resourceSet
+	 *            a resource set
+	 * @return the best available semantic content provider factory (never {@code null})
+	 * 
+	 * @see #getContentProvider(ResourceSet)
+	 */
+	public static ISemanticContentProviderFactory getContentProviderFactory(ResourceSet resourceSet) {
+		Collection<? extends IModel> models = (resourceSet instanceof ModelSet)
+				? ILanguageService.getLanguageModels((ModelSet) resourceSet)
+				: Collections.emptyList();
+		return models.stream()
+				.map(m -> m.getAdapter(ISemanticContentProviderFactory.class))
+				.filter(Objects::nonNull)
+				.reduce(ISemanticContentProviderFactory::compose)
+				.orElse(SemanticEMFContentProvider::new);
+	}
+
+	/**
+	 * Obtain the best available semantic content provider for a given resource set.
+	 * 
+	 * @param resourceSet
+	 *            a resource set
+	 * @return the best available semantic content provider factory (never {@code null})
+	 * 
+	 * @see #getContentProviderFactory(ResourceSet)
+	 */
+	public static ITreeContentProvider getContentProvider(ResourceSet resourceSet) {
+		return getContentProviderFactory(resourceSet).createSemanticContentProvider(resourceSet);
+	}
+
 }
diff --git a/plugins/infra/emf/pom.xml b/plugins/infra/emf/pom.xml
new file mode 100644
index 00000000000..b64c1d01e8b
--- /dev/null
+++ b/plugins/infra/emf/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.infra-emf</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <name>Papyrus EMF Infrastructure</name>
+	<description>Various plug-ins providing extended modeling services on EMF.</description>
+
+	<modules>
+		<module>org.eclipse.papyrus.infra.emf</module>
+		<module>org.eclipse.papyrus.infra.emf.appearance</module>
+		<module>org.eclipse.papyrus.infra.emf.diagram.common</module>
+		<module>org.eclipse.papyrus.infra.emf.gmf</module>
+		<module>org.eclipse.papyrus.infra.emf.readonly</module>
+		<module>org.eclipse.papyrus.infra.ui.emf</module>
+	</modules>
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/.classpath b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.classpath
index e4dad7e73e2..e4dad7e73e2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/.classpath
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.classpath
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/.project b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.project
index ccfe5b57b73..ccfe5b57b73 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/.project
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.project
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c4..f08be2b06c4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/META-INF/MANIFEST.MF b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/META-INF/MANIFEST.MF
index fcf89852c96..11762be1a9c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.filters.provider

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

- org.eclipse.papyrus.infra.filters;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.emf.edit;bundle-version="2.11.0";visibility:=reexport,

- org.eclipse.uml2.types;bundle-version="2.0.0";visibility:=reexport,

- org.eclipse.uml2.common.edit;bundle-version="2.0.0";visibility:=reexport

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.filters.provider.FiltersEditPlugin$Implementation

-Bundle-SymbolicName: org.eclipse.papyrus.infra.filters.edit;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.filters.provider
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.filters;bundle-version="1.2.0";visibility:=reexport,
+ org.eclipse.emf.edit;bundle-version="2.11.0";visibility:=reexport,
+ org.eclipse.uml2.types;bundle-version="2.0.0";visibility:=reexport,
+ org.eclipse.uml2.common.edit;bundle-version="2.0.0";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.filters.provider.FiltersEditPlugin$Implementation
+Bundle-SymbolicName: org.eclipse.papyrus.infra.filters.edit;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/about.html b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/about.html
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/build.properties b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/build.properties
index 1a722c325fb..1a722c325fb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/build.properties
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/build.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/icons/full/obj16/CompoundFilter.gif b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/icons/full/obj16/CompoundFilter.gif
index 56b2a595a02..56b2a595a02 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/icons/full/obj16/CompoundFilter.gif
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/icons/full/obj16/CompoundFilter.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/icons/full/obj16/Equals.gif b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/icons/full/obj16/Equals.gif
index 9250fecbffd..9250fecbffd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/icons/full/obj16/Equals.gif
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/icons/full/obj16/Equals.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/plugin.properties b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/plugin.properties
index 0cdde9edcf4..0cdde9edcf4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/plugin.properties
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/plugin.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/plugin.xml b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/plugin.xml
index f7be53a6ef5..f7be53a6ef5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/plugin.xml
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/plugin.xml
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/pom.xml b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/pom.xml
index 2c12fb309cd..54968cf19b7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/pom.xml
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-filters</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.filters.edit</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/CompoundFilterItemProvider.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/CompoundFilterItemProvider.java
index 01494ebc69b..01494ebc69b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/CompoundFilterItemProvider.java
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/CompoundFilterItemProvider.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/EqualsItemProvider.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/EqualsItemProvider.java
index e5d3920f441..e5d3920f441 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/EqualsItemProvider.java
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/EqualsItemProvider.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FilterItemProvider.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FilterItemProvider.java
index f27ca6ca345..f27ca6ca345 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FilterItemProvider.java
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FilterItemProvider.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FiltersEditPlugin.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FiltersEditPlugin.java
index 19619082810..19619082810 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FiltersEditPlugin.java
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FiltersEditPlugin.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FiltersItemProviderAdapterFactory.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FiltersItemProviderAdapterFactory.java
index 937b66356d1..937b66356d1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FiltersItemProviderAdapterFactory.java
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/src-gen/org/eclipse/papyrus/infra/filters/provider/FiltersItemProviderAdapterFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/.classpath b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.classpath
index ca965add0fd..ca965add0fd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/.classpath
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.classpath
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/.project b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.project
index bbf564865dc..bbf564865dc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/.project
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.project
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c4..f08be2b06c4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/META-INF/MANIFEST.MF b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/META-INF/MANIFEST.MF
index ebc00032fd7..975b7f92cfc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/META-INF/MANIFEST.MF
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
-Manifest-Version: 1.0

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

- org.eclipse.emf.ecore;bundle-version="2.11.0";visibility:=reexport,

- org.eclipse.uml2.types;bundle-version="2.0.0";visibility:=reexport,

- org.eclipse.uml2.common;visibility:=reexport,

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

-Export-Package: org.eclipse.papyrus.infra.filters,

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

- org.eclipse.papyrus.infra.filters.internal;x-internal:=true,

- org.eclipse.papyrus.infra.filters.internal.operations;x-internal:=true,

- org.eclipse.papyrus.infra.filters.util

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.filters.internal.FiltersPlugin$Implementation

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.infra.filters;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;bundle-version="2.11.0";visibility:=reexport,
+ org.eclipse.uml2.types;bundle-version="2.0.0";visibility:=reexport,
+ org.eclipse.uml2.common;visibility:=reexport,
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"
+Export-Package: org.eclipse.papyrus.infra.filters,
+ org.eclipse.papyrus.infra.filters.impl,
+ org.eclipse.papyrus.infra.filters.internal;x-internal:=true,
+ org.eclipse.papyrus.infra.filters.internal.operations;x-internal:=true,
+ org.eclipse.papyrus.infra.filters.util
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.filters.internal.FiltersPlugin$Implementation
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.infra.filters;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/about.html b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/about.html
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/build.properties b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/build.properties
index 55cc9ab299f..55cc9ab299f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/build.properties
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/build.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/model/filters.di b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.di
index bf9abab340f..bf9abab340f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/model/filters.di
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.di
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/model/filters.ecore b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.ecore
index 5607ca0f7a9..5607ca0f7a9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/model/filters.ecore
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.ecore
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/model/filters.genmodel b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.genmodel
index 611f5ea8d41..611f5ea8d41 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/model/filters.genmodel
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.genmodel
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/model/filters.notation b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.notation
index 46dad1f49b7..46dad1f49b7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/model/filters.notation
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.notation
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/model/filters.uml b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.uml
index c3430071b55..c3430071b55 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/model/filters.uml
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/model/filters.uml
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/plugin.properties b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/plugin.properties
index bc6db7809bf..bc6db7809bf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/plugin.properties
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/plugin.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/plugin.xml b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/plugin.xml
index 9310b29c5c6..9310b29c5c6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/plugin.xml
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/plugin.xml
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/pom.xml b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/pom.xml
index d2ebb84db4c..2810fd85b74 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/pom.xml
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-filters</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.filters</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/CompoundFilter.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/CompoundFilter.java
index 0767ad09db8..0767ad09db8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/CompoundFilter.java
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/CompoundFilter.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/Equals.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/Equals.java
index 7c6dfedf126..7c6dfedf126 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/Equals.java
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/Equals.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/Filter.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/Filter.java
index 64fab478a24..64fab478a24 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/Filter.java
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/Filter.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/FiltersFactory.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/FiltersFactory.java
index 5f312ce6942..5f312ce6942 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/FiltersFactory.java
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/FiltersFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/FiltersPackage.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/FiltersPackage.java
index 7d9fae9033c..7d9fae9033c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/FiltersPackage.java
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/FiltersPackage.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/OperatorKind.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/OperatorKind.java
index cdc27b0128e..cdc27b0128e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/OperatorKind.java
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/OperatorKind.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/CompoundFilterImpl.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/CompoundFilterImpl.java
index 0503fc2361a..0503fc2361a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/CompoundFilterImpl.java
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/CompoundFilterImpl.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/EqualsImpl.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/EqualsImpl.java
index de1a89ce889..de1a89ce889 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/EqualsImpl.java
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/EqualsImpl.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/FiltersFactoryImpl.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/FiltersFactoryImpl.java
index 3a35ee42250..3a35ee42250 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/FiltersFactoryImpl.java
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/FiltersFactoryImpl.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/FiltersPackageImpl.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/FiltersPackageImpl.java
index 3ce25b4c4a7..3ce25b4c4a7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/FiltersPackageImpl.java
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/impl/FiltersPackageImpl.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/internal/operations/CompoundFilterOperations.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/internal/operations/CompoundFilterOperations.java
index f9eb88a4c43..f9eb88a4c43 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/internal/operations/CompoundFilterOperations.java
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/internal/operations/CompoundFilterOperations.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/internal/operations/EqualsOperations.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/internal/operations/EqualsOperations.java
index fc5b9da3da2..fc5b9da3da2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/internal/operations/EqualsOperations.java
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/internal/operations/EqualsOperations.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersAdapterFactory.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersAdapterFactory.java
index c385141f9b6..c385141f9b6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersAdapterFactory.java
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersAdapterFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersSwitch.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersSwitch.java
index 87585bbb9f1..87585bbb9f1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersSwitch.java
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersSwitch.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersValidator.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersValidator.java
index 9b28bde6595..9b28bde6595 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersValidator.java
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src-gen/org/eclipse/papyrus/infra/filters/util/FiltersValidator.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/src/org/eclipse/papyrus/infra/filters/internal/FiltersPlugin.java b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src/org/eclipse/papyrus/infra/filters/internal/FiltersPlugin.java
index 28210d2d7d3..28210d2d7d3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/src/org/eclipse/papyrus/infra/filters/internal/FiltersPlugin.java
+++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/src/org/eclipse/papyrus/infra/filters/internal/FiltersPlugin.java
diff --git a/plugins/infra/filters/pom.xml b/plugins/infra/filters/pom.xml
new file mode 100644
index 00000000000..78e80962aa1
--- /dev/null
+++ b/plugins/infra/filters/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.infra-filters</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+	<name>Papyrus Infra Filters Model</name>
+	<description>General-purpose filter model intended for inclusion in other Papyrus tooling models.</description>
+
+	<modules>
+		<module>org.eclipse.papyrus.infra.filters</module>
+		<module>org.eclipse.papyrus.infra.filters.edit</module>	</modules>
+</project>
diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/pom.xml b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/pom.xml
index c2205d02249..a2115d59e35 100644
--- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/pom.xml
+++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-gmfdiag-assistant</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.assistant.edit</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/pom.xml b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/pom.xml
index d5bcaa9c75a..752285996db 100644
--- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/pom.xml
+++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-gmfdiag-assistant</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.assistant.editor</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/pom.xml b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/pom.xml
index f59536858f5..af816ad51da 100644
--- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/pom.xml
+++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-gmfdiag-assistant</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.assistant.ui</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/pom.xml b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/pom.xml
index 5a41c2543c3..4b8e4a5729e 100644
--- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/pom.xml
+++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-gmfdiag-assistant</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.assistant</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/assistant/pom.xml b/plugins/infra/gmfdiag/assistant/pom.xml
new file mode 100644
index 00000000000..1dbc9520adf
--- /dev/null
+++ b/plugins/infra/gmfdiag/assistant/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.infra-gmfdiag-assistant</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <name>Papyrus Diagram Assistants</name>
+	<description>Model and run-time engine for model-driven contributions to the GMF Diagram Assistants service.</description>
+
+	<modules>
+		<module>org.eclipse.papyrus.infra.gmfdiag.assistant</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.assistant.edit</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.assistant.editor</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.assistant.ui</module>
+	</modules>
+</project>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/pom.xml
index acaad34d9cd..04b9961c188 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/pom.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag-css</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.configuration</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF
index 95080e688c6..e9c39204b8c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF
@@ -1,25 +1,25 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

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

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

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

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

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

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

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

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

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

- org.eclipse.e4.ui.css.core;bundle-version="0.10.2",

- org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="1.2.0",

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

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

- org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="1.2.0"

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: CSS Debug view

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.debug.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.debug;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
+ org.eclipse.core.databinding;bundle-version="1.4.1",
+ org.eclipse.emf.ecore;bundle-version="2.9.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
+ org.eclipse.e4.ui.css.core;bundle-version="0.10.2",
+ org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.draw2d.ui;bundle-version="1.7.0",
+ org.eclipse.draw2d;bundle-version="3.9.0",
+ org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="1.2.0"
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: CSS Debug view
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.debug.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.debug;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/pom.xml
index bcd907b1642..94cec25982d 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/pom.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.dev.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../../releng/dev</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag-css</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.debug</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF
index ece79d60fc2..83ce4dc8841 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF
@@ -1,40 +1,39 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.properties.creation,

- org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding,

- org.eclipse.papyrus.infra.gmfdiag.css.properties.provider

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

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

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

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

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

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

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

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

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

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

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

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

- org.eclipse.emf.databinding;bundle-version="1.2.0",

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

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

- org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.2.0",

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

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

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",

- org.eclipse.e4.ui.css.core;bundle-version="0.10.0",

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

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

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

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

- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: CSS Properties

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.properties.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.properties;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.properties.creation,
+ org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding,
+ org.eclipse.papyrus.infra.gmfdiag.css.properties.provider
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.emf.edit;bundle-version="2.8.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.core.databinding;bundle-version="1.4.1",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0",
+ org.eclipse.emf.databinding;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
+ org.eclipse.e4.ui.css.core;bundle-version="0.10.0",
+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: CSS Properties
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.properties.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.properties;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/css.ctx b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/css.ctx
index 7acab6a523e..1b6ded15f5c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/css.ctx
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/css.ctx
@@ -95,7 +95,7 @@
     <elements xmi:id="_8MrCVIk1EeWBadfj_-2HEQ" name="ModelStyleSheet">
       <properties xmi:id="_8MrCVYk1EeWBadfj_-2HEQ" name="stylesheets" label="Model style sheets" type="Reference" multiplicity="-1" description="The style sheets associated to the model"/>
     </elements>
-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@modelElementFactories.0"/>
+    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@modelElementFactories.0"/>
   </dataContexts>
   <dataContexts xmi:id="_8MrCVok1EeWBadfj_-2HEQ" name="Preferences" label="Preferences">
     <elements xmi:id="_8MrCV4k1EeWBadfj_-2HEQ" name="org.eclipse.papyrus.infra.gmfdiag.css">
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 40dbfbfbce4..b5c6f7de370 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
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:css="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.css.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<GridLayout numColumns="1"></GridLayout>

-	</Composite.layout>

-	<css:ResetStyleWidget input="{Binding}" property="CSS:PapyrusCSSStyle:cssStyle"></css:ResetStyleWidget>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:css="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.css.properties.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<GridLayout numColumns="1"></GridLayout>
+	</Composite.layout>
+	<css:ResetStyleWidget input="{Binding}" property="CSS:PapyrusCSSStyle:cssStyle"></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 4361f29795b..a2f377c116c 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
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:css="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.css.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringLabel input="{Binding}"

-			property="Preferences:org.eclipse.papyrus.infra.gmfdiag.css:currentTheme"></ppe:StringLabel>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<GridLayout></GridLayout>

-		</Composite.layout>

-		<css:ResetStyleWidget property="CSS:PapyrusCSSStyle:cssStyle"

-			input="{Binding}"></css:ResetStyleWidget>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="CSS:DiagramStyle:css_stylesheets"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="CSS:ModelStyle:modelStyleSheets"></ppe:MultiReference>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}" property="CSS:PapyrusCSSStyle:cssClass"></ppe:MultiString>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:css="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.css.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringLabel input="{Binding}"
+			property="Preferences:org.eclipse.papyrus.infra.gmfdiag.css:currentTheme"></ppe:StringLabel>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<GridLayout></GridLayout>
+		</Composite.layout>
+		<css:ResetStyleWidget property="CSS:PapyrusCSSStyle:cssStyle"
+			input="{Binding}"></css:ResetStyleWidget>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="CSS:DiagramStyle:css_stylesheets"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="CSS:ModelStyle:modelStyleSheets"></ppe:MultiReference>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}" property="CSS:PapyrusCSSStyle:cssClass"></ppe:MultiString>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleEmbeddedStyleSheet.xwt b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleEmbeddedStyleSheet.xwt
index 0af8d6e26c4..da0c1115779 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleEmbeddedStyleSheet.xwt
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleEmbeddedStyleSheet.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="modelstylesheets:EmbeddedStyleSheet:label"></ppe:StringEditor>

-		<ppe:StringMultiline input="{Binding}"

-			property="modelstylesheets:EmbeddedStyleSheet:content"></ppe:StringMultiline>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="modelstylesheets:EmbeddedStyleSheet:label"></ppe:StringEditor>
+		<ppe:StringMultiline input="{Binding}"
+			property="modelstylesheets:EmbeddedStyleSheet:content"></ppe:StringMultiline>
+	</Composite>
 </Composite>
\ No newline at end of file
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 827e0614086..69bb939acd8 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
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:css="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.css.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<GridLayout></GridLayout>

-		</Composite.layout>

-		<css:ResetStyleWidget input="{Binding}" property="CSS:PapyrusCSSStyle:cssStyle"></css:ResetStyleWidget>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}" property="CSS:PapyrusCSSStyle:cssClass"

-			customLabel="Applied styles"></ppe:MultiString>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:css="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.css.properties.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<GridLayout></GridLayout>
+		</Composite.layout>
+		<css:ResetStyleWidget input="{Binding}" property="CSS:PapyrusCSSStyle:cssStyle"></css:ResetStyleWidget>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}" property="CSS:PapyrusCSSStyle:cssClass"
+			customLabel="Applied styles"></ppe:MultiString>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleStyleSheetReference.xwt b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleStyleSheetReference.xwt
index 4be65ab7b03..a6cd887e55f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleStyleSheetReference.xwt
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleStyleSheetReference.xwt
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite 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="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringFileSelector allowFileSystem="false"

-			input="{Binding}" allowWorkspace="true"

-			property="modelstylesheets:StyleSheetReference:path">

-			<ppe:StringFileSelector.filterNames>

-				<x:Array Type="j:String">

-					<j:String>CSS Stylesheets</j:String>

-					<j:String>All</j:String>

-				</x:Array>

-			</ppe:StringFileSelector.filterNames>

-			<ppe:StringFileSelector.filterExtensions>

-				<x:Array Type="j:String">

-					<j:String>*.css</j:String>

-					<j:String>*</j:String>

-				</x:Array>

-			</ppe:StringFileSelector.filterExtensions>

-		</ppe:StringFileSelector>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringFileSelector allowFileSystem="false"
+			input="{Binding}" allowWorkspace="true"
+			property="modelstylesheets:StyleSheetReference:path">
+			<ppe:StringFileSelector.filterNames>
+				<x:Array Type="j:String">
+					<j:String>CSS Stylesheets</j:String>
+					<j:String>All</j:String>
+				</x:Array>
+			</ppe:StringFileSelector.filterNames>
+			<ppe:StringFileSelector.filterExtensions>
+				<x:Array Type="j:String">
+					<j:String>*.css</j:String>
+					<j:String>*</j:String>
+				</x:Array>
+			</ppe:StringFileSelector.filterExtensions>
+		</ppe:StringFileSelector>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleTheme.xwt b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleTheme.xwt
index cb7b2c841c5..358cc9713ab 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleTheme.xwt
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleTheme.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Composite xmlns="http://www.eclipse.org/xwt/presentation"
 	xmlns:css="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.css.properties.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
 	xmlns:x="http://www.eclipse.org/xwt">
 	<Composite.layout>
 		<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/pom.xml
index 6325c35a37f..c4eca1b9958 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/pom.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag-css</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.properties</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/creation/StyleSheetFactory.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/creation/StyleSheetFactory.java
index 708bc39b6a7..dcc8af32a7d 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/creation/StyleSheetFactory.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/creation/StyleSheetFactory.java
@@ -1,75 +1,75 @@
-/*****************************************************************************

- * 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.properties.creation;

-

-import java.util.Collection;

-

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

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

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

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;

-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsPackage;

-import org.eclipse.papyrus.infra.widgets.creation.IAtomicOperationExecutor;

-import org.eclipse.papyrus.views.properties.creation.EcorePropertyEditorFactory;

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

-

-/**

- * A Factory for creating StyleSheets directly in the resource. It is not

- * contained in an EObject.

- *

- * @author Camille Letavernier

- */

-public class StyleSheetFactory extends EcorePropertyEditorFactory {

-

-	protected View context;

-

-	public StyleSheetFactory(View context) {

-		super(NotationPackage.eINSTANCE.getEObjectListValueStyle_EObjectListValue());

-		this.type = StylesheetsPackage.eINSTANCE.getStyleSheet();

-		this.context = context;

-	}

-

-	@Override

-	protected EObject createObjectInDifferentContainer(Control widget) {

-		// The EObject is simply created ; it isn't stored anywhere (yet)

-		// @see #validateObjects(Collection)

-		return simpleCreateObject(widget);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.views.properties.creation.PropertyEditorFactory#getOperationExecutor(java.lang.Object)

-	 *

-	 * @param context

-	 * @return

-	 */

-	@Override

-	public IAtomicOperationExecutor getOperationExecutor(Object context) {

-		if (context instanceof StyleSheet) {

-			StyleSheet stylesheet = (StyleSheet) context;

-			if (stylesheet.eResource() == null) {

-				// Bug 468345: Use the current Notation::view instead, since we're creating the stylesheet in this object's resource

-				// Ensure that further edition occurs in a proper nested transaction

-				return super.getOperationExecutor(this.context);

-			}

-		}

-

-		return super.getOperationExecutor(context);

-	}

-

-	/**

-	 * Return the objects as-is. The factory is not responsible for storing them

-	 */

-	@Override

-	public Collection<Object> validateObjects(Collection<Object> objectsToValidate) {

-		return objectsToValidate;

-	}

-}

+/*****************************************************************************
+ * 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.properties.creation;
+
+import java.util.Collection;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsPackage;
+import org.eclipse.papyrus.infra.properties.ui.creation.EcorePropertyEditorFactory;
+import org.eclipse.papyrus.infra.widgets.creation.IAtomicOperationExecutor;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * A Factory for creating StyleSheets directly in the resource. It is not
+ * contained in an EObject.
+ *
+ * @author Camille Letavernier
+ */
+public class StyleSheetFactory extends EcorePropertyEditorFactory {
+
+	protected View context;
+
+	public StyleSheetFactory(View context) {
+		super(NotationPackage.eINSTANCE.getEObjectListValueStyle_EObjectListValue());
+		this.type = StylesheetsPackage.eINSTANCE.getStyleSheet();
+		this.context = context;
+	}
+
+	@Override
+	protected EObject createObjectInDifferentContainer(Control widget) {
+		// The EObject is simply created ; it isn't stored anywhere (yet)
+		// @see #validateObjects(Collection)
+		return simpleCreateObject(widget);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.properties.ui.creation.PropertyEditorFactory#getOperationExecutor(java.lang.Object)
+	 *
+	 * @param context
+	 * @return
+	 */
+	@Override
+	public IAtomicOperationExecutor getOperationExecutor(Object context) {
+		if (context instanceof StyleSheet) {
+			StyleSheet stylesheet = (StyleSheet) context;
+			if (stylesheet.eResource() == null) {
+				// Bug 468345: Use the current Notation::view instead, since we're creating the stylesheet in this object's resource
+				// Ensure that further edition occurs in a proper nested transaction
+				return super.getOperationExecutor(this.context);
+			}
+		}
+
+		return super.getOperationExecutor(context);
+	}
+
+	/**
+	 * Return the objects as-is. The factory is not responsible for storing them
+	 */
+	@Override
+	public Collection<Object> validateObjects(Collection<Object> objectsToValidate) {
+		return objectsToValidate;
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/creation/ThemePropertyEditorFactory.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/creation/ThemePropertyEditorFactory.java
index e1ac9e8cbc3..35187f16e46 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/creation/ThemePropertyEditorFactory.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/creation/ThemePropertyEditorFactory.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.Theme;
-import org.eclipse.papyrus.views.properties.creation.EcorePropertyEditorFactory;
+import org.eclipse.papyrus.infra.properties.ui.creation.EcorePropertyEditorFactory;
 import org.eclipse.swt.widgets.Control;
 
 
@@ -38,7 +38,7 @@ public class ThemePropertyEditorFactory extends EcorePropertyEditorFactory {
 
 
 	/**
-	 * @see org.eclipse.papyrus.views.properties.creation.EcorePropertyEditorFactory#simpleCreateObject(org.eclipse.swt.widgets.Control)
+	 * @see org.eclipse.papyrus.infra.properties.ui.creation.EcorePropertyEditorFactory#simpleCreateObject(org.eclipse.swt.widgets.Control)
 	 *
 	 * @param widget
 	 * @return
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/dialog/CSSThemeEditionDialog.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/dialog/CSSThemeEditionDialog.java
index 101605646f7..dca1f8f0cd0 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/dialog/CSSThemeEditionDialog.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/dialog/CSSThemeEditionDialog.java
@@ -46,6 +46,7 @@ import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsFactory;
 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsPackage;
 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.Theme;
 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.WorkspaceThemes;
+import org.eclipse.papyrus.infra.properties.ui.creation.EcorePropertyEditorFactory;
 import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
 import org.eclipse.papyrus.infra.services.labelprovider.service.impl.LabelProviderServiceImpl;
 import org.eclipse.papyrus.infra.ui.emf.providers.EMFContentProvider;
@@ -57,7 +58,6 @@ import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;
 import org.eclipse.papyrus.infra.widgets.providers.WorkspaceContentProvider;
 import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;
 import org.eclipse.papyrus.infra.widgets.util.FileUtil;
-import org.eclipse.papyrus.views.properties.creation.EcorePropertyEditorFactory;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSPreferencesModelElement.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSPreferencesModelElement.java
index 818b236c1db..d2920c44562 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSPreferencesModelElement.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSPreferencesModelElement.java
@@ -1,35 +1,35 @@
-/*****************************************************************************

- * 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.properties.modelelement;

-

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

-import org.eclipse.papyrus.infra.gmfdiag.css.preferences.ThemePreferences;

-import org.eclipse.papyrus.infra.gmfdiag.css.properties.provider.CSSThemeLabelProvider;

-import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.modelelement.PreferencesModelElement;

-

-

-public class CSSPreferencesModelElement extends PreferencesModelElement {

-

-	public CSSPreferencesModelElement(DataContextElement context) {

-		super(context);

-	}

-

-	@Override

-	public ILabelProvider getLabelProvider(String propertyPath) {

-		if (ThemePreferences.CURRENT_THEME.equals(propertyPath)) {

-			return new CSSThemeLabelProvider();

-		}

-		return super.getLabelProvider(propertyPath);

-	}

-

-}

+/*****************************************************************************
+ * 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.properties.modelelement;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.gmfdiag.css.preferences.ThemePreferences;
+import org.eclipse.papyrus.infra.gmfdiag.css.properties.provider.CSSThemeLabelProvider;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.PreferencesModelElement;
+
+
+public class CSSPreferencesModelElement extends PreferencesModelElement {
+
+	public CSSPreferencesModelElement(DataContextElement context) {
+		super(context);
+	}
+
+	@Override
+	public ILabelProvider getLabelProvider(String propertyPath) {
+		if (ThemePreferences.CURRENT_THEME.equals(propertyPath)) {
+			return new CSSThemeLabelProvider();
+		}
+		return super.getLabelProvider(propertyPath);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSPreferencesModelElementFactory.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSPreferencesModelElementFactory.java
index 76bf00b0eb6..ad77722d18b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSPreferencesModelElementFactory.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSPreferencesModelElementFactory.java
@@ -1,27 +1,27 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2014 CEA LIST and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *  Christian W. Damus (CEA) - bug 417409

- *

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

-package org.eclipse.papyrus.infra.gmfdiag.css.properties.modelelement;

-

-import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.modelelement.PreferencesModelElement;

-import org.eclipse.papyrus.views.properties.modelelement.PreferencesModelElementFactory;

-

-

-public class CSSPreferencesModelElementFactory extends PreferencesModelElementFactory {

-

-	@Override

-	protected PreferencesModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {

-		return new CSSPreferencesModelElement(context);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.properties.modelelement;
+
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.PreferencesModelElement;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.PreferencesModelElementFactory;
+
+
+public class CSSPreferencesModelElementFactory extends PreferencesModelElementFactory {
+
+	@Override
+	protected PreferencesModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {
+		return new CSSPreferencesModelElement(context);
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSThemesModelElement.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSThemesModelElement.java
index 7e64efad235..b9a164efc99 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSThemesModelElement.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSThemesModelElement.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.papyrus.infra.gmfdiag.css.properties.provider.CSSStyleSheetLabelProvider;
-import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement;
 
 
 /**
@@ -44,7 +44,7 @@ public class CSSThemesModelElement extends EMFModelElement {
 	}
 
 	/**
-	 * @see org.eclipse.papyrus.views.properties.modelelement.EMFModelElement#getLabelProvider(java.lang.String)
+	 * @see org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement#getLabelProvider(java.lang.String)
 	 *
 	 * @param propertyPath
 	 * @return
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSThemesModelElementFactory.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSThemesModelElementFactory.java
index 71d3c44b370..4bca7fc62d6 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSThemesModelElementFactory.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSThemesModelElementFactory.java
@@ -17,9 +17,9 @@ package org.eclipse.papyrus.infra.gmfdiag.css.properties.modelelement;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.properties.Activator;
 import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
-import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.modelelement.AbstractEMFModelElementFactory;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.AbstractEMFModelElementFactory;
 
 
 /**
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/preferences/ThemePreferencesPage.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/preferences/ThemePreferencesPage.java
index 2db99a62dcc..50d8ede6916 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/preferences/ThemePreferencesPage.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/preferences/ThemePreferencesPage.java
@@ -51,6 +51,7 @@ import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;
 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsPackage;
 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.Theme;
 import org.eclipse.papyrus.infra.gmfdiag.css.theme.ThemeManager;
+import org.eclipse.papyrus.infra.properties.ui.creation.EcorePropertyEditorFactory;
 import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
 import org.eclipse.papyrus.infra.services.labelprovider.service.impl.LabelProviderServiceImpl;
 import org.eclipse.papyrus.infra.ui.emf.providers.EMFContentProvider;
@@ -61,7 +62,6 @@ import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;
 import org.eclipse.papyrus.infra.widgets.providers.WorkspaceContentProvider;
 import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;
 import org.eclipse.papyrus.infra.widgets.util.FileUtil;
-import org.eclipse.papyrus.views.properties.creation.EcorePropertyEditorFactory;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/property/StyleSheetsPropertyPage.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/property/StyleSheetsPropertyPage.java
index a42b1b740f0..db4aa0f5131 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/property/StyleSheetsPropertyPage.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/property/StyleSheetsPropertyPage.java
@@ -46,13 +46,13 @@ import org.eclipse.papyrus.infra.gmfdiag.css.properties.provider.CSSStyleSheetLa
 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.ModelStyleSheets;
 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;
 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsPackage;
+import org.eclipse.papyrus.infra.properties.ui.creation.EcorePropertyEditorFactory;
 import org.eclipse.papyrus.infra.ui.emf.providers.EMFContentProvider;
 import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
 import org.eclipse.papyrus.infra.widgets.editors.MultipleValueSelectorDialog;
 import org.eclipse.papyrus.infra.widgets.providers.AbstractStaticContentProvider;
 import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
 import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;
-import org.eclipse.papyrus.views.properties.creation.EcorePropertyEditorFactory;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
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 f8df14a2f4a..713253ad31b 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
@@ -1,96 +1,96 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2014 CEA LIST and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

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

- *

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

-package org.eclipse.papyrus.infra.gmfdiag.css.properties.widgets;

-

-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;

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

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

-

-

-public class ResetStyleWidget implements SelectionListener {

-

-	private Button button;

-

-	private DataSource input;

-

-	private String propertyPath;

-

-	public ResetStyleWidget(Composite parent, int style) {

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

-		button.addSelectionListener(this);

-		button.setText("Default style");

-		button.setToolTipText("Resets the properties which have been customized outside of the Style support. The default style will be applied");

-	}

-

-	public void widgetSelected(SelectionEvent event) {

-		if (event.widget != button || input == null) {

-			return;

-		}

-

-		IStructuredSelection viewSelection = input.getSelection();

-		ResetStyleHelper.resetStyle(viewSelection);

-	}

-

-	public void widgetDefaultSelected(SelectionEvent e) {

-		// Nothing

-	}

-

-	public void setText(String text) {

-		button.setText(text);

-	}

-

-	public String getText() {

-		return button.getText();

-	}

-

-	public void setToolTipText(String tooltip) {

-		button.setToolTipText(tooltip);

-	}

-

-	public String getToolTipText() {

-		return button.getToolTipText();

-	}

-

-	public void setInput(DataSource input) {

-		this.input = input;

-		checkInput();

-	}

-

-	public DataSource getInput() {

-		return input;

-	}

-

-	public String getProperty() {

-		return propertyPath;

-	}

-

-	public void setProperty(String property) {

-		this.propertyPath = property;

-		checkInput();

-	}

-

-	protected void checkInput() {

-		if ((propertyPath != null) && (input != null)) {

-			button.setEnabled(input.isEditable(propertyPath));

-		} else {

-			button.setEnabled(true); // For compatibility with XWT models that don't specify the property

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 323802
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css.properties.widgets;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.gmfdiag.css.helper.ResetStyleHelper;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.DataSource;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+
+
+public class ResetStyleWidget implements SelectionListener {
+
+	private Button button;
+
+	private DataSource input;
+
+	private String propertyPath;
+
+	public ResetStyleWidget(Composite parent, int style) {
+		button = new Button(parent, SWT.PUSH);
+		button.addSelectionListener(this);
+		button.setText("Default style");
+		button.setToolTipText("Resets the properties which have been customized outside of the Style support. The default style will be applied");
+	}
+
+	public void widgetSelected(SelectionEvent event) {
+		if (event.widget != button || input == null) {
+			return;
+		}
+
+		IStructuredSelection viewSelection = input.getSelection();
+		ResetStyleHelper.resetStyle(viewSelection);
+	}
+
+	public void widgetDefaultSelected(SelectionEvent e) {
+		// Nothing
+	}
+
+	public void setText(String text) {
+		button.setText(text);
+	}
+
+	public String getText() {
+		return button.getText();
+	}
+
+	public void setToolTipText(String tooltip) {
+		button.setToolTipText(tooltip);
+	}
+
+	public String getToolTipText() {
+		return button.getToolTipText();
+	}
+
+	public void setInput(DataSource input) {
+		this.input = input;
+		checkInput();
+	}
+
+	public DataSource getInput() {
+		return input;
+	}
+
+	public String getProperty() {
+		return propertyPath;
+	}
+
+	public void setProperty(String property) {
+		this.propertyPath = property;
+		checkInput();
+	}
+
+	protected void checkInput() {
+		if ((propertyPath != null) && (input != null)) {
+			button.setEnabled(input.isEditable(propertyPath));
+		} else {
+			button.setEnabled(true); // For compatibility with XWT models that don't specify the property
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/pom.xml
index 623fa1433e5..73b362cf5d5 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/pom.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag-css</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.theme</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/.classpath b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/.classpath
index 486b1b8b096..50aae142c50 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/.classpath
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/.classpath
@@ -1,8 +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.6"/>

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

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

-	<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.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/.settings/org.eclipse.jdt.core.prefs
index 410244d65a6..b3aa6d60f94 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-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

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
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 63ab1796743..86a8fbcc0db 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
@@ -1,54 +1,53 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.css,

- org.eclipse.papyrus.infra.gmfdiag.css.converters,

- org.eclipse.papyrus.infra.gmfdiag.css.dom,

- org.eclipse.papyrus.infra.gmfdiag.css.engine,

- org.eclipse.papyrus.infra.gmfdiag.css.engine.enginecopy,

- org.eclipse.papyrus.infra.gmfdiag.css.handler,

- org.eclipse.papyrus.infra.gmfdiag.css.helper,

- org.eclipse.papyrus.infra.gmfdiag.css.listener,

- org.eclipse.papyrus.infra.gmfdiag.css.lists,

- org.eclipse.papyrus.infra.gmfdiag.css.notation,

- org.eclipse.papyrus.infra.gmfdiag.css.preferences,

- org.eclipse.papyrus.infra.gmfdiag.css.provider,

- org.eclipse.papyrus.infra.gmfdiag.css.resource,

- org.eclipse.papyrus.infra.gmfdiag.css.service,

- org.eclipse.papyrus.infra.gmfdiag.css.style.impl,

- org.eclipse.papyrus.infra.gmfdiag.css.theme

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.e4.ui.css.core;bundle-version="0.10.0",

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

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

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

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

- org.w3c.css.sac;bundle-version="1.3.1",

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

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

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

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

- org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.2.0",

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

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

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.notation.edit;bundle-version="1.7.0",

- org.w3c.dom.svg;bundle-version="1.1.0",

- org.eclipse.emf.edit.ui,

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

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",

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

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

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

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

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.css,
+ org.eclipse.papyrus.infra.gmfdiag.css.converters,
+ org.eclipse.papyrus.infra.gmfdiag.css.dom,
+ org.eclipse.papyrus.infra.gmfdiag.css.engine,
+ org.eclipse.papyrus.infra.gmfdiag.css.engine.enginecopy,
+ org.eclipse.papyrus.infra.gmfdiag.css.handler,
+ org.eclipse.papyrus.infra.gmfdiag.css.helper,
+ org.eclipse.papyrus.infra.gmfdiag.css.listener,
+ org.eclipse.papyrus.infra.gmfdiag.css.lists,
+ org.eclipse.papyrus.infra.gmfdiag.css.notation,
+ org.eclipse.papyrus.infra.gmfdiag.css.preferences,
+ org.eclipse.papyrus.infra.gmfdiag.css.provider,
+ org.eclipse.papyrus.infra.gmfdiag.css.resource,
+ org.eclipse.papyrus.infra.gmfdiag.css.service,
+ org.eclipse.papyrus.infra.gmfdiag.css.spi,
+ org.eclipse.papyrus.infra.gmfdiag.css.style.impl,
+ org.eclipse.papyrus.infra.gmfdiag.css.theme
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.e4.ui.css.core;bundle-version="0.10.0",
+ org.eclipse.emf.ecore;bundle-version="2.8.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.w3c.css.sac;bundle-version="1.3.1",
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
+ org.eclipse.core.databinding;bundle-version="1.4.1",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.notation.edit;bundle-version="1.7.0",
+ org.w3c.dom.svg;bundle-version="1.1.0",
+ org.eclipse.emf.edit.ui,
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml
index 01a93b90dde..deef8f07927 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag-css</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
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 722dc09fbf1..0ce86d572d0 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
@@ -1,79 +1,82 @@
-/*****************************************************************************

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

-

-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.infra.gmfdiag.css"; //$NON-NLS-1$

-

-	/**

-	 * The CSS Context

-	 */

-	public static final String CSS = "Papyrus CSS"; //ID of the CSS context //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * The plug-in's logger

-	 */

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

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

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

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

-	 */

-	@Override

-	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;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.css;
+
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.papyrus.infra.gmfdiag.css.service.StylingService;
+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.gmfdiag.css"; //$NON-NLS-1$
+
+	/**
+	 * The CSS Context
+	 */
+	public static final String CSS = "Papyrus CSS"; // ID of the CSS context //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/**
+	 * The plug-in's logger
+	 */
+	public static LogHelper log;
+
+	private StylingService stylingService;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+
+		stylingService = new StylingService(context);
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		stylingService.dispose();
+		stylingService = null;
+
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	public StylingService getStylingService() {
+		return stylingService;
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/command/ResetStyleCommand.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/command/ResetStyleCommand.java
index 116ae288c4e..a5ab5ba2ee9 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/command/ResetStyleCommand.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/command/ResetStyleCommand.java
@@ -1,240 +1,224 @@
-/*****************************************************************************

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

- *  Celine Janssens (ALL4TEC) celine.janssens@all4tec.net	- Bug 455311

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

-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;

-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayUtil;

-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant;

-

-

-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);

-		papyrusStyleAnnotations.add(VisualInformationPapyrusConstants.CUSTOM_APPEARENCE_ANNOTATION);

-		papyrusStyleAnnotations.add(StereotypeDisplayConstant.STEREOTYPE_LABEL_DEPTH);

-	}

-

-	private Iterator<?> iterator;

-	private TransactionalEditingDomain domain;

-

-	/**

-	 * 

-	 * Constructor.

-	 *

-	 * @param domain

-	 * @param iterator

-	 */

-	public ResetStyleCommand(TransactionalEditingDomain domain, Iterator<?> iterator) {

-		super(domain);

-		this.domain = 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);

-			}

-		}

-	}

-

-	/**

-	 * Reset the diagram

-	 * 

-	 * @param diagram

-	 */

-	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);

-			}

-		}

-	}

-

-

-	/**

-	 * Reset a Style and its children

-	 * 

-	 * @param view

-	 *            the view of which the style should be reset

-	 * @param recursive

-	 *            true if the children should be reset as well

-	 */

-	private void resetStyle(View view, boolean recursive) {

-		resetStyle(view);

-		if (recursive) {

-			for (Object childObject : view.getChildren()) {

-				if (childObject instanceof View) {

-					resetStyle((View) childObject, recursive);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Reset the style of a view.

-	 * Delete all the custom NamedStyle

-	 * Reset EAnnotation

-	 * Reset Stereotype Styles

-	 * 

-	 * @param view

-	 *            the view to be reset

-	 */

-	private void resetStyle(View view) {

-		// Reset the view (Except for volatile/transient elements which are already derived, e.g. Stereotype compartments)

-		if (view.eContainingFeature().isTransient()) {

-			return;

-		}

-

-		// remove all the named Style of the 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())) {

-

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

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

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

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

-					case NotationPackage.STRING_VALUE_STYLE:

-					case NotationPackage.BOOLEAN_VALUE_STYLE:

-					case NotationPackage.INT_VALUE_STYLE:

-					case NotationPackage.DOUBLE_VALUE_STYLE:

-					case NotationPackage.STRING_LIST_VALUE_STYLE:

-						styleIterator.remove();

-					}

-

-				}

-			} else if (styleObject instanceof Style) {

-				resetStyle((Style) styleObject);

-			}

-		}

-

-		if (view instanceof Style) {

-			resetStyle((Style) view);

-		}

-

-		// Remove the "forceValue" annotations

-		resetAnnotations(view);

-		// Remove the Papyrus Style EAnnotations

-		resetStyleAnnotations(view);

-

-		// Reset Stereotype Persistency

-		resetStereotypeView(view);

-

-		// Reset the visibility

-		view.eUnset(NotationPackage.eINSTANCE.getView_Visible());

-	}

-

-	/**

-	 * This method reset the style of the Stereotype Node

-	 * 

-	 * @param view

-	 *            Stereotype View

-	 */

-	private void resetStereotypeView(final View view) {

-		StereotypeDisplayUtil helper = StereotypeDisplayUtil.getInstance();

-

-		if (helper.isStereotypeView(view)) {

-			helper.unsetPersistency(domain, view);

-

-		}

-

-	}

-

-	/**

-	 * Reset a Style .

-	 * 

-	 * @param style

-	 *            the Style to reset.

-	 */

-	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();

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Celine Janssens (ALL4TEC) celine.janssens@all4tec.net	- Bug 455311
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+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.Activator;
+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);
+		papyrusStyleAnnotations.add(VisualInformationPapyrusConstants.CUSTOM_APPEARENCE_ANNOTATION);
+	}
+
+	private Iterator<?> iterator;
+	private TransactionalEditingDomain domain;
+
+	/**
+	 * 
+	 * Constructor.
+	 *
+	 * @param domain
+	 * @param iterator
+	 */
+	public ResetStyleCommand(TransactionalEditingDomain domain, Iterator<?> iterator) {
+		super(domain);
+		this.domain = 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);
+			}
+		}
+	}
+
+	/**
+	 * Reset the diagram
+	 * 
+	 * @param diagram
+	 */
+	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);
+			}
+		}
+	}
+
+
+	/**
+	 * Reset a Style and its children
+	 * 
+	 * @param view
+	 *            the view of which the style should be reset
+	 * @param recursive
+	 *            true if the children should be reset as well
+	 */
+	private void resetStyle(View view, boolean recursive) {
+		resetStyle(view);
+		if (recursive) {
+			for (Object childObject : view.getChildren()) {
+				if (childObject instanceof View) {
+					resetStyle((View) childObject, recursive);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Reset the style of a view.
+	 * Delete all the custom NamedStyle
+	 * Reset EAnnotation
+	 * Reset Stereotype Styles
+	 * 
+	 * @param view
+	 *            the view to be reset
+	 */
+	private void resetStyle(View view) {
+		// Reset the view (Except for volatile/transient elements which are already derived, e.g. Stereotype compartments)
+		if (view.eContainingFeature().isTransient()) {
+			return;
+		}
+
+		// remove all the named Style of the 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())) {
+
+					// Remove only NamedStyle which are supported by the CSS Implementation
+					// See org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSViewDelegate.getCSSNamedStyle(EClass, String)
+					// See Bug 425190 - [CSS] Loss of Notation information when CSS style is applied on Edges.
+					switch (customStyle.eClass().getClassifierID()) {
+					case NotationPackage.STRING_VALUE_STYLE:
+					case NotationPackage.BOOLEAN_VALUE_STYLE:
+					case NotationPackage.INT_VALUE_STYLE:
+					case NotationPackage.DOUBLE_VALUE_STYLE:
+					case NotationPackage.STRING_LIST_VALUE_STYLE:
+						styleIterator.remove();
+					}
+
+				}
+			} else if (styleObject instanceof Style) {
+				resetStyle((Style) styleObject);
+			}
+		}
+
+		if (view instanceof Style) {
+			resetStyle((Style) view);
+		}
+
+		// Remove the "forceValue" annotations
+		resetAnnotations(view);
+		// Remove the Papyrus Style EAnnotations
+		resetStyleAnnotations(view);
+
+		// Delegate to extenders
+		Activator.getDefault().getStylingService().resetStyle(view);
+
+		// Reset the visibility
+		view.eUnset(NotationPackage.eINSTANCE.getView_Visible());
+	}
+
+	/**
+	 * Reset a Style .
+	 * 
+	 * @param style
+	 *            the Style to reset.
+	 */
+	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/service/StylingService.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/service/StylingService.java
new file mode 100644
index 00000000000..56c621453e0
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/service/StylingService.java
@@ -0,0 +1,72 @@
+/*****************************************************************************
+ * Copyright (c) 2016 Christian W. Damus and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.css.service;
+
+import java.util.function.Predicate;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.css.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.css.spi.IStylingProvider;
+import org.eclipse.papyrus.infra.tools.util.CompositeServiceTracker;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The notation view styling service. It delegates to registered
+ * OSGi service implementations of the {@link IStylingProvider} protocol.
+ * 
+ */
+public class StylingService implements IStylingProvider {
+
+	private final CompositeServiceTracker<IStylingProvider> tracker;
+
+	public StylingService(BundleContext context) {
+		super();
+
+		tracker = new CompositeServiceTracker<>(context,
+				IStylingProvider.class,
+				IStylingProvider.NONE,
+				IStylingProvider::compose);
+		tracker.open();
+	}
+
+	/**
+	 * Obtains the Styling Service that delegates to registered providers.
+	 * 
+	 * @return the Styling Service
+	 */
+	public static StylingService getInstance() {
+		return Activator.getDefault().getStylingService();
+	}
+
+	public void dispose() {
+		tracker.close();
+	}
+
+	@Override
+	public void resetStyle(View view) {
+		tracker.getService().resetStyle(view);
+	}
+
+	@Override
+	public Iterable<EClass> getSupportedSemanticClasses() {
+		return tracker.getService().getSupportedSemanticClasses();
+	}
+
+	@Override
+	public Predicate<EStructuralFeature> getSemanticPropertySupportedPredicate() {
+		return tracker.getService().getSemanticPropertySupportedPredicate();
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/spi/IStylingProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/spi/IStylingProvider.java
new file mode 100644
index 00000000000..fa857f3f439
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/spi/IStylingProvider.java
@@ -0,0 +1,99 @@
+/*****************************************************************************
+ * Copyright (c) 2016 Christian W. Damus and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.css.spi;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.function.Predicate;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gmf.runtime.notation.View;
+
+import com.google.common.collect.Iterables;
+
+/**
+ * Service interface for participants in the styling of notation elements.
+ */
+public interface IStylingProvider {
+	IStylingProvider NONE = new IStylingProvider() {
+		@Override
+		public void resetStyle(View view) {
+			// Pass
+		}
+
+		@Override
+		public Iterable<EClass> getSupportedSemanticClasses() {
+			return Collections.emptyList();
+		}
+
+		@Override
+		public Predicate<EStructuralFeature> getSemanticPropertySupportedPredicate() {
+			return feature -> false;
+		}
+	};
+
+	/**
+	 * Resets the domain-specific (from the service implementation's perspective)
+	 * styling of a given notation {@code view}.
+	 * 
+	 * @param view
+	 *            the notation view which is having its styling reset
+	 */
+	void resetStyle(View view);
+
+	/**
+	 * Obtains a collection of Ecore classes representing the supported CSS classes for
+	 * semantic elements.
+	 * 
+	 * @return a collection of semantic CSS classes, or {@link Collection#isEmpty() empty} if none
+	 */
+	Iterable<EClass> getSupportedSemanticClasses();
+
+	/**
+	 * Obtains a predicate determining whether a feature of a
+	 * {@linkplain #getSupportedSemanticClasses() supported class} is supported as a CSS
+	 * property for semantic elements.
+	 * 
+	 * @return the semantic CSS property predicate
+	 */
+	Predicate<EStructuralFeature> getSemanticPropertySupportedPredicate();
+
+	default IStylingProvider compose(IStylingProvider other) {
+		IStylingProvider self = this;
+		return (self == NONE)
+				? other
+				: (other == NONE)
+						? self
+						: new IStylingProvider() {
+							@Override
+							public void resetStyle(View view) {
+								self.resetStyle(view);
+								other.resetStyle(view);
+							}
+
+							@Override
+							public Iterable<EClass> getSupportedSemanticClasses() {
+								return Iterables.concat(self.getSupportedSemanticClasses(),
+										other.getSupportedSemanticClasses());
+							}
+
+							@Override
+							public Predicate<EStructuralFeature> getSemanticPropertySupportedPredicate() {
+								return self.getSemanticPropertySupportedPredicate().or(
+										other.getSemanticPropertySupportedPredicate());
+							}
+						};
+	}
+}
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.classpath b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.classpath
index d1b97f72bd5..bc001b4a78c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.classpath
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.classpath
@@ -1,9 +1,9 @@
 <?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.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="src" path="xtend-gen"/>
-	<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="output" path="bin"/>
 </classpath>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c4..b3aa6d60f94 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 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.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/META-INF/MANIFEST.MF
index 5708934a9af..d105d17b046 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/META-INF/MANIFEST.MF
@@ -1,28 +1,28 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.xtext.ui,

- org.eclipse.ui.editors;bundle-version="3.5.0",

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

- org.eclipse.xtext.ui.shared,

- org.eclipse.ui,

- org.eclipse.xtext.builder,

- org.eclipse.xtext.xbase.lib,

- org.eclipse.xtext.common.types.ui,

- org.eclipse.xtext.ui.codetemplates.ui,

- org.eclipse.compare,

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

- org.eclipse.uml2.uml,

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

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.css3.ui.quickfix,

- org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist,

- org.eclipse.papyrus.infra.gmfdiag.css3.ui.internal,

- org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: CSS3 Xtext Editor (UI)

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css3.ui.internal.CSSActivator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui; singleton:=true

-Import-Package: org.apache.log4j

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="1.2.0";visibility:=reexport,
+ org.eclipse.xtext.ui,
+ org.eclipse.ui.editors;bundle-version="3.5.0",
+ org.eclipse.ui.ide;bundle-version="3.5.0",
+ org.eclipse.xtext.ui.shared,
+ org.eclipse.ui,
+ org.eclipse.xtext.builder,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtext.common.types.ui,
+ org.eclipse.xtext.ui.codetemplates.ui,
+ org.eclipse.compare,
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0"
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.css3.ui.quickfix,
+ org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist,
+ org.eclipse.papyrus.infra.gmfdiag.css3.ui.internal,
+ org.eclipse.papyrus.infra.gmfdiag.css3.ui.contentassist.antlr
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: CSS3 Xtext Editor (UI)
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css3.ui.internal.CSSActivator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui; singleton:=true
+Import-Package: org.apache.log4j
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/plugin.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/plugin.xml
index d7716fb075a..49b159d1cae 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/plugin.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/plugin.xml
@@ -1,426 +1,426 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<plugin>

-

-    <extension

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

-        <editor

-              class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor"

-              contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"

-              default="true"

-              extensions="css"

-              icon="icons/sourceEditor.gif"

-              id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"

-              name="Papyrus CSS Editor">

-        </editor>

-    </extension>

-    <extension

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

-        <handler

-            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclarationHandler"

-            commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration">

-            <activeWhen>

-                <reference

-                    definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">

-                </reference>

-            </activeWhen>

-        </handler>

-        <handler

-            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"

-            commandId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.validate">

-         <activeWhen>

-            <reference

-                    definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">

-            </reference>

-         </activeWhen>

-      	</handler>

-      	<!-- copy qualified name -->

-        <handler

-            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler"

-            commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName">

-            <activeWhen>

-				<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened" />

-            </activeWhen>

-        </handler>

-        <handler

-            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler"

-            commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName">

-            <activeWhen>

-            	<and>

-            		<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.XtextEditor.opened" />

-	                <iterate>

-						<adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />

-					</iterate>

-				</and>

-            </activeWhen>

-        </handler>

-    </extension>

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

-        <definition id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">

-            <and>

-                <reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/>

-                <with variable="activeEditor">

-                    <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName" 

-                        value="org.eclipse.papyrus.infra.gmfdiag.css3.CSS" 

-                        forcePluginActivation="true"/>

-                </with>        

-            </and>

-        </definition>

-        <definition id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.XtextEditor.opened">

-            <and>

-                <reference definitionId="isXtextEditorActive"/>

-                <with variable="activeEditor">

-                    <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName" 

-                        value="org.eclipse.papyrus.infra.gmfdiag.css3.CSS" 

-                        forcePluginActivation="true"/>

-                </with>        

-            </and>

-        </definition>

-    </extension>

-    <extension

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

-        <page

-            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"

-            id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"

-            name="CSS">

-            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"/>

-        </page>

-        <page

-            category="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"

-            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.syntaxcoloring.SyntaxColoringPreferencePage"

-            id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.coloring"

-            name="Syntax Coloring">

-            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"/>

-        </page>

-        <page

-            category="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"

-            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage"

-            id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.templates"

-            name="Templates">

-            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"/>

-        </page>

-    </extension>

-    <extension

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

-        <page

-            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"

-            id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"

-            name="CSS">

-            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"/>

-            <enabledWhen>

-	            <adapt type="org.eclipse.core.resources.IProject"/>

-			</enabledWhen>

-	        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>

-        </page>

-    </extension>

-    <extension

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

-        <keyword

-            id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"

-            label="CSS"/>

-    </extension>

-    <extension

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

-      <command

-            description="Trigger expensive validation"

-            id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.validate"

-            name="Validate">

-      </command>

-      <!-- copy qualified name -->

-      <command

-            id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"

-            categoryId="org.eclipse.ui.category.edit"

-            description="Copy the qualified name for the selected element"

-            name="Copy Qualified Name">

-      </command>

-      <command

-            id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"

-            categoryId="org.eclipse.ui.category.edit"

-            description="Copy the qualified name for the selected element"

-            name="Copy Qualified Name">

-      </command>

-    </extension>

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

-        <menuContribution

-            locationURI="popup:#TextEditorContext?after=group.edit">

-             <command

-                 commandId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.validate"

-                 style="push"

-                 tooltip="Trigger expensive validation">

-            <visibleWhen checkEnabled="false">

-                <reference

-                    definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">

-                </reference>

-            </visibleWhen>

-         </command>  

-         </menuContribution>

-         <!-- copy qualified name -->

-         <menuContribution locationURI="popup:#TextEditorContext?after=copy">

-         	<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName" 

-         		style="push" tooltip="Copy Qualified Name">

-            	<visibleWhen checkEnabled="false">

-                	<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened" />

-            	</visibleWhen>

-         	</command>  

-         </menuContribution>

-         <menuContribution locationURI="menu:edit?after=copy">

-         	<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"

-            	style="push" tooltip="Copy Qualified Name">

-            	<visibleWhen checkEnabled="false">

-                	<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened" />

-            	</visibleWhen>

-         	</command>  

-         </menuContribution>

-         <menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">

-			<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName" 

-				style="push" tooltip="Copy Qualified Name">

-         		<visibleWhen checkEnabled="false">

-	            	<and>

-	            		<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.XtextEditor.opened" />

-						<iterate>

-							<adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />

-						</iterate>

-					</and>

-				</visibleWhen>

-			</command>

-         </menuContribution>

-    </extension>

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

-		<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">

-			<command commandId="org.eclipse.xtext.ui.editor.FindReferences">

-				<visibleWhen checkEnabled="false">

-                	<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">

-                	</reference>

-            	</visibleWhen>

-			</command>

-		</menuContribution>

-	</extension>

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

-	    <handler

-            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler"

-            commandId="org.eclipse.xtext.ui.editor.FindReferences">

-            <activeWhen>

-                <reference

-                    definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">

-                </reference>

-            </activeWhen>

-        </handler>

-    </extension>   

-

-<!-- adding resource factories -->

-

-	<extension

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

-		<parser

-			class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.resource.IResourceFactory"

-			type="css">

-		</parser>

-	</extension>

-	<extension point="org.eclipse.xtext.extension_resourceServiceProvider">

-        <resourceServiceProvider

-            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.resource.IResourceUIServiceProvider"

-            uriExtension="css">

-        </resourceServiceProvider>

-    </extension>

-

-

-	<!-- marker definitions for org.eclipse.papyrus.infra.gmfdiag.css3.CSS -->

-	<extension

-	        id="css.check.fast"

-	        name="CSS Problem"

-	        point="org.eclipse.core.resources.markers">

-	    <super type="org.eclipse.xtext.ui.check.fast"/>

-	    <persistent value="true"/>

-	</extension>

-	<extension

-	        id="css.check.normal"

-	        name="CSS Problem"

-	        point="org.eclipse.core.resources.markers">

-	    <super type="org.eclipse.xtext.ui.check.normal"/>

-	    <persistent value="true"/>

-	</extension>

-	<extension

-	        id="css.check.expensive"

-	        name="CSS Problem"

-	        point="org.eclipse.core.resources.markers">

-	    <super type="org.eclipse.xtext.ui.check.expensive"/>

-	    <persistent value="true"/>

-	</extension>

-

-   <extension

-         point="org.eclipse.xtext.builder.participant">

-      <participant

-            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant"

-            fileExtensions="css"

-            >

-      </participant>

-   </extension>

-   <extension

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

-        <page

-            category="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"

-            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"

-            id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.compiler.preferencePage"

-            name="Compiler">

-            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"/>

-        </page>

-    </extension>

-    <extension

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

-        <page

-            category="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"

-            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"

-            id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.compiler.propertyPage"

-            name="Compiler">

-            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"/>

-            <enabledWhen>

-	            <adapt type="org.eclipse.core.resources.IProject"/>

-			</enabledWhen>

-	        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>

-        </page>

-    </extension>

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

-		<menuContribution locationURI="popup:#TextEditorContext?after=xtext.ui.openDeclaration">

-			<command

-				commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand"

-				id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.OpenGeneratedCode"

-				style="push">

-					<visibleWhen checkEnabled="false">

-						<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened" />

-					</visibleWhen>

-			</command>

-		</menuContribution>

-	</extension>

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

-		<handler

-			class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.generator.trace.OpenGeneratedFileHandler"

-			commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand">

-				<activeWhen>

-					<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened" />

-				</activeWhen>

-		</handler>

-	</extension>

-

-	<!-- Quick Outline -->

-	<extension

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

-		<handler 

-			class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler"

-			commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline">

-			<activeWhen>

-				<reference

-					definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">

-				</reference>

-			</activeWhen>

-		</handler>

-	</extension>

-	<extension

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

-		<command

-			description="Open the quick outline."

-			id="org.eclipse.xtext.ui.editor.outline.QuickOutline"

-			name="Quick Outline">

-		</command>

-	</extension>

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

-		<menuContribution

-			locationURI="popup:#TextEditorContext?after=group.open">

-			<command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"

-				style="push"

-				tooltip="Open Quick Outline">

-				<visibleWhen checkEnabled="false">

-					<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened"/>

-				</visibleWhen>

-			</command>

-		</menuContribution>

-	</extension>

-    <!-- quickfix marker resolution generator for org.eclipse.papyrus.infra.gmfdiag.css3.CSS -->

-    <extension

-            point="org.eclipse.ui.ide.markerResolution">

-        <markerResolutionGenerator

-            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"

-            markerType="org.eclipse.papyrus.infra.gmfdiag.css3.ui.css.check.fast">

-            <attribute

-                name="FIXABLE_KEY"

-                value="true">

-            </attribute>

-        </markerResolutionGenerator>

-        <markerResolutionGenerator

-            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"

-            markerType="org.eclipse.papyrus.infra.gmfdiag.css3.ui.css.check.normal">

-            <attribute

-                name="FIXABLE_KEY"

-                value="true">

-            </attribute>

-        </markerResolutionGenerator>

-        <markerResolutionGenerator

-            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"

-            markerType="org.eclipse.papyrus.infra.gmfdiag.css3.ui.css.check.expensive">

-            <attribute

-                name="FIXABLE_KEY"

-                value="true">

-            </attribute>

-        </markerResolutionGenerator>

-    </extension>

-   	<!-- Rename Refactoring -->

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

-		<handler 

-			class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler"

-			commandId="org.eclipse.xtext.ui.refactoring.RenameElement">

-			<activeWhen>

-				<reference

-					definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">

-				</reference>

-			</activeWhen>

-		</handler>

-	</extension>

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

-         <menuContribution

-            locationURI="popup:#TextEditorContext?after=group.edit">

-         <command commandId="org.eclipse.xtext.ui.refactoring.RenameElement"

-               style="push">

-            <visibleWhen checkEnabled="false">

-               <reference

-                     definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">

-               </reference>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

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

-	    <page

-	        category="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"

-	        class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferencePage"

-	        id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.refactoring"

-	        name="Refactoring">

-	        <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"/>

-	    </page>

-	</extension>

-

-  <extension point="org.eclipse.compare.contentViewers">

-    <viewer id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.compare.contentViewers"

-            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"

-            extensions="css">

-    </viewer>

-  </extension>

-  <extension point="org.eclipse.compare.contentMergeViewers">

-    <viewer id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.compare.contentMergeViewers"

-            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"

-            extensions="css" label="CSS Compare">

-     </viewer>

-  </extension>

-  <extension point="org.eclipse.ui.editors.documentProviders">

-    <provider id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.editors.documentProviders"

-            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.model.XtextDocumentProvider"

-            extensions="css">

-    </provider>

-  </extension>

-  <extension point="org.eclipse.team.core.fileTypes">

-    <fileTypes

-            extension="css"

-            type="text">

-    </fileTypes>

-  </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<plugin>
+
+    <extension
+            point="org.eclipse.ui.editors">
+        <editor
+              class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor"
+              contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
+              default="true"
+              extensions="css"
+              icon="icons/sourceEditor.gif"
+              id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"
+              name="Papyrus CSS Editor">
+        </editor>
+    </extension>
+    <extension
+        point="org.eclipse.ui.handlers">
+        <handler
+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclarationHandler"
+            commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration">
+            <activeWhen>
+                <reference
+                    definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">
+                </reference>
+            </activeWhen>
+        </handler>
+        <handler
+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"
+            commandId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.validate">
+         <activeWhen>
+            <reference
+                    definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">
+            </reference>
+         </activeWhen>
+      	</handler>
+      	<!-- copy qualified name -->
+        <handler
+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler"
+            commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName">
+            <activeWhen>
+				<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened" />
+            </activeWhen>
+        </handler>
+        <handler
+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler"
+            commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName">
+            <activeWhen>
+            	<and>
+            		<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.XtextEditor.opened" />
+	                <iterate>
+						<adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+					</iterate>
+				</and>
+            </activeWhen>
+        </handler>
+    </extension>
+    <extension point="org.eclipse.core.expressions.definitions">
+        <definition id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">
+            <and>
+                <reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/>
+                <with variable="activeEditor">
+                    <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName" 
+                        value="org.eclipse.papyrus.infra.gmfdiag.css3.CSS" 
+                        forcePluginActivation="true"/>
+                </with>        
+            </and>
+        </definition>
+        <definition id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.XtextEditor.opened">
+            <and>
+                <reference definitionId="isXtextEditorActive"/>
+                <with variable="activeEditor">
+                    <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName" 
+                        value="org.eclipse.papyrus.infra.gmfdiag.css3.CSS" 
+                        forcePluginActivation="true"/>
+                </with>        
+            </and>
+        </definition>
+    </extension>
+    <extension
+            point="org.eclipse.ui.preferencePages">
+        <page
+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
+            id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"
+            name="CSS">
+            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"/>
+        </page>
+        <page
+            category="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"
+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.syntaxcoloring.SyntaxColoringPreferencePage"
+            id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.coloring"
+            name="Syntax Coloring">
+            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"/>
+        </page>
+        <page
+            category="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"
+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage"
+            id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.templates"
+            name="Templates">
+            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"/>
+        </page>
+    </extension>
+    <extension
+            point="org.eclipse.ui.propertyPages">
+        <page
+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
+            id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"
+            name="CSS">
+            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"/>
+            <enabledWhen>
+	            <adapt type="org.eclipse.core.resources.IProject"/>
+			</enabledWhen>
+	        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
+        </page>
+    </extension>
+    <extension
+        point="org.eclipse.ui.keywords">
+        <keyword
+            id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"
+            label="CSS"/>
+    </extension>
+    <extension
+         point="org.eclipse.ui.commands">
+      <command
+            description="Trigger expensive validation"
+            id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.validate"
+            name="Validate">
+      </command>
+      <!-- copy qualified name -->
+      <command
+            id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+            categoryId="org.eclipse.ui.category.edit"
+            description="Copy the qualified name for the selected element"
+            name="Copy Qualified Name">
+      </command>
+      <command
+            id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+            categoryId="org.eclipse.ui.category.edit"
+            description="Copy the qualified name for the selected element"
+            name="Copy Qualified Name">
+      </command>
+    </extension>
+    <extension point="org.eclipse.ui.menus">
+        <menuContribution
+            locationURI="popup:#TextEditorContext?after=group.edit">
+             <command
+                 commandId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.validate"
+                 style="push"
+                 tooltip="Trigger expensive validation">
+            <visibleWhen checkEnabled="false">
+                <reference
+                    definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">
+                </reference>
+            </visibleWhen>
+         </command>  
+         </menuContribution>
+         <!-- copy qualified name -->
+         <menuContribution locationURI="popup:#TextEditorContext?after=copy">
+         	<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName" 
+         		style="push" tooltip="Copy Qualified Name">
+            	<visibleWhen checkEnabled="false">
+                	<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened" />
+            	</visibleWhen>
+         	</command>  
+         </menuContribution>
+         <menuContribution locationURI="menu:edit?after=copy">
+         	<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+            	style="push" tooltip="Copy Qualified Name">
+            	<visibleWhen checkEnabled="false">
+                	<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened" />
+            	</visibleWhen>
+         	</command>  
+         </menuContribution>
+         <menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">
+			<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName" 
+				style="push" tooltip="Copy Qualified Name">
+         		<visibleWhen checkEnabled="false">
+	            	<and>
+	            		<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.XtextEditor.opened" />
+						<iterate>
+							<adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+						</iterate>
+					</and>
+				</visibleWhen>
+			</command>
+         </menuContribution>
+    </extension>
+    <extension point="org.eclipse.ui.menus">
+		<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
+			<command commandId="org.eclipse.xtext.ui.editor.FindReferences">
+				<visibleWhen checkEnabled="false">
+                	<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">
+                	</reference>
+            	</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<extension point="org.eclipse.ui.handlers">
+	    <handler
+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler"
+            commandId="org.eclipse.xtext.ui.editor.FindReferences">
+            <activeWhen>
+                <reference
+                    definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">
+                </reference>
+            </activeWhen>
+        </handler>
+    </extension>   
+
+<!-- adding resource factories -->
+
+	<extension
+		point="org.eclipse.emf.ecore.extension_parser">
+		<parser
+			class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.resource.IResourceFactory"
+			type="css">
+		</parser>
+	</extension>
+	<extension point="org.eclipse.xtext.extension_resourceServiceProvider">
+        <resourceServiceProvider
+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.resource.IResourceUIServiceProvider"
+            uriExtension="css">
+        </resourceServiceProvider>
+    </extension>
+
+
+	<!-- marker definitions for org.eclipse.papyrus.infra.gmfdiag.css3.CSS -->
+	<extension
+	        id="css.check.fast"
+	        name="CSS Problem"
+	        point="org.eclipse.core.resources.markers">
+	    <super type="org.eclipse.xtext.ui.check.fast"/>
+	    <persistent value="true"/>
+	</extension>
+	<extension
+	        id="css.check.normal"
+	        name="CSS Problem"
+	        point="org.eclipse.core.resources.markers">
+	    <super type="org.eclipse.xtext.ui.check.normal"/>
+	    <persistent value="true"/>
+	</extension>
+	<extension
+	        id="css.check.expensive"
+	        name="CSS Problem"
+	        point="org.eclipse.core.resources.markers">
+	    <super type="org.eclipse.xtext.ui.check.expensive"/>
+	    <persistent value="true"/>
+	</extension>
+
+   <extension
+         point="org.eclipse.xtext.builder.participant">
+      <participant
+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant"
+            fileExtensions="css"
+            >
+      </participant>
+   </extension>
+   <extension
+            point="org.eclipse.ui.preferencePages">
+        <page
+            category="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"
+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
+            id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.compiler.preferencePage"
+            name="Compiler">
+            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"/>
+        </page>
+    </extension>
+    <extension
+            point="org.eclipse.ui.propertyPages">
+        <page
+            category="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"
+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
+            id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.compiler.propertyPage"
+            name="Compiler">
+            <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"/>
+            <enabledWhen>
+	            <adapt type="org.eclipse.core.resources.IProject"/>
+			</enabledWhen>
+	        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
+        </page>
+    </extension>
+    <extension point="org.eclipse.ui.menus">
+		<menuContribution locationURI="popup:#TextEditorContext?after=xtext.ui.openDeclaration">
+			<command
+				commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand"
+				id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.OpenGeneratedCode"
+				style="push">
+					<visibleWhen checkEnabled="false">
+						<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened" />
+					</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<extension point="org.eclipse.ui.handlers">
+		<handler
+			class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.generator.trace.OpenGeneratedFileHandler"
+			commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand">
+				<activeWhen>
+					<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened" />
+				</activeWhen>
+		</handler>
+	</extension>
+
+	<!-- Quick Outline -->
+	<extension
+		point="org.eclipse.ui.handlers">
+		<handler 
+			class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler"
+			commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline">
+			<activeWhen>
+				<reference
+					definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	<extension
+		point="org.eclipse.ui.commands">
+		<command
+			description="Open the quick outline."
+			id="org.eclipse.xtext.ui.editor.outline.QuickOutline"
+			name="Quick Outline">
+		</command>
+	</extension>
+	<extension point="org.eclipse.ui.menus">
+		<menuContribution
+			locationURI="popup:#TextEditorContext?after=group.open">
+			<command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"
+				style="push"
+				tooltip="Open Quick Outline">
+				<visibleWhen checkEnabled="false">
+					<reference definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened"/>
+				</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+    <!-- quickfix marker resolution generator for org.eclipse.papyrus.infra.gmfdiag.css3.CSS -->
+    <extension
+            point="org.eclipse.ui.ide.markerResolution">
+        <markerResolutionGenerator
+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+            markerType="org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui.css.check.fast">
+            <attribute
+                name="FIXABLE_KEY"
+                value="true">
+            </attribute>
+        </markerResolutionGenerator>
+        <markerResolutionGenerator
+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+            markerType="org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui.css.check.normal">
+            <attribute
+                name="FIXABLE_KEY"
+                value="true">
+            </attribute>
+        </markerResolutionGenerator>
+        <markerResolutionGenerator
+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+            markerType="org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui.css.check.expensive">
+            <attribute
+                name="FIXABLE_KEY"
+                value="true">
+            </attribute>
+        </markerResolutionGenerator>
+    </extension>
+   	<!-- Rename Refactoring -->
+	<extension point="org.eclipse.ui.handlers">
+		<handler 
+			class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler"
+			commandId="org.eclipse.xtext.ui.refactoring.RenameElement">
+			<activeWhen>
+				<reference
+					definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+    <extension point="org.eclipse.ui.menus">
+         <menuContribution
+            locationURI="popup:#TextEditorContext?after=group.edit">
+         <command commandId="org.eclipse.xtext.ui.refactoring.RenameElement"
+               style="push">
+            <visibleWhen checkEnabled="false">
+               <reference
+                     definitionId="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.Editor.opened">
+               </reference>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+   </extension>
+   <extension point="org.eclipse.ui.preferencePages">
+	    <page
+	        category="org.eclipse.papyrus.infra.gmfdiag.css3.CSS"
+	        class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferencePage"
+	        id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.refactoring"
+	        name="Refactoring">
+	        <keywordReference id="org.eclipse.papyrus.infra.gmfdiag.css3.ui.keyword_CSS"/>
+	    </page>
+	</extension>
+
+  <extension point="org.eclipse.compare.contentViewers">
+    <viewer id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.compare.contentViewers"
+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
+            extensions="css">
+    </viewer>
+  </extension>
+  <extension point="org.eclipse.compare.contentMergeViewers">
+    <viewer id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.compare.contentMergeViewers"
+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
+            extensions="css" label="CSS Compare">
+     </viewer>
+  </extension>
+  <extension point="org.eclipse.ui.editors.documentProviders">
+    <provider id="org.eclipse.papyrus.infra.gmfdiag.css3.CSS.editors.documentProviders"
+            class="org.eclipse.papyrus.infra.gmfdiag.css3.ui.CSSExecutableExtensionFactory:org.eclipse.xtext.ui.editor.model.XtextDocumentProvider"
+            extensions="css">
+    </provider>
+  </extension>
+  <extension point="org.eclipse.team.core.fileTypes">
+    <fileTypes
+            extension="css"
+            type="text">
+    </fileTypes>
+  </extension>
+
+</plugin>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/pom.xml
index 5d5d6b9a034..debd4cd3c07 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/pom.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag-css</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	
@@ -51,4 +49,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/CustomCSSProposalProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/CustomCSSProposalProvider.java
index 65c1e2280d3..4c6d6a484b8 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/CustomCSSProposalProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/src/org/eclipse/papyrus/infra/gmfdiag/css3/ui/contentassist/CustomCSSProposalProvider.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2015 CEA LIST.
+ * Copyright (c) 2015, 2016 CEA LIST, Christian W. Damus, and others.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,6 +8,7 @@
  *
  * Contributors:
  *   Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
+ *   Christian W. Damus - bug 485220
  *   
  *****************************************************************************/
 
@@ -19,21 +20,21 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
-import org.eclipse.emf.ecore.EAttribute;
 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.gmf.runtime.notation.NotationPackage;
 import org.eclipse.jface.text.contentassist.CompletionProposal;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.utils.NamedStyleProperties;
+import org.eclipse.papyrus.infra.gmfdiag.css.service.StylingService;
 import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.AttributeSelector;
 import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.IdentifierTok;
 import org.eclipse.papyrus.infra.gmfdiag.css3.cSS.css_declaration;
-import org.eclipse.uml2.uml.UMLPackage;
 import org.eclipse.xtext.Assignment;
 import org.eclipse.xtext.RuleCall;
 import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
@@ -49,8 +50,8 @@ public class CustomCSSProposalProvider extends AbstractCSSProposalProvider {
 	/** The Constant colorNames. */
 	static final Set<String> colorNames = new LinkedHashSet<String>();
 
-	/** The Constant umlProperties. */
-	static final Set<String> umlProperties = new LinkedHashSet<String>();
+	/** The CSS properties of supported semantic classes. */
+	static final Set<String> semanticProperties;
 
 	static {
 		colorNames.add("aliceblue");//$NON-NLS-1$
@@ -202,26 +203,16 @@ public class CustomCSSProposalProvider extends AbstractCSSProposalProvider {
 	}
 
 	static {
-		for (EClassifier umlMetaclass : UMLPackage.eINSTANCE.getEClassifiers()) {
-			if (umlMetaclass instanceof EClass) {
-				EClass umlClass = (EClass) umlMetaclass;
-				for (EAttribute attribute : umlClass.getEAllAttributes()) {
-					umlProperties.add(attribute.getName());
-				}
-
-				for (EReference reference : umlClass.getEAllReferences()) {
-					EClassifier type = reference.getEType();
-					if (type instanceof EClass) {
-						EClass eType = (EClass) type;
-						if (EMFHelper.isSubclass(eType, UMLPackage.eINSTANCE.getNamedElement())) {
-							umlProperties.add(reference.getName());
-						}
-					}
-				}
-			}
-		}
+		semanticProperties = supportedSemanticCSSClasses()
+				.flatMap(cssClass -> cssClass.getEAllStructuralFeatures().stream())
+				.filter(StylingService.getInstance().getSemanticPropertySupportedPredicate())
+				.map(EStructuralFeature::getName)
+				.collect(Collectors.toCollection(LinkedHashSet::new));
 	}
 
+	private static Stream<EClass> supportedSemanticCSSClasses() {
+		return StreamSupport.stream(StylingService.getInstance().getSupportedSemanticClasses().spliterator(), false);
+	}
 
 	/**
 	 * Gets the custom properties.
@@ -486,14 +477,10 @@ public class CustomCSSProposalProvider extends AbstractCSSProposalProvider {
 	@Override
 	public void complete_selector(final EObject model, final RuleCall ruleCall, final ContentAssistContext context, final ICompletionProposalAcceptor acceptor) {
 		super.complete_selector(model, ruleCall, context, acceptor);
-		for (EClassifier umlMetaclass : UMLPackage.eINSTANCE.getEClassifiers()) {
-			if (umlMetaclass instanceof EClass) {
-				EClass umlClass = (EClass) umlMetaclass;
-				if (umlClass.getName().contains(context.getPrefix())) {
-					acceptor.accept(buildProposal(umlClass.getName(), context));
-				}
-			}
-		}
+
+		supportedSemanticCSSClasses()
+				.filter(cssClass -> cssClass.getName().contains(context.getPrefix()))
+				.forEach(cssClass -> acceptor.accept(buildProposal(cssClass.getName(), context)));
 
 		String[] otherSemanticElements = new String[] {
 				"Compartment", //$NON-NLS-1$
@@ -529,9 +516,9 @@ public class CustomCSSProposalProvider extends AbstractCSSProposalProvider {
 				prefix = prefix.substring(1);
 			}
 
-			for (String umlProperty : umlProperties) {
-				if (umlProperty.contains(prefix)) {
-					acceptor.accept(buildProposal(umlProperty, context));
+			for (String semanticProperty : semanticProperties) {
+				if (semanticProperty.contains(prefix)) {
+					acceptor.accept(buildProposal(semanticProperty, context));
 				}
 			}
 		} else {
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/pom.xml
index 44b3301c6c2..7a15b3ee14b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/pom.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag-css</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css3.xtext</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
@@ -51,4 +49,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/css/pom.xml b/plugins/infra/gmfdiag/css/pom.xml
new file mode 100644
index 00000000000..cc53d9256a6
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.infra-gmfdiag-css</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <name>Papyrus Diagram CSS Support</name>
+	<description>Implementation of CSS styling and other functions in GMF-based diagrams.</description>
+
+	<modules>
+		<module>org.eclipse.papyrus.infra.gmfdiag.css</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.css.configuration</module>
+		<!-- org.eclipse.papyrus.infra.gmfdiag.css.debug is in the Dev Build (?!) -->
+		<module>org.eclipse.papyrus.infra.gmfdiag.css.properties</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.css.theme</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.css3.xtext</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui</module>
+	</modules>
+</project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/pom.xml
index ba8a1c3fdc0..cb528176aa6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.extensionpoints.editors</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/pom.xml
index 5a2e90ce89f..457f16020be 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.canonical</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.classpath
index 2d1a4302f04..eca7bdba8f0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.classpath
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.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.8"/>
+	<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/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..b3aa6d60f94 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-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

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF
index fbc21a71a93..d7098a42fba 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF
@@ -1,30 +1,31 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui.workbench,

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

- org.eclipse.gmf.runtime.common.core,

- org.eclipse.emf.common,

- org.eclipse.gef,

- org.eclipse.emf.workspace;bundle-version="1.4.0",

- org.eclipse.emf.transaction.ui;bundle-version="1.4.0",

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

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

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

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

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

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",

- org.eclipse.core.expressions;bundle-version="3.4.500",

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

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

- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.commands,

- org.eclipse.papyrus.commands.util,

- org.eclipse.papyrus.commands.wrappers

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

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

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.commands;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui.workbench,
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.common.core,
+ org.eclipse.emf.common,
+ org.eclipse.gef,
+ org.eclipse.emf.workspace;bundle-version="1.4.0",
+ org.eclipse.emf.transaction.ui;bundle-version="1.4.0",
+ org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
+ org.eclipse.core.expressions;bundle-version="3.4.500",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor,
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0";visibility:=reexport
+Export-Package: org.eclipse.papyrus.commands,
+ org.eclipse.papyrus.commands.util,
+ org.eclipse.papyrus.commands.wrappers
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.commands.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.commands;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/pom.xml
index 344ef62fbcd..b8e09e29ea7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.commands</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/schema/historyListeners.exsd b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/schema/historyListeners.exsd
index 16f042831a6..400062f555d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/schema/historyListeners.exsd
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/schema/historyListeners.exsd
@@ -13,7 +13,7 @@
    <element name="extension">
       <annotation>
          <appinfo>
-            <meta.element />
+            <meta.element deprecated="true" replacement="org.eclipse.papyrus.infra.emf.gmf.historyListeners" />
          </appinfo>
       </annotation>
       <complexType>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/schema/operationApprover.exsd b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/schema/operationApprover.exsd
index 1b3e020a89a..5cd1009f43e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/schema/operationApprover.exsd
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/schema/operationApprover.exsd
@@ -1,78 +1,78 @@
-<?xml version='1.0' encoding='UTF-8'?>

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

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

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.commands" id="operationApprover" name="operationApprover"/>

-      </appinfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="operationApprover" minOccurs="0" 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="operationApprover">

-      <complexType>

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

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.core.commands.operations.IOperationApprover2"/>

-               </appinfo>

-            </annotation>

-         </attribute>

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

-            <annotation>

-               <documentation>

-                  An integer value representing the priority of the operationApprover.

-High value means the operationApprover will be checked before those with lower value.

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-

-

-

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.commands" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.commands" id="operationApprover" name="operationApprover"/>
+      </appinfo>
+      <documentation>
+         
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element deprecated="true" replacement="org.eclipse.papyrus.infra.emf.gmf.operationApprovers" />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="operationApprover" minOccurs="0" 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="operationApprover">
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.core.commands.operations.IOperationApprover2"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+         <attribute name="priority" type="string">
+            <annotation>
+               <documentation>
+                  An integer value representing the priority of the operationApprover.
+High value means the operationApprover will be checked before those with lower value.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+
+
+
+
+
+</schema>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/Activator.java
index 5a2a149874e..db4ed64cd02 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/Activator.java
@@ -1,74 +1,89 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos.

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Vincent Hemery (Atos) - Initial API and implementation

- *

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

-package org.eclipse.papyrus.commands;

-

-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.infra.gmfdiag.commands"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/** The log helper */

-	public static LogHelper log = new LogHelper();

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

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

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		// register the log helper

-		log.setPlugin(plugin);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

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

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		log = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 Atos, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Hemery (Atos) - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.commands;
+
+import java.util.function.BinaryOperator;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.papyrus.infra.emf.gmf.command.ICommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.util.CommandUtils;
+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.gmfdiag.commands"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/** The log helper */
+	public static LogHelper log = new LogHelper();
+
+	// Teach the infra layer how to deal with GEF commands
+	static {
+		// The registry prefers the GMFtoGEFCommandWrapper for GMF ICommands
+		ICommandWrapper.REGISTRY.registerUnwrapper(ICommandProxy.class, ICommand.class,
+				ICommandProxy::getICommand);
+		// The registry prefers the GEFtoGMFCommandWrapper for GEF Commands
+		ICommandWrapper.REGISTRY.registerUnwrapper(CommandProxy.class, Command.class,
+				CommandProxy::getCommand);
+
+		@SuppressWarnings("deprecation")
+		BinaryOperator<Command> gefComposer = org.eclipse.papyrus.commands.util.NonDirtyingUtils::chain;
+		CommandUtils.REGISTRY.registerComposer(Command.class, gefComposer);
+		CommandUtils.REGISTRY.registerDecomposer(CompoundCommand.class, CompoundCommand::getCommands);
+		CommandUtils.REGISTRY.registerLabeller(Command.class, Command::getLabel);
+	}
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		// register the log helper
+		log.setPlugin(plugin);
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		log = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedDiagramCommandStack.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedDiagramCommandStack.java
index 6a9ec578fa3..45f8c6d22d1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedDiagramCommandStack.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedDiagramCommandStack.java
@@ -1,89 +1,90 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2014 Atos, CEA, and others.

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Vincent Hemery (Atos) - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 421411

- *  Christian W. Damus (CEA) - bug 384169

- *

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

-package org.eclipse.papyrus.commands;

-

-import org.eclipse.core.commands.operations.IOperationHistory;

-import org.eclipse.core.commands.operations.IUndoContext;

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

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

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

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

-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.parts.DiagramCommandStack;

-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramEditDomain;

-import org.eclipse.papyrus.commands.util.NonDirtyingUtils;

-

-/**

- * This DiagramCommandStack uses CheckedOperationHistory instead of the default one.

- *

- * @author vhemery

- */

-public class CheckedDiagramCommandStack extends DiagramCommandStack {

-

-	protected IOperationHistory operationHistory;

-

-	public CheckedDiagramCommandStack(IDiagramEditDomain editDomain) {

-		super(editDomain);

-		operationHistory = CheckedOperationHistory.getInstance();

-	}

-

-	@Override

-	protected IOperationHistory getOperationHistory() {

-		return operationHistory;

-	}

-

-	@Override

-	public void execute(Command command, IProgressMonitor progressMonitor) {

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

-			execute(wrap(command), progressMonitor);

-		}

-	}

-

-	private ICommand wrap(Command command) {

-		if (command instanceof CompoundCommand) {

-			CompositeCommand composite = new CompositeCommand(command.getLabel());

-			Object[] subCommands = ((CompoundCommand) command).getChildren();

-

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

-				composite.compose(wrap((Command) subCommands[i]));

-			}

-			return composite.reduce();

-		}

-

-		if (command instanceof ICommandProxy) {

-			return getICommand(((ICommandProxy) command).getICommand());

-		}

-

-		if (null != command) {

-			// Handle possible non-dirtying command

-			return NonDirtyingUtils.wrap(command);

-		} else {

-			return null;

-		}

-	}

-

-	@Override

-	public void dispose() {

-		// Flush my undo context

-		IUndoContext context = getUndoContext();

-		if ((context != null) && (operationHistory != null)) {

-			operationHistory.dispose(context, true, true, true);

-		}

-

-		super.dispose();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2014 Atos, CEA, and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Hemery (Atos) - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 421411
+ *  Christian W. Damus (CEA) - bug 384169
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.commands;
+
+import org.eclipse.core.commands.operations.IOperationHistory;
+import org.eclipse.core.commands.operations.IUndoContext;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+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.parts.DiagramCommandStack;
+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramEditDomain;
+import org.eclipse.papyrus.commands.util.NonDirtyingUtils;
+import org.eclipse.papyrus.infra.emf.gmf.command.CheckedOperationHistory;
+
+/**
+ * This DiagramCommandStack uses CheckedOperationHistory instead of the default one.
+ *
+ * @author vhemery
+ */
+public class CheckedDiagramCommandStack extends DiagramCommandStack {
+
+	protected IOperationHistory operationHistory;
+
+	public CheckedDiagramCommandStack(IDiagramEditDomain editDomain) {
+		super(editDomain);
+		operationHistory = CheckedOperationHistory.getInstance();
+	}
+
+	@Override
+	protected IOperationHistory getOperationHistory() {
+		return operationHistory;
+	}
+
+	@Override
+	public void execute(Command command, IProgressMonitor progressMonitor) {
+		if ((command != null) && command.canExecute()) {
+			execute(wrap(command), progressMonitor);
+		}
+	}
+
+	private ICommand wrap(Command command) {
+		if (command instanceof CompoundCommand) {
+			CompositeCommand composite = new CompositeCommand(command.getLabel());
+			Object[] subCommands = ((CompoundCommand) command).getChildren();
+
+			for (int i = 0; i < subCommands.length; i++) {
+				composite.compose(wrap((Command) subCommands[i]));
+			}
+			return composite.reduce();
+		}
+
+		if (command instanceof ICommandProxy) {
+			return getICommand(((ICommandProxy) command).getICommand());
+		}
+
+		if (null != command) {
+			// Handle possible non-dirtying command
+			return NonDirtyingUtils.wrap(command);
+		} else {
+			return null;
+		}
+	}
+
+	@Override
+	public void dispose() {
+		// Flush my undo context
+		IUndoContext context = getUndoContext();
+		if ((context != null) && (operationHistory != null)) {
+			operationHistory.dispose(context, true, true, true);
+		}
+
+		super.dispose();
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedOperationHistory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedOperationHistory.java
index 4c12684795c..76b15d44ca4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedOperationHistory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedOperationHistory.java
@@ -1,319 +1,164 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2014 Atos, CEA, and others.

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Mathieu Velten (Atos) - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 357250, bug 323802

- *

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

-package org.eclipse.papyrus.commands;

-

-import java.util.Collections;

-import java.util.LinkedList;

-import java.util.List;

-

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

-import org.eclipse.core.commands.operations.ICompositeOperation;

-import org.eclipse.core.commands.operations.IOperationApprover;

-import org.eclipse.core.commands.operations.IOperationApprover2;

-import org.eclipse.core.commands.operations.IOperationHistory;

-import org.eclipse.core.commands.operations.IOperationHistoryListener;

-import org.eclipse.core.commands.operations.IUndoContext;

-import org.eclipse.core.commands.operations.IUndoableOperation;

-import org.eclipse.core.commands.operations.OperationHistoryFactory;

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

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

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

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

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

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

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

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

-import org.eclipse.emf.workspace.EMFCommandOperation;

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

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

-

-public class CheckedOperationHistory implements IOperationHistory {

-

-	private static class CheckedOperationHistoryHolder {

-

-		public static final CheckedOperationHistory instance = new CheckedOperationHistory();

-	}

-

-	public static CheckedOperationHistory getInstance() {

-		return CheckedOperationHistoryHolder.instance;

-	}

-

-	protected static final IOperationApprover2[] approversArray;

-

-	protected IOperationHistory history;

-

-	private static class ApproverPriorityPair implements Comparable<ApproverPriorityPair> {

-

-		public IOperationApprover2 approver;

-

-		public int priority;

-

-		public int compareTo(ApproverPriorityPair o) {

-			if (o.priority > priority) {

-				return 1;

-			} else if (o.priority < priority) {

-				return -1;

-			} else {

-				return 0;

-			}

-		}

-

-	}

-

-	static {

-		IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(Activator.PLUGIN_ID, "operationApprover"); //$NON-NLS-1$

-

-		List<ApproverPriorityPair> approverPriorityPairs = new LinkedList<ApproverPriorityPair>();

-		for (IConfigurationElement elem : configElements) {

-			if ("operationApprover".equals(elem.getName())) { //$NON-NLS-1$

-				try {

-					ApproverPriorityPair approverPriorityPair = new ApproverPriorityPair();

-					approverPriorityPair.approver = (IOperationApprover2) elem.createExecutableExtension("class"); //$NON-NLS-1$

-					approverPriorityPair.priority = Integer.parseInt(elem.getAttribute("priority")); //$NON-NLS-1$

-

-					approverPriorityPairs.add(approverPriorityPair);

-				} catch (Exception e) {

-					Activator.log.error("Uncaught exception in instantiation of operation approver.", e); //$NON-NLS-1$

-				}

-			}

-		}

-

-		Collections.sort(approverPriorityPairs);

-

-		approversArray = new IOperationApprover2[approverPriorityPairs.size()];

-

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

-			approversArray[i] = approverPriorityPairs.get(i).approver;

-		}

-	}

-

-	private CheckedOperationHistory() {

-		history = OperationHistoryFactory.getOperationHistory();

-

-		addRegisteredListeners(history);

-	}

-

-	/*

-	 * Consult the IOperationApprovers to see if the proposed redo should be

-	 * allowed.

-	 */

-	protected IStatus getRedoApproval(IUndoableOperation operation, IAdaptable info) {

-		operation = unwrap(operation);

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

-			IStatus approval = approversArray[i].proceedRedoing(operation, this, info);

-			if (!approval.isOK()) {

-				return approval;

-			}

-		}

-		return Status.OK_STATUS;

-	}

-

-	/*

-	 * Consult the IOperationApprovers to see if the proposed undo should be

-	 * allowed.

-	 */

-	protected IStatus getUndoApproval(IUndoableOperation operation, IAdaptable info) {

-		operation = unwrap(operation);

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

-			IStatus approval = approversArray[i].proceedUndoing(operation, this, info);

-			if (!approval.isOK()) {

-				return approval;

-			}

-		}

-		return Status.OK_STATUS;

-	}

-

-	/*

-	 * Consult the IOperationApprovers to see if the proposed execution should

-	 * be allowed.

-	 *

-	 * @since 3.2

-	 */

-	protected IStatus getExecuteApproval(IUndoableOperation operation, IAdaptable info) {

-		operation = unwrap(operation);

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

-			IStatus approval = approversArray[i].proceedExecuting(operation, this, info);

-			if (!approval.isOK()) {

-				return approval;

-			}

-		}

-		return Status.OK_STATUS;

-	}

-

-	/**

-	 * the unified command stack wraps ICommand GMFtoEMFCommandWrapper

-	 * which are wrapped in EMFCommandOperation,

-	 * unwrap it before validation

-	 *

-	 * @param operation

-	 * @return

-	 */

-	protected IUndoableOperation unwrap(IUndoableOperation operation) {

-		if (operation instanceof EMFCommandOperation) {

-			Command emfCommand = ((EMFCommandOperation) operation).getCommand();

-			if (emfCommand instanceof GMFtoEMFCommandWrapper) {

-				ICommand gmfCommand = ((GMFtoEMFCommandWrapper) emfCommand).getGMFCommand();

-				if (gmfCommand != null) {

-					return gmfCommand;

-				}

-			}

-		}

-

-		return operation;

-	}

-

-	public IStatus execute(IUndoableOperation operation, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		// check with the operation approvers

-		IStatus status = getExecuteApproval(operation, info);

-		if (!status.isOK()) {

-			// not approved. No notifications are sent, just return the status.

-			return status;

-		}

-		return history.execute(operation, monitor, info);

-	}

-

-	public IStatus undo(IUndoContext context, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		Assert.isNotNull(context);

-		IUndoableOperation operation = getUndoOperation(context);

-

-		// info if there is no operation

-		if (operation == null) {

-			return IOperationHistory.NOTHING_TO_UNDO_STATUS;

-		}

-

-		// check with the operation approvers

-		IStatus status = getUndoApproval(operation, info);

-		if (!status.isOK()) {

-			// not approved. No notifications are sent, just return the status.

-			return status;

-		}

-		return history.undo(context, monitor, info);

-	}

-

-	public IStatus redo(IUndoContext context, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		Assert.isNotNull(context);

-		IUndoableOperation operation = getRedoOperation(context);

-

-		// info if there is no operation

-		if (operation == null) {

-			return IOperationHistory.NOTHING_TO_REDO_STATUS;

-		}

-

-		// check with the operation approvers

-		IStatus status = getRedoApproval(operation, info);

-		if (!status.isOK()) {

-			// not approved. No notifications are sent, just return the status.

-			return status;

-		}

-		return history.redo(context, monitor, info);

-	}

-

-	private static void addRegisteredListeners(IOperationHistory history) {

-		IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(Activator.PLUGIN_ID, "historyListeners"); //$NON-NLS-1$

-

-		for (IConfigurationElement elem : configElements) {

-			if ("historyListener".equals(elem.getName())) { //$NON-NLS-1$

-				try {

-					IOperationHistoryListener listener = (IOperationHistoryListener) elem.createExecutableExtension("class"); //$NON-NLS-1$

-					history.addOperationHistoryListener(listener);

-				} catch (Exception e) {

-					Activator.log.error("Uncaught exception in instantiation of operation history listener.", e); //$NON-NLS-1$

-				}

-			}

-		}

-	}

-

-	// all the following methods are pure delegation

-

-	public IStatus undoOperation(IUndoableOperation operation, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		return history.undoOperation(operation, monitor, info);

-	}

-

-	public void setLimit(IUndoContext context, int limit) {

-		history.setLimit(context, limit);

-	}

-

-	public void replaceOperation(IUndoableOperation operation, IUndoableOperation[] replacements) {

-		history.replaceOperation(operation, replacements);

-	}

-

-	public void removeOperationHistoryListener(IOperationHistoryListener listener) {

-		history.removeOperationHistoryListener(listener);

-	}

-

-	public void removeOperationApprover(IOperationApprover approver) {

-		history.removeOperationApprover(approver);

-	}

-

-	public IStatus redoOperation(IUndoableOperation operation, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		return history.redoOperation(operation, monitor, info);

-	}

-

-	public void operationChanged(IUndoableOperation operation) {

-		history.operationChanged(operation);

-	}

-

-	public void openOperation(ICompositeOperation operation, int mode) {

-		history.openOperation(operation, mode);

-	}

-

-	public IUndoableOperation getUndoOperation(IUndoContext context) {

-		return history.getUndoOperation(context);

-	}

-

-	public IUndoableOperation[] getUndoHistory(IUndoContext context) {

-		return history.getUndoHistory(context);

-	}

-

-	public IUndoableOperation getRedoOperation(IUndoContext context) {

-		return history.getRedoOperation(context);

-	}

-

-	public IUndoableOperation[] getRedoHistory(IUndoContext context) {

-		return history.getRedoHistory(context);

-	}

-

-	public int getLimit(IUndoContext context) {

-		return history.getLimit(context);

-	}

-

-	public void dispose(IUndoContext context, boolean flushUndo, boolean flushRedo, boolean flushContext) {

-		history.dispose(context, flushUndo, flushRedo, flushContext);

-	}

-

-	public void closeOperation(boolean operationOK, boolean addToHistory, int mode) {

-		history.closeOperation(operationOK, addToHistory, mode);

-	}

-

-	public boolean canUndo(IUndoContext context) {

-		return history.canUndo(context);

-	}

-

-	public boolean canRedo(IUndoContext context) {

-		return history.canRedo(context);

-	}

-

-	public void addOperationHistoryListener(IOperationHistoryListener listener) {

-		history.addOperationHistoryListener(listener);

-	}

-

-	public void addOperationApprover(IOperationApprover approver) {

-		history.addOperationApprover(approver);

-	}

-

-	public void add(IUndoableOperation operation) {

-		history.add(operation);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 Atos, CEA, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mathieu Velten (Atos) - Initial API and implementation
+ *  Christian W. Damus (CEA) - bugs 357250, 323802
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.operations.ICompositeOperation;
+import org.eclipse.core.commands.operations.IOperationApprover;
+import org.eclipse.core.commands.operations.IOperationHistory;
+import org.eclipse.core.commands.operations.IOperationHistoryListener;
+import org.eclipse.core.commands.operations.IUndoContext;
+import org.eclipse.core.commands.operations.IUndoableOperation;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+
+/**
+ * @deprecated Use the {@link org.eclipse.papyrus.infra.emf.gmf.command.CheckedOperationHistory} API, instead.
+ */
+@Deprecated
+public class CheckedOperationHistory implements IOperationHistory {
+
+	private static class CheckedOperationHistoryHolder {
+
+		public static final CheckedOperationHistory instance = new CheckedOperationHistory();
+	}
+
+	public static CheckedOperationHistory getInstance() {
+		return CheckedOperationHistoryHolder.instance;
+	}
+
+	private final IOperationHistory delegate = org.eclipse.papyrus.infra.emf.gmf.command.CheckedOperationHistory.getInstance();
+
+	private CheckedOperationHistory() {
+		super();
+	}
+
+	@Override
+	public void add(IUndoableOperation operation) {
+		delegate.add(operation);
+	}
+
+	@Override
+	public void addOperationApprover(IOperationApprover approver) {
+		delegate.addOperationApprover(approver);
+	}
+
+	@Override
+	public void addOperationHistoryListener(IOperationHistoryListener listener) {
+		delegate.addOperationHistoryListener(listener);
+	}
+
+	@Override
+	public void closeOperation(boolean operationOK, boolean addToHistory, int mode) {
+		delegate.closeOperation(operationOK, addToHistory, mode);
+	}
+
+	@Override
+	public boolean canRedo(IUndoContext context) {
+		return delegate.canRedo(context);
+	}
+
+	@Override
+	public boolean canUndo(IUndoContext context) {
+		return delegate.canUndo(context);
+	}
+
+	@Override
+	public void dispose(IUndoContext context, boolean flushUndo, boolean flushRedo, boolean flushContext) {
+		delegate.dispose(context, flushUndo, flushRedo, flushContext);
+	}
+
+	@Override
+	public IStatus execute(IUndoableOperation operation, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		return delegate.execute(operation, monitor, info);
+	}
+
+	@Override
+	public int getLimit(IUndoContext context) {
+		return delegate.getLimit(context);
+	}
+
+	@Override
+	public IUndoableOperation[] getRedoHistory(IUndoContext context) {
+		return delegate.getRedoHistory(context);
+	}
+
+	@Override
+	public IUndoableOperation getRedoOperation(IUndoContext context) {
+		return delegate.getRedoOperation(context);
+	}
+
+	@Override
+	public IUndoableOperation[] getUndoHistory(IUndoContext context) {
+		return delegate.getUndoHistory(context);
+	}
+
+	@Override
+	public void openOperation(ICompositeOperation operation, int mode) {
+		delegate.openOperation(operation, mode);
+	}
+
+	@Override
+	public void operationChanged(IUndoableOperation operation) {
+		delegate.operationChanged(operation);
+	}
+
+	@Override
+	public IUndoableOperation getUndoOperation(IUndoContext context) {
+		return delegate.getUndoOperation(context);
+	}
+
+	@Override
+	public IStatus redo(IUndoContext context, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		return delegate.redo(context, monitor, info);
+	}
+
+	@Override
+	public IStatus redoOperation(IUndoableOperation operation, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		return delegate.redoOperation(operation, monitor, info);
+	}
+
+	@Override
+	public void removeOperationApprover(IOperationApprover approver) {
+		delegate.removeOperationApprover(approver);
+	}
+
+	@Override
+	public void removeOperationHistoryListener(IOperationHistoryListener listener) {
+		delegate.removeOperationHistoryListener(listener);
+	}
+
+	@Override
+	public void replaceOperation(IUndoableOperation operation, IUndoableOperation[] replacements) {
+		delegate.replaceOperation(operation, replacements);
+	}
+
+	@Override
+	public void setLimit(IUndoContext context, int limit) {
+		delegate.setLimit(context, limit);
+	}
+
+	@Override
+	public IStatus undo(IUndoContext context, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		return delegate.undo(context, monitor, info);
+	}
+
+	@Override
+	public IStatus undoOperation(IUndoableOperation operation, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		return delegate.undoOperation(operation, monitor, info);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/INonDirtying.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/INonDirtying.java
index 25800754378..01961958638 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/INonDirtying.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/INonDirtying.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 CEA and others.
+ * Copyright (c) 2014, 2016 CEA, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,6 +8,7 @@
  *
  * Contributors:
  *   Christian W. Damus (CEA) - Initial API and implementation
+ *   Christian W. Damus - bug 485220
  *
  */
 package org.eclipse.papyrus.commands;
@@ -20,7 +21,10 @@ import org.eclipse.emf.common.command.Command;
  * A marker interface for GMF and GEF commands that are non-dirtying. For EMF {@link Command}s, use the {@link AbstractCommand.NonDirtying} interface.
  *
  * @see AbstractCommand.NonDirtying
+ * 
+ * @deprecated Use the {@link org.eclipse.papyrus.infra.emf.gmf.command.INonDirtying} API, instead.
  */
-public interface INonDirtying {
+@Deprecated
+public interface INonDirtying extends org.eclipse.papyrus.infra.emf.gmf.command.INonDirtying {
 	// Just a marker interface
 }
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/NestingNotifyingWorkspaceCommandStack.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/NestingNotifyingWorkspaceCommandStack.java
index 8abf20e29dc..2e64c17bf91 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/NestingNotifyingWorkspaceCommandStack.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/NestingNotifyingWorkspaceCommandStack.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2013, 2014 CEA LIST and others.
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,6 +9,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *  Christian W. Damus (CEA) - adapted for self-nesting behaviour
+ *  Christian W. Damus - bug 485220
  *
  *****************************************************************************/
 package org.eclipse.papyrus.commands;
@@ -20,7 +21,10 @@ import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.transaction.RollbackException;
 
-
+/**
+ * @deprecated Use the {@link org.eclipse.papyrus.infra.emf.gmf.command.NestingNotifyingWorkspaceCommandStack} API, instead.
+ */
+@Deprecated
 public class NestingNotifyingWorkspaceCommandStack extends NotifyingWorkspaceCommandStack {
 
 	private NestingNotifyingWorkspaceCommandStack childCommandStack;
@@ -48,10 +52,12 @@ public class NestingNotifyingWorkspaceCommandStack extends NotifyingWorkspaceCom
 	private static IUndoContext computeNestedUndoContext() {
 		return new IUndoContext() {
 
+			@Override
 			public boolean matches(IUndoContext context) {
 				return context == this;
 			}
 
+			@Override
 			public String getLabel() {
 				return "Nested Undo Context";
 			}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/NotifyingWorkspaceCommandStack.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/NotifyingWorkspaceCommandStack.java
index 958bb7e90c6..35f99697feb 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/NotifyingWorkspaceCommandStack.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/NotifyingWorkspaceCommandStack.java
@@ -1,663 +1,38 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2015 Atos, CEA, Christian W. Damus, and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Mathieu Velten (Atos) - Initial API and implementation

- *  Arthur Daussy (Atos) - 363826: [Model Explorer] Drag and drop and undo, incorrect behavior

- *  Christian W. Damus (CEA) - 404220: Add contexts for tracking objects changed by operations (CDO)

- *  Christian W. Damus (CEA) - bug 402525

- *  Christian W. Damus (CEA) - bug 430648

- *  Christian W. Damus (CEA) - bug 431023

- *  Christian W. Damus (CEA) - bug 384169

- *  Christian W. Damus - bug 459746

- *

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

-package org.eclipse.papyrus.commands;

-

-import static org.eclipse.papyrus.commands.util.OperationUtils.anyDirtying;

-import static org.eclipse.papyrus.commands.util.OperationUtils.isDirty;

-

-import java.util.Collection;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-

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

-import org.eclipse.core.commands.operations.IOperationHistory;

-import org.eclipse.core.commands.operations.IOperationHistoryListener;

-import org.eclipse.core.commands.operations.IUndoContext;

-import org.eclipse.core.commands.operations.IUndoableOperation;

-import org.eclipse.core.commands.operations.OperationHistoryEvent;

-import org.eclipse.core.commands.operations.UndoContext;

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

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

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

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

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

-import org.eclipse.emf.common.command.CommandStackListener;

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

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

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

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

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

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

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

-import org.eclipse.emf.transaction.impl.AbstractTransactionalCommandStack;

-import org.eclipse.emf.transaction.impl.EMFCommandTransaction;

-import org.eclipse.emf.transaction.impl.InternalTransaction;

-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;

-import org.eclipse.emf.transaction.impl.TriggerCommandTransaction;

-import org.eclipse.emf.transaction.util.TriggerCommand;

-import org.eclipse.emf.workspace.EMFCommandOperation;

-import org.eclipse.emf.workspace.IResourceUndoContextPolicy;

-import org.eclipse.emf.workspace.IWorkspaceCommandStack;

-import org.eclipse.emf.workspace.ResourceUndoContext;

-import org.eclipse.emf.workspace.impl.EMFOperationTransaction;

-import org.eclipse.emf.workspace.impl.WorkspaceCommandStackImpl;

-import org.eclipse.emf.workspace.internal.EMFWorkspacePlugin;

-import org.eclipse.emf.workspace.internal.EMFWorkspaceStatusCodes;

-import org.eclipse.emf.workspace.internal.Tracing;

-import org.eclipse.emf.workspace.internal.l10n.Messages;

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

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

-import org.eclipse.papyrus.commands.util.NonDirtyingUtils;

-

-/**

- * Copied from WorkspaceCommandStackImpl but modify in order to change the

- * IUndoContext. We want to make it point the the TransactionalEditingDomain. To

- * see what really change in this class from original implementation look for

- * "HAS CHANGE FROM ORIGINAL IMPLEMENTATION" in Java Doc.

- *

- */

-public class NotifyingWorkspaceCommandStack extends AbstractTransactionalCommandStack// AbstractTransactionalCommandStack

-		implements IWorkspaceCommandStack {

-

-	private final IOperationHistory history;

-

-	private DomainListener domainListener;

-

-	private IResourceUndoContextPolicy undoContextPolicy = IResourceUndoContextPolicy.DEFAULT;

-

-	private IUndoableOperation currentOperation;

-

-	private Set<Resource> historyAffectedResources;

-

-	/**

-	 * HAS CHANGE FROM ORIGINAL IMPLEMENTATION TO USE {@link EditingDomainUndoContext}

-	 */

-	private IUndoContext defaultContext = null;

-

-	private IUndoContext savedContext = null;

-

-	private IUndoableOperation mostRecentOperation;

-

-	/**

-	 * Initializes me with the operation history to which I delegate command

-	 * execution.

-	 *

-	 * @param history

-	 *            my operation history

-	 */

-	public NotifyingWorkspaceCommandStack(IOperationHistory history) {

-		super();

-		this.history = history;

-		domainListener = new DomainListener();

-		defaultContext = new UndoContext() {

-

-			@Override

-			public String getLabel() {

-				return getDefaultUndoContextLabel();

-			}

-

-			@Override

-			public String toString() {

-				return getLabel();

-			}

-		};

-	}

-

-	/**

-	 * map with registered listeners and the corresponding proxy registered to

-	 * actual map

-	 */

-	private Map<CommandStackListener, IOperationHistoryListener> proxyOperationListeners = new HashMap<CommandStackListener, IOperationHistoryListener>();

-

-	@Override

-	public void addCommandStackListener(final CommandStackListener listener) {

-		removeCommandStackListener(listener);

-		IOperationHistoryListener proxy = new IOperationHistoryListener() {

-

-			public void historyNotification(OperationHistoryEvent event) {

-				int type = event.getEventType();

-				// emf stack only needs to be notified when an operation is

-				// finished

-				if (OperationHistoryEvent.DONE == type || OperationHistoryEvent.REDONE == type || OperationHistoryEvent.UNDONE == type) {

-					listener.commandStackChanged(new EventObject(NotifyingWorkspaceCommandStack.this));

-				}

-			}

-		};

-		getOperationHistory().addOperationHistoryListener(proxy);

-		proxyOperationListeners.put(listener, proxy);

-	}

-

-	@Override

-	public void removeCommandStackListener(CommandStackListener listener) {

-		IOperationHistoryListener proxy = proxyOperationListeners.remove(listener);

-		if (proxy != null) {

-			getOperationHistory().removeOperationHistoryListener(proxy);

-		}

-	}

-

-	/**

-	 * Extends the superclass implementation to add/remove listeners on the

-	 * editing domain. HAS CHANGE FROM ORIGINAL IMPLEMENTATION TO USE {@link EditingDomainUndoContext}

-	 */

-	@Override

-	public void setEditingDomain(InternalTransactionalEditingDomain domain) {

-		InternalTransactionalEditingDomain oldDomain = getDomain();

-		if (oldDomain != null) {

-			oldDomain.removeResourceSetListener(domainListener);

-			history.removeOperationHistoryListener(domainListener);

-		}

-		super.setEditingDomain(domain);

-		/*

-		 * HAS CHANGE FROM ORIGINAL IMPLEMENTATION TO USE {@link

-		 * EditingDomainUndoContext}

-		 */

-		if (getDomain() != null) {

-			boolean domainHasChanged = oldDomain == null || !oldDomain.equals(getDomain());

-			if (domainHasChanged) {

-				defaultContext = new EditingDomainUndoContext(domain, getDefaultUndoContextLabel());

-			}

-		}

-		if (domain != null) {

-			history.addOperationHistoryListener(domainListener);

-			domain.addResourceSetListener(domainListener);

-		}

-	}

-

-	// Documentation copied from the method specification

-	public final IOperationHistory getOperationHistory() {

-		return history;

-	}

-

-	// Documentation copied from the method specification

-	public IUndoContext getDefaultUndoContext() {

-		return defaultContext;

-	}

-

-	/**

-	 * Obtains the label to display for the default undo context that I apply to

-	 * operations executed through me as {@link Command}s. Subclasses may

-	 * override to customize the label.

-	 *

-	 * @return my default undo context label

-	 *

-	 * @since 1.2

-	 */

-	protected String getDefaultUndoContextLabel() {

-		String domainID = (getDomain() == null) ? null : getDomain().getID();

-		if (domainID == null) {

-			domainID = String.valueOf(domainID); // guaranteed to be safe

-		}

-		return NLS.bind(Messages.cmdStkCtxLabel, domainID);

-	}

-

-	private final IUndoContext getSavedContext() {

-		if (savedContext == null) {

-			savedContext = new UndoContext() {

-

-				@Override

-				public String getLabel() {

-					return getSavepointUndoContextLabel();

-				}

-

-				@Override

-				public String toString() {

-					return getLabel();

-				}

-			};

-		}

-		return savedContext;

-	}

-

-	/**

-	 * Obtains the label to display for the save-point undo context that I apply

-	 * to the last operation in my {@linkplain #getDefaultUndoContext() default

-	 * undo context} that was executed at the time save was performed (as

-	 * indicated by invocation of the {@link #saveIsDone()} method). Subclasses

-	 * may override to customize the label.

-	 *

-	 * @return my save-point undo context label

-	 *

-	 * @since 1.2

-	 */

-	protected String getSavepointUndoContextLabel() {

-		String domainID = (getDomain() == null) ? null : getDomain().getID();

-		if (domainID == null) {

-			domainID = String.valueOf(domainID); // guaranteed to be safe

-		}

-		return NLS.bind(Messages.cmdStkSaveCtxLabel, domainID);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * @since 1.1

-	 */

-	@Override

-	protected void doExecute(Command command, Map<?, ?> options) throws InterruptedException, RollbackException {

-		IUndoableOperation oper = NonDirtyingUtils.wrap(getDomain(), command, options);

-		// add the appropriate context

-		oper.addContext(getDefaultUndoContext());

-		try {

-			IStatus status = history.execute(oper, new NullProgressMonitor(), null);

-			if (status.getSeverity() >= IStatus.ERROR) {

-				// the transaction must have rolled back if the status was

-				// error or worse

-				RollbackException exc = new RollbackException(status);

-				Tracing.throwing(WorkspaceCommandStackImpl.class, "execute", exc); //$NON-NLS-1$

-				throw exc;

-			}

-			notifyListeners();

-		} catch (ExecutionException e) {

-			Tracing.catching(WorkspaceCommandStackImpl.class, "execute", e); //$NON-NLS-1$

-			command.dispose();

-			if (e.getCause() instanceof RollbackException) {

-				// throw the rollback

-				RollbackException exc = (RollbackException) e.getCause();

-				Tracing.throwing(WorkspaceCommandStackImpl.class, "execute", exc); //$NON-NLS-1$

-				throw exc;

-			} else if (e.getCause() instanceof RuntimeException) {

-				// throw the programming error

-				RuntimeException exc = (RuntimeException) e.getCause();

-				Tracing.throwing(WorkspaceCommandStackImpl.class, "execute", exc); //$NON-NLS-1$

-				throw exc;

-			} else {

-				// log the problem. We can't rethrow whatever it was

-				handleError(e);

-			}

-		}

-	}

-

-	/**

-	 * Queries whether we can undo my default undo context in my operation

-	 * history.

-	 */

-	@Override

-	public boolean canUndo() {

-		return getOperationHistory().canUndo(getDefaultUndoContext());

-	}

-

-	/**

-	 * Undoes my default undo context in my operation history.

-	 */

-	@Override

-	public void undo() {

-		try {

-			getOperationHistory().undo(getDefaultUndoContext(), new NullProgressMonitor(), null);

-		} catch (ExecutionException e) {

-			Tracing.catching(WorkspaceCommandStackImpl.class, "undo", e); //$NON-NLS-1$

-			// can't throw anything from this method

-			handleError(e);

-		} finally {

-			// notify even if there was an error; clients should check to see

-			// that the command stack is flushed

-			notifyListeners();

-		}

-	}

-

-	/**

-	 * Queries whether we can redo my default undo context in my operation

-	 * history.

-	 */

-	@Override

-	public boolean canRedo() {

-		return getOperationHistory().canRedo(getDefaultUndoContext());

-	}

-

-	/**

-	 * Redoes my default undo context in my operation history.

-	 */

-	@Override

-	public void redo() {

-		try {

-			getOperationHistory().redo(getDefaultUndoContext(), new NullProgressMonitor(), null);

-		} catch (ExecutionException e) {

-			Tracing.catching(WorkspaceCommandStackImpl.class, "redo", e); //$NON-NLS-1$

-			// can't throw anything from this method

-			handleError(e);

-		} finally {

-			// notify even if there was an error; clients should check to see

-			// that the command stack is flushed

-			notifyListeners();

-		}

-	}

-

-	/**

-	 * Disposes my default undo context in my operation history.

-	 */

-	@Override

-	public void flush() {

-		getOperationHistory().dispose(getDefaultUndoContext(), true, true, true);

-		if (savedContext != null) {

-			getOperationHistory().dispose(getSavedContext(), true, true, true);

-			savedContext = null;

-		}

-	}

-

-	/**

-	 * Gets the command from the most recently executed, done, or redone

-	 * operation.

-	 */

-	@Override

-	public Command getMostRecentCommand() {

-		Command result = null;

-		if (mostRecentOperation instanceof EMFCommandOperation) {

-			result = ((EMFCommandOperation) mostRecentOperation).getCommand();

-		}

-		return result;

-	}

-

-	/**

-	 * Gets the command from the top of the undo history, if any.

-	 */

-	@Override

-	public Command getUndoCommand() {

-		Command result = null;

-		IUndoableOperation topOperation = getOperationHistory().getUndoOperation(getDefaultUndoContext());

-		if (topOperation instanceof EMFCommandOperation) {

-			result = ((EMFCommandOperation) topOperation).getCommand();

-		}

-		return result;

-	}

-

-	/**

-	 * Gets the command from the top of the redo history, if any.

-	 */

-	@Override

-	public Command getRedoCommand() {

-		Command result = null;

-		IUndoableOperation topOperation = getOperationHistory().getRedoOperation(getDefaultUndoContext());

-		if (topOperation instanceof EMFCommandOperation) {

-			result = ((EMFCommandOperation) topOperation).getCommand();

-		}

-		return result;

-	}

-

-	// Documentation copied from the method specification

-	public EMFCommandTransaction createTransaction(Command command, Map<?, ?> options) throws InterruptedException {

-		EMFCommandTransaction result;

-		if (command instanceof TriggerCommand) {

-			result = new TriggerCommandTransaction((TriggerCommand) command, getDomain(), options);

-		} else {

-			result = new EMFOperationTransaction(command, getDomain(), options);

-		}

-		result.start();

-		return result;

-	}

-

-	// Documentation copied from the method specification

-	public void executeTriggers(Command command, List<Command> triggers, Map<?, ?> options) throws InterruptedException, RollbackException {

-		if (!triggers.isEmpty()) {

-			TriggerCommand trigger = (command == null) ? new TriggerCommand(triggers) : new TriggerCommand(command, triggers);

-			InternalTransaction tx = createTransaction(trigger, makeTriggerTransactionOptions(options));

-			try {

-				trigger.execute();

-				InternalTransaction parent = (InternalTransaction) tx.getParent();

-				// shouldn't be null if we're executing triggers!

-				if (parent != null) {

-					parent.addTriggers(trigger);

-				}

-				// commit the transaction now

-				tx.commit();

-			} catch (RuntimeException e) {

-				Tracing.catching(WorkspaceCommandStackImpl.class, "executeTriggers", e); //$NON-NLS-1$

-				IStatus status;

-				if (e instanceof OperationCanceledException) {

-					status = Status.CANCEL_STATUS;

-				} else {

-					status = new Status(IStatus.ERROR, EMFWorkspacePlugin.getPluginId(), EMFWorkspaceStatusCodes.PRECOMMIT_FAILED, Messages.precommitFailed, e);

-				}

-				RollbackException rbe = new RollbackException(status);

-				Tracing.throwing(WorkspaceCommandStackImpl.class, "executeTriggers", rbe); //$NON-NLS-1$

-				throw rbe;

-			} finally {

-				if ((tx != null) && (tx.isActive())) {

-					// roll back because an uncaught exception occurred

-					rollback(tx);

-				}

-			}

-		}

-	}

-

-	// Documentation copied from the method specification

-	public void dispose() {

-		setEditingDomain(null); // remove listeners

-		domainListener = null;

-		historyAffectedResources = null;

-		mostRecentOperation = null;

-

-		// remove listeners registered in opertationHistory

-		Collection<IOperationHistoryListener> values = proxyOperationListeners.values();

-		for (IOperationHistoryListener proxy : values) {

-			getOperationHistory().removeOperationHistoryListener(proxy);

-		}

-		proxyOperationListeners.clear();

-

-		// Flush default and savepoint undo contexts

-		flush();

-	}

-

-	/**

-	 * Obtains my resource undo-context policy.

-	 *

-	 * @return my resource undo-context policy

-	 *

-	 * @since 1.3

-	 */

-	public IResourceUndoContextPolicy getResourceUndoContextPolicy() {

-		return undoContextPolicy;

-	}

-

-	/**

-	 * Sets my resource undo-context policy.

-	 *

-	 * @param policy

-	 *            my new policy, or <code>null</code> to restore the default

-	 *

-	 * @since 1.3

-	 */

-	public void setResourceUndoContextPolicy(IResourceUndoContextPolicy policy) {

-		this.undoContextPolicy = policy;

-	}

-

-	/**

-	 * A listener on the editing domain and operation history that tracks which

-	 * resources are changed by an operation and attaches the appropriate {@link ResourceUndoContext} to it when it completes.

-	 *

-	 * @author Christian W. Damus (cdamus)

-	 */

-	private class DomainListener extends ResourceSetListenerImpl implements IOperationHistoryListener {

-

-		public void historyNotification(OperationHistoryEvent event) {

-			final IUndoableOperation operation = event.getOperation();

-			switch (event.getEventType()) {

-			case OperationHistoryEvent.ABOUT_TO_EXECUTE:

-				// set up to remember affected resources in case we make EMF

-				// changes

-				currentOperation = operation;

-				historyAffectedResources = new java.util.HashSet<Resource>();

-				break;

-			case OperationHistoryEvent.DONE:

-				if ((historyAffectedResources != null) && !historyAffectedResources.isEmpty()) {

-					// add my undo context to the operation that has

-					// completed, but only if the operation actually changed

-					// any of my resources (in case this history is shared

-					// with other domains)

-					for (Resource next : historyAffectedResources) {

-						operation.addContext(new ResourceUndoContext(getDomain(), next));

-					}

-				}

-				currentOperation = null;

-				historyAffectedResources = null;

-				if (operation.hasContext(getDefaultUndoContext())) {

-					mostRecentOperation = operation;

-				}

-				break;

-			case OperationHistoryEvent.OPERATION_NOT_OK:

-				// just forget about the context because this operation

-				// failed

-				currentOperation = null;

-				historyAffectedResources = null;

-				break;

-			case OperationHistoryEvent.UNDONE:

-			case OperationHistoryEvent.REDONE:

-				if (operation.hasContext(getDefaultUndoContext())) {

-					mostRecentOperation = operation;

-				}

-				break;

-			case OperationHistoryEvent.OPERATION_REMOVED:

-				if (operation == mostRecentOperation) {

-					mostRecentOperation = null;

-				}

-				break;

-			}

-		}

-

-		@Override

-		public void resourceSetChanged(ResourceSetChangeEvent event) {

-			IUndoableOperation operation = null;

-			Set<Resource> unloaded = getUnloadedResources(event.getNotifications());

-			if (unloaded != null) {

-				// dispose their undo contexts

-				for (Resource next : unloaded) {

-					getOperationHistory().dispose(new ResourceUndoContext(getDomain(), next), true, true, true);

-				}

-			}

-			Transaction tx = event.getTransaction();

-			if (tx != null) {

-				operation = (IUndoableOperation) tx.getOptions().get(EMFWorkspacePlugin.OPTION_OWNING_OPERATION);

-			}

-			if (operation == null) {

-				operation = currentOperation;

-			}

-			if (operation != null) {

-				Set<Resource> affectedResources = getResourceUndoContextPolicy().getContextResources(operation, event.getNotifications());

-				if (unloaded != null) {

-					// don't add these resources to the operation

-					affectedResources.removeAll(unloaded);

-				}

-				if (!affectedResources.isEmpty()) {

-					// add any resource undo contexts to this operation that are

-					// not already applied

-					for (Resource next : affectedResources) {

-						ResourceUndoContext ctx = new ResourceUndoContext(getDomain(), next);

-						if (!operation.hasContext(ctx)) {

-							operation.addContext(ctx);

-						}

-					}

-				}

-				if (historyAffectedResources != null) {

-					// there is an operation executing on our history that is

-					// affecting my editing domain. Remember the affected

-					// resources.

-					historyAffectedResources.addAll(affectedResources);

-				}

-

-				hookUndoContexts(operation, event);

-			}

-		}

-

-		/**

-		 * Finds resources that have sent unload notifications.

-		 *

-		 * @param notifications

-		 *            notifications received from a transaction

-		 * @return a set of resources that the notifications indicate have been

-		 *         unloaded, or <code>null</code> if none

-		 */

-		private Set<Resource> getUnloadedResources(Collection<Notification> notifications) {

-			Set<Resource> result = null;

-			for (Notification next : notifications) {

-				if (NotificationFilter.RESOURCE_UNLOADED.matches(next)) {

-					if (result == null) {

-						result = new java.util.HashSet<Resource>();

-					}

-					result.add((Resource) next.getNotifier());

-				}

-			}

-			return result;

-		}

-

-		@Override

-		public boolean isPostcommitOnly() {

-			// only interested in post-commit "resourceSetChanged" event

-			return true;

-		}

-	}

-

-	/**

-	 * A hook for subclasses to attach additional undo-contexts to an {@code operation} based on changes

-	 * in the resource set.

-	 *

-	 * @param operation

-	 *            an operation that has been executed (never {@code null})

-	 * @param event

-	 *            the description of changes made by the {@code operation} in the resource set

-	 */

-	protected void hookUndoContexts(IUndoableOperation operation, ResourceSetChangeEvent event) {

-		// pass

-	}

-

-

-	@Override

-	public boolean isSaveNeeded() {

-		// This class inherits from AbstractTransactionalCommandStack which in turn inherits from BasicCommandStack.

-

-		// The operation isSaveNeeded is defined in BasicCommandStack. In order to work, it requires an update of the

-		// variables "saveIndex" and "top" which is done in BasicCommandStack::execute. However, this operation is overridden

-		// in method AbstractTransactionalCommandStack::execute which never calls the superclass method BasicCommandStack::execute.

-		// Thus, we cannot rely on the super class method of isSaveNeeded (although it seems to work in some cases).

-		// => so we have to implement the isSaveNeeded method here.

-		IUndoableOperation nextUndoableOperation = history.getUndoOperation(getDefaultUndoContext());

-		if (nextUndoableOperation == null) {

-			// this is the last undoable operation. But the document might have been saved at some operation now on the redo stack

-			return savedContext != null;

-		}

-		return savedContext != null ? !nextUndoableOperation.hasContext(getSavedContext()) && isDirty(history.getUndoHistory(getDefaultUndoContext()), history.getRedoHistory(getDefaultUndoContext()), history.getUndoOperation(savedContext))

-				: anyDirtying(history.getUndoHistory(getDefaultUndoContext()));

-	}

-

-	@Override

-	public void saveIsDone() {

-		// See comment for isSaveNeeded

-		if (savedContext != null) {

-			// The save context is only stored on one operation. We must

-			// remove it from any other operation that may have contained it

-			// before.

-			IUndoableOperation[] undoableOperations = history.getUndoHistory(getSavedContext());

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

-				undoableOperations[i].removeContext(getSavedContext());

-			}

-			IUndoableOperation[] redoableOperations = history.getRedoHistory(getSavedContext());

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

-				redoableOperations[i].removeContext(getSavedContext());

-			}

-		}

-		IUndoableOperation nextUndoableOperation = history.getUndoOperation(getDefaultUndoContext());

-		if (nextUndoableOperation == null) {

-			// We no longer have any operation that was saved

-			savedContext = null;

-			return;

-		}

-		nextUndoableOperation.addContext(getSavedContext());

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 Atos, CEA, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mathieu Velten (Atos) - Initial API and implementation
+ *  Arthur Daussy (Atos) - 363826: [Model Explorer] Drag and drop and undo, incorrect behavior
+ *  Christian W. Damus (CEA) - 404220: Add contexts for tracking objects changed by operations (CDO)
+ *  Christian W. Damus (CEA) - bugs 402525, 430648, 431023, 384169
+ *  Christian W. Damus - bugs 459746, 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.commands;
+
+import org.eclipse.core.commands.operations.IOperationHistory;
+
+/**
+ * @deprecated Use the {@link org.eclipse.papyrus.infra.emf.gmf.command.NotifyingWorkspaceCommandStack} API, instead.
+ */
+@Deprecated
+public class NotifyingWorkspaceCommandStack extends org.eclipse.papyrus.infra.emf.gmf.command.NotifyingWorkspaceCommandStack {
+
+	/**
+	 * Initializes me with the operation history to which I delegate command
+	 * execution.
+	 *
+	 * @param history
+	 *            my operation history
+	 */
+	public NotifyingWorkspaceCommandStack(IOperationHistory history) {
+		super(history);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/util/CommandTreeIterator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/util/CommandTreeIterator.java
index 9285142a88a..0da082a63b6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/util/CommandTreeIterator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/util/CommandTreeIterator.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2015 Christian W. Damus and others.
+ * Copyright (c) 2015, 2016 Christian W. Damus and others.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -26,17 +26,20 @@ import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;
 import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.papyrus.commands.wrappers.EMFtoGEFCommandWrapper;
-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.commands.wrappers.GMFtoGEFCommandWrapper;
 import org.eclipse.papyrus.commands.wrappers.OperationToGEFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 
 /**
  * An iterator over the tree structure of EMF, GEF, and GMF commands that returns leaf commands of one or all of these kinds,
  * with accounting for the various kinds of wrappers employed to intermix them. This iterator does not support the
  * optional {@link Iterator#remove()} operation.
+ * 
+ * @deprecated Use the {@link org.eclipse.papyrus.infra.emf.gmf.util.CommandTreeIterator} API, instead.
  */
+@Deprecated
 public class CommandTreeIterator<C> implements Iterator<C> {
 	private final Class<C> type;
 
@@ -130,6 +133,7 @@ public class CommandTreeIterator<C> implements Iterator<C> {
 		return (current == null) && iterators.isEmpty();
 	}
 
+	@Override
 	public boolean hasNext() {
 		while (!isDone() && (preparedNext == null)) {
 			Object next = internalNext();
@@ -141,6 +145,7 @@ public class CommandTreeIterator<C> implements Iterator<C> {
 		return preparedNext != null;
 	}
 
+	@Override
 	public C next() {
 		if (!hasNext()) {
 			throw new NoSuchElementException();
@@ -154,6 +159,7 @@ public class CommandTreeIterator<C> implements Iterator<C> {
 	/**
 	 * Remove is not supported.
 	 */
+	@Override
 	public void remove() {
 		throw new UnsupportedOperationException("remove"); //$NON-NLS-1$
 	}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/util/NonDirtyingUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/util/NonDirtyingUtils.java
index 2241b69c7be..2f675b9399e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/util/NonDirtyingUtils.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/util/NonDirtyingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 CEA and others.
+ * Copyright (c) 2014, 2016 CEA, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,6 +8,7 @@
  *
  * Contributors:
  *   Christian W. Damus (CEA) - Initial API and implementation
+ *   Christian W. Damus - bug 485220
  *
  */
 package org.eclipse.papyrus.commands.util;
@@ -19,11 +20,10 @@ import org.eclipse.emf.common.command.AbstractCommand;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.command.CompoundCommand;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.EMFCommandOperation;
 import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-import org.eclipse.papyrus.commands.INonDirtying;
+import org.eclipse.papyrus.infra.emf.gmf.command.INonDirtying;
 
 
 /**
@@ -31,7 +31,10 @@ import org.eclipse.papyrus.commands.INonDirtying;
  *
  * @see INonDirtying
  * @see AbstractCommand.NonDirtying
+ * 
+ * @deprecated Use the {@link org.eclipse.papyrus.infra.emf.gmf.util.CommandUtils} API, instead.
  */
+@Deprecated
 public class NonDirtyingUtils {
 
 	/**
@@ -42,21 +45,15 @@ public class NonDirtyingUtils {
 	}
 
 	public static IUndoableOperation wrap(TransactionalEditingDomain domain, Command command) {
-		if (command instanceof AbstractCommand.NonDirtying) {
-			return new NonDirtyingEMFCommandOperation(domain, command);
-		}
-		return new EMFCommandOperation(domain, command);
+		return org.eclipse.papyrus.infra.emf.gmf.util.CommandUtils.wrap(domain, command);
 	}
 
 	public static IUndoableOperation wrap(TransactionalEditingDomain domain, Command command, Map<?, ?> options) {
-		if (command instanceof AbstractCommand.NonDirtying) {
-			return new NonDirtyingEMFCommandOperation(domain, command, options);
-		}
-		return new EMFCommandOperation(domain, command, options);
+		return org.eclipse.papyrus.infra.emf.gmf.util.CommandUtils.wrap(domain, command, options);
 	}
 
 	public static CompoundCommand nonDirtyingEMFCompound() {
-		return new NonDirtyingEMFCompoundCommand();
+		return org.eclipse.papyrus.infra.emf.gmf.util.CommandUtils.nonDirtyingEMFCompound();
 	}
 
 	/**
@@ -79,10 +76,7 @@ public class NonDirtyingUtils {
 	}
 
 	public static Command chain(Command command1, Command command2) {
-		if ((command1 instanceof AbstractCommand.NonDirtying) && (command2 instanceof AbstractCommand.NonDirtying)) {
-			return new NonDirtyingEMFCompoundCommand().chain(command1).chain(command2);
-		}
-		return command1.chain(command2);
+		return org.eclipse.papyrus.infra.emf.gmf.util.CommandUtils.chain(command1, command2);
 	}
 
 	public static org.eclipse.gef.commands.CompoundCommand nonDirtyingGEFCompound() {
@@ -97,71 +91,17 @@ public class NonDirtyingUtils {
 	}
 
 	public static CompositeCommand nonDirtyingGMFComposite(String label) {
-		return new NonDirtyingGMFCompositeCommand(label);
+		return org.eclipse.papyrus.infra.emf.gmf.util.CommandUtils.nonDirtyingGMFComposite(label);
 	}
 
 	public static ICommand compose(ICommand command1, ICommand command2) {
-		if ((command1 instanceof INonDirtying) && (command2 instanceof INonDirtying)) {
-			return new NonDirtyingGMFCompositeCommand(command1.getLabel()).compose(command1).compose(command2);
-		}
-		return command1.compose(command2);
+		return org.eclipse.papyrus.infra.emf.gmf.util.CommandUtils.compose(command1, command2);
 	}
 
 	//
 	// Nested types
 	//
 
-	private static class NonDirtyingEMFCommandOperation extends EMFCommandOperation implements INonDirtying {
-
-		NonDirtyingEMFCommandOperation(TransactionalEditingDomain domain, Command command, Map<?, ?> options) {
-			super(domain, checkCommand(command), options);
-		}
-
-		NonDirtyingEMFCommandOperation(TransactionalEditingDomain domain, Command command) {
-			super(domain, checkCommand(command));
-		}
-
-		static Command checkCommand(Command command) {
-			if (!(command instanceof AbstractCommand.NonDirtying)) {
-				throw new IllegalStateException("Attempt to wrap dirtying command in a non-dirtying operation."); //$NON-NLS-1$
-			}
-			return command;
-		}
-	}
-
-	private static class NonDirtyingEMFCompoundCommand extends CompoundCommand implements AbstractCommand.NonDirtying {
-
-		@Override
-		public void append(Command command) {
-			checkNonDirtying(command);
-			super.append(command);
-		}
-
-		@Override
-		public boolean appendAndExecute(Command command) {
-			checkNonDirtying(command);
-			return super.appendAndExecute(command);
-		}
-
-		@Override
-		public boolean appendIfCanExecute(Command command) {
-			checkNonDirtying(command);
-			return super.appendIfCanExecute(command);
-		}
-
-		@Override
-		public Command chain(Command command) {
-			append(command);
-			return this;
-		}
-
-		private void checkNonDirtying(Command command) {
-			if (!(command instanceof AbstractCommand.NonDirtying)) {
-				throw new IllegalArgumentException("Attempt to append a dirtying command to a non-dirtying compound."); //$NON-NLS-1$
-			}
-		}
-	}
-
 	private static class NonDirtyingGEFCompoundCommand extends org.eclipse.gef.commands.CompoundCommand implements INonDirtying {
 
 		@Override
@@ -186,25 +126,6 @@ public class NonDirtyingUtils {
 		}
 	}
 
-	private static class NonDirtyingGMFCompositeCommand extends CompositeCommand implements INonDirtying {
-
-		NonDirtyingGMFCompositeCommand(String label) {
-			super(label);
-		}
-
-		@Override
-		public void add(IUndoableOperation operation) {
-			checkNonDirtying(operation);
-			super.add(operation);
-		}
-
-		private void checkNonDirtying(IUndoableOperation operation) {
-			if (!(operation instanceof INonDirtying)) {
-				throw new IllegalArgumentException("Attempt to append a dirtying operation to a non-dirtying composite."); //$NON-NLS-1$
-			}
-		}
-	}
-
 	private static class NonDirytingCommandProxy extends CommandProxy implements INonDirtying {
 
 		NonDirytingCommandProxy(org.eclipse.gef.commands.Command command) {
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/util/OperationHistoryDirtyState.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/util/OperationHistoryDirtyState.java
index 10e14b0b7e6..d42818e0765 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/util/OperationHistoryDirtyState.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/util/OperationHistoryDirtyState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 CEA and others.
+ * Copyright (c) 2014, 2016 CEA, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,48 +8,32 @@
  *
  * Contributors:
  *   Christian W. Damus (CEA) - Initial API and implementation
+ *   Christian W. Damus - bug 485220
  *
  */
 package org.eclipse.papyrus.commands.util;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.IOperationHistoryListener;
 import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.commands.operations.OperationHistoryEvent;
 import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.papyrus.commands.INonDirtying;
+import org.eclipse.papyrus.infra.emf.gmf.command.INonDirtying;
 
 
 /**
  * A utility class for tracking the dirty state of an operation history. It works in the
  * same fashion as the EMF {@link BasicCommandStack}, accounting for operations that {@linkplain INonDirtying do not dirty} the editor.
+ * 
+ * @deprecated Use the {@link org.eclipse.papyrus.infra.emf.gmf.util.OperationHistoryDirtyState} API, instead.
  */
-public class OperationHistoryDirtyState {
-
-	private static final Map<IUndoContext, OperationHistoryDirtyState> instances = new HashMap<IUndoContext, OperationHistoryDirtyState>();
-
-	private final AtomicInteger refCount = new AtomicInteger(0);
-
-	private final IUndoContext context;
-
-	private final IOperationHistory history;
-
-	private IOperationHistoryListener listener;
-
-	private IUndoableOperation savepoint;
-
-	private boolean forceDirty;
+@Deprecated
+public class OperationHistoryDirtyState extends org.eclipse.papyrus.infra.emf.gmf.util.OperationHistoryDirtyState.Delegator {
 
 	private OperationHistoryDirtyState(IUndoContext context, IOperationHistory history) {
-		this.context = context;
-		this.history = history;
+		super(context, history);
+	}
 
-		history.addOperationHistoryListener(createOperationHistoryListener());
+	private OperationHistoryDirtyState(org.eclipse.papyrus.infra.emf.gmf.util.OperationHistoryDirtyState delegate) {
+		super(delegate);
 	}
 
 	/**
@@ -57,86 +41,19 @@ public class OperationHistoryDirtyState {
 	 * even if it is actually the same instance as returned by an earlier call, because instances are reference-counted.
 	 */
 	public static OperationHistoryDirtyState newInstance(IUndoContext context, IOperationHistory history) {
-		OperationHistoryDirtyState result;
-
-		synchronized (instances) {
-			result = instances.get(context);
-			if (result == null) {
-				result = new OperationHistoryDirtyState(context, history);
-				instances.put(context, result);
-			}
-		}
-
-		result.retain();
-		return result;
+		return adapt(getInstance(context, history, OperationHistoryDirtyState::new));
 	}
 
-	private IOperationHistoryListener createOperationHistoryListener() {
-		this.listener = new IOperationHistoryListener() {
-
-			public void historyNotification(OperationHistoryEvent event) {
-				switch (event.getEventType()) {
-				case OperationHistoryEvent.DONE:
-				case OperationHistoryEvent.UNDONE:
-				case OperationHistoryEvent.REDONE:
-				case OperationHistoryEvent.OPERATION_CHANGED:
-					// Check on our savepoint, if any
-					if ((savepoint != null) && !savepoint.hasContext(context)) {
-						// Our savepoint has been removed from the context (our undo/redo stack), so it
-						// is effectively lost
-						savepoint = null;
-					}
-					break;
-				case OperationHistoryEvent.OPERATION_REMOVED:
-					IUndoableOperation removed = event.getOperation();
-					if (removed != null) {
-						if (removed == savepoint) {
-							// the savepoint was removed, so now we can never return to it
-							savepoint = null;
-						} else if ((savepoint == null) && removed.hasContext(context) && !OperationUtils.isNonDirtying(removed)) {
-							// A dirtying operation has been lost from the history, so we will not now be able to return
-							// to a state equivalent to the savepoint
-							forceDirty = true;
-						}
-					}
-					break;
-				}
-			}
-		};
-
-		return this.listener;
-	}
-
-	private OperationHistoryDirtyState retain() {
-		refCount.incrementAndGet();
-		return this;
-	}
-
-	private boolean release() {
-		return refCount.decrementAndGet() == 0;
-	}
-
-	public void dispose() {
-		synchronized (instances) {
-			if (release()) {
-				instances.remove(context);
-
-				if (listener != null) {
-					history.removeOperationHistoryListener(listener);
-					listener = null;
-				}
+	private static OperationHistoryDirtyState adapt(org.eclipse.papyrus.infra.emf.gmf.util.OperationHistoryDirtyState state) {
+		OperationHistoryDirtyState result;
 
-				savepoint = null;
-			}
+		if (state instanceof OperationHistoryDirtyState) {
+			result = (OperationHistoryDirtyState) state;
+		} else {
+			result = new OperationHistoryDirtyState(state);
 		}
-	}
 
-	public boolean isDirty() {
-		return forceDirty || OperationUtils.isDirty(history.getUndoHistory(context), history.getRedoHistory(context), savepoint);
+		return result;
 	}
 
-	public void saved() {
-		this.savepoint = history.getUndoOperation(context);
-		this.forceDirty = false;
-	}
 }
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/util/OperationUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/util/OperationUtils.java
index dd809a3588a..7b8d2376bd1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/util/OperationUtils.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/util/OperationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 CEA and others.
+ * Copyright (c) 2014, 2016 CEA, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,25 +8,22 @@
  *
  * Contributors:
  *   Christian W. Damus (CEA) - Initial API and implementation
+ *   Christian W. Damus - bug 485220
  *
  */
 package org.eclipse.papyrus.commands.util;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
 import org.eclipse.core.commands.operations.IUndoableOperation;
 import org.eclipse.emf.common.command.AbstractCommand;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.workspace.EMFCommandOperation;
-import org.eclipse.papyrus.commands.INonDirtying;
-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
 
 
 /**
  * Utilities for working with undoable operations.
+ * 
+ * @deprecated Use the {@link org.eclipse.papyrus.infra.emf.gmf.util.OperationUtils} API, instead.
  */
+@Deprecated
 public class OperationUtils {
 
 	/**
@@ -37,18 +34,7 @@ public class OperationUtils {
 	}
 
 	public static boolean anyDirtying(IUndoableOperation[] undoHistory) {
-		boolean result = false;
-
-		if ((undoHistory != null) && (undoHistory.length > 0)) {
-			for (int i = 0; i < undoHistory.length; i++) {
-				if (!isNonDirtying(undoHistory[i])) {
-					result = true;
-					break;
-				}
-			}
-		}
-
-		return result;
+		return org.eclipse.papyrus.infra.emf.gmf.util.OperationUtils.anyDirtying(undoHistory);
 	}
 
 	/**
@@ -60,12 +46,7 @@ public class OperationUtils {
 	 * @return whether it is a non-dirtying operation
 	 */
 	public static boolean isNonDirtying(IUndoableOperation operation) {
-		boolean result = operation instanceof INonDirtying;
-		if (!result) {
-			Command command = unwrap(operation);
-			result = command instanceof AbstractCommand.NonDirtying;
-		}
-		return result;
+		return org.eclipse.papyrus.infra.emf.gmf.util.OperationUtils.isNonDirtying(operation);
 	}
 
 	/**
@@ -77,63 +58,10 @@ public class OperationUtils {
 	 * @return the {@link Command} that it wraps, or {@code null} if it does not wrap a singular EMF command
 	 */
 	public static Command unwrap(IUndoableOperation operation) {
-		Command result = null;
-
-		if (operation instanceof EMFCommandOperation) {
-			result = ((EMFCommandOperation) operation).getCommand();
-		} else if (operation instanceof EMFtoGMFCommandWrapper) {
-			result = ((EMFtoGMFCommandWrapper) operation).getEMFCommand();
-		}
-
-		return result;
+		return org.eclipse.papyrus.infra.emf.gmf.util.OperationUtils.unwrap(operation);
 	}
 
 	public static boolean isDirty(IUndoableOperation[] undoHistory, IUndoableOperation[] redoHistory, IUndoableOperation savepoint) {
-		boolean result = false;
-
-		if (savepoint == null) {
-			result = anyDirtying(undoHistory);
-		} else {
-			List<IUndoableOperation> undos = ((undoHistory == null) || (undoHistory.length == 0)) ? Collections.<IUndoableOperation> emptyList() : Arrays.asList(undoHistory);
-			List<IUndoableOperation> redos = ((redoHistory == null) || (redoHistory.length == 0)) ? Collections.<IUndoableOperation> emptyList() : Arrays.asList(redoHistory);
-
-			if (undos.contains(savepoint)) {
-				// See whether there is any dirtying command after the savepoint in the undo stack
-				int i = 0;
-
-				for (; i < undoHistory.length; i++) {
-					if (undoHistory[i] == savepoint) {
-						i++; // Advance over the save point to start testing
-						break;
-					}
-				}
-
-				for (; i < undoHistory.length; i++) {
-					if (!isNonDirtying(undoHistory[i])) {
-						result = true;
-						break;
-					}
-				}
-			} else if (redos.contains(savepoint)) {
-				// See whether there is any dirtying command before the savepoint in the redo stack
-				for (int i = redoHistory.length - 1; i >= 0; i--) {
-					if (!isNonDirtying(redoHistory[i])) {
-						result = true;
-						break;
-					}
-					if (redoHistory[i] == savepoint) {
-						// Done scanning. Everything up to and including the savepoint is non-dirtying
-						break;
-					}
-				}
-			} else {
-				// If we have no history but we have a savepoint, then we cannot undo nor redo to that savepoint
-				// (the history has been flushed) so evidently some change was made that invalidated the history,
-				// therefore we are dirty
-				result = true;
-			}
-		}
-
-		return result;
+		return org.eclipse.papyrus.infra.emf.gmf.util.OperationUtils.isDirty(undoHistory, redoHistory, savepoint);
 	}
 }
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/EMFtoGEFCommandWrapper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/EMFtoGEFCommandWrapper.java
index b16f53ce55f..80e82d18b26 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/EMFtoGEFCommandWrapper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/EMFtoGEFCommandWrapper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2014 AIRBUS FRANCE, CEA, and others.
+ * Copyright (c) 2005, 2016 AIRBUS FRANCE, CEA, Christian W. Damus, and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -9,6 +9,7 @@
  *    David Sciamma (Anyware Technologies), Mathieu Garcia (Anyware Technologies),
  *    Jacques Lescot (Anyware Technologies) - initial API and implementation
  *    Christian W. Damus (CEA) - bug 430701
+ *    Christian W. Damus - bug 485220
  *
  *******************************************************************************/
 package org.eclipse.papyrus.commands.wrappers;
@@ -16,8 +17,8 @@ package org.eclipse.papyrus.commands.wrappers;
 import org.eclipse.emf.common.command.AbstractCommand;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.papyrus.commands.INonDirtying;
+import org.eclipse.papyrus.infra.emf.gmf.command.ICommandWrapper;
 
-// TODO: Auto-generated Javadoc
 /**
  * A GEF Command that wraps an EMF command. Each method is redirected to the EMF one. <br>
  * Adapts an {@link org.eclipse.emf.common.command.Command EMF Command} to be a {@link org.eclipse.gef.commands.Command GEF Command}.
@@ -26,7 +27,7 @@ import org.eclipse.papyrus.commands.INonDirtying;
  *
  * @author aarong, <a href="mailto:jacques.lescot@anyware-tech.com">Jacques LESCOT</a>
  */
-public class EMFtoGEFCommandWrapper extends Command {
+public class EMFtoGEFCommandWrapper extends Command implements ICommandWrapper<org.eclipse.emf.common.command.Command> {
 
 	/**
 	 * The wrapped EMF Command. Package-level visibility so that the command stack wrapper can
@@ -34,6 +35,13 @@ public class EMFtoGEFCommandWrapper extends Command {
 	 */
 	private final org.eclipse.emf.common.command.Command emfCommand;
 
+	static {
+		REGISTRY.registerWrapper(org.eclipse.emf.common.command.Command.class, Command.class,
+				EMFtoGEFCommandWrapper::wrap);
+		REGISTRY.registerUnwrapper(EMFtoGEFCommandWrapper.class, org.eclipse.emf.common.command.Command.class,
+				EMFtoGEFCommandWrapper::getWrappedCommand);
+	}
+
 	/**
 	 * Constructor.
 	 *
@@ -64,11 +72,15 @@ public class EMFtoGEFCommandWrapper extends Command {
 	 *
 	 * @return the EMF command
 	 */
-	// @unused
 	public org.eclipse.emf.common.command.Command getEMFCommand() {
 		return emfCommand;
 	}
 
+	@Override
+	public org.eclipse.emf.common.command.Command getWrappedCommand() {
+		return getEMFCommand();
+	}
+
 	/**
 	 * Dispose.
 	 *
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/EMFtoGMFCommandWrapper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/EMFtoGMFCommandWrapper.java
index 10d1916ab7c..85f9c98fd13 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/EMFtoGMFCommandWrapper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/EMFtoGMFCommandWrapper.java
@@ -1,222 +1,71 @@
-/***************************************************************************

- * Copyright (c) 2007, 2014 Conselleria de Infraestructuras y Transporte, Generalitat de la Comunitat Valenciana, CEA, and others.

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors: Mario Cervera Ubeda (Prodevelop)

- *    Christian W. Damus (CEA) - bug 430701

- *

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

-package org.eclipse.papyrus.commands.wrappers;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

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

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

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

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

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

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

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

-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

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

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

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

-import org.eclipse.papyrus.commands.INonDirtying;

-

-/**

- * A GMF Command that wraps an EMF command. Each method is redirected to the EMF one.

- */

-public class EMFtoGMFCommandWrapper extends AbstractCommand {

-

-	/**

-	 * The wrapped EMF Command. Package-level visibility so that the command stack wrapper can

-	 * access the field.

-	 */

-	protected Command emfCommand;

-

-	/**

-	 * This variable is used to avoid reentrant call in canUndo/undo/redo

-	 *

-	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=389382

-	 */

-	protected boolean isBusy;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param emfCommand

-	 *            the emf command

-	 */

-	public EMFtoGMFCommandWrapper(Command emfCommand) {

-		super(emfCommand.getLabel());

-		this.emfCommand = emfCommand;

-	}

-

-	/**

-	 * Wraps the given {@code command}, accounting for possible non-dirty state.

-	 *

-	 * @param command

-	 *            a command to wrap

-	 * @return the best wrapper for the {@code command}

-	 */

-	public static ICommand wrap(Command command) {

-		if (command instanceof org.eclipse.emf.common.command.AbstractCommand.NonDirtying) {

-			return new NonDirtying(command);

-		}

-		return new EMFtoGMFCommandWrapper(command);

-	}

-

-	/**

-	 * Returns the wrapped EMF command.

-	 *

-	 * @return the EMF command

-	 */

-	// @unused

-	public org.eclipse.emf.common.command.Command getEMFCommand() {

-		return emfCommand;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @seeorg.eclipse.gmf.runtime.common.core.command.AbstractCommand#

-	 * doExecuteWithResult(org.eclipse .core.runtime.IProgressMonitor,

-	 * org.eclipse.core.runtime.IAdaptable)

-	 */

-	@Override

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

-

-		emfCommand.execute();

-

-		return CommandResult.newOKCommandResult();

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.gmf.runtime.common.core.command.AbstractCommand#doRedoWithResult

-	 * (org.eclipse. core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)

-	 */

-	@Override

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

-

-		if (!isBusy) {

-			isBusy = true;

-			emfCommand.redo();

-			isBusy = false;

-		}

-

-		return CommandResult.newOKCommandResult();

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.gmf.runtime.common.core.command.AbstractCommand#doUndoWithResult

-	 * (org.eclipse. core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)

-	 */

-	@Override

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

-

-		if (!isBusy) {

-			isBusy = true;

-			emfCommand.undo();

-			isBusy = false;

-		}

-

-		return CommandResult.newOKCommandResult();

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.core.commands.operations.AbstractOperation#canExecute()

-	 */

-	@Override

-	public boolean canExecute() {

-		return emfCommand.canExecute();

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.gmf.runtime.common.core.command.AbstractCommand#dispose()

-	 */

-	@Override

-	public void dispose() {

-		emfCommand.dispose();

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.core.commands.operations.AbstractOperation#canUndo()

-	 */

-	@Override

-	public boolean canUndo() {

-		if (!isBusy) {

-			isBusy = true;

-			boolean res = emfCommand.canUndo();

-			isBusy = false;

-			return res;

-		} else {

-			return true;

-		}

-	}

-

-	@Override

-	public List getAffectedFiles() {

-		ArrayList affectedFiles = new ArrayList();

-		Collection<?> affectedObjects = emfCommand.getAffectedObjects();

-		if (affectedObjects != null) {

-			for (Object o : affectedObjects) {

-				if (o instanceof EObject) {

-					o = ((EObject) o).eResource();

-				}

-				if (o instanceof Resource) {

-					o = WorkspaceSynchronizer.getFile((Resource) o);

-				}

-				if (o instanceof IFile) {

-					affectedFiles.add(o);

-				}

-			}

-		}

-		return affectedFiles;

-	}

-

-	@Override

-	public CommandResult getCommandResult() {

-		Collection<?> res = emfCommand.getResult();

-		if (res != null && !res.isEmpty()) {

-			if (res.size() == 1) {

-				return CommandResult.newOKCommandResult(res.iterator().next());

-			}

-			return CommandResult.newOKCommandResult(res);

-		}

-		return CommandResult.newOKCommandResult();

-	}

-

-	//

-	// Nested types

-	//

-

-	/**

-	 * A non-dirtying wrapper for non-dirtying commands.

-	 */

-	public static class NonDirtying extends EMFtoGMFCommandWrapper implements INonDirtying {

-

-		public NonDirtying(org.eclipse.emf.common.command.Command command) {

-			super(command);

-

-			if (!(command instanceof org.eclipse.emf.common.command.AbstractCommand.NonDirtying)) {

-				throw new IllegalArgumentException("Wrapped command is not non-dirtying"); //$NON-NLS-1$

-			}

-		}

-

-	}

-}

+/***************************************************************************
+ * Copyright (c) 2007, 2014 Conselleria de Infraestructuras y Transporte, Generalitat de la Comunitat Valenciana, CEA, Christian W. Damus, and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: Mario Cervera Ubeda (Prodevelop)
+ *    Christian W. Damus (CEA) - bug 430701
+ *    Christian W. Damus - bug 485220
+ *
+ ******************************************************************************/
+package org.eclipse.papyrus.commands.wrappers;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.commands.INonDirtying;
+
+/**
+ * A GMF Command that wraps an EMF command. Each method is redirected to the EMF one.
+ * 
+ * @deprecated Use the {@link org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper} API, instead.
+ */
+@Deprecated
+public class EMFtoGMFCommandWrapper extends org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper {
+
+	static {
+		// Configure legacy compatibility
+		setWrapperFunction(EMFtoGMFCommandWrapper::new);
+		setNonDirtyingWrapperFunction(NonDirtying::new);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param emfCommand
+	 *            the emf command
+	 */
+	public EMFtoGMFCommandWrapper(Command emfCommand) {
+		super(emfCommand);
+	}
+
+	/**
+	 * Wraps the given {@code command}, accounting for possible non-dirty state.
+	 *
+	 * @param command
+	 *            a command to wrap
+	 * @return the best wrapper for the {@code command}
+	 */
+	public static ICommand wrap(Command command) {
+		return org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper.wrap(command);
+	}
+
+	//
+	// Nested types
+	//
+
+	/**
+	 * A non-dirtying wrapper for non-dirtying commands.
+	 * 
+	 * @deprecated Use the {@link org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper.NonDirtying} API, instead.
+	 */
+	@Deprecated
+	public static class NonDirtying extends org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper.NonDirtying implements INonDirtying {
+
+		public NonDirtying(org.eclipse.emf.common.command.Command command) {
+			super(command);
+		}
+
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/GEFtoEMFCommandWrapper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/GEFtoEMFCommandWrapper.java
index fb8520c513a..31255adc72b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/GEFtoEMFCommandWrapper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/GEFtoEMFCommandWrapper.java
@@ -1,142 +1,131 @@
-/***************************************************************************

- * Copyright (c) 2007, 2014 Conselleria de Infraestructuras y Transporte, Generalitat de la Comunitat Valenciana, CEA, and others.

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors: Mario Cervera Ubeda (Prodevelop)

- *    Christian W. Damus (CEA) - bug 430701

- *

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

-package org.eclipse.papyrus.commands.wrappers;

-

-import org.eclipse.emf.common.command.AbstractCommand;

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

-import org.eclipse.papyrus.commands.INonDirtying;

-

-// TODO: Auto-generated Javadoc

-/**

- * A EMF Command that wraps a GEF command. Each method is redirected to the GEF one.

- */

-public class GEFtoEMFCommandWrapper extends AbstractCommand {

-

-	/**

-	 * The wrapped GEF Command. Package-level visibility so that the command stack wrapper can

-	 * access the field.

-	 */

-	private final Command gefCommand;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param gefCommand

-	 *            the gef command

-	 */

-	public GEFtoEMFCommandWrapper(Command gefCommand) {

-		super(gefCommand.getLabel());

-		this.gefCommand = gefCommand;

-	}

-

-	/**

-	 * Wraps the given {@code command}, accounting for possible non-dirty state.

-	 *

-	 * @param command

-	 *            a command to wrap

-	 * @return the best wrapper for the {@code command}

-	 */

-	public static org.eclipse.emf.common.command.Command wrap(Command command) {

-		if (command instanceof INonDirtying) {

-			return new NonDirtying(command);

-		}

-		return new GEFtoEMFCommandWrapper(command);

-	}

-

-	/**

-	 * Returns the wrapped GEF command.

-	 *

-	 * @return the GEF command

-	 */

-	// @unused

-	public Command getGEFCommand() {

-		return gefCommand;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.emf.common.command.AbstractCommand#canExecute()

-	 */

-	@Override

-	public boolean canExecute() {

-		return gefCommand.canExecute();

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.emf.common.command.AbstractCommand#dispose()

-	 */

-	@Override

-	public void dispose() {

-		gefCommand.dispose();

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.emf.common.command.AbstractCommand#canUndo()

-	 */

-	@Override

-	public boolean canUndo() {

-		return gefCommand.canUndo();

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.emf.common.command.Command#execute()

-	 */

-	public void execute() {

-

-		gefCommand.execute();

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.emf.common.command.Command#redo()

-	 */

-	public void redo() {

-		gefCommand.redo();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.emf.common.command.AbstractCommand#undo()

-	 *

-	 */

-	@Override

-	public void undo() {

-		gefCommand.undo();

-	}

-

-	//

-	// Nested types

-	//

-

-	/**

-	 * A non-dirtying wrapper for non-dirtying commands.

-	 */

-	public static class NonDirtying extends GEFtoEMFCommandWrapper implements AbstractCommand.NonDirtying {

-

-		public NonDirtying(Command command) {

-			super(command);

-

-			if (!(command instanceof INonDirtying)) {

-				throw new IllegalArgumentException("Wrapped command is not non-dirtying"); //$NON-NLS-1$

-			}

-		}

-

-	}

-}

+/***************************************************************************
+ * Copyright (c) 2007, 2014 Conselleria de Infraestructuras y Transporte, Generalitat de la Comunitat Valenciana, CEA, Christian W. Damus, and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: Mario Cervera Ubeda (Prodevelop)
+ *    Christian W. Damus (CEA) - bug 430701
+ *    Christian W. Damus - bug 485220
+ *
+ ******************************************************************************/
+package org.eclipse.papyrus.commands.wrappers;
+
+import org.eclipse.emf.common.command.AbstractCommand;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.papyrus.infra.emf.gmf.command.ICommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.INonDirtying;
+
+/**
+ * A EMF Command that wraps a GEF command. Each method is redirected to the GEF one.
+ */
+public class GEFtoEMFCommandWrapper extends AbstractCommand implements ICommandWrapper<Command> {
+
+	/**
+	 * The wrapped GEF Command. Package-level visibility so that the command stack wrapper can
+	 * access the field.
+	 */
+	private final Command gefCommand;
+
+	static {
+		REGISTRY.registerWrapper(Command.class, org.eclipse.emf.common.command.Command.class,
+				GEFtoEMFCommandWrapper::wrap);
+		REGISTRY.registerUnwrapper(GEFtoEMFCommandWrapper.class, Command.class,
+				GEFtoEMFCommandWrapper::getWrappedCommand);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param gefCommand
+	 *            the gef command
+	 */
+	public GEFtoEMFCommandWrapper(Command gefCommand) {
+		super(gefCommand.getLabel());
+		this.gefCommand = gefCommand;
+	}
+
+	/**
+	 * Wraps the given {@code command}, accounting for possible non-dirty state.
+	 *
+	 * @param command
+	 *            a command to wrap
+	 * @return the best wrapper for the {@code command}
+	 */
+	public static org.eclipse.emf.common.command.Command wrap(Command command) {
+		if (command instanceof INonDirtying) {
+			return new NonDirtying(command);
+		}
+		return new GEFtoEMFCommandWrapper(command);
+	}
+
+	/**
+	 * Returns the wrapped GEF command.
+	 *
+	 * @return the GEF command
+	 */
+	public Command getGEFCommand() {
+		return gefCommand;
+	}
+
+	@Override
+	public Command getWrappedCommand() {
+		return getGEFCommand();
+	}
+
+	@Override
+	public boolean canExecute() {
+		return gefCommand.canExecute();
+	}
+
+	@Override
+	public void dispose() {
+		gefCommand.dispose();
+	}
+
+	@Override
+	public boolean canUndo() {
+		return gefCommand.canUndo();
+	}
+
+	@Override
+	public void execute() {
+
+		gefCommand.execute();
+	}
+
+	@Override
+	public void redo() {
+		gefCommand.redo();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.emf.common.command.AbstractCommand#undo()
+	 *
+	 */
+	@Override
+	public void undo() {
+		gefCommand.undo();
+	}
+
+	//
+	// Nested types
+	//
+
+	/**
+	 * A non-dirtying wrapper for non-dirtying commands.
+	 */
+	public static class NonDirtying extends GEFtoEMFCommandWrapper implements AbstractCommand.NonDirtying {
+
+		public NonDirtying(Command command) {
+			super(command);
+
+			if (!(command instanceof INonDirtying)) {
+				throw new IllegalArgumentException("Wrapped command is not non-dirtying"); //$NON-NLS-1$
+			}
+		}
+
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/GMFtoEMFCommandWrapper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/GMFtoEMFCommandWrapper.java
index 7161d938c4a..7cb2bf5a9c4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/GMFtoEMFCommandWrapper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/GMFtoEMFCommandWrapper.java
@@ -1,205 +1,71 @@
-/***************************************************************************

- * Copyright (c) 2007, 2014 Conselleria de Infraestructuras y Transporte, Generalitat de la Comunitat Valenciana, CEA, and others.

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors: Mario Cervera Ubeda (Prodevelop)

- *    Christian W. Damus (CEA) - bug 430701

- *

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

-package org.eclipse.papyrus.commands.wrappers;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

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

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

-import org.eclipse.emf.common.command.AbstractCommand;

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

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

-import org.eclipse.papyrus.commands.INonDirtying;

-

-// TODO: Auto-generated Javadoc

-/**

- * A EMF Command that wraps a GMF command. Each method is redirected to the GMF one.

- */

-public class GMFtoEMFCommandWrapper extends AbstractCommand {

-

-	/**

-	 *

-	 * Wraps the GMF command return value to be returned by this method.

-	 *

-	 * @return the possible return value from the GMF command

-	 */

-	@Override

-	public Collection<?> getResult() {

-

-		Collection<Object> result = new ArrayList<Object>();

-		if (getGMFReturnValue() != null) {

-			result.add(getGMFReturnValue());

-		} // else return an empty collection

-

-		return result;

-	}

-

-	private Object getGMFReturnValue() {

-		if (getGMFCommand().getCommandResult() != null) {

-			return getGMFCommand().getCommandResult().getReturnValue();

-		}

-

-		return null;

-	}

-

-	/**

-	 * The wrapped GMF Command. Package-level visibility so that the command stack wrapper can

-	 * access the field.

-	 */

-	private final ICommand gmfCommand;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param gmfCommand

-	 *            the gmf command

-	 */

-	public GMFtoEMFCommandWrapper(ICommand gmfCommand) {

-		super(gmfCommand.getLabel());

-		this.gmfCommand = gmfCommand;

-	}

-

-	/**

-	 * Wraps the given {@code command}, accounting for possible non-dirty state.

-	 *

-	 * @param command

-	 *            a command to wrap

-	 * @return the best wrapper for the {@code command}

-	 */

-	public static Command wrap(ICommand command) {

-		if (command instanceof INonDirtying) {

-			return new NonDirtying(command);

-		}

-		return new GMFtoEMFCommandWrapper(command);

-	}

-

-	/**

-	 * Returns the wrapped GMF command.

-	 *

-	 * @return the GMF command

-	 */

-	// @unused

-	public ICommand getGMFCommand() {

-		return gmfCommand;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.emf.common.command.AbstractCommand#canExecute()

-	 */

-	@Override

-	public boolean canExecute() {

-		return gmfCommand.canExecute();

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.emf.common.command.AbstractCommand#dispose()

-	 */

-	@Override

-	public void dispose() {

-		gmfCommand.dispose();

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.emf.common.command.AbstractCommand#canUndo()

-	 */

-	@Override

-	public boolean canUndo() {

-		return gmfCommand.canUndo();

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.emf.common.command.Command#execute()

-	 */

-	public void execute() {

-		try {

-			gmfCommand.execute(new NullProgressMonitor(), null);

-		} catch (ExecutionException e) {

-		}

-

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.emf.common.command.Command#redo()

-	 */

-	public void redo() {

-		try {

-			gmfCommand.redo(new NullProgressMonitor(), null);

-		} catch (ExecutionException e) {

-		}

-

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.emf.common.command.AbstractCommand#undo()

-	 */

-	@Override

-	public void undo() {

-		try {

-			gmfCommand.undo(new NullProgressMonitor(), null);

-		} catch (ExecutionException e) {

-		}

-

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.emf.common.command.Command#getAffectedObjects()

-	 */

-	@Override

-	public Collection<?> getAffectedObjects() {

-		return gmfCommand.getAffectedFiles();

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.emf.common.command.Command#getDescription()

-	 */

-	@Override

-	public String getDescription() {

-		return gmfCommand.getLabel();

-	}

-

-	//

-	// Nested types

-	//

-

-	/**

-	 * A non-dirtying wrapper for non-dirtying commands.

-	 */

-	public static class NonDirtying extends GMFtoEMFCommandWrapper implements AbstractCommand.NonDirtying {

-

-		public NonDirtying(ICommand command) {

-			super(command);

-

-			if (!(command instanceof INonDirtying)) {

-				throw new IllegalArgumentException("Wrapped command is not non-dirtying"); //$NON-NLS-1$

-			}

-		}

-

-	}

-

-}

+/***************************************************************************
+ * Copyright (c) 2007, 2014 Conselleria de Infraestructuras y Transporte, Generalitat de la Comunitat Valenciana, CEA, Christian W. Damus, and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: Mario Cervera Ubeda (Prodevelop)
+ *    Christian W. Damus (CEA) - bug 430701
+ *    Christian W. Damus - bug 485220
+ *
+ ******************************************************************************/
+package org.eclipse.papyrus.commands.wrappers;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+
+/**
+ * A EMF Command that wraps a GMF command. Each method is redirected to the GMF one.
+ * 
+ * @deprecated Use the {@link org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper} API, instead.
+ */
+@Deprecated
+public class GMFtoEMFCommandWrapper extends org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper {
+
+	static {
+		// Configure legacy compatibility
+		setWrapperFunction(GMFtoEMFCommandWrapper::new);
+		setNonDirtyingWrapperFunction(NonDirtying::new);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param gmfCommand
+	 *            the gmf command
+	 */
+	public GMFtoEMFCommandWrapper(ICommand gmfCommand) {
+		super(gmfCommand);
+	}
+
+	/**
+	 * Wraps the given {@code command}, accounting for possible non-dirty state.
+	 *
+	 * @param command
+	 *            a command to wrap
+	 * @return the best wrapper for the {@code command}
+	 */
+	public static Command wrap(ICommand command) {
+		return org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper.wrap(command);
+	}
+
+	//
+	// Nested types
+	//
+
+	/**
+	 * A non-dirtying wrapper for non-dirtying commands.
+	 * 
+	 * @deprecated Use the {@link org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper.NonDirtying} API, instead.
+	 */
+	@Deprecated
+	public static class NonDirtying extends org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper.NonDirtying {
+
+		public NonDirtying(ICommand command) {
+			super(command);
+		}
+
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/GMFtoGEFCommandWrapper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/GMFtoGEFCommandWrapper.java
index 13c63716303..8c189b2f0c4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/GMFtoGEFCommandWrapper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/GMFtoGEFCommandWrapper.java
@@ -1,6 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2013, 2014 CEA LIST and others.
- *
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -10,6 +9,7 @@
  * Contributors:
  *  Benoit Maggi  benoit.maggi@cea.fr - Initial API and implementation
  *  Christian W. Damus (CEA) - bug 430701
+ *  Christian W. Damus - bug 485220
  *
  *****************************************************************************/
 package org.eclipse.papyrus.commands.wrappers;
@@ -19,11 +19,12 @@ import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.papyrus.commands.INonDirtying;
+import org.eclipse.papyrus.infra.emf.gmf.command.ICommandWrapper;
 
 /**
  * A GEF Command that wraps a GMF command. Each method is redirected to the GMF one.
  */
-public class GMFtoGEFCommandWrapper extends Command {
+public class GMFtoGEFCommandWrapper extends Command implements ICommandWrapper<ICommand> {
 
 	/**
 	 * The wrapped GMF Command. Package-level visibility so that the command stack wrapper can
@@ -31,6 +32,13 @@ public class GMFtoGEFCommandWrapper extends Command {
 	 */
 	private final ICommand gmfCommand;
 
+	static {
+		REGISTRY.registerWrapper(ICommand.class, Command.class,
+				GMFtoGEFCommandWrapper::wrap);
+		REGISTRY.registerUnwrapper(GMFtoGEFCommandWrapper.class, ICommand.class,
+				GMFtoGEFCommandWrapper::getWrappedCommand);
+	}
+
 
 	/**
 	 * Constructor.
@@ -66,6 +74,11 @@ public class GMFtoGEFCommandWrapper extends Command {
 		return gmfCommand;
 	}
 
+	@Override
+	public ICommand getWrappedCommand() {
+		return getGMFCommand();
+	}
+
 	/**
 	 * Dispose.
 	 *
@@ -151,7 +164,7 @@ public class GMFtoGEFCommandWrapper extends Command {
 		public NonDirtying(ICommand command) {
 			super(command);
 
-			if (!(command instanceof INonDirtying)) {
+			if (!(command instanceof org.eclipse.papyrus.infra.emf.gmf.command.INonDirtying)) {
 				throw new IllegalArgumentException("Wrapped command is not non-dirtying"); //$NON-NLS-1$
 			}
 		}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/OperationToGEFCommandWrapper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/OperationToGEFCommandWrapper.java
index 298fb40f491..d77bc785828 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/OperationToGEFCommandWrapper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/OperationToGEFCommandWrapper.java
@@ -1,158 +1,171 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2014 Atos, CEA, and others.

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  Vincent Hemery (Atos) - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 430701

- *

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

-package org.eclipse.papyrus.commands.wrappers;

-

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

-import org.eclipse.core.commands.operations.IUndoableOperation;

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

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

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

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

-import org.eclipse.papyrus.commands.Activator;

-import org.eclipse.papyrus.commands.INonDirtying;

-

-/**

- * A GEF Command that wraps an undoable operation. Each method is redirected to the operation. <br>

- * In case the {@link IUndoableOperation} is a {@link ICommand}, you should use {@link org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy} instead of this implementation.

- *

- * @author vhemery

- */

-public class OperationToGEFCommandWrapper extends Command {

-

-	/** the IUndoableOperation which calls are redirected to */

-	private IUndoableOperation operation = null;

-

-	/**

-	 * Construct a new command wrapper

-	 *

-	 * @param baseOperation

-	 */

-	public OperationToGEFCommandWrapper(IUndoableOperation baseOperation) {

-		super(baseOperation.getLabel());

-		operation = baseOperation;

-		Assert.isNotNull(operation);

-	}

-

-	/**

-	 * Wraps the given {@code operation}, accounting for possible non-dirty state.

-	 *

-	 * @param operation

-	 *            an operation to wrap

-	 * @return the best wrapper for the {@code operation}

-	 */

-	public static Command wrap(IUndoableOperation operation) {

-		if (operation instanceof INonDirtying) {

-			return new NonDirtying(operation);

-		}

-		return new OperationToGEFCommandWrapper(operation);

-	}

-

-	/**

-	 * Get the {@link IUndoableOperation} to which calls are redirected

-	 *

-	 * @return operation

-	 */

-	public IUndoableOperation getOperation() {

-		return operation;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean canExecute() {

-		return operation.canExecute();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean canUndo() {

-		return operation.canUndo();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void dispose() {

-		operation.dispose();

-		super.dispose();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void execute() {

-		try {

-			operation.execute(new NullProgressMonitor(), null);

-		} catch (ExecutionException e) {

-			Activator.log.error(e.getLocalizedMessage(), e);

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void redo() {

-		try {

-			operation.redo(new NullProgressMonitor(), null);

-		} catch (ExecutionException e) {

-			Activator.log.error(e.getLocalizedMessage(), e);

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void undo() {

-		try {

-			operation.undo(new NullProgressMonitor(), null);

-		} catch (ExecutionException e) {

-			Activator.log.error(e.getLocalizedMessage(), e);

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public String getLabel() {

-		return operation.getLabel();

-	}

-

-	//

-	// Nested types

-	//

-

-	/**

-	 * A non-dirtying wrapper for non-dirtying commands.

-	 */

-	public static class NonDirtying extends OperationToGEFCommandWrapper implements INonDirtying {

-

-		public NonDirtying(IUndoableOperation operation) {

-			super(operation);

-

-			if (!(operation instanceof INonDirtying)) {

-				throw new IllegalArgumentException("Wrapped operation is not non-dirtying"); //$NON-NLS-1$

-			}

-		}

-

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 Atos, CEA, Christian W. Damus, and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Hemery (Atos) - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 430701
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.commands.wrappers;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.operations.IUndoableOperation;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.commands.Activator;
+import org.eclipse.papyrus.commands.INonDirtying;
+import org.eclipse.papyrus.infra.emf.gmf.command.ICommandWrapper;
+
+/**
+ * A GEF Command that wraps an undoable operation. Each method is redirected to the operation. <br>
+ * In case the {@link IUndoableOperation} is a {@link ICommand}, you should use {@link org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy} instead of this implementation.
+ *
+ * @author vhemery
+ */
+public class OperationToGEFCommandWrapper extends Command implements ICommandWrapper<IUndoableOperation> {
+
+	/** the IUndoableOperation which calls are redirected to */
+	private IUndoableOperation operation = null;
+
+	static {
+		// The registry prefers the GMFtoGEFCommandWrapper for ICommands
+		REGISTRY.registerUnwrapper(OperationToGEFCommandWrapper.class, IUndoableOperation.class,
+				OperationToGEFCommandWrapper::getWrappedCommand);
+	}
+
+	/**
+	 * Construct a new command wrapper
+	 *
+	 * @param baseOperation
+	 */
+	public OperationToGEFCommandWrapper(IUndoableOperation baseOperation) {
+		super(baseOperation.getLabel());
+		operation = baseOperation;
+		Assert.isNotNull(operation);
+	}
+
+	/**
+	 * Wraps the given {@code operation}, accounting for possible non-dirty state.
+	 *
+	 * @param operation
+	 *            an operation to wrap
+	 * @return the best wrapper for the {@code operation}
+	 */
+	public static Command wrap(IUndoableOperation operation) {
+		if (operation instanceof INonDirtying) {
+			return new NonDirtying(operation);
+		}
+		return new OperationToGEFCommandWrapper(operation);
+	}
+
+	/**
+	 * Get the {@link IUndoableOperation} to which calls are redirected
+	 *
+	 * @return operation
+	 */
+	public IUndoableOperation getOperation() {
+		return operation;
+	}
+
+	@Override
+	public IUndoableOperation getWrappedCommand() {
+		return getOperation();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean canExecute() {
+		return operation.canExecute();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean canUndo() {
+		return operation.canUndo();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void dispose() {
+		operation.dispose();
+		super.dispose();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void execute() {
+		try {
+			operation.execute(new NullProgressMonitor(), null);
+		} catch (ExecutionException e) {
+			Activator.log.error(e.getLocalizedMessage(), e);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void redo() {
+		try {
+			operation.redo(new NullProgressMonitor(), null);
+		} catch (ExecutionException e) {
+			Activator.log.error(e.getLocalizedMessage(), e);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void undo() {
+		try {
+			operation.undo(new NullProgressMonitor(), null);
+		} catch (ExecutionException e) {
+			Activator.log.error(e.getLocalizedMessage(), e);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getLabel() {
+		return operation.getLabel();
+	}
+
+	//
+	// Nested types
+	//
+
+	/**
+	 * A non-dirtying wrapper for non-dirtying commands.
+	 */
+	public static class NonDirtying extends OperationToGEFCommandWrapper implements INonDirtying {
+
+		public NonDirtying(IUndoableOperation operation) {
+			super(operation);
+
+			if (!(operation instanceof org.eclipse.papyrus.infra.emf.gmf.command.INonDirtying)) {
+				throw new IllegalArgumentException("Wrapped operation is not non-dirtying"); //$NON-NLS-1$
+			}
+		}
+
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.classpath
index 9a39368d975..f0c55498599 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.classpath
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.classpath
@@ -1,8 +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.6"/>

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

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

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

-	<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.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.settings/org.eclipse.jdt.core.prefs
index 410244d65a6..b3aa6d60f94 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-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

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
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 974f758c11d..e20390c551d 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
@@ -1,104 +1,108 @@
-Manifest-Version: 1.0

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

- org.eclipse.papyrus.infra.gmfdiag.common.adapter,

- org.eclipse.papyrus.infra.gmfdiag.common.advice,

- org.eclipse.papyrus.infra.gmfdiag.common.commands,

- org.eclipse.papyrus.infra.gmfdiag.common.commands.requests,

- org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom,

- org.eclipse.papyrus.infra.gmfdiag.common.decoration,

- org.eclipse.papyrus.infra.gmfdiag.common.editpart,

- org.eclipse.papyrus.infra.gmfdiag.common.editpolicies,

- org.eclipse.papyrus.infra.gmfdiag.common.expansion,

- org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel,

- org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.impl,

- org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.util,

- org.eclipse.papyrus.infra.gmfdiag.common.figure,

- org.eclipse.papyrus.infra.gmfdiag.common.figure.edge,

- org.eclipse.papyrus.infra.gmfdiag.common.figure.node,

- org.eclipse.papyrus.infra.gmfdiag.common.geometry,

- org.eclipse.papyrus.infra.gmfdiag.common.handler,

- org.eclipse.papyrus.infra.gmfdiag.common.helper,

- org.eclipse.papyrus.infra.gmfdiag.common.internal.sync;x-internal:=true,

- org.eclipse.papyrus.infra.gmfdiag.common.listener,

- org.eclipse.papyrus.infra.gmfdiag.common.locator,

- org.eclipse.papyrus.infra.gmfdiag.common.messages,

- org.eclipse.papyrus.infra.gmfdiag.common.model,

- org.eclipse.papyrus.infra.gmfdiag.common.parsers,

- org.eclipse.papyrus.infra.gmfdiag.common.preferences,

- org.eclipse.papyrus.infra.gmfdiag.common.providers,

- org.eclipse.papyrus.infra.gmfdiag.common.reconciler,

- org.eclipse.papyrus.infra.gmfdiag.common.selection,

- org.eclipse.papyrus.infra.gmfdiag.common.service.shape,

- org.eclipse.papyrus.infra.gmfdiag.common.service.visualtype,

- org.eclipse.papyrus.infra.gmfdiag.common.snap,

- org.eclipse.papyrus.infra.gmfdiag.common.snap.copy,

- org.eclipse.papyrus.infra.gmfdiag.common.strategy,

- org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy,

- org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste,

- org.eclipse.papyrus.infra.gmfdiag.common.structure,

- org.eclipse.papyrus.infra.gmfdiag.common.sync,

- org.eclipse.papyrus.infra.gmfdiag.common.types,

- org.eclipse.papyrus.infra.gmfdiag.common.undocontext,

- org.eclipse.papyrus.infra.gmfdiag.common.updater,

- org.eclipse.papyrus.infra.gmfdiag.common.utils

-Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="2.5.0",

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

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

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.gef;bundle-version="3.7.1";visibility:=reexport,

- org.eclipse.emf.workspace;bundle-version="1.4.0",

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

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

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

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

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

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

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

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

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

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

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

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

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

- org.eclipse.emf.databinding;bundle-version="1.3.0",

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

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

- org.eclipse.core.expressions,

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

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

- org.w3c.dom.svg;bundle-version="1.1.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;bundle-version="[3.3.0,4.0.0)",

- com.ibm.icu,

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",

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

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",

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

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

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

- org.eclipse.gmf.runtime.draw2d.ui.render.awt,

- org.apache.xerces;bundle-version="2.9.0",

- org.eclipse.core.runtime,

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.xmi;visibility:=reexport,

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

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

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

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

- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.common.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.common,
+ org.eclipse.papyrus.infra.gmfdiag.common.adapter,
+ org.eclipse.papyrus.infra.gmfdiag.common.advice,
+ org.eclipse.papyrus.infra.gmfdiag.common.commands,
+ org.eclipse.papyrus.infra.gmfdiag.common.commands.requests,
+ org.eclipse.papyrus.infra.gmfdiag.common.databinding,
+ org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom,
+ org.eclipse.papyrus.infra.gmfdiag.common.decoration,
+ org.eclipse.papyrus.infra.gmfdiag.common.editpart,
+ org.eclipse.papyrus.infra.gmfdiag.common.editpolicies,
+ org.eclipse.papyrus.infra.gmfdiag.common.expansion,
+ org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel,
+ org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.impl,
+ org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.util,
+ org.eclipse.papyrus.infra.gmfdiag.common.figure,
+ org.eclipse.papyrus.infra.gmfdiag.common.figure.edge,
+ org.eclipse.papyrus.infra.gmfdiag.common.figure.node,
+ org.eclipse.papyrus.infra.gmfdiag.common.geometry,
+ org.eclipse.papyrus.infra.gmfdiag.common.handler,
+ org.eclipse.papyrus.infra.gmfdiag.common.helper,
+ org.eclipse.papyrus.infra.gmfdiag.common.internal.sync;x-internal:=true,
+ org.eclipse.papyrus.infra.gmfdiag.common.listener,
+ org.eclipse.papyrus.infra.gmfdiag.common.locator,
+ org.eclipse.papyrus.infra.gmfdiag.common.messages,
+ org.eclipse.papyrus.infra.gmfdiag.common.model,
+ org.eclipse.papyrus.infra.gmfdiag.common.parsers,
+ org.eclipse.papyrus.infra.gmfdiag.common.preferences,
+ org.eclipse.papyrus.infra.gmfdiag.common.providers,
+ org.eclipse.papyrus.infra.gmfdiag.common.reconciler,
+ org.eclipse.papyrus.infra.gmfdiag.common.selection,
+ org.eclipse.papyrus.infra.gmfdiag.common.service,
+ org.eclipse.papyrus.infra.gmfdiag.common.service.shape,
+ org.eclipse.papyrus.infra.gmfdiag.common.service.visualtype,
+ org.eclipse.papyrus.infra.gmfdiag.common.snap,
+ org.eclipse.papyrus.infra.gmfdiag.common.snap.copy,
+ org.eclipse.papyrus.infra.gmfdiag.common.spi,
+ org.eclipse.papyrus.infra.gmfdiag.common.strategy,
+ org.eclipse.papyrus.infra.gmfdiag.common.strategy.copy,
+ org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste,
+ org.eclipse.papyrus.infra.gmfdiag.common.structure,
+ org.eclipse.papyrus.infra.gmfdiag.common.sync,
+ org.eclipse.papyrus.infra.gmfdiag.common.types,
+ org.eclipse.papyrus.infra.gmfdiag.common.undocontext,
+ org.eclipse.papyrus.infra.gmfdiag.common.updater,
+ org.eclipse.papyrus.infra.gmfdiag.common.utils,
+ org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions;x-internal:=true
+Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="2.5.0",
+ org.eclipse.emf.ecore.edit;bundle-version="2.5.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0";visibility:=reexport,
+ org.eclipse.gef;bundle-version="3.7.1";visibility:=reexport,
+ org.eclipse.emf.workspace;bundle-version="1.4.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",
+ org.eclipse.core.databinding;bundle-version="1.4.1",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
+ org.eclipse.ui.ide;bundle-version="3.8.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
+ org.eclipse.emf.databinding;bundle-version="1.3.0",
+ org.eclipse.core.databinding.property;bundle-version="1.4.200",
+ org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.1",
+ org.eclipse.core.expressions,
+ org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.svggen;bundle-version="[1.6.0,1.7.0)",
+ org.w3c.dom.svg;bundle-version="1.1.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;bundle-version="[3.3.0,4.0.0)",
+ com.ibm.icu,
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.decoration;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.7.0",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.draw2d.ui.render.awt,
+ org.apache.xerces;bundle-version="2.9.0",
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.papyrus.infra.sync;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.edit.ui;bundle-version="1.2.0"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.common.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations
index 0d813f220da..6db8bf14e5f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.gmfdiag.common.NotationElementTypeSet" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation" name="NotationElementTypeSet" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">

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

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

-  </elementTypeConfigurations>

+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.gmfdiag.common.NotationElementTypeSet" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation" name="NotationElementTypeSet" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">
+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" identifier="org.eclipse.papyrus.gmfdiag.common.Diagram" name="GMF::Diagram" xmi:id="_ScP1oVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
+    <eClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.ecore#//Diagram"/>
+  </elementTypeConfigurations>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
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 3b03fd6247e..7161ddd10cd 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
@@ -78,7 +78,8 @@
       <model
             classname="org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel"
             description="Model for notation"
-            fileExtension="notation">
+            fileExtension="notation"
+            required="true">
       </model>
   </extension>
 
@@ -202,6 +203,13 @@
          properties="diagramType"
          type="org.eclipse.gmf.runtime.notation.View">
    </propertyTester>   
+   <propertyTester
+         class="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.GraphicalEditPartPropertyTester"
+         id="org.eclipse.papyrus.infra.gmfdiag.common.GraphicalEditPartProperties"
+         namespace="org.eclipse.papyrus.infra.gmfdiag.common"
+         properties="canDelete,isSemanticDeletion"
+         type="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
+   </propertyTester>
 </extension>
 <extension
       point="org.eclipse.ui.menus">
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml
index 25ed791f109..20ea78cd534 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.common</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/pasteCommandProvider.exsd b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/pasteCommandProvider.exsd
index 828559605ee..c2db4277e91 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/pasteCommandProvider.exsd
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/pasteCommandProvider.exsd
@@ -60,7 +60,7 @@
                   this is the class that will provide the command in charge of the paste
                </documentation>
                <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.uml.pastemanager.IPasteCommandProvider"/>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.gmfdiag.common.providers.IPasteCommandProvider"/>
                </appInfo>
             </annotation>
          </attribute>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/AbstractPapyrusGmfCreateDiagramCommandHandler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/AbstractPapyrusGmfCreateDiagramCommandHandler.java
index 476b9c7a2bd..2f8ee3dff13 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/AbstractPapyrusGmfCreateDiagramCommandHandler.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/AbstractPapyrusGmfCreateDiagramCommandHandler.java
@@ -51,6 +51,8 @@ import org.eclipse.jface.window.Window;
 import org.eclipse.papyrus.commands.CheckedOperationHistory;
 import org.eclipse.papyrus.commands.ICreationCommand;
 import org.eclipse.papyrus.commands.OpenDiagramCommand;
+import org.eclipse.papyrus.infra.core.language.ILanguageService;
+import org.eclipse.papyrus.infra.core.resource.IEMFModel;
 import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler2;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;
@@ -72,7 +74,6 @@ import org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule;
 import org.eclipse.papyrus.infra.viewpoints.configuration.RootAutoSelect;
 import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
-import org.eclipse.papyrus.uml.tools.model.UmlUtils;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.statushandlers.StatusManager;
 
@@ -124,7 +125,6 @@ public abstract class AbstractPapyrusGmfCreateDiagramCommandHandler extends Abst
 		}
 
 		private CommandResult createDiagram() throws ServiceException {
-			Resource modelResource = UmlUtils.getUmlResource(modelSet);
 			Resource notationResource = getNotationResource(modelSet, owner, element);
 			if (notationResource == null) {
 				return CommandResult.newErrorCommandResult("Cannot create a diagram on the selected element (ReadOnly?)");
@@ -132,6 +132,12 @@ public abstract class AbstractPapyrusGmfCreateDiagramCommandHandler extends Abst
 			Resource diResource = DiModelUtils.getDiResource(modelSet);
 
 			if (owner == null) {
+				Resource modelResource = ILanguageService.getLanguageModels(modelSet).stream()
+						.filter(IEMFModel.class::isInstance)
+						.map(IEMFModel.class::cast)
+						.findAny()
+						.map(IEMFModel::getResource)
+						.orElse(null);
 				owner = getRootElement(modelResource);
 				attachModelToResource(owner, modelResource);
 			}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/Activator.java
index 1300a79a0be..95b7c9478e2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/Activator.java
@@ -1,190 +1,209 @@
-/*****************************************************************************

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

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 410346

- *  Christian W. Damus (CEA) - bug 425270

- *

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

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

-

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

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

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

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

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

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

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

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

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

-import org.eclipse.swt.graphics.Image;

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

-import org.osgi.framework.BundleContext;

-

-public class Activator extends AbstractUIPlugin {

-

-	public static final String ID = "org.eclipse.papyrus.infra.gmfdiag.common"; //$NON-NLS-1$

-

-	public static final PreferencesHint DIAGRAM_PREFERENCES_HINT = new PreferencesHint(ID);

-	public static final String EXPANSION_TRACE="expansion";

-

-	private static Activator instance;

-

-	public Activator() {

-	}

-

-	/** Logging helper */

-	public static LogHelper log;

-

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		instance = this;

-		// register the login helper

-		log = new LogHelper(this);

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

-	}

-

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		log = null;

-		instance = null;

-		super.stop(context);

-	}

-

-	public static Activator getInstance() {

-		return instance;

-	}

-

-	public AdapterFactory getItemProvidersAdapterFactory() {

-		return org.eclipse.papyrus.uml.tools.Activator.getDefault().getItemProviderAdapterFactory();

-	}

-

-	public ImageDescriptor getItemImageDescriptor(Object item) {

-		IItemLabelProvider labelProvider = (IItemLabelProvider) getItemProvidersAdapterFactory().adapt(item, IItemLabelProvider.class);

-		if (labelProvider != null) {

-			return ExtendedImageRegistry.getInstance().getImageDescriptor(labelProvider.getImage(item));

-		}

-		return null;

-	}

-

-	/**

-	 * 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 getBundledImageDescriptor(String path) {

-		return AbstractUIPlugin.imageDescriptorFromPlugin(ID, path);

-	}

-

-	/**

-	 * Respects images residing in any plug-in. If path is relative, then this bundle is looked up

-	 * for the image, otherwise, for absolute path, first segment is taken as id of plug-in with

-	 * image

-	 *

-	 * @param path

-	 *            the path to image, either absolute (with plug-in id as first segment), or relative

-	 *            for bundled images

-	 * @return the image descriptor

-	 */

-	public static ImageDescriptor findImageDescriptor(String path) {

-		final IPath p = new Path(path);

-		if (p.isAbsolute() && p.segmentCount() > 1) {

-			return AbstractUIPlugin.imageDescriptorFromPlugin(p.segment(0), p.removeFirstSegments(1).makeAbsolute().toString());

-		} else {

-			return getBundledImageDescriptor(p.makeAbsolute().toString());

-		}

-	}

-

-	/**

-	 * Returns string from plug-in's resource bundle

-	 */

-	public static String getString(String key) {

-		return Platform.getResourceString(getInstance().getBundle(), "%" + key); //$NON-NLS-1$

-	}

-

-	/**

-	 * Returns an image for the image file at the given plug-in relative path. Client do not need to

-	 * dispose this image. Images will be disposed automatically.

-	 *

-	 * @param path

-	 *            the path

-	 * @return image instance

-	 */

-	public Image getBundledImage(String path) {

-		Image image = getImageRegistry().get(path);

-		if (image == null) {

-			getImageRegistry().put(path, getBundledImageDescriptor(path));

-			image = getImageRegistry().get(path);

-		}

-		return image;

-	}

-

-	public void logError(String error) {

-		logError(error, null);

-	}

-

-	/**

-	 * @param throwable

-	 *            actual error or null could be passed

-	 */

-	public void logError(String error, Throwable throwable) {

-		if (error == null && throwable != null) {

-			error = throwable.getMessage();

-		}

-		getLog().log(new Status(IStatus.ERROR, Activator.ID, IStatus.OK, error, throwable));

-		debug(error, throwable);

-	}

-

-	public void logInfo(String message) {

-		logInfo(message, null);

-	}

-

-	/**

-	 * @param throwable

-	 *            actual error or null could be passed

-	 */

-	public void logInfo(String message, Throwable throwable) {

-		if (message == null && throwable != null) {

-			message = throwable.getMessage();

-		}

-		getLog().log(new Status(IStatus.INFO, Activator.ID, IStatus.OK, message, throwable));

-		debug(message, throwable);

-	}

-

-	private void debug(String message, Throwable throwable) {

-		if (!isDebugging()) {

-			return;

-		}

-		if (message != null) {

-			System.err.println(message);

-		}

-		if (throwable != null) {

-			throwable.printStackTrace();

-		}

-	}

-

-	/**

-	 * 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(ID, path);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008, 2016 LIFL, CEA LIST, Christian W. Damus, and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bugs 410346, 425270
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.spi.GraphicalDeletionHelperService;
+import org.eclipse.papyrus.infra.gmfdiag.common.spi.IGraphicalDeletionHelper;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+public class Activator extends AbstractUIPlugin {
+
+	public static final String ID = "org.eclipse.papyrus.infra.gmfdiag.common"; //$NON-NLS-1$
+
+	public static final PreferencesHint DIAGRAM_PREFERENCES_HINT = new PreferencesHint(ID);
+	public static final String EXPANSION_TRACE = "expansion";
+
+	private static Activator instance;
+
+	private ComposedAdapterFactory adapterFactory;
+
+	private GraphicalDeletionHelperService deletionHelper;
+
+	public Activator() {
+	}
+
+	/** Logging helper */
+	public static LogHelper log;
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		instance = this;
+		// register the login helper
+		log = new LogHelper(this);
+		adapterFactory = createAdapterFactory();
+		deletionHelper = new GraphicalDeletionHelperService(context);
+		PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, getPreferenceStore());
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		deletionHelper.dispose();
+		adapterFactory.dispose();
+		adapterFactory = null;
+		log = null;
+		instance = null;
+		super.stop(context);
+	}
+
+	public static Activator getInstance() {
+		return instance;
+	}
+
+	protected ComposedAdapterFactory createAdapterFactory() {
+		return new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+	}
+
+	public AdapterFactory getItemProvidersAdapterFactory() {
+		return adapterFactory;
+	}
+
+	public ImageDescriptor getItemImageDescriptor(Object item) {
+		IItemLabelProvider labelProvider = (IItemLabelProvider) getItemProvidersAdapterFactory().adapt(item, IItemLabelProvider.class);
+		if (labelProvider != null) {
+			return ExtendedImageRegistry.getInstance().getImageDescriptor(labelProvider.getImage(item));
+		}
+		return null;
+	}
+
+	/**
+	 * 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 getBundledImageDescriptor(String path) {
+		return AbstractUIPlugin.imageDescriptorFromPlugin(ID, path);
+	}
+
+	/**
+	 * Respects images residing in any plug-in. If path is relative, then this bundle is looked up
+	 * for the image, otherwise, for absolute path, first segment is taken as id of plug-in with
+	 * image
+	 *
+	 * @param path
+	 *            the path to image, either absolute (with plug-in id as first segment), or relative
+	 *            for bundled images
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor findImageDescriptor(String path) {
+		final IPath p = new Path(path);
+		if (p.isAbsolute() && p.segmentCount() > 1) {
+			return AbstractUIPlugin.imageDescriptorFromPlugin(p.segment(0), p.removeFirstSegments(1).makeAbsolute().toString());
+		} else {
+			return getBundledImageDescriptor(p.makeAbsolute().toString());
+		}
+	}
+
+	/**
+	 * Returns string from plug-in's resource bundle
+	 */
+	public static String getString(String key) {
+		return Platform.getResourceString(getInstance().getBundle(), "%" + key); //$NON-NLS-1$
+	}
+
+	/**
+	 * Returns an image for the image file at the given plug-in relative path. Client do not need to
+	 * dispose this image. Images will be disposed automatically.
+	 *
+	 * @param path
+	 *            the path
+	 * @return image instance
+	 */
+	public Image getBundledImage(String path) {
+		Image image = getImageRegistry().get(path);
+		if (image == null) {
+			getImageRegistry().put(path, getBundledImageDescriptor(path));
+			image = getImageRegistry().get(path);
+		}
+		return image;
+	}
+
+	public void logError(String error) {
+		logError(error, null);
+	}
+
+	/**
+	 * @param throwable
+	 *            actual error or null could be passed
+	 */
+	public void logError(String error, Throwable throwable) {
+		if (error == null && throwable != null) {
+			error = throwable.getMessage();
+		}
+		getLog().log(new Status(IStatus.ERROR, Activator.ID, IStatus.OK, error, throwable));
+		debug(error, throwable);
+	}
+
+	public void logInfo(String message) {
+		logInfo(message, null);
+	}
+
+	/**
+	 * @param throwable
+	 *            actual error or null could be passed
+	 */
+	public void logInfo(String message, Throwable throwable) {
+		if (message == null && throwable != null) {
+			message = throwable.getMessage();
+		}
+		getLog().log(new Status(IStatus.INFO, Activator.ID, IStatus.OK, message, throwable));
+		debug(message, throwable);
+	}
+
+	private void debug(String message, Throwable throwable) {
+		if (!isDebugging()) {
+			return;
+		}
+		if (message != null) {
+			System.err.println(message);
+		}
+		if (throwable != null) {
+			throwable.printStackTrace();
+		}
+	}
+
+	/**
+	 * 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(ID, path);
+	}
+
+	public IGraphicalDeletionHelper getGraphicalDeletionHelper() {
+		return deletionHelper;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/GMFObservableList.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/GMFObservableList.java
new file mode 100644
index 00000000000..d5b5056fc73
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/GMFObservableList.java
@@ -0,0 +1,49 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.databinding;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.services.edit.ui.databinding.PapyrusObservableList;
+
+/**
+ * An ObservableList used to edit collections of EObjects through
+ * Papyrus commands
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class GMFObservableList extends PapyrusObservableList {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param wrappedList
+	 *            The list to be edited when #commit() is called
+	 * @param domain
+	 *            The editing domain on which the commands will be executed
+	 * @param source
+	 *            The EObject from which the list will be retrieved
+	 * @param feature
+	 *            The feature from which the list will be retrieved
+	 */
+	public GMFObservableList(List<?> wrappedList, EditingDomain domain, EObject source, EStructuralFeature feature) {
+		super(wrappedList, domain, source, feature, GMFtoEMFCommandWrapper::wrap);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/GMFObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/GMFObservableValue.java
new file mode 100644
index 00000000000..9e367ff66bc
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/GMFObservableValue.java
@@ -0,0 +1,65 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *  Christian W. Damus (CEA) - bugs 440108, 417409
+ *  Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - bug 447698
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.databinding;
+
+import org.eclipse.core.databinding.observable.Realm;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.services.edit.ui.databinding.PapyrusObservableValue;
+
+/**
+ * An ObservableValue used to edit EObject properties through
+ * Papyrus commands
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class GMFObservableValue extends PapyrusObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param eObject
+	 *            The EObject to edit
+	 * @param eStructuralFeature
+	 *            The structural feature to edit
+	 * @param domain
+	 *            The editing domain on which the commands will be executed
+	 */
+	public GMFObservableValue(EObject eObject, EStructuralFeature eStructuralFeature, EditingDomain domain) {
+		super(eObject, eStructuralFeature, domain, GMFtoEMFCommandWrapper::wrap);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param realm
+	 * @param eObject
+	 *            The EObject to edit
+	 * @param eStructuralFeature
+	 *            The structural feature to edit
+	 * @param domain
+	 *            The editing domain on which the commands will be executed
+	 */
+	public GMFObservableValue(Realm realm, EObject eObject, EStructuralFeature eStructuralFeature, EditingDomain domain) {
+		super(realm, eObject, eStructuralFeature, domain, GMFtoEMFCommandWrapper::wrap);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AbstractCustomStyleObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AbstractCustomStyleObservableValue.java
index 52712763b5f..19928b072d9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AbstractCustomStyleObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AbstractCustomStyleObservableValue.java
@@ -1,130 +1,130 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2014 CEA LIST and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *  Christian W. Damus (CEA) - 402525

- *

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

-package org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom;

-

-import org.eclipse.core.databinding.observable.ChangeEvent;

-import org.eclipse.core.databinding.observable.IChangeListener;

-import org.eclipse.core.databinding.observable.IObserving;

-import org.eclipse.core.databinding.observable.value.AbstractObservableValue;

-import org.eclipse.core.databinding.observable.value.ValueDiff;

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

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

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

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

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

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

-import org.eclipse.papyrus.infra.gmfdiag.common.listener.CustomStyleListener;

-import org.eclipse.papyrus.uml.tools.databinding.CommandBasedObservableValue;

-

-/**

- * Abstract implementation for an ObservableValue associated to a GMF custom

- * style (NamedStyle).

- *

- * @author Camille Letavernier

- *

- */

-public abstract class AbstractCustomStyleObservableValue extends AbstractObservableValue implements CommandBasedObservableValue, IChangeListener, IObserving {

-

-	protected View source;

-

-	protected EditingDomain domain;

-

-	protected String styleName;

-

-	protected Object lastValue;

-

-	protected CustomStyleListener listener;

-

-	protected EClass styleClass;

-

-	protected EStructuralFeature styleFeature;

-

-	public AbstractCustomStyleObservableValue(View source, EditingDomain domain, String styleName, EClass styleClass, EStructuralFeature styleFeature) {

-		this.source = source;

-		this.domain = domain;

-		this.styleName = styleName;

-		this.styleClass = styleClass;

-		this.styleFeature = styleFeature;

-		source.eAdapters().add(listener = new CustomStyleListener(source, styleFeature, this, styleName));

-	}

-

-	@Override

-	public void handleChange(ChangeEvent event) {

-

-		final Object oldValue = lastValue;

-		final Object newValue = doGetValue();

-

-		fireValueChange(new ValueDiff() {

-

-			@Override

-			public Object getOldValue() {

-				return oldValue;

-			}

-

-			@Override

-			public Object getNewValue() {

-				return newValue;

-			}

-

-		});

-	}

-

-	@Override

-	protected Object doGetValue() {

-		NamedStyle valueStyle = source.getNamedStyle(styleClass, styleName);

-		if (valueStyle != null) {

-			lastValue = valueStyle.eGet(styleFeature);

-		} else {

-			lastValue = getDefaultValue();

-		}

-		return lastValue;

-	}

-

-	/**

-	 * Gets the default value when this style is not set.

-	 *

-	 * @return The default value for this NamedStyle

-	 */

-	protected abstract Object getDefaultValue();

-

-	@Override

-	protected void doSetValue(Object value) {

-		Command command = getCommand(value);

-		domain.getCommandStack().execute(command);

-		doGetValue(); // Refresh the lastValue

-	}

-

-	@Override

-	public Command getCommand(Object value) {

-		return new CustomStyleValueCommand(source, value, styleClass, styleFeature, styleName);

-	}

-

-	@Override

-	public Object getObserved() {

-		return source;

-	}

-

-	@Override

-	public void dispose() {

-		if (isDisposed()) {

-			return;

-		}

-		if (listener != null) {

-			source.eAdapters().remove(listener);

-			listener.dispose();

-			listener = null;

-		}

-		super.dispose();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - 402525
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom;
+
+import org.eclipse.core.databinding.observable.ChangeEvent;
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.core.databinding.observable.IObserving;
+import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
+import org.eclipse.core.databinding.observable.value.ValueDiff;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.notation.NamedStyle;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.listener.CustomStyleListener;
+import org.eclipse.papyrus.infra.tools.databinding.CommandBasedObservableValue;
+
+/**
+ * Abstract implementation for an ObservableValue associated to a GMF custom
+ * style (NamedStyle).
+ *
+ * @author Camille Letavernier
+ *
+ */
+public abstract class AbstractCustomStyleObservableValue extends AbstractObservableValue implements CommandBasedObservableValue, IChangeListener, IObserving {
+
+	protected View source;
+
+	protected EditingDomain domain;
+
+	protected String styleName;
+
+	protected Object lastValue;
+
+	protected CustomStyleListener listener;
+
+	protected EClass styleClass;
+
+	protected EStructuralFeature styleFeature;
+
+	public AbstractCustomStyleObservableValue(View source, EditingDomain domain, String styleName, EClass styleClass, EStructuralFeature styleFeature) {
+		this.source = source;
+		this.domain = domain;
+		this.styleName = styleName;
+		this.styleClass = styleClass;
+		this.styleFeature = styleFeature;
+		source.eAdapters().add(listener = new CustomStyleListener(source, styleFeature, this, styleName));
+	}
+
+	@Override
+	public void handleChange(ChangeEvent event) {
+
+		final Object oldValue = lastValue;
+		final Object newValue = doGetValue();
+
+		fireValueChange(new ValueDiff() {
+
+			@Override
+			public Object getOldValue() {
+				return oldValue;
+			}
+
+			@Override
+			public Object getNewValue() {
+				return newValue;
+			}
+
+		});
+	}
+
+	@Override
+	protected Object doGetValue() {
+		NamedStyle valueStyle = source.getNamedStyle(styleClass, styleName);
+		if (valueStyle != null) {
+			lastValue = valueStyle.eGet(styleFeature);
+		} else {
+			lastValue = getDefaultValue();
+		}
+		return lastValue;
+	}
+
+	/**
+	 * Gets the default value when this style is not set.
+	 *
+	 * @return The default value for this NamedStyle
+	 */
+	protected abstract Object getDefaultValue();
+
+	@Override
+	protected void doSetValue(Object value) {
+		Command command = getCommand(value);
+		domain.getCommandStack().execute(command);
+		doGetValue(); // Refresh the lastValue
+	}
+
+	@Override
+	public Command getCommand(Object value) {
+		return new CustomStyleValueCommand(source, value, styleClass, styleFeature, styleName);
+	}
+
+	@Override
+	public Object getObserved() {
+		return source;
+	}
+
+	@Override
+	public void dispose() {
+		if (isDisposed()) {
+			return;
+		}
+		if (listener != null) {
+			source.eAdapters().remove(listener);
+			listener.dispose();
+			listener = null;
+		}
+		super.dispose();
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/RoundedRectangleNodePlateFigure.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/RoundedRectangleNodePlateFigure.java
index 12d2758372a..d8638947696 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/RoundedRectangleNodePlateFigure.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/RoundedRectangleNodePlateFigure.java
@@ -93,7 +93,7 @@ public class RoundedRectangleNodePlateFigure extends DefaultSizeNodeFigure imple
 	 *
 	 * @param svgNodePlateFigure
 	 *            the new SVG node plate container
-	 * @see org.eclipse.papyrus.infra.gmfdiag.common.figure.node.ICustomNodePlate#setSVGNodePlateContainer(org.eclipse.papyrus.uml.diagram.common.figure.node.SVGNodePlateFigure)
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.figure.node.ICustomNodePlate#setSVGNodePlateContainer(SVGNodePlateFigure)
 	 */
 	@Override
 	public void setSVGNodePlateContainer(SVGNodePlateFigure svgNodePlateFigure) {
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/model/NotationModel.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/model/NotationModel.java
index 1e1841b2197..7455ae503ff 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/model/NotationModel.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/model/NotationModel.java
@@ -1,189 +1,194 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2016 LIFL, CEA LIST, Christian W. Damus, and others.

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *   LIFL - Initial API and implementation

- *   Christian W. Damus - bug 485220

- *   

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

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

-

-import java.util.Collections;

-

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

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

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

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

-import org.eclipse.emf.ecore.resource.URIConverter;

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

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

-import org.eclipse.papyrus.infra.core.resource.BadArgumentExcetion;

-import org.eclipse.papyrus.infra.core.resource.EMFLogicalModel;

-import org.eclipse.papyrus.infra.core.resource.IEMFModel;

-import org.eclipse.papyrus.infra.core.resource.IModel;

-import org.eclipse.papyrus.infra.core.resource.NotFoundException;

-import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;

-

-/**

- * @author cedric dumoulin

- *

- */

-public class NotationModel extends EMFLogicalModel implements IModel {

-

-	/**

-	 * File extension used for notation.

-	 */

-	public static final String NOTATION_FILE_EXTENSION = "notation"; //$NON-NLS-1$

-

-	/**

-	 * Model ID.

-	 */

-	public static final String MODEL_ID = "org.eclipse.papyrus.infra.core.resource.notation.NotationModel"; //$NON-NLS-1$

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public NotationModel() {

-

-	}

-

-	/**

-	 * Get the file extension used for this model.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getModelFileExtension() {

-		return NOTATION_FILE_EXTENSION;

-	}

-

-	/**

-	 * Get the identifier used to register this model.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()

-	 *

-	 * @return

-	 */

-	@Override

-	public String getIdentifier() {

-		return MODEL_ID;

-	}

-

-	/**

-	 * Add a new initialized {@link Diagram} to the model.

-	 *

-	 * @param newDiagram

-	 *            The diagram to add.

-	 */

-	public void addDiagram(Diagram newDiagram) {

-		getResource().getContents().add(newDiagram);

-	}

-

-	// Prevent infinite loop from 2 models delegating to each other.

-	private boolean checkingControlState = false;

-

-	/**

-	 * Notation resources are controlled if their base element is controlled

-	 * In case the notation resource is empty, we should look at the associated resources and see if one of them is controlled.

-	 */

-	@Override

-	public boolean isControlled(Resource resource) {

-		if (checkingControlState) {

-			return false;

-		}

-

-		try {

-			checkingControlState = true;

-

-			for (Resource resourceInModelSet : modelSet.getResources()) {

-				if (resource.getURI().trimFileExtension().equals(resourceInModelSet.getURI().trimFileExtension()) && !isRelatedResource(resourceInModelSet)) {

-					if (!resourceInModelSet.getContents().isEmpty()) {

-						EObject eObject = resourceInModelSet.getContents().get(0);

-						IModel iModel = modelSet.getModelFor(eObject);

-						if (iModel instanceof IEMFModel) {

-							if (((IEMFModel) iModel).isControlled(resourceInModelSet)) {

-								return true;

-							}

-						}

-					}

-				}

-			}

-		} finally {

-			checkingControlState = false;

-		}

-

-		return false;

-	}

-

-	@Override

-	public void handle(Resource resource) {

-		super.handle(resource);

-		if (resource == null) {

-			return;

-		}

-

-		// If the parameter resource is already a notation resource, nothing to do

-		if (!isRelatedResource(resource)) {

-			URI notationURI = resource.getURI().trimFileExtension().appendFileExtension(NOTATION_FILE_EXTENSION);

-			ResourceSet resourceSet = getResourceSet();

-			if (resourceSet != null && resourceSet.getURIConverter() != null) {

-				URIConverter converter = resourceSet.getURIConverter();

-				if (converter.exists(notationURI, Collections.emptyMap())) {

-					// If the notation resource associated to the parameter resource exists, load it

-					getResourceSet().getResource(notationURI, true);

-				}

-			}

-		}

-	}

-

-

-	/**

-	 * Get a diagram by its name.

-	 *

-	 * @param diagramName

-	 *            Name of the diagram. This is the name set by the user.

-	 * @return

-	 * @throws NotFoundException

-	 * @throws BadArgumentExcetion

-	 */

-	public Diagram getDiagram(String diagramName) throws NotFoundException, BadArgumentExcetion {

-

-		if (diagramName == null || diagramName.length() == 0) {

-			throw new BadArgumentExcetion("Diagram name should not be null and size should be >0."); //$NON-NLS-1$

-		}

-

-		for (Resource current : getResources()) {

-			for (EObject element : current.getContents()) {

-				if (element instanceof Diagram) {

-					Diagram diagram = (Diagram) element;

-

-					if (diagramName.equals(diagram.getName())) {

-						// Found

-						return diagram;

-

-					}

-				}

-			}

-		}

-		// not found

-		throw new NotFoundException(NLS.bind("No Diagram named '{0}' can be found in Model.",diagramName)); //$NON-NLS-1$

-	}

-	

-	/**

-	 * An object is additionally a root element only if it has a corresponding

-	 * viewpoint prototope.

-	 */

-	@Override

-	protected boolean isRootElement(EObject object) {

-		return super.isRootElement(object) && ViewPrototype.isViewObject(object);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 LIFL, CEA LIST, Christian W. Damus, and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   LIFL - Initial API and implementation
+ *   Christian W. Damus - bug 485220
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.model;
+
+import java.util.Collections;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.URIConverter;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.resource.BadArgumentExcetion;
+import org.eclipse.papyrus.infra.core.resource.EMFLogicalModel;
+import org.eclipse.papyrus.infra.core.resource.IEMFModel;
+import org.eclipse.papyrus.infra.core.resource.IModel;
+import org.eclipse.papyrus.infra.core.resource.NotFoundException;
+import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
+
+/**
+ * @author cedric dumoulin
+ *
+ */
+public class NotationModel extends EMFLogicalModel implements IModel {
+
+	/**
+	 * File extension used for notation.
+	 */
+	public static final String NOTATION_FILE_EXTENSION = "notation"; //$NON-NLS-1$
+
+	/**
+	 * Model ID.
+	 */
+	public static final String MODEL_ID = "org.eclipse.papyrus.infra.core.resource.notation.NotationModel"; //$NON-NLS-1$
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public NotationModel() {
+
+	}
+
+	/**
+	 * Get the file extension used for this model.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getModelFileExtension() {
+		return NOTATION_FILE_EXTENSION;
+	}
+
+	/**
+	 * Get the identifier used to register this model.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()
+	 *
+	 * @return
+	 */
+	@Override
+	public String getIdentifier() {
+		return MODEL_ID;
+	}
+
+	/**
+	 * Add a new initialized {@link Diagram} to the model.
+	 *
+	 * @param newDiagram
+	 *            The diagram to add.
+	 */
+	public void addDiagram(Diagram newDiagram) {
+		getResource().getContents().add(newDiagram);
+	}
+
+	// Prevent infinite loop from 2 models delegating to each other.
+	private boolean checkingControlState = false;
+
+	/**
+	 * Notation resources are controlled if their base element is controlled
+	 * In case the notation resource is empty, we should look at the associated resources and see if one of them is controlled.
+	 */
+	@Override
+	public boolean isControlled(Resource resource) {
+		if (checkingControlState) {
+			return false;
+		}
+
+		try {
+			checkingControlState = true;
+
+			for (Resource resourceInModelSet : modelSet.getResources()) {
+				if (resource.getURI().trimFileExtension().equals(resourceInModelSet.getURI().trimFileExtension()) && !isRelatedResource(resourceInModelSet)) {
+					if (!resourceInModelSet.getContents().isEmpty()) {
+						EObject eObject = resourceInModelSet.getContents().get(0);
+						IModel iModel = modelSet.getModelFor(eObject);
+						if (iModel instanceof IEMFModel) {
+							if (((IEMFModel) iModel).isControlled(resourceInModelSet)) {
+								return true;
+							}
+						}
+					}
+				}
+			}
+		} finally {
+			checkingControlState = false;
+		}
+
+		return false;
+	}
+
+	@Override
+	public void handle(Resource resource) {
+		super.handle(resource);
+		if (resource == null) {
+			return;
+		}
+
+		// If the parameter resource is already a notation resource, nothing to do
+		if (!isRelatedResource(resource)) {
+			URI notationURI = resource.getURI().trimFileExtension().appendFileExtension(NOTATION_FILE_EXTENSION);
+			ResourceSet resourceSet = getResourceSet();
+			if (resourceSet != null && resourceSet.getURIConverter() != null) {
+				URIConverter converter = resourceSet.getURIConverter();
+				if (converter.exists(notationURI, Collections.emptyMap())) {
+					// If the notation resource associated to the parameter resource exists, load it
+					getResourceSet().getResource(notationURI, true);
+				}
+			}
+		}
+	}
+
+
+	/**
+	 * Get a diagram by its name.
+	 *
+	 * @param diagramName
+	 *            Name of the diagram. This is the name set by the user.
+	 * @return
+	 * @throws NotFoundException
+	 * @throws BadArgumentExcetion
+	 */
+	public Diagram getDiagram(String diagramName) throws NotFoundException, BadArgumentExcetion {
+
+		if (diagramName == null || diagramName.length() == 0) {
+			throw new BadArgumentExcetion("Diagram name should not be null and size should be >0."); //$NON-NLS-1$
+		}
+
+		for (Resource current : getResources()) {
+			for (EObject element : current.getContents()) {
+				if (element instanceof Diagram) {
+					Diagram diagram = (Diagram) element;
+
+					if (diagramName.equals(diagram.getName())) {
+						// Found
+						return diagram;
+
+					}
+				}
+			}
+		}
+		// not found
+		throw new NotFoundException(NLS.bind("No Diagram named '{0}' can be found in Model.", diagramName)); //$NON-NLS-1$
+	}
+
+	/**
+	 * An object is additionally a root element only if it has a corresponding
+	 * viewpoint prototope.
+	 */
+	@Override
+	protected boolean isRootElement(EObject object) {
+		return super.isRootElement(object) && ViewPrototype.isViewObject(object);
+	}
+
+	@Override
+	protected boolean isSupportedRoot(EObject object) {
+		return ViewPrototype.isViewObject(object);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/model/NotationUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/model/NotationUtils.java
index abe00ff970f..fca433cae04 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/model/NotationUtils.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/model/NotationUtils.java
@@ -1,6 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2009 Atos Origin.
- *
+ * Copyright (c) 2009, 2016 Atos Origin, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,10 +8,12 @@
  *
  * Contributors:
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus - bug 482220
  *
  *****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.common.model;
 
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -194,6 +195,41 @@ public class NotationUtils {
 	}
 
 	/**
+	 * Obtains all of the notation views (diagrams, tables, etc.) persisted in a resource-set.
+	 * 
+	 * @param resourceSet
+	 *            a resource-set
+	 * 
+	 * @return all of the notations within it
+	 * 
+	 * @see #getAllNotations(ResourceSet, Class)
+	 */
+	public static Iterable<EObject> getAllNotations(ResourceSet resourceSet) {
+		return getAllNotations(resourceSet, EObject.class);
+	}
+
+	/**
+	 * Obtains all of the notation views of some type persisted in a resource-set.
+	 * 
+	 * @param resourceSet
+	 *            a resource-set
+	 * @param type
+	 *            the notation type (diagram, table, etc.)
+	 * 
+	 * @return all of the notations of that {@code type} within it
+	 */
+	public static <T extends EObject> Iterable<T> getAllNotations(ResourceSet resourceSet, Class<T> type) {
+		// Algorithm ported from NavigatorUtils::getNotationRoots() in the Model Explorer View bundle
+		return () -> resourceSet.getResources().stream()
+				.filter(r -> NotationModel.NOTATION_FILE_EXTENSION.equalsIgnoreCase(r.getURI().fileExtension()))
+				.map(Resource::getContents)
+				.flatMap(Collection::stream)
+				.filter(type::isInstance)
+				.map(type::cast)
+				.iterator();
+	}
+
+	/**
 	 * Helper to retrieve the Notation resource associated to a ModelSet. May be null.
 	 *
 	 * @param from
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/IPasteCommandProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/IPasteCommandProvider.java
new file mode 100644
index 00000000000..84c3bbd2b92
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/IPasteCommandProvider.java
@@ -0,0 +1,54 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.providers;
+
+import java.awt.datatransfer.Clipboard;
+import java.util.Collection;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+
+/**
+ *
+ * a paste provider has provide operation in order to paste by taking account system clipboard or papyrus clipboard
+ *
+ */
+public interface IPasteCommandProvider {
+
+	/**
+	 * return the paste command to execute by taking account parameter
+	 *
+	 * @param targetEditPart
+	 *            the target where object will be paste
+	 * @param systemClipboard
+	 *            contains info form the system copy paste
+	 * @param papyrusCliboard
+	 *            the list of views to paste
+	 * @return a command
+	 */
+	public ICommand getPasteViewCommand(GraphicalEditPart targetEditPart, Clipboard systemClipboard, Collection<Object> papyrusCliboard);
+
+	/**
+	 * return the paste command to execute by taking account parameter. It copy also element of the semantic model
+	 *
+	 * @param targetEditPart
+	 *            the target where object will be paste
+	 * @param systemClipboard
+	 *            contains info form the system copy paste
+	 * @param papyrusCliboard
+	 *            the list of views to paste
+	 * @return a command
+	 */
+	public ICommand getPasteWithModelCommand(GraphicalEditPart targetEditPart, Clipboard systemClipboard, Collection<Object> papyrusCliboard);
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconciler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconciler.java
index 2e0e82ffb6d..f9b8bf3aff8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconciler.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconciler.java
@@ -8,7 +8,7 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.StringValueStyle;
 
 /**
- * Instances of this base class are provided via "org.eclipse.papyrus.uml.diagram.common.diagramReconciler" extension point and provide migration of
+ * Instances of this base class are provided via "org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler" extension point and provide migration of
  * the diagram instances from "previous" version to the "current" Papyrus version. The version is stored as a {@link StringValueStyle} with name {@link DiagramVersioningUtils#COMPATIBILITY_VERSION}.
  * <p/>
  * Every {@link DiagramReconciler} subclass provides statical descriptor of its capabilities (that is, the supported diagram type, outdated "previous" version and the expected "current" version). For some possible advanced cases it also gets a chance to
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/PasteCommandService.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/PasteCommandService.java
new file mode 100644
index 00000000000..a2aa3a342b8
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/PasteCommandService.java
@@ -0,0 +1,147 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.service;
+
+import java.awt.datatransfer.Clipboard;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.common.providers.IPasteCommandProvider;
+
+/**
+ * this singleton looks for in extension point to find a pasteCommandProvider
+ * and can provide a paste command
+ */
+
+
+public class PasteCommandService {
+
+	private static final String PASTECOMMANDPROVIDER_EXTENSION_ID = Activator.ID + ".pasteCommandProvider"; //$NON-NLS-1$
+
+	private static final String REALIZATION = "realization"; //$NON-NLS-1$
+
+	private static final String PRIORITY = "priority"; //$NON-NLS-1$
+
+	private static PasteCommandService instance = null;
+
+	public static PasteCommandService getInstance() {
+		if (instance == null) {
+			instance = new PasteCommandService();
+		}
+		return instance;
+	}
+
+
+	/**
+	 * Load an instance of a class
+	 *
+	 * @param element
+	 *            the extension point
+	 * @param classAttribute
+	 *            the name of the class to load
+	 * @return the loaded Class
+	 * @throws Exception
+	 *             if the class is not loaded
+	 */
+	protected static Object createExtension(final IConfigurationElement element, final String classAttribute) throws Exception {
+		return element.createExecutableExtension(classAttribute);
+	}
+
+	protected Map<String, IPasteCommandProvider> pasteCommandProviderMap;
+
+
+	private PasteCommandService() {
+		// Reading data from plugins
+		IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(PASTECOMMANDPROVIDER_EXTENSION_ID);
+		pasteCommandProviderMap = new HashMap<String, IPasteCommandProvider>();
+		for (int i = 0; i < configElements.length; i++) {
+			getPasteCommandProvider(configElements[i]);
+		}
+
+	}
+
+	/**
+	 * Load one rule
+	 *
+	 * @param element
+	 *            the extension point
+	 */
+	protected void getPasteCommandProvider(IConfigurationElement element) {
+		IPasteCommandProvider pasteCommandProvider = null;
+		try {
+			pasteCommandProvider = (IPasteCommandProvider) createExtension(element, REALIZATION);
+			String priority = element.getAttribute(PRIORITY);
+			pasteCommandProviderMap.put(priority, pasteCommandProvider);
+
+		} catch (Exception e) {
+			Activator.log.error("- " + pasteCommandProvider + " can not be loaded: " + e.getLocalizedMessage(), e); //$NON-NLS-1$
+		}
+	}
+
+	protected IPasteCommandProvider lookForProvider() {
+		String[] priority = { "Highest", "High", "Medium", "Low", "Lowest" };
+		IPasteCommandProvider selectedProvider = null;
+		int i = 0;
+		while (selectedProvider == null && i < priority.length) {
+			selectedProvider = pasteCommandProviderMap.get(priority[i]);
+			i++;
+		}
+		return selectedProvider;
+	}
+
+	/**
+	 * return the paste command to execute by taking account parameter
+	 *
+	 * @param targetEditPart
+	 *            the target where object will be paste
+	 * @param systemClipboard
+	 *            contains info form the system copy paste
+	 * @param papyrusCliboard
+	 *            the list of views to paste
+	 * @return a command
+	 */
+	public ICommand getPasteViewCommand(GraphicalEditPart targetEditPart, Clipboard systemClipboard, Collection<Object> papyrusCliboard) {
+		IPasteCommandProvider selectedProvider = lookForProvider();
+		if (selectedProvider == null) {
+			return UnexecutableCommand.INSTANCE;
+		}
+		return selectedProvider.getPasteViewCommand(targetEditPart, systemClipboard, papyrusCliboard);
+	}
+
+	/**
+	 * return the paste command to execute by taking account parameter. It copy also element of the semantic model
+	 *
+	 * @param targetEditPart
+	 *            the target where object will be paste
+	 * @param systemClipboard
+	 *            contains info form the system copy paste
+	 * @param papyrusCliboard
+	 *            the list of views to paste
+	 * @return a command
+	 */
+	public ICommand getPasteWithModelCommand(GraphicalEditPart targetEditPart, Clipboard systemClipboard, Collection<Object> papyrusCliboard) {
+		IPasteCommandProvider selectedProvider = lookForProvider();
+		if (selectedProvider == null) {
+			return UnexecutableCommand.INSTANCE;
+		}
+		return selectedProvider.getPasteWithModelCommand(targetEditPart, systemClipboard, papyrusCliboard);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/spi/GraphicalDeletionHelperService.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/spi/GraphicalDeletionHelperService.java
new file mode 100644
index 00000000000..d8eb431e328
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/spi/GraphicalDeletionHelperService.java
@@ -0,0 +1,46 @@
+/*****************************************************************************
+ * Copyright (c) 2016 Christian W. Damus and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.spi;
+
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.papyrus.infra.tools.util.CompositeServiceTracker;
+import org.osgi.framework.BundleContext;
+
+/**
+ * A delegating deletion helper that consults registered deletion-helper services.
+ */
+public class GraphicalDeletionHelperService implements IGraphicalDeletionHelper {
+
+	private final CompositeServiceTracker<IGraphicalDeletionHelper> tracker;
+
+	public GraphicalDeletionHelperService(BundleContext context) {
+		super();
+
+		tracker = new CompositeServiceTracker<>(context,
+				IGraphicalDeletionHelper.class,
+				IGraphicalDeletionHelper.DEFAULT,
+				IGraphicalDeletionHelper::compose);
+		tracker.open();
+	}
+
+	public void dispose() {
+		tracker.close();
+	}
+
+	@Override
+	public boolean canDelete(IGraphicalEditPart editPart) {
+		return tracker.getService().canDelete(editPart);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/spi/IGraphicalDeletionHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/spi/IGraphicalDeletionHelper.java
new file mode 100644
index 00000000000..e7b318c3139
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/spi/IGraphicalDeletionHelper.java
@@ -0,0 +1,51 @@
+/*****************************************************************************
+ * Copyright (c) 2016 Christian W. Damus and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.spi;
+
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil;
+
+/**
+ * Protocol of a pluggable graphical deletion helper strategy.
+ */
+public interface IGraphicalDeletionHelper {
+	/** The default instance just checks whether the edit-part is not read-only. */
+	IGraphicalDeletionHelper DEFAULT = ep -> !DiagramEditPartsUtil.isReadOnly(ep);
+
+	/**
+	 * Queries whether the specified edit-part can be deleted. If the helper
+	 * does not have a specific positive answer for the edit-part, it should
+	 * return {@code false} to let another helper answer (the ultimate fall-back
+	 * checks the standard read-only state of the edit-part).
+	 * 
+	 * @param editPart
+	 *            an edit-part that is proposed for deletion
+	 * 
+	 * @return whether it may be delete, or {@code false} if I don't know
+	 */
+	boolean canDelete(IGraphicalEditPart editPart);
+
+	/**
+	 * Composes me with an{@code other} helper in a disjuntion
+	 * on the {@link #canDelete(IGraphicalEditPart)} operation.
+	 * 
+	 * @param other
+	 *            another graphical deletion helper
+	 * 
+	 * @return the composed helper
+	 */
+	default IGraphicalDeletionHelper compose(IGraphicalDeletionHelper other) {
+		return ep -> other.canDelete(ep) || this.canDelete(ep);
+	}
+}
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 f276013441e..1e701af7a6d 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
@@ -1,6 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others.
- *
+ * Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,8 +8,7 @@
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
- *  Christian W. Damus - bug 433206
- *  Christian W. Damus - bug 473148
+ *  Christian W. Damus - bugs 433206, 473148, 485220
  *
  *****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.common.utils;
@@ -30,6 +28,7 @@ import org.eclipse.emf.ecore.EClass;
 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.gef.EditPart;
 import org.eclipse.gef.EditPartViewer;
 import org.eclipse.gef.RootEditPart;
@@ -55,7 +54,13 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler2;
+import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.readonly.ReadOnlyManager;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusDiagramEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.infra.ui.util.EditorHelper;
 import org.eclipse.ui.IEditorPart;
@@ -63,6 +68,7 @@ import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 import com.google.common.base.Function;
+import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
@@ -907,4 +913,88 @@ public class DiagramEditPartsUtil {
 		return result;
 	}
 
+	/**
+	 * Checks if is semantic deletion.
+	 *
+	 * @param editPart
+	 *            the edit part
+	 * @return true, if is semantic deletion
+	 */
+	public static boolean isSemanticDeletion(IGraphicalEditPart editPart) {
+		boolean isSemanticDeletion = false;
+		TransactionalEditingDomain editingDomain = null;
+
+		// Get Editing Domain
+		try {
+			editingDomain = ServiceUtilsForEditPart.getInstance().getTransactionalEditingDomain(editPart);
+		} catch (ServiceException e) {
+
+		}
+
+		if (editingDomain != null) {
+
+			IReadOnlyHandler2 readOnly = ReadOnlyManager.getReadOnlyHandler(editingDomain);
+			EObject semantic = EMFHelper.getEObject(editPart);
+			View graphical = NotationHelper.findView(editPart);
+
+			isSemanticDeletion = !(semantic == null || semantic == graphical || semantic.eContainer() == null);
+
+
+			if (isSemanticDeletion && readOnly != null) {
+				// Is the semantic element read-only?
+				Optional<Boolean> result = readOnly.isReadOnly(ReadOnlyAxis.anyAxis(), semantic);
+				if (!result.or(false) && (graphical != null)) {
+					// Or, if not, is the graphical element read-only?
+					result = readOnly.isReadOnly(ReadOnlyAxis.anyAxis(), graphical);
+				}
+
+				// Are both the semantic and graphical elements writable?
+				isSemanticDeletion = !result.or(false);
+			}
+		}
+
+
+		return isSemanticDeletion;
+	}
+
+	/**
+	 * Checks if this is a read only element from the edit part.
+	 *
+	 * @param editPart
+	 *            the edit part
+	 * @return true, if this is a read only element.
+	 */
+	public static boolean isReadOnly(final IGraphicalEditPart editPart) {
+		boolean isReadOnly = true;
+		TransactionalEditingDomain editingDomain = null;
+
+		// Get Editing Domain
+		try {
+			editingDomain = ServiceUtilsForEditPart.getInstance().getTransactionalEditingDomain(editPart);
+		} catch (ServiceException e) {
+			// Do nothing
+		}
+
+		if (null != editingDomain) {
+
+			final IReadOnlyHandler2 readOnly = ReadOnlyManager.getReadOnlyHandler(editingDomain);
+			final EObject semantic = EMFHelper.getEObject(editPart);
+			final View graphical = NotationHelper.findView(editPart);
+
+			if (null != readOnly && null != semantic) {
+				// Is the semantic element read-only?
+				Optional<Boolean> result = readOnly.isReadOnly(ReadOnlyAxis.anyAxis(), semantic);
+				isReadOnly = result.get();
+
+				if (!isReadOnly && (graphical != null)) {
+					// Or, if not, is the graphical element read-only?
+					result = readOnly.isReadOnly(ReadOnlyAxis.anyAxis(), graphical);
+					isReadOnly = result.get();
+				}
+			}
+		}
+
+		return isReadOnly;
+	}
+
 }
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/GMFUnsafe.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/GMFUnsafe.java
index 9a69ef17b2e..5838683d503 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/GMFUnsafe.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/GMFUnsafe.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 CEA and others.
+ * Copyright (c) 2014, 2016 CEA, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,29 +8,26 @@
  *
  * Contributors:
  *   Christian W. Damus (CEA) - Initial API and implementation
+ *   Christian W. Damus - bug 485220
  *
  */
 package org.eclipse.papyrus.infra.gmfdiag.common.utils;
 
 import java.util.Collection;
-import java.util.Collections;
 
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.command.AbstractCommand;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.WrappedException;
 import org.eclipse.emf.transaction.RollbackException;
-import org.eclipse.emf.transaction.Transaction;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.papyrus.commands.Activator;
 
 
 /**
  * Utilities for operations in the GMF context that we might consider as "unsafe" or exceptional cases.
+ * 
+ * @deprecated use the {@link org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe} API, instead.
  */
+@Deprecated
 public class GMFUnsafe {
 
 	/**
@@ -56,17 +53,7 @@ public class GMFUnsafe {
 	 *             if the current thread is interrupted while waiting for the unprotected write transaction to start
 	 */
 	public static void write(TransactionalEditingDomain domain, Runnable writeOperation) throws InterruptedException, RollbackException {
-		runUnprotected(domain, writeOperation);
-	}
-
-	private static void runUnprotected(TransactionalEditingDomain domain, Runnable writeOperation) throws InterruptedException, RollbackException {
-		InternalTransactionalEditingDomain internalDomain = (InternalTransactionalEditingDomain) domain;
-		Transaction unprotected = internalDomain.startTransaction(false, Collections.singletonMap(Transaction.OPTION_UNPROTECTED, true));
-		try {
-			writeOperation.run();
-		} finally {
-			unprotected.commit();
-		}
+		org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe.write(domain, writeOperation);
 	}
 
 	/**
@@ -88,7 +75,7 @@ public class GMFUnsafe {
 	 * @see #write(TransactionalEditingDomain, Runnable)
 	 */
 	public static void write(TransactionalEditingDomain domain, Command command) throws InterruptedException, RollbackException {
-		write(domain, new CommandRunnable(command));
+		org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe.write(domain, command);
 	}
 
 	/**
@@ -112,16 +99,7 @@ public class GMFUnsafe {
 	 * @see #write(TransactionalEditingDomain, Runnable)
 	 */
 	public static void write(TransactionalEditingDomain domain, ICommand command) throws InterruptedException, RollbackException, ExecutionException {
-		try {
-			write(domain, new GMFCommandRunnable(command));
-		} catch (WrappedException e) {
-			if (e.exception() instanceof ExecutionException) {
-				throw (ExecutionException) e.exception();
-			} else {
-				// It must have been an unchecked RuntimeException of some kind
-				throw (RuntimeException) e.exception();
-			}
-		}
+		org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe.write(domain, command);
 	}
 
 	/**
@@ -143,84 +121,22 @@ public class GMFUnsafe {
 
 	/**
 	 * A useful base class for commands that need to execute, undo, and redo in unprotected mode on the command stack.
+	 * 
+	 * @deprecated Use the {@link org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe.UnsafeCommand} API, instead.
 	 */
-	public static abstract class UnsafeCommand extends AbstractCommand {
-
-		private final TransactionalEditingDomain domain;
+	@Deprecated
+	public static abstract class UnsafeCommand extends org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe.UnsafeCommand {
 
 		protected UnsafeCommand(TransactionalEditingDomain domain) {
-			this.domain = domain;
+			super(domain);
 		}
 
 		protected UnsafeCommand(TransactionalEditingDomain domain, String label, String description) {
-			super(label, description);
-
-			this.domain = domain;
+			super(domain, label, description);
 		}
 
 		protected UnsafeCommand(TransactionalEditingDomain domain, String label) {
-			super(label);
-
-			this.domain = domain;
-		}
-
-		@Override
-		public final void execute() {
-			try {
-				runUnprotected(domain, new Runnable() {
-
-					@Override
-					public void run() {
-						doExecute();
-					}
-				});
-			} catch (Exception e) {
-				handleException(e);
-			}
-		}
-
-		protected abstract void doExecute();
-
-		@Override
-		public final void undo() {
-			try {
-				runUnprotected(domain, new Runnable() {
-
-					@Override
-					public void run() {
-						doUndo();
-					}
-				});
-			} catch (Exception e) {
-				handleException(e);
-			}
-		}
-
-		protected void doUndo() {
-			// Pass. Usually, unprotected changes are not undoable
-		}
-
-		@Override
-		public final void redo() {
-			try {
-				runUnprotected(domain, new Runnable() {
-
-					@Override
-					public void run() {
-						doRedo();
-					}
-				});
-			} catch (Exception e) {
-				handleException(e);
-			}
-		}
-
-		protected void doRedo() {
-			// Pass. Usually, unprotected changes are not undoable
-		}
-
-		void handleException(Exception e) {
-			Activator.log.error(e);
+			super(domain, label);
 		}
 	}
 
@@ -280,35 +196,4 @@ public class GMFUnsafe {
 		}
 	}
 
-	private static class CommandRunnable implements Runnable {
-
-		private final Command command;
-
-		CommandRunnable(Command command) {
-			this.command = command;
-		}
-
-		@Override
-		public void run() {
-			command.execute();
-		}
-	}
-
-	private static class GMFCommandRunnable implements Runnable {
-
-		private final ICommand command;
-
-		GMFCommandRunnable(ICommand command) {
-			this.command = command;
-		}
-
-		@Override
-		public void run() {
-			try {
-				command.execute(new NullProgressMonitor(), null);
-			} catch (ExecutionException e) {
-				throw new WrappedException(e);
-			}
-		}
-	}
 }
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/MDTUtil.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/MDTUtil.java
index 798d8ec3823..31c21583a58 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/MDTUtil.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/MDTUtil.java
@@ -26,9 +26,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EcoreFactory;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.gef.EditPart;
@@ -54,60 +52,6 @@ import org.osgi.framework.Constants;
  */
 public class MDTUtil {
 
-	// ID for the EAnnotation that describes the version of the first editor
-	// that modified the diagram
-	/** The EDITO r_ version. */
-	public static final String EDITOR_VERSION = "org.eclipse.papyrus.uml.diagram.common.Editor";
-
-	/**
-	 * Add to a diagram the version of the first editor that will modify the
-	 * diagram.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 * @param version
-	 *            version of the editor that is going to modify the diagram
-	 *
-	 * @author gmerin
-	 * @author <a href="mailto:fjcano@prodevelop.es">Francisco Javier Cano Muñoz</a>
-	 */
-	public static void addDiagramVersion(Diagram diagram, String version) {
-		if (version == null) {
-			// if version is null no action will be taken:
-			return;
-		}
-		EAnnotation eAnnotation = diagram.getEAnnotation(EDITOR_VERSION);
-		if (eAnnotation == null) {
-			eAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
-			eAnnotation.setSource(EDITOR_VERSION);
-			// Add a detail to store the version
-			eAnnotation.getDetails().put("version", version);
-
-			diagram.getEAnnotations().add(eAnnotation);
-		}
-	}
-
-	/**
-	 * Obtain the diagram the version of first editor that modified the diagram.
-	 *
-	 * @param diagram
-	 *            the diagram
-	 *
-	 * @return the diagram version
-	 *
-	 * @author <a href="mailto:gmerin@prodevelop.es">Gabriel Merin</a> The
-	 *         version of the first editor that modified the diagram
-	 */
-	// @unused
-	public static String getDiagramVersion(Diagram diagram) {
-		EAnnotation eAnnotation = diagram.getEAnnotation(EDITOR_VERSION);
-		// No version of the diagram
-		if (eAnnotation == null) {
-			return null;
-		}
-		return eAnnotation.getDetails().get("version");
-	}
-
 	/**
 	 * Obtain the plugin's version of the editor.
 	 *
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/internal/common/expressions/GraphicalEditPartPropertyTester.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/internal/common/expressions/GraphicalEditPartPropertyTester.java
new file mode 100644
index 00000000000..2101316c60b
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/internal/common/expressions/GraphicalEditPartPropertyTester.java
@@ -0,0 +1,56 @@
+/*****************************************************************************
+ * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Initial API and implementation
+ *   Christian W. Damus - bug 485220
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions;
+
+import static com.google.common.base.Objects.equal;
+
+import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil;
+
+/**
+ * Property tester to enable different actions in diagrams.
+ * 
+ * @author Gabriel Pascual
+ *
+ */
+public class GraphicalEditPartPropertyTester extends PropertyTester {
+
+	private static final String SEMANTIC_DELETION_PROPERTY = "isSemanticDeletion"; //$NON-NLS-1$
+
+	private static final String CAN_DELETE_PROPERTY = "canDelete"; //$NON-NLS-1$
+
+	public GraphicalEditPartPropertyTester() {
+		super();
+	}
+
+	@Override
+	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
+		boolean result = false;
+
+		switch (property) {
+		case SEMANTIC_DELETION_PROPERTY:
+			result = equal(expectedValue, DiagramEditPartsUtil.isSemanticDeletion((IGraphicalEditPart) receiver));
+			break;
+		case CAN_DELETE_PROPERTY:
+			boolean canDelete = Activator.getInstance().getGraphicalDeletionHelper().canDelete((IGraphicalEditPart) receiver);
+			result = equal(expectedValue, canDelete);
+			break;
+		}
+
+		return result;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/pom.xml
index cea3cdda672..89f5f37cb9f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.controlmode</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
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 d415305d6f4..8ebc8bd94ff 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
@@ -1,19 +1,18 @@
-Manifest-Version: 1.0

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

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.ui,

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

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

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.model,

- org.eclipse.papyrus.infra.gmfdiag.css.stylesheets,

- org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.impl,

- org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.util

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.model;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.ui,
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.model,
+ org.eclipse.papyrus.infra.gmfdiag.css.stylesheets,
+ org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.impl,
+ org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.util
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.model;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/pom.xml
index 5c41f747bc4..97562ee69ee 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.model</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.project
deleted file mode 100644
index 5a5285828be..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.gmfdiag.css.palette</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/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/META-INF/MANIFEST.MF
deleted file mode 100644
index d9fc53ae289..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.gef;bundle-version="3.8.0",

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

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

- org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="1.2.0",

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

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

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

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

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

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

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: CSS Palette customization

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.palette.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.palette;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/about.html
deleted file mode 100644
index dd02e0be168..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

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

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

-<head>

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

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>December 2, 2009</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/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/icon/sourceEditor.gif b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/icon/sourceEditor.gif
deleted file mode 100644
index 75ebdb85865..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/icon/sourceEditor.gif
+++ /dev/null
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/plugin.xml
deleted file mode 100644
index afebf315d91..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/plugin.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.uml.diagram.common.aspectToolProvider">

-      <aspectToolProvider

-            class="org.eclipse.papyrus.infra.gmfdiag.css.palette.provider.CSSStyleAspectActionProvider"

-            description="Applies a CSS Style to a newly created element"

-            icon="icon/sourceEditor.gif"

-            id="org.eclipse.papyrus.infra.gmfdiag.css.style"

-            name="Apply CSS Style">

-         <Priority

-               name="Lowest">

-         </Priority>

-      </aspectToolProvider>

-   </extension>

-

-</plugin>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/pom.xml
deleted file mode 100644
index d5ea80f222a..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
-	</parent>
-	<artifactId>org.eclipse.papyrus.infra.gmfdiag.css.palette</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/aspect/CSSStylePostAction.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/aspect/CSSStylePostAction.java
deleted file mode 100644
index 42003796575..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/aspect/CSSStylePostAction.java
+++ /dev/null
@@ -1,140 +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.palette.aspect;

-

-import java.util.List;

-

-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.emf.commands.core.command.AbstractTransactionalCommand;

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

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

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

-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.AddCustomStyleListValueCommand;

-import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;

-import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;

-import org.eclipse.papyrus.infra.widgets.editors.StringCombo;

-import org.eclipse.papyrus.infra.widgets.providers.EmptyContentProvider;

-import org.eclipse.papyrus.uml.diagram.common.service.palette.IAspectActionProvider;

-import org.eclipse.papyrus.uml.diagram.common.service.palette.IPaletteEntryProxy;

-import org.eclipse.papyrus.uml.diagram.common.service.palette.ModelPostAction;

-import org.eclipse.swt.SWT;

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

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

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

-import org.w3c.dom.Element;

-import org.w3c.dom.Node;

-import org.w3c.dom.NodeList;

-

-/**

- * A Palette post action to automatically add a CSS Style on a newly created element

- *

- * @author Camille Letavernier

- */

-public class CSSStylePostAction extends ModelPostAction {

-

-	private StringCombo editor;

-

-	private Node configurationNode;

-

-	public static final String CLASS_ELEMENT = "cssClass";

-

-	public static final String CLASS_PROPERTY = "class";

-

-	private String value;

-

-	// Copied from org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles.CSS_GMF_CLASS_KEY

-	// FIXME: Add a dependency and use the existing constant. Avoid dependency to the GMF Factory.

-	private static final String CSS_CLASS = "cssClass";

-

-	public Control createConfigurationComposite(Composite parent, IPaletteEntryProxy entryProxy, List<Profile> appliedProfiles) {

-		editor = new StringCombo(parent, SWT.NONE);

-		editor.setContentProvider(EmptyContentProvider.instance); // TODO: We should not depend on the CSS Parser ; do not use CSSClassContentProvider.

-		if (value != null) {

-			editor.setValue(value);

-		}

-

-		editor.addCommitListener(new ICommitListener() {

-

-			public void commit(AbstractEditor widget) {

-				value = editor.getValue();

-			}

-		});

-

-		return editor;

-	}

-

-	@Override

-	public void init(Node configurationNode, IAspectActionProvider factory) {

-		super.init(configurationNode, factory);

-		this.configurationNode = configurationNode;

-

-		this.value = getValue();

-	}

-

-	public void save(Node parentNode) {

-		Element cssElement = ((Element) parentNode).getOwnerDocument().createElement(CLASS_ELEMENT);

-		parentNode.appendChild(cssElement);

-		cssElement.setAttribute(CLASS_PROPERTY, value == null ? "" : value);

-	}

-

-	private String getValue() {

-		if (configurationNode == null) {

-			return null;

-		}

-		NodeList cssElements = ((Element) configurationNode).getElementsByTagName(CLASS_ELEMENT);

-		if (cssElements != null) {

-			for (int i = 0; i < cssElements.getLength(); i++) {

-				Node node = cssElements.item(i);

-				if (node instanceof Element) {

-					String value = ((Element) node).getAttribute(CLASS_PROPERTY);

-					return value;

-				}

-			}

-		}

-		return null;

-	}

-

-	// We should not depend on the properties view to edit the custom style.

-	// FIXME: Move CustomStyleValueCommand to infra.gmfdiag.common (or infra.gmfdiag.tools)

-	public ICommand getPostCommand(final IAdaptable viewAdapter) {

-		TransactionalEditingDomain domain = (TransactionalEditingDomain) EMFHelper.resolveEditingDomain(viewAdapter);

-

-		if (domain != null) {

-			AbstractTransactionalCommand transactionalCommand = new AbstractTransactionalCommand(domain, "Change css style", null) {

-

-				@Override

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

-					View notationView = (View) viewAdapter.getAdapter(View.class);

-					if (notationView != null) {

-						String value = getValue();

-						if (value != null) {

-							AddCustomStyleListValueCommand command = new AddCustomStyleListValueCommand(getEditingDomain(), notationView, CSS_CLASS, NotationPackage.eINSTANCE.getStringListValueStyle(),

-									NotationPackage.eINSTANCE.getStringListValueStyle_StringListValue(), value);

-							command.execute();

-							return CommandResult.newOKCommandResult();

-						}

-					}

-					return CommandResult.newOKCommandResult();

-				}

-			};

-

-			return transactionalCommand;

-		}

-

-		return null;

-	}

-}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/provider/CSSStyleAspectActionProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/provider/CSSStyleAspectActionProvider.java
deleted file mode 100644
index c2ad08695cf..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/provider/CSSStyleAspectActionProvider.java
+++ /dev/null
@@ -1,39 +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.palette.provider;

-

-import org.eclipse.papyrus.infra.gmfdiag.css.palette.aspect.CSSStylePostAction;

-import org.eclipse.papyrus.uml.diagram.common.service.palette.AbstractAspectActionProvider;

-import org.eclipse.papyrus.uml.diagram.common.service.palette.IAspectAction;

-import org.eclipse.papyrus.uml.diagram.common.service.palette.IPaletteEntryProxy;

-import org.w3c.dom.Node;

-

-/**

- * A Palette post action provider to automatically add a CSS Style on a newly created element

- *

- * @author Camille Letavernier

- *

- * @see CSSStylePostAction

- */

-public class CSSStyleAspectActionProvider extends AbstractAspectActionProvider {

-

-	public IAspectAction createAction(Node configurationNode) {

-		IAspectAction cssStylePostAction = new CSSStylePostAction();

-		cssStylePostAction.init(configurationNode, this);

-		return cssStylePostAction;

-	}

-

-	public boolean isEnable(IPaletteEntryProxy entryProxy) {

-		return true;

-	}

-

-}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/pom.xml
index fef26f2de10..3757f49be3d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.dnd</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/.classpath
index ad32c83a788..eca7bdba8f0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/.classpath
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/.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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..b3aa6d60f94 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 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.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/META-INF/MANIFEST.MF
index 8dd360e7646..72372bd72cb 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/META-INF/MANIFEST.MF
@@ -1,28 +1,28 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.export

-Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0",

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

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

- org.eclipse.core.expressions;bundle-version="3.4.300",

- org.eclipse.emf.common.ui;bundle-version="2.7.0",

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

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

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

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

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0",

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

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

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

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

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

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

- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.export.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.export;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.export
+Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.4.1",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.core.expressions;bundle-version="3.4.300",
+ org.eclipse.emf.common.ui;bundle-version="2.7.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.decoration;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.semantic;bundle-version="1.2.0"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.export.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.export;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/plugin.xml
index 68fdce3d716..178d33c83ab 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/plugin.xml
@@ -98,7 +98,7 @@
             allPopups="true"
             locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup?after=org.eclipse.papyrus.uml.import.menu">
          <menu
-               id="org.eclipse.papyrus.uml.export.menu"
+               id="org.eclipse.papyrus.infra.gmfdiag.export.menu"
                label="&amp;Export"
                icon="icons/export_wiz_16x16-papyrusColor.gif"
                tooltip="Papyrus Export Menu">            
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/pom.xml
index ebadecff5c9..a06e4b6f4f1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.export</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/engine/ExportAllDiagramsEngine.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/engine/ExportAllDiagramsEngine.java
index 5df647f3b86..d7022d60cd9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/engine/ExportAllDiagramsEngine.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/engine/ExportAllDiagramsEngine.java
@@ -20,6 +20,8 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.eclipse.core.resources.WorkspaceJob;
 import org.eclipse.core.runtime.CoreException;
@@ -50,12 +52,11 @@ import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.resource.ModelsReader;
 import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelManager;
-import org.eclipse.papyrus.infra.core.sashwindows.di.service.ILocalPageService;
 import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;
 import org.eclipse.papyrus.infra.core.services.ServiceDescriptor;
 import org.eclipse.papyrus.infra.core.services.ServiceDescriptor.ServiceTypeKind;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServiceMultiException;
 import org.eclipse.papyrus.infra.core.services.ServiceStartKind;
 import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
 import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
@@ -67,10 +68,8 @@ import org.eclipse.papyrus.infra.gmfdiag.export.actions.ExportAllDiagramsParamet
 import org.eclipse.papyrus.infra.gmfdiag.export.messages.Messages;
 import org.eclipse.papyrus.infra.services.decoration.DecorationService;
 import org.eclipse.papyrus.infra.services.markerlistener.MarkersMonitorService;
-import org.eclipse.papyrus.infra.ui.editor.DiSashModelManagerServiceFactory;
-import org.eclipse.papyrus.infra.ui.editor.PageMngrServiceFactory;
-import org.eclipse.papyrus.uml.tools.model.UmlUtils;
-import org.eclipse.papyrus.views.validation.internal.ValidationMarkersService;
+import org.eclipse.papyrus.infra.services.semantic.service.SemanticService;
+import org.eclipse.papyrus.infra.services.validation.IValidationMarkersService;
 import org.eclipse.swt.SWTError;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbenchWindow;
@@ -202,11 +201,14 @@ public class ExportAllDiagramsEngine {
 
 
 				// Get pages manager from service registry
-				IPageManager pageManager = null;
+				IPageManager pageManager;
+				SemanticService semanticService;
 				try {
 					pageManager = ServiceUtilsForResourceSet.getInstance().getService(IPageManager.class, modelSet);
+					semanticService = ServiceUtilsForResourceSet.getInstance().getService(SemanticService.class, modelSet);
 				} catch (ServiceException e) {
 					Activator.log.error(e);
+					return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Failed to obtain required services.", e);
 				}
 
 				if (diagnostic.getSeverity() != Diagnostic.OK || newMonitor.isCanceled()) {
@@ -214,17 +216,13 @@ public class ExportAllDiagramsEngine {
 				}
 
 				// Step 3 : Get all diagram
-				ILocalPageService service = new ExportDiagramLocalPageService(UmlUtils.getUmlResource(modelSet).getContents().get(0));
-				List<Object> pagesList = pageManager.allLocalPages(service);
-				List<Diagram> diagrams = new ArrayList<Diagram>();
-
-
-				for (Object page : pagesList) {
-
-					if (page instanceof Diagram) {
-						diagrams.add((Diagram) page);
-					}
-				}
+				List<Diagram> diagrams = Stream.of(semanticService.getSemanticRoots())
+						.map(ExportDiagramLocalPageService::new)
+						.flatMap(service -> pageManager.allLocalPages(service).stream())
+						.filter(Diagram.class::isInstance)
+						.map(Diagram.class::cast)
+						.distinct()
+						.collect(Collectors.toList());
 
 				if (newMonitor.isCanceled()) {
 					return handleDiagnosticStatus();
@@ -267,21 +265,30 @@ public class ExportAllDiagramsEngine {
 	 * @return the model set
 	 */
 	private ModelSet initialiseModelSet() {
-		ServicesRegistry service = new ServicesRegistry();
+		ServicesRegistry service = null;
+
+		try {
+			service = new ExtensionServicesRegistry();
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+			service = new ServicesRegistry(); // This won't really work
+		}
 
-		// Add service factory for Model Set
+		// Override service factory for Model Set
 		ServiceDescriptor descriptor = new ServiceDescriptor(ModelSet.class, ModelSetServiceFactory.class.getName(), ServiceStartKind.STARTUP, 10);
 		descriptor.setServiceTypeKind(ServiceTypeKind.serviceFactory);
 		service.add(descriptor);
 
-		// Add factory for editing domain
+		// Override factory for editing domain
 		descriptor = new ServiceDescriptor(TransactionalEditingDomain.class, EditingDomainServiceFactory.class.getName(), ServiceStartKind.STARTUP, 10, Collections.singletonList(ModelSet.class.getName()));
 		descriptor.setServiceTypeKind(ServiceTypeKind.serviceFactory);
 		service.add(descriptor);
 
 		try {
-			service.startRegistry();
-		} catch (ServiceMultiException e) {
+			service.startServicesByClassKeys(
+					ModelSet.class,
+					TransactionalEditingDomain.class);
+		} catch (ServiceException e) {
 			Activator.log.error(e);
 		}
 
@@ -326,87 +333,66 @@ public class ExportAllDiagramsEngine {
 	 *            the model set
 	 */
 	private void initialiseServiceRegistry(ModelSet modelSet) {
-
 		ServicesRegistry service = ModelSetServiceFactory.getServiceRegistry(modelSet);
 
 		try {
 
 			if (service == null) {
-				service = new ServicesRegistry();
-				addModelSetServices(modelSet, service);
-				service.startRegistry();
+				service = new ExtensionServicesRegistry();
+				startModelSetServices(modelSet, service);
 			}
 
-			addCSSServices(service);
-			service.startRegistry();
-
-			addModelerServices(service);
-			service.startRegistry();
+			startCSSServices(service);
+			startModelerServices(service);
 
 		} catch (ServiceException e) {
 			diagnostic = new BasicDiagnostic(Diagnostic.ERROR, Activator.PLUGIN_ID, 0, "Failed to load models", new Object[] { e });
 		}
-
-
-
-
 	}
 
 
 	/**
-	 * Adds the model set services.
+	 * Starts the model set services.
 	 *
 	 * @param modelSet
 	 *            the model set
 	 * @param service
 	 *            the service
 	 */
-	private void addModelSetServices(ModelSet modelSet, ServicesRegistry service) {
+	private void startModelSetServices(ModelSet modelSet, ServicesRegistry service) throws ServiceException {
 		service.add(ModelSet.class, 10, modelSet);
-		ServiceDescriptor descriptor = new ServiceDescriptor(TransactionalEditingDomain.class, EditingDomainServiceFactory.class.getName(), ServiceStartKind.STARTUP, 10, Collections.singletonList(ModelSet.class.getName()));
-		descriptor.setServiceTypeKind(ServiceTypeKind.serviceFactory);
-		service.add(descriptor);
+
+		service.startServicesByClassKeys(ModelSet.class);
 	}
 
 
 	/**
-	 * Adds the modeler services.
+	 * Starts the modeler services.
 	 *
 	 * @param service
 	 *            the service
 	 */
-	private void addModelerServices(ServicesRegistry service) {
-
-		// Di model services
-		ServiceDescriptor descriptor = new ServiceDescriptor(DiSashModelManager.class, DiSashModelManagerServiceFactory.class.getName(), ServiceStartKind.STARTUP, 10, Collections.singletonList(TransactionalEditingDomain.class.getName()));
-		descriptor.setServiceTypeKind(ServiceTypeKind.serviceFactory);
-		service.add(descriptor);
-
-		// Page Manager services
-		descriptor = new ServiceDescriptor(IPageManager.class, PageMngrServiceFactory.class.getName(), ServiceStartKind.STARTUP, 10, Collections.singletonList(DiSashModelManager.class.getName()));
-		descriptor.setServiceTypeKind(ServiceTypeKind.serviceFactory);
-		service.add(descriptor);
-
-
-
+	private void startModelerServices(ServicesRegistry service) throws ServiceException {
+		service.startServicesByClassKeys(
+				DiSashModelManager.class,
+				IPageManager.class,
+				SemanticService.class);
 	}
 
 
 	/**
-	 * Adds the css services.
+	 * Starts the css services.
 	 *
 	 * @param service
 	 *            the service
 	 */
-	private void addCSSServices(ServicesRegistry service) {
-
-		service.add(MarkersMonitorService.class, 10, new MarkersMonitorService());
-		service.add(CssMarkerEventManagerService.class, 10, new CssMarkerEventManagerService());
-		service.add(MarkerToPseudoSelectorMappingService.class, 10, new MarkerToPseudoSelectorMappingService());
-		service.add(ValidationMarkersService.class, 10, new ValidationMarkersService());
-		service.add(DecorationService.class, 10, new DecorationService());
-
-
+	private void startCSSServices(ServicesRegistry service) throws ServiceException {
+		service.startServicesByClassKeys(
+				MarkersMonitorService.class,
+				CssMarkerEventManagerService.class,
+				MarkerToPseudoSelectorMappingService.class,
+				IValidationMarkersService.class,
+				DecorationService.class);
 	}
 
 	/**
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/utils/ExportUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/utils/ExportUtils.java
new file mode 100644
index 00000000000..54d180254a1
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/utils/ExportUtils.java
@@ -0,0 +1,81 @@
+/*****************************************************************************
+ * Copyright (c) 2016 Christian W. Damus and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.export.utils;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResourceSet;
+import org.eclipse.papyrus.infra.gmfdiag.export.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.export.engine.ExportDiagramLocalPageService;
+import org.eclipse.papyrus.infra.services.semantic.service.SemanticService;
+
+/**
+ * Static utilities in support of the export APIs.
+ */
+public class ExportUtils {
+
+	private ExportUtils() {
+		super();
+	}
+
+	/**
+	 * Obtains the complete collection of exportable diagrams in a model-set.
+	 * 
+	 * @param modelSet
+	 *            the model-set from which to export diagrams
+	 * 
+	 * @return the exportable diagrams (which may be empty if there are none)
+	 * 
+	 * @throws ServiceException
+	 *             on failure to get a required Papyrus service
+	 */
+	public static List<Diagram> getExportableDiagrams(ModelSet modelSet) throws ServiceException {
+		return exportableDiagrams(modelSet).collect(Collectors.toList());
+	}
+
+	private static Stream<Diagram> exportableDiagrams(ModelSet modelSet) throws ServiceException {
+		IPageManager pageManager = ServiceUtilsForResourceSet.getInstance().getService(IPageManager.class, modelSet);
+		SemanticService semanticService = ServiceUtilsForResourceSet.getInstance().getService(SemanticService.class, modelSet);
+
+		return Stream.of(semanticService.getSemanticRoots())
+				.map(ExportDiagramLocalPageService::new)
+				.flatMap(service -> pageManager.allLocalPages(service).stream())
+				.filter(Diagram.class::isInstance)
+				.map(Diagram.class::cast)
+				.distinct();
+	}
+
+	/**
+	 * Queries whether a model-set has any exportable diagrams.
+	 * 
+	 * @param modelSet
+	 *            the model-set from which to export diagrams
+	 * 
+	 * @return whether it has any diagrams
+	 */
+	public static boolean hasExportableDiagrams(ModelSet modelSet) {
+		try {
+			return exportableDiagrams(modelSet).findAny().isPresent();
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+			return false;
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/utils/SelectionHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/utils/SelectionHelper.java
index 4eb9c5196da..e44ffca1195 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/utils/SelectionHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/utils/SelectionHelper.java
@@ -15,22 +15,16 @@
 package org.eclipse.papyrus.infra.gmfdiag.export.utils;
 
 import java.util.Collection;
-import java.util.List;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.resource.Resource;
 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.core.resource.sasheditor.DiModel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.service.ILocalPageService;
-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.gmfdiag.export.engine.ExportDiagramLocalPageService;
 import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForSelection;
-import org.eclipse.papyrus.uml.tools.model.UmlUtils;
 
 /**
  * Helper to extract file from selection in Project Explorer.
@@ -120,39 +114,15 @@ public class SelectionHelper {
 	 * @return true, if is exportable mosdel
 	 */
 	public static boolean isExportableModel(IStructuredSelection receiver) {
+		boolean result = false;
 
-
-		IPageManager pageManager = null;
 		try {
-			pageManager = ServiceUtilsForSelection.getInstance().getService(IPageManager.class, receiver);
+			ModelSet modelSet = ServiceUtilsForSelection.getInstance().getModelSet(receiver);
+			result = (modelSet != null) && ExportUtils.hasExportableDiagrams(modelSet);
 		} catch (ServiceException e) {
-			// Ignore service exception
-		}
-
-
-		boolean isExportable = false;
-
-		if (pageManager != null) {
-
-			ModelSet modelSet = null;
-			try {
-				modelSet = ServiceUtilsForSelection.getInstance().getModelSet(receiver);
-			} catch (ServiceException e) {
-				// Ignore service exception
-				return false;
-			}
-
-			// There is at least one diagram in resource
-			Resource umlResource = UmlUtils.getUmlResource(modelSet);
-			ILocalPageService service = new ExportDiagramLocalPageService(umlResource.getContents().get(0));
-			List<Object> localPages = pageManager.allLocalPages(service);
-
-			isExportable = !localPages.isEmpty();
-
+			// Ignore; it's normal for some selections
 		}
 
-
-
-		return isExportable;
+		return result;
 	}
 }
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/pom.xml
index 983819332af..dc66c8a0a0f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.gef</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/pom.xml
index 788158b8534..184e1228f71 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF
index ae0c7298ef5..495a4876555 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF
@@ -19,9 +19,12 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.services.navigation;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"
 Export-Package: org.eclipse.papyrus.infra.gmfdiag.hyperlink,
  org.eclipse.papyrus.infra.gmfdiag.hyperlink.editpolicies,
+ org.eclipse.papyrus.infra.gmfdiag.hyperlink.helper,
+ org.eclipse.papyrus.infra.gmfdiag.hyperlink.object,
  org.eclipse.papyrus.infra.gmfdiag.hyperlink.ui
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/build.properties
index e3693a3b66e..61e14d04fc3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/build.properties
@@ -1,7 +1,8 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               plugin.xml

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               plugin.xml,\
+               icons/
+src.includes = about.html
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/Add_16x16.gif b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/icons/obj16/Plus.gif
index 252d7ebcb8c..252d7ebcb8c 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/Add_16x16.gif
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/icons/obj16/Plus.gif
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/plugin.xml
index 91cc4e06ce7..c4891f51b53 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/plugin.xml
@@ -24,4 +24,20 @@
       
    </extension>
 
+   <extension
+         point="org.eclipse.papyrus.infra.hyperlink.registration">
+      <hyperlink
+            helper="org.eclipse.papyrus.infra.gmfdiag.hyperlink.helper.EditorHyperLinkHelper"
+            position="50"
+            tabId="org.eclipse.papyrus.infra.hyperlink.editor">
+      </hyperlink>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">
+      <!-- Priority 35 is higher than the core's priority-40 label provider for the same type. -->
+      <labelProvider
+            priority="35"
+            provider="org.eclipse.papyrus.infra.gmfdiag.hyperlink.providers.EditorHyperlinkLabelProvider">
+      </labelProvider>
+   </extension>
 </plugin>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/pom.xml
index 54563be25ed..a368b8f303e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.hyperlink</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/Activator.java
index f893293366a..0f87528ea0f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/Activator.java
@@ -1,69 +1,76 @@
-/*****************************************************************************

- * 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.hyperlink;

-

-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.infra.gmfdiag.hyperlink"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

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

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

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

-	 */

-	@Override

-	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;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.hyperlink;
+
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.swt.graphics.Image;
+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.gmfdiag.hyperlink"; //$NON-NLS-1$
+
+	public static final String IMG_PLUS = "plus"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	@Override
+	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
+	protected void initializeImageRegistry(ImageRegistry reg) {
+		super.initializeImageRegistry(reg);
+
+		reg.put(IMG_PLUS, imageDescriptorFromPlugin(PLUGIN_ID, "icons/obj16/Plus.gif")); //$NON-NLS-1$
+	}
+
+	public Image getIcon(String key) {
+		return getImageRegistry().get(key);
+	}
+
+}
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 e03aa2cc6f7..701afe40cbe 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
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2009, 2014 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2009, 2016 CEA LIST, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,7 +8,7 @@
  *
  * Contributors:
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 451230
+ *  Christian W. Damus - bugs 451230, 485220
  *
  *****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.hyperlink.editpolicies;
@@ -41,7 +41,6 @@ import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkHelpersRegistrationUtil
 import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
 import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistry;
 import org.eclipse.papyrus.infra.ui.editorsfactory.PageIconsRegistry;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 /**
  * The Class HyperLinkPopupBarEditPolicy can be applied on edit part to display
@@ -84,7 +83,7 @@ public class HyperLinkPopupBarEditPolicy extends PapyrusPopupBarEditPolicy {
 		}
 
 		// Add the New Hyperlink tool
-		addPopupBarDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.papyrus.uml.diagram.common", "/icons/obj16/Plus.gif").createImage(), new AddHyperlinkTool(), "Add hyperlink");
+		addPopupBarDescriptor(Activator.getDefault().getIcon(Activator.IMG_PLUS), new AddHyperlinkTool(), "Add hyperlink");
 	}
 
 	//
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/HyperlinkNavigationMenuEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/HyperlinkNavigationMenuEditPolicy.java
index 4dfcd471761..86a5ec70a86 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/HyperlinkNavigationMenuEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/HyperlinkNavigationMenuEditPolicy.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2009, 2014 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2009, 2016 CEA LIST, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,7 +8,7 @@
  *
  * Contributors:
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 451230
+ *  Christian W. Damus - bugs 451230, 485220
  *  Shuai Li - Modifications for navigation menu integration
  *
  *****************************************************************************/
@@ -47,7 +47,6 @@ import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderSer
 import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistry;
 import org.eclipse.papyrus.infra.ui.editorsfactory.PageIconsRegistry;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 /**
  * The Class HyperlinkNavigationMenuEditPolicy can be applied on edit part to display
@@ -105,7 +104,7 @@ public class HyperlinkNavigationMenuEditPolicy extends NavigationEditPolicy {
 		}
 
 		// Add the New Hyperlink tool
-		addNavigationMenuHyperlinkDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.papyrus.uml.diagram.common", "/icons/obj16/Plus.gif").createImage(), new AddHyperlinkAction(), "Open hyperlinks menu", "Modify hyperlinks");
+		addNavigationMenuHyperlinkDescriptor(Activator.getDefault().getIcon(Activator.IMG_PLUS), new AddHyperlinkAction(), "Open hyperlinks menu", "Modify hyperlinks");
 	}
 
 	private void addHyperlinks() {
@@ -167,7 +166,7 @@ public class HyperlinkNavigationMenuEditPolicy extends NavigationEditPolicy {
 	// Nested types
 	//
 
-	//protected abstract class AbstractHyperlinkTool extends AbstractTool implements DragTracker {
+	// protected abstract class AbstractHyperlinkTool extends AbstractTool implements DragTracker {
 	protected abstract class AbstractHyperlinkAction extends Action {
 
 	}
@@ -180,7 +179,7 @@ public class HyperlinkNavigationMenuEditPolicy extends NavigationEditPolicy {
 			hyperLinkManagerShell.setInput(hyperLinkObjectList);
 
 			// Hide the navigation menu now because the shell is modal
-			//destroyViewerContext();
+			// destroyViewerContext();
 
 			hyperLinkManagerShell.open();
 		}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/NavigationEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/NavigationEditPolicy.java
index 6c33721c402..e82f0960fad 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/NavigationEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/NavigationEditPolicy.java
@@ -40,10 +40,10 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.OpenEditPolicy;
 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.commands.INonDirtying;
-import org.eclipse.papyrus.commands.util.NonDirtyingUtils;
 import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.gmf.command.INonDirtying;
+import org.eclipse.papyrus.infra.emf.gmf.util.CommandUtils;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
 import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.hyperlink.Activator;
@@ -241,7 +241,7 @@ public class NavigationEditPolicy extends OpenEditPolicy {
 					@Override
 					public void execute() {
 						Iterator<HyperLinkObject> iter = hList.iterator();
-						openLinksCommand = NonDirtyingUtils.nonDirtyingGMFComposite("Navigate hyperlinks");
+						openLinksCommand = CommandUtils.nonDirtyingGMFComposite("Navigate hyperlinks");
 
 						try {
 							TransactionalEditingDomain editingDomain = ServiceUtilsForEditPart.getInstance().getTransactionalEditingDomain(getHost());
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/EditorHyperLinkHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/helper/EditorHyperLinkHelper.java
index 1a8255131e5..4208d7d2837 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/EditorHyperLinkHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/helper/EditorHyperLinkHelper.java
@@ -1,185 +1,187 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *  Christian W. Damus (CEA LIST) - implement extension API to support drag-and-drop

- *  Christian W. Damus - bug 485220

- *

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

-package org.eclipse.papyrus.infra.hyperlink.helper;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

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

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

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

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

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

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

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

-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

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

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

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

-import org.eclipse.papyrus.infra.hyperlink.Activator;

-import org.eclipse.papyrus.infra.hyperlink.commands.CreateHyperLinkPageCommand;

-import org.eclipse.papyrus.infra.hyperlink.messages.Messages;

-import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkEditor;

-import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;

-import org.eclipse.papyrus.infra.hyperlink.ui.EditorHyperLinkEditorShell;

-import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistry;

-

-/**

- *

- * The helper for editors

- *

- */

-public class EditorHyperLinkHelper extends AbstractHyperLinkHelper implements IHyperlinkHelperExtension {

-

-

-	@Override

-	public String getNameofManagedHyperLink() {

-		return Messages.EditorHyperLinkHelper_Editor;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper#executeNewMousePressed(java.util.List, org.eclipse.emf.ecore.EObject)

-	 *

-	 * @param list

-	 * @param aModel

-	 */

-	@Override

-	public void executeNewMousePressed(final List<HyperLinkObject> list, final EObject aModel) {

-		IPageIconsRegistry editorRegistry;

-		try {

-			editorRegistry = ServiceUtilsForEObject.getInstance().getService(IPageIconsRegistry.class, aModel);

-		} catch (ServiceException e) {

-			Activator.log.error(e);

-			return;

-		}

-		EditorHyperLinkEditorShell editor = new EditorHyperLinkEditorShell(editorRegistry, aModel);

-		editor.open();

-		if (editor.getHyperLinkEditor() != null) {

-			list.add(editor.getHyperLinkEditor());

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper#getFilteredObject(java.util.List)

-	 *

-	 * @param hyperLinkObjects

-	 * @return

-	 */

-	@Override

-	public List<HyperLinkObject> getFilteredObject(final List<HyperLinkObject> hyperLinkObjects) {

-		ArrayList<HyperLinkObject> result = new ArrayList<HyperLinkObject>();

-		Iterator<HyperLinkObject> iterator = hyperLinkObjects.iterator();

-		while (iterator.hasNext()) {

-			HyperLinkObject current = iterator.next();

-			if (current instanceof HyperLinkEditor) {

-				result.add(current);

-			}

-		}

-		return result;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper#getHyperLinkObject(org.eclipse.emf.ecore.EAnnotation)

-	 *

-	 * @param eAnnotation

-	 * @return

-	 */

-	@Override

-	public HyperLinkObject getHyperLinkObject(EAnnotation eAnnotation) {

-		return getHyperLinkObjectFor(eAnnotation);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper#getAddHyperLinkCommand(org.eclipse.emf.transaction.TransactionalEditingDomain, org.eclipse.emf.ecore.EModelElement, org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject)

-	 *

-	 * @param domain

-	 * @param object

-	 * @param HyperLinkObject

-	 * @return

-	 */

-	@Override

-	public RecordingCommand getAddHyperLinkCommand(TransactionalEditingDomain domain, EModelElement object, HyperLinkObject hyperLinkObject) {

-		if (hyperLinkObject instanceof HyperLinkEditor) {

-			HyperLinkEditor hyperLinkEditor = (HyperLinkEditor) hyperLinkObject;

-			return new CreateHyperLinkPageCommand(domain, object, hyperLinkEditor.getTooltipText(), HyperLinkConstants.PAPYRUS_HYPERLINK_PAGE, (EObject) hyperLinkEditor.getObject(), hyperLinkObject.getIsDefault());

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param editor

-	 *            an editor

-	 * @return

-	 * 		the HyperLinkEditor corresponding to this object

-	 *

-	 */

-	public HyperLinkEditor getHyperLinkObjectFor(final Object editor) {// create an interface for this method?

-		HyperLinkEditor hyperLinkEditor = new HyperLinkEditor();

-		hyperLinkEditor.setObject(editor);

-		return hyperLinkEditor;

-	}

-

-	/**

-	 *

-	 * @param eAnnotation

-	 *            an eAnnotation

-	 * @return

-	 * 		the HyperLinkEditor corresponding to this eAnnotation

-	 */

-	public HyperLinkEditor getHyperLinkObjectFor(final EAnnotation eAnnotation) {

-		for (String source : HyperLinkConstants.validHyperLinkPageSources) {

-			if (source.equals(eAnnotation.getSource())) {

-				if (!eAnnotation.getReferences().isEmpty()) {

-					HyperLinkEditor editor = new HyperLinkEditor();

-					editor.setObject(eAnnotation.getReferences().get(0));

-					editor.setIsDefault(Boolean.parseBoolean(eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_IS_DEFAULT_NAVIGATION)));

-					editor.setTooltipText(eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_TOOLTYPE_TEXT));

-					return editor;

-				}

-			}

-		}

-

-		return null;

-	}

-

-	public Command getCreateHyperlinkCommand(TransactionalEditingDomain domain, EModelElement linkOwner, Object linkTarget) {

-		Command result = null;

-

-		final ServicesRegistry registry;

-		try {

-			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(linkOwner);

-			IPageManager pageManager = registry.getService(IPageManager.class);

-

-			if ((linkTarget instanceof EObject) && pageManager.allPages().contains(linkTarget)) {

-				ILabelProvider labelProvider = registry.getService(LabelProviderService.class).getLabelProvider();

-

-				String text = labelProvider.getText(linkTarget);

-				result = new CreateHyperLinkPageCommand(domain, linkOwner, text, text, (EObject) linkTarget, true);

-			}

-		} catch (ServiceException ex) {

-			Activator.log.error(ex);

-		}

-

-		return result;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA LIST) - implement extension API to support drag-and-drop
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.hyperlink.helper;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.gmfdiag.hyperlink.messages.Messages;
+import org.eclipse.papyrus.infra.gmfdiag.hyperlink.object.HyperLinkEditor;
+import org.eclipse.papyrus.infra.gmfdiag.hyperlink.ui.EditorHyperLinkEditorShell;
+import org.eclipse.papyrus.infra.hyperlink.Activator;
+import org.eclipse.papyrus.infra.hyperlink.commands.CreateHyperLinkPageCommand;
+import org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper;
+import org.eclipse.papyrus.infra.hyperlink.helper.IHyperlinkHelperExtension;
+import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;
+import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistry;
+
+/**
+ *
+ * The helper for editors
+ *
+ */
+public class EditorHyperLinkHelper extends AbstractHyperLinkHelper implements IHyperlinkHelperExtension {
+
+
+	@Override
+	public String getNameofManagedHyperLink() {
+		return Messages.EditorHyperLinkHelper_Editor;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper#executeNewMousePressed(java.util.List, org.eclipse.emf.ecore.EObject)
+	 *
+	 * @param list
+	 * @param aModel
+	 */
+	@Override
+	public void executeNewMousePressed(final List<HyperLinkObject> list, final EObject aModel) {
+		IPageIconsRegistry editorRegistry;
+		try {
+			editorRegistry = ServiceUtilsForEObject.getInstance().getService(IPageIconsRegistry.class, aModel);
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+			return;
+		}
+		EditorHyperLinkEditorShell editor = new EditorHyperLinkEditorShell(editorRegistry, aModel);
+		editor.open();
+		if (editor.getHyperLinkEditor() != null) {
+			list.add(editor.getHyperLinkEditor());
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper#getFilteredObject(java.util.List)
+	 *
+	 * @param hyperLinkObjects
+	 * @return
+	 */
+	@Override
+	public List<HyperLinkObject> getFilteredObject(final List<HyperLinkObject> hyperLinkObjects) {
+		ArrayList<HyperLinkObject> result = new ArrayList<HyperLinkObject>();
+		Iterator<HyperLinkObject> iterator = hyperLinkObjects.iterator();
+		while (iterator.hasNext()) {
+			HyperLinkObject current = iterator.next();
+			if (current instanceof HyperLinkEditor) {
+				result.add(current);
+			}
+		}
+		return result;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper#getHyperLinkObject(org.eclipse.emf.ecore.EAnnotation)
+	 *
+	 * @param eAnnotation
+	 * @return
+	 */
+	@Override
+	public HyperLinkObject getHyperLinkObject(EAnnotation eAnnotation) {
+		return getHyperLinkObjectFor(eAnnotation);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper#getAddHyperLinkCommand(org.eclipse.emf.transaction.TransactionalEditingDomain, org.eclipse.emf.ecore.EModelElement, org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject)
+	 *
+	 * @param domain
+	 * @param object
+	 * @param HyperLinkObject
+	 * @return
+	 */
+	@Override
+	public RecordingCommand getAddHyperLinkCommand(TransactionalEditingDomain domain, EModelElement object, HyperLinkObject hyperLinkObject) {
+		if (hyperLinkObject instanceof HyperLinkEditor) {
+			HyperLinkEditor hyperLinkEditor = (HyperLinkEditor) hyperLinkObject;
+			return new CreateHyperLinkPageCommand(domain, object, hyperLinkEditor.getTooltipText(), HyperLinkConstants.PAPYRUS_HYPERLINK_PAGE, (EObject) hyperLinkEditor.getObject(), hyperLinkObject.getIsDefault());
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param editor
+	 *            an editor
+	 * @return
+	 * 		the HyperLinkEditor corresponding to this object
+	 *
+	 */
+	public HyperLinkEditor getHyperLinkObjectFor(final Object editor) {// create an interface for this method?
+		HyperLinkEditor hyperLinkEditor = new HyperLinkEditor();
+		hyperLinkEditor.setObject(editor);
+		return hyperLinkEditor;
+	}
+
+	/**
+	 *
+	 * @param eAnnotation
+	 *            an eAnnotation
+	 * @return
+	 * 		the HyperLinkEditor corresponding to this eAnnotation
+	 */
+	public HyperLinkEditor getHyperLinkObjectFor(final EAnnotation eAnnotation) {
+		for (String source : HyperLinkConstants.validHyperLinkPageSources) {
+			if (source.equals(eAnnotation.getSource())) {
+				if (!eAnnotation.getReferences().isEmpty()) {
+					HyperLinkEditor editor = new HyperLinkEditor();
+					editor.setObject(eAnnotation.getReferences().get(0));
+					editor.setIsDefault(Boolean.parseBoolean(eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_IS_DEFAULT_NAVIGATION)));
+					editor.setTooltipText(eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_TOOLTYPE_TEXT));
+					return editor;
+				}
+			}
+		}
+
+		return null;
+	}
+
+	public Command getCreateHyperlinkCommand(TransactionalEditingDomain domain, EModelElement linkOwner, Object linkTarget) {
+		Command result = null;
+
+		final ServicesRegistry registry;
+		try {
+			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(linkOwner);
+			IPageManager pageManager = registry.getService(IPageManager.class);
+
+			if ((linkTarget instanceof EObject) && pageManager.allPages().contains(linkTarget)) {
+				ILabelProvider labelProvider = registry.getService(LabelProviderService.class).getLabelProvider();
+
+				String text = labelProvider.getText(linkTarget);
+				result = new CreateHyperLinkPageCommand(domain, linkOwner, text, text, (EObject) linkTarget, true);
+			}
+		} catch (ServiceException ex) {
+			Activator.log.error(ex);
+		}
+
+		return result;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/messages/Messages.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/messages/Messages.java
new file mode 100644
index 00000000000..0666379b224
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/messages/Messages.java
@@ -0,0 +1,36 @@
+/*****************************************************************************
+ * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA LIST) - Consolidate all hyperlink helper contributions into one tab
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.hyperlink.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.gmfdiag.hyperlink.messages.messages"; //$NON-NLS-1$
+
+	public static String EditorHyperLinkEditorShell_ICanFindTheHyperLinkEditorObject;
+
+	public static String EditorHyperLinkEditorShell_View;
+
+	public static String EditorHyperLinkHelper_Editor;
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/messages/messages.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/messages/messages.properties
new file mode 100644
index 00000000000..d36f735bae0
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/messages/messages.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#   CEA LIST - Initial API and implementation
+#   Christian W. Damus (CEA LIST) - Consolidate all hyperlink helper contributions into one tab
+#   Christian W. Damus - bug 485220
+#
+EditorHyperLinkEditorShell_ICanFindTheHyperLinkEditorObject=I can't find the HyperlinkEditorObject for : {0}
+EditorHyperLinkEditorShell_View=View :
+EditorHyperLinkHelper_Editor=View
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkEditor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/object/HyperLinkEditor.java
index aa302885f28..c0f94624ae4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkEditor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/object/HyperLinkEditor.java
@@ -1,85 +1,86 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *  Christian W. Damus - bug 485220

- *

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

-package org.eclipse.papyrus.infra.hyperlink.object;

-

-import java.util.List;

-

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

-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

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

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

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

-import org.eclipse.papyrus.infra.hyperlink.Activator;

-import org.eclipse.papyrus.infra.hyperlink.ui.EditorHyperLinkEditorShell;

-import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistry;

-

-

-public class HyperLinkEditor extends HyperLinkObject {

-

-	@Override

-	public void openLink() {

-		EObject context = EMFHelper.getEObject(getObject());

-		if (context != null) {

-			try {

-				final IPageManager pageManager = ServiceUtilsForEObject.getInstance().getService(IPageManager.class, context);

-				Object objectToOpen = getObject();

-				if (pageManager.isOpen(objectToOpen)) {

-					pageManager.selectPage(objectToOpen);

-				} else {

-					pageManager.openPage(objectToOpen);

-				}

-

-			} catch (Exception ex) {

-				Activator.log.error(ex);

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject#executeEditMousePressed(java.util.List, org.eclipse.emf.ecore.EObject)

-	 *

-	 * @param list

-	 * @param amodel

-	 */

-	@Override

-	public void executeEditMousePressed(List<HyperLinkObject> list, EObject amodel) {

-		IPageIconsRegistry editorRegistry;

-		try {

-			editorRegistry = ServiceUtilsForEObject.getInstance().getService(IPageIconsRegistry.class, amodel);

-		} catch (ServiceException e) {

-			Activator.log.error(e);

-			return;

-		}

-

-		EditorHyperLinkEditorShell editor = new EditorHyperLinkEditorShell(editorRegistry, amodel);

-		editor.setHyperLinkEditor(this);

-		editor.open();

-		if (editor.getHyperLinkEditor() != null) {

-			int index = list.indexOf(this);

-			list.remove(this);

-			list.add(index, editor.getHyperLinkEditor());

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * This HyperLink never needs a command, because the IPageManager already supports transactions

-	 */

-	@Override

-	public boolean needsOpenCommand() {

-		return false;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.hyperlink.object;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.gmfdiag.hyperlink.ui.EditorHyperLinkEditorShell;
+import org.eclipse.papyrus.infra.hyperlink.Activator;
+import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;
+import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistry;
+
+
+public class HyperLinkEditor extends HyperLinkObject {
+
+	@Override
+	public void openLink() {
+		EObject context = EMFHelper.getEObject(getObject());
+		if (context != null) {
+			try {
+				final IPageManager pageManager = ServiceUtilsForEObject.getInstance().getService(IPageManager.class, context);
+				Object objectToOpen = getObject();
+				if (pageManager.isOpen(objectToOpen)) {
+					pageManager.selectPage(objectToOpen);
+				} else {
+					pageManager.openPage(objectToOpen);
+				}
+
+			} catch (Exception ex) {
+				Activator.log.error(ex);
+			}
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject#executeEditMousePressed(java.util.List, org.eclipse.emf.ecore.EObject)
+	 *
+	 * @param list
+	 * @param amodel
+	 */
+	@Override
+	public void executeEditMousePressed(List<HyperLinkObject> list, EObject amodel) {
+		IPageIconsRegistry editorRegistry;
+		try {
+			editorRegistry = ServiceUtilsForEObject.getInstance().getService(IPageIconsRegistry.class, amodel);
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+			return;
+		}
+
+		EditorHyperLinkEditorShell editor = new EditorHyperLinkEditorShell(editorRegistry, amodel);
+		editor.setHyperLinkEditor(this);
+		editor.open();
+		if (editor.getHyperLinkEditor() != null) {
+			int index = list.indexOf(this);
+			list.remove(this);
+			list.add(index, editor.getHyperLinkEditor());
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * This HyperLink never needs a command, because the IPageManager already supports transactions
+	 */
+	@Override
+	public boolean needsOpenCommand() {
+		return false;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/providers/EditorHyperlinkLabelProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/providers/EditorHyperlinkLabelProvider.java
new file mode 100644
index 00000000000..d663f9b987a
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/providers/EditorHyperlinkLabelProvider.java
@@ -0,0 +1,71 @@
+/*****************************************************************************
+ * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.hyperlink.providers;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.gmfdiag.hyperlink.object.HyperLinkEditor;
+import org.eclipse.papyrus.infra.hyperlink.Activator;
+import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;
+import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Label provider for diagram-editor hyperlinks.
+ */
+public class EditorHyperlinkLabelProvider extends LabelProvider implements IFilteredLabelProvider {
+
+	public boolean accept(Object element) {
+		return element instanceof HyperLinkEditor;
+	}
+
+	@Override
+	public Image getImage(Object element) {
+		if (element instanceof HyperLinkEditor) {
+			EObject editorContext = EMFHelper.getEObject(((HyperLinkEditor) element).getObject());
+			if (editorContext != null) {
+				try {
+					return ServiceUtilsForEObject.getInstance().getService(LabelProviderService.class, editorContext).getLabelProvider().getImage(editorContext);
+				} catch (ServiceException ex) {
+					Activator.log.error(ex);
+				}
+			}
+		}
+
+		return super.getImage(element);
+	}
+
+	@Override
+	public String getText(Object element) {
+		if (element instanceof HyperLinkEditor) {
+			EObject editorContext = EMFHelper.getEObject(((HyperLinkEditor) element).getObject());
+			if (editorContext != null) {
+				try {
+					return ServiceUtilsForEObject.getInstance().getService(LabelProviderService.class, editorContext).getLabelProvider().getText(editorContext);
+				} catch (ServiceException ex) {
+					Activator.log.error(ex);
+				}
+			}
+		} else {
+			return super.getText(element);
+		}
+
+		return ((HyperLinkObject) element).getTooltipText();
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/AdvancedHLManager.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/AdvancedHLManager.java
index d1a914287ea..33ff3bfb55f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/AdvancedHLManager.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/AdvancedHLManager.java
@@ -1,125 +1,125 @@
-/*****************************************************************************

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

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

- *  Arthur Daussy (Atos) arthur.daussy@atos.net - Bug 363827 - [Improvement] Diagram creation, remember the latest tab chosen

- *  Vincent Lorenzo (CEA-LIST) Vincent.lorenzo@cea.fr (refactoring of the hyperlink)

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

-package org.eclipse.papyrus.infra.gmfdiag.hyperlink.ui;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

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

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

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

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

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

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

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

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

-import org.eclipse.papyrus.infra.hyperlink.helper.HyperLinkHelperFactory;

-import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkEditor;

-import org.eclipse.papyrus.infra.hyperlink.ui.AbstractHyperLinkTab;

-import org.eclipse.papyrus.infra.hyperlink.ui.HyperLinkManagerShell;

-import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistry;

-

-/**

- *

- * This hyperlink manager can manage default hyperlinks and creation of diagram with heuristic

- */

-public class AdvancedHLManager extends HyperLinkManagerShell {

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param editorFactoryRegistry

-	 *            the editor factory registry

-	 * @param model

-	 *            the model that contains all elements

-	 * @param domain

-	 *            the domain in order to execute command

-	 * @param umlElement

-	 *            the uml element linked to the view

-	 * @param aview

-	 *            the view of the uml element

-	 *

-	 */

-	public AdvancedHLManager(IPageIconsRegistry editorFactoryRegistry, TransactionalEditingDomain domain, EModelElement semanticElement, View aview, HyperLinkHelperFactory hyperHelperFactory) {

-		super(editorFactoryRegistry, domain, semanticElement, aview, hyperHelperFactory);

-	}

-

-	/**

-	 * this method parse the command to extract created diagram and construct a list of hyperlinkDiagrams

-	 *

-	 * @param creationcommand

-	 *            a gmf command

-	 * @return the list of hyperlinks diagram

-	 */

-	protected ArrayList<HyperLinkEditor> getCreatedHyperlinkDiagramsWithHeuristic(ICommand creationcommand) {

-		ArrayList<Diagram> diagrams = new ArrayList<Diagram>();

-		if (creationcommand instanceof CompositeCommand) {

-			CompositeCommand compositeCommand = (CompositeCommand) creationcommand;

-			Object value = compositeCommand.getCommandResult().getReturnValue();

-			if (value instanceof ArrayList) {

-				diagrams.addAll((Collection<Diagram>) value);

-			}

-		}

-		ArrayList<HyperLinkEditor> hyperLinkDiagrams = new ArrayList<HyperLinkEditor>();

-		for (int i = 0; i < diagrams.size(); i++) {

-			HyperLinkEditor hyperLinkEditor = new HyperLinkEditor();

-			hyperLinkEditor.setObject(diagrams.get(i));

-			hyperLinkEditor.setIsDefault(true);

-			hyperLinkEditor.setTooltipText(diagrams.get(i).getName());

-			hyperLinkDiagrams.add(hyperLinkEditor);

-		}

-		return hyperLinkDiagrams;

-	}

-

-	@Override

-	protected void doAction() {

-		super.doAction();

-		// defaultTab = getDefaultHyperLinkTab();

-		final LocalDefaultLinkDiagramTab heuristicTab = getHeuristicTab();

-		ArrayList<HyperLinkEditor> defaultdiagramsWithHeuristic = new ArrayList<HyperLinkEditor>();

-		// if the default diagrams is opened, get created default diagrams

-		if (heuristicTab.getDefaultHyperlinkComposite().isVisible()) {

-			heuristicTab.okPressed();

-			ICommand creationCommand = heuristicTab.getCommand();

-			// TODO : should be chained with the others command

-			transactionalEditingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(heuristicTab.getCommand()));

-			defaultdiagramsWithHeuristic.addAll(getCreatedHyperlinkDiagramsWithHeuristic(creationCommand));

-		}

-

-

-

-		// add into the list all diagram create by using heuristic

-		for (int i = 0; i < defaultdiagramsWithHeuristic.size(); i++) {

-			allhypHyperlinkObjects.add(0, defaultdiagramsWithHeuristic.get(i));

-		}

-

-	}

-

-	private LocalDefaultLinkDiagramTab getHeuristicTab() {

-		int i = 0;

-		LocalDefaultLinkDiagramTab tab = null;

-		for (AbstractHyperLinkTab current : tabList) {

-			if (current instanceof LocalDefaultLinkDiagramTab) {

-				tab = (LocalDefaultLinkDiagramTab) current;

-				i++;

-			}

-		}

-		Assert.isTrue(i == 1);

-		Assert.isNotNull(tab);

-		return tab;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Arthur Daussy (Atos) arthur.daussy@atos.net - Bug 363827 - [Improvement] Diagram creation, remember the latest tab chosen
+ *  Vincent Lorenzo (CEA-LIST) Vincent.lorenzo@cea.fr (refactoring of the hyperlink)
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.hyperlink.ui;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.gmfdiag.hyperlink.object.HyperLinkEditor;
+import org.eclipse.papyrus.infra.hyperlink.helper.HyperLinkHelperFactory;
+import org.eclipse.papyrus.infra.hyperlink.ui.AbstractHyperLinkTab;
+import org.eclipse.papyrus.infra.hyperlink.ui.HyperLinkManagerShell;
+import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistry;
+
+/**
+ *
+ * This hyperlink manager can manage default hyperlinks and creation of diagram with heuristic
+ */
+public class AdvancedHLManager extends HyperLinkManagerShell {
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param editorFactoryRegistry
+	 *            the editor factory registry
+	 * @param model
+	 *            the model that contains all elements
+	 * @param domain
+	 *            the domain in order to execute command
+	 * @param umlElement
+	 *            the uml element linked to the view
+	 * @param aview
+	 *            the view of the uml element
+	 *
+	 */
+	public AdvancedHLManager(IPageIconsRegistry editorFactoryRegistry, TransactionalEditingDomain domain, EModelElement semanticElement, View aview, HyperLinkHelperFactory hyperHelperFactory) {
+		super(editorFactoryRegistry, domain, semanticElement, aview, hyperHelperFactory);
+	}
+
+	/**
+	 * this method parse the command to extract created diagram and construct a list of hyperlinkDiagrams
+	 *
+	 * @param creationcommand
+	 *            a gmf command
+	 * @return the list of hyperlinks diagram
+	 */
+	protected ArrayList<HyperLinkEditor> getCreatedHyperlinkDiagramsWithHeuristic(ICommand creationcommand) {
+		ArrayList<Diagram> diagrams = new ArrayList<Diagram>();
+		if (creationcommand instanceof CompositeCommand) {
+			CompositeCommand compositeCommand = (CompositeCommand) creationcommand;
+			Object value = compositeCommand.getCommandResult().getReturnValue();
+			if (value instanceof ArrayList) {
+				diagrams.addAll((Collection<Diagram>) value);
+			}
+		}
+		ArrayList<HyperLinkEditor> hyperLinkDiagrams = new ArrayList<HyperLinkEditor>();
+		for (int i = 0; i < diagrams.size(); i++) {
+			HyperLinkEditor hyperLinkEditor = new HyperLinkEditor();
+			hyperLinkEditor.setObject(diagrams.get(i));
+			hyperLinkEditor.setIsDefault(true);
+			hyperLinkEditor.setTooltipText(diagrams.get(i).getName());
+			hyperLinkDiagrams.add(hyperLinkEditor);
+		}
+		return hyperLinkDiagrams;
+	}
+
+	@Override
+	protected void doAction() {
+		super.doAction();
+		// defaultTab = getDefaultHyperLinkTab();
+		final LocalDefaultLinkDiagramTab heuristicTab = getHeuristicTab();
+		ArrayList<HyperLinkEditor> defaultdiagramsWithHeuristic = new ArrayList<HyperLinkEditor>();
+		// if the default diagrams is opened, get created default diagrams
+		if (heuristicTab.getDefaultHyperlinkComposite().isVisible()) {
+			heuristicTab.okPressed();
+			ICommand creationCommand = heuristicTab.getCommand();
+			// TODO : should be chained with the others command
+			transactionalEditingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(heuristicTab.getCommand()));
+			defaultdiagramsWithHeuristic.addAll(getCreatedHyperlinkDiagramsWithHeuristic(creationCommand));
+		}
+
+
+
+		// add into the list all diagram create by using heuristic
+		for (int i = 0; i < defaultdiagramsWithHeuristic.size(); i++) {
+			allhypHyperlinkObjects.add(0, defaultdiagramsWithHeuristic.get(i));
+		}
+
+	}
+
+	private LocalDefaultLinkDiagramTab getHeuristicTab() {
+		int i = 0;
+		LocalDefaultLinkDiagramTab tab = null;
+		for (AbstractHyperLinkTab current : tabList) {
+			if (current instanceof LocalDefaultLinkDiagramTab) {
+				tab = (LocalDefaultLinkDiagramTab) current;
+				i++;
+			}
+		}
+		Assert.isTrue(i == 1);
+		Assert.isNotNull(tab);
+		return tab;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorHyperLinkEditorShell.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/EditorHyperLinkEditorShell.java
index ce43545a039..15ee47a6b54 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorHyperLinkEditorShell.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/EditorHyperLinkEditorShell.java
@@ -1,183 +1,184 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2014 CEA LIST and others.

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *  Christian W. Damus (CEA) - bug 431397

- *

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

-package org.eclipse.papyrus.infra.hyperlink.ui;

-

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

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

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

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

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

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

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

-import org.eclipse.papyrus.infra.hyperlink.Activator;

-import org.eclipse.papyrus.infra.hyperlink.helper.EditorHyperLinkHelper;

-import org.eclipse.papyrus.infra.hyperlink.messages.Messages;

-import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkEditor;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistry;

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

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

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

-

-/**

- *

- * This shell is used to find the editors

- *

- */

-public class EditorHyperLinkEditorShell extends AbstractEditHyperlinkDocumentShell {

-

-	/** The usedefault tooltip. */

-	protected boolean usedefaultTooltip = true;

-

-	/** The hyper link diagram. */

-	protected HyperLinkEditor hyperLinkEditor;

-

-	/** The editor registry. */

-	private IPageIconsRegistry editorRegistry;

-

-	/** The amodel. */

-	protected final EObject amodel;

-

-	/**

-	 * Open.

-	 */

-	public void open() {

-		Display display = Display.getCurrent();

-		// code use to wait for an action from the user

-

-		// getEditHyperlinkShell().setBounds(500, 500, 600, 120);

-		getEditHyperlinkShell().pack();

-		getEditHyperlinkShell().open();

-		while (!getEditHyperlinkShell().isDisposed()) {

-			if (!display.readAndDispatch()) {

-				display.sleep();

-			}

-		}

-	}

-

-	/**

-	 * Instantiates a new editor hyperlink diagram shell.

-	 *

-	 * @param editorFactoryRegistry

-	 *            the editor factory registry

-	 * @param model

-	 *            the model

-	 */

-	public EditorHyperLinkEditorShell(IPageIconsRegistry editorFactoryRegistry, EObject model) {

-		super();

-		this.amodel = model;

-		this.editorRegistry = editorFactoryRegistry;

-		createEditHyperlinkShell();

-		getObjectcLabel().setText(Messages.EditorHyperLinkEditorShell_View); // TODO : where is it used?

-

-		// intialize "use default" check box

-		getUseDefaultCheckBox().setSelection(usedefaultTooltip);

-		getObjectLabeltext().setEditable(false);

-		if (usedefaultTooltip) {

-			getTooltipInputText().setEditable(false);

-			getTooltipInputText().setText(getObjectLabeltext().getText());

-		}

-		// add listener "use default button"

-		getUseDefaultCheckBox().addSelectionListener(new SelectionAdapter() {

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				usedefaultTooltip = getUseDefaultCheckBox().getSelection();

-				if (usedefaultTooltip) {

-					getTooltipInputText().setEditable(false);

-					getTooltipInputText().setText(getObjectLabeltext().getText());

-				} else {

-					getTooltipInputText().setEditable(true);

-				}

-			}

-		});

-

-		// launch a new editor to choose or create diagrams

-		getChooseDiagramButton().addSelectionListener(new SelectionAdapter() {

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				EditorLookForEditorShell editorLookForDiagram = new EditorLookForEditorShell(editorRegistry, amodel);

-				editorLookForDiagram.open();

-				Object selection = editorLookForDiagram.getSelectedEditor();

-				if (selection == null) {// cancelled or no selection

-					// nothing to do

-				} else {

-

-					EditorHyperLinkHelper helper = new EditorHyperLinkHelper();

-					hyperLinkEditor = helper.getHyperLinkObjectFor(selection);

-					Assert.isNotNull(hyperLinkEditor, NLS.bind(Messages.EditorHyperLinkEditorShell_ICanFindTheHyperLinkEditorObject, selection));

-					hyperLinkEditor.setObject(selection);

-

-					// TODO : remove this dependency

-					ILabelProvider labelProvider;

-					try {

-						labelProvider = ServiceUtilsForEObject.getInstance().getServiceRegistry(amodel).getService(LabelProviderService.class).getLabelProvider();

-					} catch (ServiceException ex) {

-						Activator.log.error(ex);

-						labelProvider = new LabelProvider();

-					}

-					getObjectLabeltext().setText(labelProvider.getText(selection));

-					if (usedefaultTooltip) {

-						getTooltipInputText().setText(getObjectLabeltext().getText());

-					}

-				}

-			}

-		});

-

-		// listener to cancel

-		this.getCancelButton().addSelectionListener(new SelectionAdapter() {

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				hyperLinkEditor = null;

-				getEditHyperlinkShell().close();

-			}

-		});

-		// listener to click on OK

-		this.getOkButton().addSelectionListener(new SelectionAdapter() {

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				if (hyperLinkEditor != null) {

-					hyperLinkEditor.setTooltipText(getTooltipInputText().getText().trim());

-					// if diagram is null, maybe bad selection or other it

-					// return null!

-					if (hyperLinkEditor.getObject() == null) {

-						hyperLinkEditor = null;

-					}

-				}

-				getEditHyperlinkShell().close();

-			}

-		});

-	}

-

-	/**

-	 * Gets the hyper link diagram.

-	 *

-	 * @return the hyperLinkEditor maybe null, if cancel or bad selection

-	 */

-	public HyperLinkEditor getHyperLinkEditor() {

-		return hyperLinkEditor;

-	}

-

-	/**

-	 * Sets the hyper link diagram.

-	 *

-	 * @param hyperLinkEditor

-	 *            the hyperLinkEditor to set

-	 */

-	public void setHyperLinkEditor(HyperLinkEditor hyperLinkEditor) {

-		// TODO

-		getTooltipInputText().setText(hyperLinkEditor.getTooltipText());

-		this.hyperLinkEditor = hyperLinkEditor;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2014 CEA LIST and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 431397
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.hyperlink.ui;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.gmfdiag.hyperlink.helper.EditorHyperLinkHelper;
+import org.eclipse.papyrus.infra.gmfdiag.hyperlink.messages.Messages;
+import org.eclipse.papyrus.infra.gmfdiag.hyperlink.object.HyperLinkEditor;
+import org.eclipse.papyrus.infra.hyperlink.Activator;
+import org.eclipse.papyrus.infra.hyperlink.ui.AbstractEditHyperlinkDocumentShell;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistry;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ *
+ * This shell is used to find the editors
+ *
+ */
+public class EditorHyperLinkEditorShell extends AbstractEditHyperlinkDocumentShell {
+
+	/** The usedefault tooltip. */
+	protected boolean usedefaultTooltip = true;
+
+	/** The hyper link diagram. */
+	protected HyperLinkEditor hyperLinkEditor;
+
+	/** The editor registry. */
+	private IPageIconsRegistry editorRegistry;
+
+	/** The amodel. */
+	protected final EObject amodel;
+
+	/**
+	 * Open.
+	 */
+	public void open() {
+		Display display = Display.getCurrent();
+		// code use to wait for an action from the user
+
+		// getEditHyperlinkShell().setBounds(500, 500, 600, 120);
+		getEditHyperlinkShell().pack();
+		getEditHyperlinkShell().open();
+		while (!getEditHyperlinkShell().isDisposed()) {
+			if (!display.readAndDispatch()) {
+				display.sleep();
+			}
+		}
+	}
+
+	/**
+	 * Instantiates a new editor hyperlink diagram shell.
+	 *
+	 * @param editorFactoryRegistry
+	 *            the editor factory registry
+	 * @param model
+	 *            the model
+	 */
+	public EditorHyperLinkEditorShell(IPageIconsRegistry editorFactoryRegistry, EObject model) {
+		super();
+		this.amodel = model;
+		this.editorRegistry = editorFactoryRegistry;
+		createEditHyperlinkShell();
+		getObjectcLabel().setText(Messages.EditorHyperLinkEditorShell_View); // TODO : where is it used?
+
+		// intialize "use default" check box
+		getUseDefaultCheckBox().setSelection(usedefaultTooltip);
+		getObjectLabeltext().setEditable(false);
+		if (usedefaultTooltip) {
+			getTooltipInputText().setEditable(false);
+			getTooltipInputText().setText(getObjectLabeltext().getText());
+		}
+		// add listener "use default button"
+		getUseDefaultCheckBox().addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				usedefaultTooltip = getUseDefaultCheckBox().getSelection();
+				if (usedefaultTooltip) {
+					getTooltipInputText().setEditable(false);
+					getTooltipInputText().setText(getObjectLabeltext().getText());
+				} else {
+					getTooltipInputText().setEditable(true);
+				}
+			}
+		});
+
+		// launch a new editor to choose or create diagrams
+		getChooseDiagramButton().addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				EditorLookForEditorShell editorLookForDiagram = new EditorLookForEditorShell(editorRegistry, amodel);
+				editorLookForDiagram.open();
+				Object selection = editorLookForDiagram.getSelectedEditor();
+				if (selection == null) {// cancelled or no selection
+					// nothing to do
+				} else {
+
+					EditorHyperLinkHelper helper = new EditorHyperLinkHelper();
+					hyperLinkEditor = helper.getHyperLinkObjectFor(selection);
+					Assert.isNotNull(hyperLinkEditor, NLS.bind(Messages.EditorHyperLinkEditorShell_ICanFindTheHyperLinkEditorObject, selection));
+					hyperLinkEditor.setObject(selection);
+
+					// TODO : remove this dependency
+					ILabelProvider labelProvider;
+					try {
+						labelProvider = ServiceUtilsForEObject.getInstance().getServiceRegistry(amodel).getService(LabelProviderService.class).getLabelProvider();
+					} catch (ServiceException ex) {
+						Activator.log.error(ex);
+						labelProvider = new LabelProvider();
+					}
+					getObjectLabeltext().setText(labelProvider.getText(selection));
+					if (usedefaultTooltip) {
+						getTooltipInputText().setText(getObjectLabeltext().getText());
+					}
+				}
+			}
+		});
+
+		// listener to cancel
+		this.getCancelButton().addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				hyperLinkEditor = null;
+				getEditHyperlinkShell().close();
+			}
+		});
+		// listener to click on OK
+		this.getOkButton().addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (hyperLinkEditor != null) {
+					hyperLinkEditor.setTooltipText(getTooltipInputText().getText().trim());
+					// if diagram is null, maybe bad selection or other it
+					// return null!
+					if (hyperLinkEditor.getObject() == null) {
+						hyperLinkEditor = null;
+					}
+				}
+				getEditHyperlinkShell().close();
+			}
+		});
+	}
+
+	/**
+	 * Gets the hyper link diagram.
+	 *
+	 * @return the hyperLinkEditor maybe null, if cancel or bad selection
+	 */
+	public HyperLinkEditor getHyperLinkEditor() {
+		return hyperLinkEditor;
+	}
+
+	/**
+	 * Sets the hyper link diagram.
+	 *
+	 * @param hyperLinkEditor
+	 *            the hyperLinkEditor to set
+	 */
+	public void setHyperLinkEditor(HyperLinkEditor hyperLinkEditor) {
+		// TODO
+		getTooltipInputText().setText(hyperLinkEditor.getTooltipText());
+		this.hyperLinkEditor = hyperLinkEditor;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorLookForEditorShell.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/EditorLookForEditorShell.java
index 8a2d9edefec..e77b706ce2e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorLookForEditorShell.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/ui/EditorLookForEditorShell.java
@@ -13,7 +13,7 @@
  *  Christian W. Damus - bug 485220
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.hyperlink.ui;
+package org.eclipse.papyrus.infra.gmfdiag.hyperlink.ui;
 
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -42,6 +42,7 @@ import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
 import org.eclipse.papyrus.infra.hyperlink.Activator;
+import org.eclipse.papyrus.infra.hyperlink.ui.AbstractLookForEditorShell;
 import org.eclipse.papyrus.infra.hyperlink.util.EditorListContentProvider;
 import org.eclipse.papyrus.infra.hyperlink.util.TreeViewContentProvider;
 import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.xml
index 6d20aba9451..8effc6acf2e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.xml
@@ -86,7 +86,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.papyrus.uml.diagram.common.commands.DeleteFromDiagram"
+               commandId="org.eclipse.papyrus.infra.gmfdiag.menu.DeleteFromDiagram"
                icon="icons/obj16/eraser.gif"
                label="Delete From diagram"
                style="push">
@@ -297,7 +297,7 @@
                            value="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
                      </instanceof>
                      <test
-                           property="org.eclipse.papyrus.uml.diagram.common.isSemanticDeletion"
+                           property="org.eclipse.papyrus.infra.gmfdiag.common.isSemanticDeletion"
                            value="true">
                      </test>
                   </iterate>
@@ -325,12 +325,12 @@
                            value="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
                      </instanceof>
                      <test
-                           property="org.eclipse.papyrus.uml.diagram.common.isSemanticDeletion"
+                           property="org.eclipse.papyrus.infra.gmfdiag.common.isSemanticDeletion"
                            value="false">
                      </test>
                      <test
-                           property="org.eclipse.papyrus.uml.diagram.common.isReadOnly"
-                           value="false">
+                           property="org.eclipse.papyrus.infra.gmfdiag.common.canDelete"
+                           value="true">
                      </test>
                   </iterate>
                </with>
@@ -339,7 +339,7 @@
       </handler>
       <handler
             class="org.eclipse.papyrus.infra.gmfdiag.menu.handlers.DeleteFromDiagramCommandHandler"
-            commandId="org.eclipse.papyrus.uml.diagram.common.commands.DeleteFromDiagram">
+            commandId="org.eclipse.papyrus.infra.gmfdiag.menu.DeleteFromDiagram">
          <activeWhen>
             <and>
                <with
@@ -429,7 +429,7 @@
       <command
             categoryId="org.eclipse.papyrus.editor.category"
             description="Delete the selection from diagram"
-            id="org.eclipse.papyrus.uml.diagram.common.commands.DeleteFromDiagram"
+            id="org.eclipse.papyrus.infra.gmfdiag.menu.DeleteFromDiagram"
             name="Delete From Diagram Command">
       </command>                      
       <command
@@ -488,7 +488,7 @@
             sequence="M1+M2+X">
       </key>
       <key
-            commandId="org.eclipse.papyrus.uml.diagram.common.commands.DeleteFromDiagram"
+            commandId="org.eclipse.papyrus.infra.gmfdiag.menu.DeleteFromDiagram"
             contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
             sequence="M2+DEL">
@@ -505,7 +505,7 @@
                      ifEmpty="false"
                      operator="and">
                   <test
-                        property="org.eclipse.papyrus.uml.diagram.common.isSemanticDeletion"
+                        property="org.eclipse.papyrus.infra.gmfdiag.common.isSemanticDeletion"
                         value="true">
                   </test>
                   <instanceof
@@ -518,7 +518,7 @@
                      ifEmpty="false"
                      operator="and">
                   <test
-                        property="org.eclipse.papyrus.uml.diagram.common.isSemanticDeletion"
+                        property="org.eclipse.papyrus.infra.gmfdiag.common.isSemanticDeletion"
                         value="false">
                   </test>
                   <instanceof
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/pom.xml
index c767a686584..c4bf565cb19 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.menu</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/src/org/eclipse/papyrus/infra/gmfdiag/menu/utils/DeleteActionUtil.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/src/org/eclipse/papyrus/infra/gmfdiag/menu/utils/DeleteActionUtil.java
index 5aa5b2e2a6d..ac29e833a43 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/src/org/eclipse/papyrus/infra/gmfdiag/menu/utils/DeleteActionUtil.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/src/org/eclipse/papyrus/infra/gmfdiag/menu/utils/DeleteActionUtil.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,8 +8,8 @@
  *
  * Contributors:
  *  Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Initial API and implementation
- *  Christian W. Damus - bug 459566
- *  Christian W. Damus - bug 463846
+ *  Christian W. Damus - bugs 459566, 463846, 485220
+ *  
  *****************************************************************************/
 
 package org.eclipse.papyrus.infra.gmfdiag.menu.utils;
@@ -31,15 +31,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler2;
-import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.emf.readonly.ReadOnlyManager;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
-
-import com.google.common.base.Optional;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil;
 
 /**
  * Utility class to manage delete action in GMF Diagram context.
@@ -62,42 +55,12 @@ public final class DeleteActionUtil {
 	 * @param editPart
 	 *            the edit part
 	 * @return true, if is semantic deletion
+	 * 
+	 * @deprecated Use the {@link DiagramEditPartsUtil#isSemanticDeletion(IGraphicalEditPart)} API, instead
 	 */
+	@Deprecated
 	public static boolean isSemanticDeletion(IGraphicalEditPart editPart) {
-		boolean isSemanticDeletion = false;
-		TransactionalEditingDomain editingDomain = null;
-
-		// Get Editing Domain
-		try {
-			editingDomain = ServiceUtilsForEditPart.getInstance().getTransactionalEditingDomain(editPart);
-		} catch (ServiceException e) {
-
-		}
-
-		if (editingDomain != null) {
-
-			IReadOnlyHandler2 readOnly = ReadOnlyManager.getReadOnlyHandler(editingDomain);
-			EObject semantic = EMFHelper.getEObject(editPart);
-			View graphical = NotationHelper.findView(editPart);
-
-			isSemanticDeletion = !(semantic == null || semantic == graphical || semantic.eContainer() == null);
-
-
-			if (isSemanticDeletion && readOnly != null) {
-				// Is the semantic element read-only?
-				Optional<Boolean> result = readOnly.isReadOnly(ReadOnlyAxis.anyAxis(), semantic);
-				if (!result.or(false) && (graphical != null)) {
-					// Or, if not, is the graphical element read-only?
-					result = readOnly.isReadOnly(ReadOnlyAxis.anyAxis(), graphical);
-				}
-
-				// Are both the semantic and graphical elements writable?
-				isSemanticDeletion = !result.or(false);
-			}
-		}
-
-
-		return isSemanticDeletion;
+		return DiagramEditPartsUtil.isSemanticDeletion(editPart);
 	}
 
 	/**
@@ -106,40 +69,14 @@ public final class DeleteActionUtil {
 	 * @param editPart
 	 *            the edit part
 	 * @return true, if this is a read only element.
+	 * 
+	 * @deprecated Use the {@link DiagramEditPartsUtil#isReadOnly(IGraphicalEditPart)} API, instead
 	 */
+	@Deprecated
 	public static boolean isReadOnly(final IGraphicalEditPart editPart) {
-		boolean isReadOnly = true;
-		TransactionalEditingDomain editingDomain = null;
-
-		// Get Editing Domain
-		try {
-			editingDomain = ServiceUtilsForEditPart.getInstance().getTransactionalEditingDomain(editPart);
-		} catch (ServiceException e) {
-			// Do nothing
-		}
-
-		if (null != editingDomain) {
-
-			final IReadOnlyHandler2 readOnly = ReadOnlyManager.getReadOnlyHandler(editingDomain);
-			final EObject semantic = EMFHelper.getEObject(editPart);
-			final View graphical = NotationHelper.findView(editPart);
-
-			if (null != readOnly && null != semantic) {
-				// Is the semantic element read-only?
-				Optional<Boolean> result = readOnly.isReadOnly(ReadOnlyAxis.anyAxis(), semantic);
-				isReadOnly = result.get();
-				
-				if (!isReadOnly && (graphical != null)) {
-					// Or, if not, is the graphical element read-only?
-					result = readOnly.isReadOnly(ReadOnlyAxis.anyAxis(), graphical);
-					isReadOnly = result.get();
-				}
-			}
-		}
-
-		return isReadOnly;
+		return DiagramEditPartsUtil.isReadOnly(editPart);
 	}
-	
+
 	/**
 	 * Gets the delete from model command.
 	 *
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 3060fab76f2..7b9c864a936 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,38 +1,38 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

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

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

- org.eclipse.gmf.runtime.notation,

- org.eclipse.emf.transaction,

- org.eclipse.gmf.runtime.common.core,

- org.eclipse.gmf.runtime.emf.commands.core,

- org.eclipse.core.expressions,

- org.eclipse.gmf.runtime.emf.type.core,

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

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

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

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

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

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

- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0",

- org.eclipse.emf.ecore,

- org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.2.0",

- org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.2.0",

- org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0",

- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0",

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

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

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.modelexplorer.Activator

-Bundle-Description: %pluginDescription

-Import-Package: org.eclipse.papyrus.emf.facet.custom.ui

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.modelexplorer;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.gmf.runtime.notation,
+ org.eclipse.emf.transaction,
+ org.eclipse.gmf.runtime.common.core,
+ org.eclipse.gmf.runtime.emf.commands.core,
+ org.eclipse.core.expressions,
+ org.eclipse.gmf.runtime.emf.type.core,
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0",
+ org.eclipse.emf.ecore,
+ org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.emf.facet.efacet;bundle-version="1.2.0",
+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="1.2.0",
+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.modelexplorer.Activator
+Bundle-Description: %pluginDescription
+Import-Package: org.eclipse.papyrus.emf.facet.custom.ui
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.modelexplorer;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/pom.xml
index 1ef36aa438f..ca0b7b6812f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.modelexplorer</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/AbstractDiagramCommandHandler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/AbstractDiagramCommandHandler.java
index 0ce5101b344..0b5026f581f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/AbstractDiagramCommandHandler.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/AbstractDiagramCommandHandler.java
@@ -1,6 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
+ * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,6 +8,8 @@
  *
  * Contributors:
  *  Patrick Tessier (CEA LIST) - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
  /*****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.handlers;
 
@@ -21,7 +22,7 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler;
+import org.eclipse.papyrus.infra.ui.command.AbstractCommandHandler;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 
@@ -31,7 +32,7 @@ public abstract class AbstractDiagramCommandHandler extends AbstractCommandHandl
 	 * Returns the list of selected diagrams
 	 *
 	 * @return
-	 *         the list of selected diagrams
+	 * 		the list of selected diagrams
 	 */
 	protected List<Diagram> getSelectedDiagrams() {
 		List<Diagram> diagrams = new ArrayList<Diagram>();
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/DuplicateDiagramHandler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/DuplicateDiagramHandler.java
index cd42a2b5ea7..78a2da15b71 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/DuplicateDiagramHandler.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/DuplicateDiagramHandler.java
@@ -1,80 +1,81 @@
-/*****************************************************************************

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

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

- *

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

-package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.handlers;

-

-import java.util.List;

-

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

-import org.eclipse.emf.common.command.CompoundCommand;

-import org.eclipse.emf.common.command.UnexecutableCommand;

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

-import org.eclipse.emf.edit.command.AddCommand;

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

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

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

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

-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

-import org.eclipse.papyrus.infra.gmfdiag.modelexplorer.messages.Messages;

-

-/**

- * This handler provides the duplicate action for the diagrams

- *

- *

- *

- */

-public class DuplicateDiagramHandler extends AbstractDiagramCommandHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler#getCommand()

-	 *

-	 * @return

-	 */

-	@Override

-	protected Command getCommand() {

-		TransactionalEditingDomain editingDomain = getEditingDomain();

-		final IPageManager pageManager = getPageManager();

-		List<Diagram> diagrams = getSelectedDiagrams();

-

-		if (editingDomain != null && pageManager != null && !diagrams.isEmpty()) {

-			CompoundCommand command = new CompoundCommand();

-			for (Diagram diagram : diagrams) {

-

-				// Clone the current diagram

-				final Diagram newDiagram = EcoreUtil.copy(diagram);

-				// Give a new name

-				newDiagram.setName(NLS.bind(Messages.DuplicateDiagramHandler_CopyOf, diagram.getName()));

-				Command addGmfDiagramCmd = new AddCommand(editingDomain, diagram.eResource().getContents(), newDiagram);

-				// EMFCommandOperation operation = new

-				// EMFCommandOperation(editingDomain,

-				// addGmfDiagramCmd);

-

-				Command sashOpenComd = new RecordingCommand(editingDomain) {

-

-					@Override

-					protected void doExecute() {

-						pageManager.openPage(newDiagram);

-					}

-				};

-

-				// TODO : synchronize with Cedric

-				// command.append(operation.getCommand());

-				command.append(addGmfDiagramCmd);

-				command.append(sashOpenComd);

-			}

-			return command.isEmpty() ? UnexecutableCommand.INSTANCE : command;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.handlers;
+
+import java.util.List;
+
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.common.command.UnexecutableCommand;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.gmfdiag.modelexplorer.messages.Messages;
+
+/**
+ * This handler provides the duplicate action for the diagrams
+ *
+ *
+ *
+ */
+public class DuplicateDiagramHandler extends AbstractDiagramCommandHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler#getCommand()
+	 *
+	 * @return
+	 */
+	@Override
+	protected Command getCommand(IEvaluationContext context) {
+		TransactionalEditingDomain editingDomain = getEditingDomain(context);
+		final IPageManager pageManager = getPageManager(context);
+		List<Diagram> diagrams = getSelectedDiagrams();
+
+		if (editingDomain != null && pageManager != null && !diagrams.isEmpty()) {
+			CompoundCommand command = new CompoundCommand();
+			for (Diagram diagram : diagrams) {
+
+				// Clone the current diagram
+				final Diagram newDiagram = EcoreUtil.copy(diagram);
+				// Give a new name
+				newDiagram.setName(NLS.bind(Messages.DuplicateDiagramHandler_CopyOf, diagram.getName()));
+				Command addGmfDiagramCmd = new AddCommand(editingDomain, diagram.eResource().getContents(), newDiagram);
+				// EMFCommandOperation operation = new
+				// EMFCommandOperation(editingDomain,
+				// addGmfDiagramCmd);
+
+				Command sashOpenComd = new RecordingCommand(editingDomain) {
+
+					@Override
+					protected void doExecute() {
+						pageManager.openPage(newDiagram);
+					}
+				};
+
+				// TODO : synchronize with Cedric
+				// command.append(operation.getCommand());
+				command.append(addGmfDiagramCmd);
+				command.append(sashOpenComd);
+			}
+			return command.isEmpty() ? UnexecutableCommand.INSTANCE : command;
+		}
+		return UnexecutableCommand.INSTANCE;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/RenameDiagramHandler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/RenameDiagramHandler.java
index aae77e50285..a067875d0e5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/RenameDiagramHandler.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/handlers/RenameDiagramHandler.java
@@ -1,78 +1,79 @@
-/*****************************************************************************

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

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

- *

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

-package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.handlers;

-

-import java.util.List;

-

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

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

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

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

-import org.eclipse.emf.common.command.UnexecutableCommand;

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

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

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

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

-import org.eclipse.jface.dialogs.InputDialog;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.infra.gmfdiag.modelexplorer.messages.Messages;

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

-

-/**

- * This handler provides the method to rename a Diagram

- *

- *

- *

- */

-public class RenameDiagramHandler extends AbstractDiagramCommandHandler {

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler#getCommand()

-	 *

-	 * @return

-	 */

-	@Override

-	protected Command getCommand() {

-		TransactionalEditingDomain editingDomain = getEditingDomain();

-		List<Diagram> diagrams = getSelectedDiagrams();

-		if (editingDomain != null && diagrams.size() == 1) {

-

-			final Diagram diag = diagrams.get(0);

-			final String currentName = diag.getName();

-			if (currentName != null) {

-

-				AbstractTransactionalCommand cmd = new AbstractTransactionalCommand(editingDomain, "RenameDiagramCommand", null) { //$NON-NLS-1$

-

-					@Override

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

-						InputDialog dialog = new InputDialog(Display.getCurrent().getActiveShell(), Messages.RenameDiagramHandler_RenameAnExistingDiagram, Messages.RenameDiagramHandler_NewName, currentName, null);

-						if (dialog.open() == Window.OK) {

-							final String name = dialog.getValue();

-							if (name != null && name.length() > 0) {

-								diag.setName(name);

-							}

-							return CommandResult.newOKCommandResult();

-						} else {

-							return CommandResult.newCancelledCommandResult();

-						}

-					}

-				};

-				return new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(cmd);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.handlers;
+
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.UnexecutableCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.infra.gmfdiag.modelexplorer.messages.Messages;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * This handler provides the method to rename a Diagram
+ *
+ *
+ *
+ */
+public class RenameDiagramHandler extends AbstractDiagramCommandHandler {
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler#getCommand()
+	 *
+	 * @return
+	 */
+	@Override
+	protected Command getCommand(IEvaluationContext context) {
+		TransactionalEditingDomain editingDomain = getEditingDomain(context);
+		List<Diagram> diagrams = getSelectedDiagrams();
+		if (editingDomain != null && diagrams.size() == 1) {
+
+			final Diagram diag = diagrams.get(0);
+			final String currentName = diag.getName();
+			if (currentName != null) {
+
+				AbstractTransactionalCommand cmd = new AbstractTransactionalCommand(editingDomain, "RenameDiagramCommand", null) { //$NON-NLS-1$
+
+					@Override
+					protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+						InputDialog dialog = new InputDialog(Display.getCurrent().getActiveShell(), Messages.RenameDiagramHandler_RenameAnExistingDiagram, Messages.RenameDiagramHandler_NewName, currentName, null);
+						if (dialog.open() == Window.OK) {
+							final String name = dialog.getValue();
+							if (name != null && name.length() > 0) {
+								diag.setName(name);
+							}
+							return CommandResult.newOKCommandResult();
+						} else {
+							return CommandResult.newCancelledCommandResult();
+						}
+					}
+				};
+				return new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(cmd);
+			}
+		}
+		return UnexecutableCommand.INSTANCE;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/DisplayDiagramRef.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/DisplayDiagramRef.java
index 9171ed5915b..86f2bd78830 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/DisplayDiagramRef.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/DisplayDiagramRef.java
@@ -1,59 +1,55 @@
-/**

- *  Copyright (c) 2011 Atos.

- *

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

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

- *  which accompanies this distribution, and is available at

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

- *

- *  Contributors:

- *  Atos - Initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries;

-

-import java.util.Iterator;

-

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

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

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

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

-import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager;

-import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException;

-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference;

-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue;

-import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;

-import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;

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

-import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;

-import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery;

-

-public class DisplayDiagramRef extends AbstractEditorContainerQuery implements IJavaQuery2<EObject, Boolean> {

-

-	/**

-	 * Return true if the element is a Diagram Container and the Ereference is diagrams

-	 */

-

-	public Boolean evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {

-		ParameterValue parameterValue = parameterValues.getParameterValueByName("eStructuralFeature");

-		EStructuralFeature eStructuralFeature = (EStructuralFeature) parameterValue.getValue();

-		if ((eStructuralFeature instanceof FacetReference) && ("diagrams".equals((eStructuralFeature).getName()))) {

-

-			Iterator<EObject> roots = NavigatorUtils.getNotationRoots(source);

-			if (roots == null) {

-				return false;

-			}

-

-			while (roots.hasNext()) {

-				EObject root = roots.next();

-				if (root instanceof Diagram) {

-					if (EcoreUtil.equals(DiagramUtils.getOwner((Diagram) root), source)) {

-						return true;

-					}

-				}

-			}

-			return false;

-		}

-		return true;

-	}

+/**
+ *  Copyright (c) 2011 Atos, Christian W. Damus, and others.
+ *
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *    Atos - Initial API and implementation
+ *    Christian W. Damus - bug 485220
+ *
+ */
+package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager;
+import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue;
+import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
+import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
+
+public class DisplayDiagramRef implements IJavaQuery2<EObject, Boolean> {
+
+	/**
+	 * Return true if the element is a Diagram Container and the Ereference is diagrams
+	 */
+
+	public Boolean evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
+		ParameterValue parameterValue = parameterValues.getParameterValueByName("eStructuralFeature");
+		EStructuralFeature eStructuralFeature = (EStructuralFeature) parameterValue.getValue();
+		if ((eStructuralFeature instanceof FacetReference) && ("diagrams".equals((eStructuralFeature).getName()))) {
+
+			ResourceSet resourceSet = EMFHelper.getResourceSet(source);
+
+			if (resourceSet != null) {
+				for (Diagram diagram : NotationUtils.getAllNotations(resourceSet, Diagram.class)) {
+					if (EcoreUtil.equals(DiagramUtils.getOwner(diagram), source)) {
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetContainedDiagrams.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetContainedDiagrams.java
index 34879ba5009..d2c60e65cff 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetContainedDiagrams.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetContainedDiagrams.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2011 Atos.
+ *  Copyright (c) 2011 Atos, Christian W. Damus, and others.
  *
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
@@ -7,41 +7,37 @@
  *  http://www.eclipse.org/legal/epl-v10.html
  *
  *  Contributors:
- *  Atos - Initial API and implementation
+ *    Atos - Initial API and implementation
+ *    Christian W. Damus - bug 485220
  *
  */
 package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager;
 import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException;
 import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
 import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
 import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;
-import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery;
 
 /** Get the collection of all contained diagrams */
-public class GetContainedDiagrams extends AbstractEditorContainerQuery implements IJavaQuery2<EObject, Collection<org.eclipse.gmf.runtime.notation.Diagram>> {
+public class GetContainedDiagrams implements IJavaQuery2<EObject, Collection<org.eclipse.gmf.runtime.notation.Diagram>> {
 
 
 	public Collection<Diagram> evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
 		List<Diagram> result = new ArrayList<Diagram>();
-		Iterator<EObject> roots = NavigatorUtils.getNotationRoots(source);
-		if (roots == null) {
-			return result;
-		}
+		ResourceSet resourceSet = EMFHelper.getResourceSet(source);
 
-		while (roots.hasNext()) {
-			EObject root = roots.next();
-			if (root instanceof Diagram) {
-				Diagram diagram = (Diagram) root;
+		if (resourceSet != null) {
+			for (Diagram diagram : NotationUtils.getAllNotations(resourceSet, Diagram.class)) {
 				if (DiagramUtils.getOwner(diagram) == source) {
 					result.add(diagram);
 				}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetDiagramIcon.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetDiagramIcon.java
index 5a16edf141b..1bdd5c56678 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetDiagramIcon.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetDiagramIcon.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2011 Atos.
+ *  Copyright (c) 2011, 2016 Atos, CEA LIST, Christian W. Damus, and others.
  *
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
@@ -7,8 +7,9 @@
  *  http://www.eclipse.org/legal/epl-v10.html
  *
  *  Contributors:
- *  Atos - Initial API and implementation
- *  Patrick Tessier (CEA LIST) Modification
+ *    Atos - Initial API and implementation
+ *    Patrick Tessier (CEA LIST) - Modification
+ *    Christian W. Damus - bug 485220
  *
  */
 package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries;
@@ -21,8 +22,8 @@ import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementEx
 import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
 import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
 import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
+import org.eclipse.papyrus.infra.ui.editorsfactory.AbstractGetEditorIconQuery;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
-import org.eclipse.papyrus.views.modelexplorer.queries.AbstractGetEditorIconQuery;
 
 /** Return the path to the icon of the corresponding diagram */
 public class GetDiagramIcon extends AbstractGetEditorIconQuery implements IJavaQuery2<Diagram, IImage> {
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/IsDiagramContainer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/IsDiagramContainer.java
index ffbb32a231c..f98855732a1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/IsDiagramContainer.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/IsDiagramContainer.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2011 Atos.
+ *  Copyright (c) 2011 Atos, Christian W. Damus, and others.
  *
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
@@ -7,38 +7,35 @@
  *  http://www.eclipse.org/legal/epl-v10.html
  *
  *  Contributors:
- *  Atos - Initial API and implementation
+ *    Atos - Initial API and implementation
+ *    Christian W. Damus - bug 485220
  *
  */
 package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries;
 
-import java.util.Iterator;
-
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager;
 import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException;
 import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
 import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
 import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;
-import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery;
 
-public class IsDiagramContainer extends AbstractEditorContainerQuery implements IJavaQuery2<EObject, Boolean> {
+public class IsDiagramContainer implements IJavaQuery2<EObject, Boolean> {
 
 	/**
 	 * Return true if the element is a Diagram Container
 	 */
 	public Boolean evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
-		Iterator<EObject> roots = NavigatorUtils.getNotationRoots(source);
+		ResourceSet resourceSet = EMFHelper.getResourceSet(source);
 
-		if (roots != null) {
-			while (roots.hasNext()) {
-				EObject root = roots.next();
-				if (root instanceof Diagram) {
-					if (DiagramUtils.getOwner((Diagram) root) == source) {
-						return true;
-					}
+		if (resourceSet != null) {
+			for (Diagram diagram : NotationUtils.getAllNotations(resourceSet, Diagram.class)) {
+				if (DiagramUtils.getOwner(diagram) == source) {
+					return true;
 				}
 			}
 		}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF
index 5f10ca41dab..166f3116933 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",
  org.eclipse.core.expressions;bundle-version="3.4.300",
- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0",
  org.eclipse.ui.navigator;bundle-version="3.5.100",
  org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/icons/separator.gif b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/icons/separator.gif
new file mode 100644
index 00000000000..cb415064e02
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/icons/separator.gif
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/pom.xml
index 057bba664b7..5e5c8ce62f2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.navigation</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/Activator.java
index 9deda8aed1e..0bb77bd9de9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/Activator.java
@@ -1,104 +1,107 @@
-/*****************************************************************************

- * 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.navigation;

-

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

-import org.eclipse.papyrus.infra.gmfdiag.navigation.preference.NavigationPreferenceInitializer;

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

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchWindow;

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

-import org.osgi.framework.BundleContext;

-

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

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

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see

-	 * org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-		NavigationPreferenceInitializer preferenceInitializer = new NavigationPreferenceInitializer();

-		preferenceInitializer.initializeDefaultPreferences();

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see

-	 * org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	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;

-	}

-

-	/**

-	 * Returns the active workbench shell

-	 *

-	 * @return the active workbench shell

-	 */

-	public static Shell getActiveWorkbenchShell() {

-		IWorkbenchWindow workBenchWindow = getActiveWorkbenchWindow();

-		if (workBenchWindow == null) {

-			return null;

-		}

-		return workBenchWindow.getShell();

-	}

-

-	/**

-	 * Returns the active workbench window

-	 *

-	 * @return the active workbench window

-	 */

-	public static IWorkbenchWindow getActiveWorkbenchWindow() {

-		if (getDefault() == null) {

-			return null;

-		}

-		IWorkbench workBench = getDefault().getWorkbench();

-		if (workBench == null) {

-			return null;

-		}

-		return workBench.getActiveWorkbenchWindow();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ */
+package org.eclipse.papyrus.infra.gmfdiag.navigation;
+
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.preference.NavigationPreferenceInitializer;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.navigation"; //$NON-NLS-1$
+
+	public static final String IMG_SEPARATOR = "separator"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+		NavigationPreferenceInitializer preferenceInitializer = new NavigationPreferenceInitializer();
+		preferenceInitializer.initializeDefaultPreferences();
+	}
+
+	@Override
+	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;
+	}
+
+	/**
+	 * Returns the active workbench shell
+	 *
+	 * @return the active workbench shell
+	 */
+	public static Shell getActiveWorkbenchShell() {
+		IWorkbenchWindow workBenchWindow = getActiveWorkbenchWindow();
+		if (workBenchWindow == null) {
+			return null;
+		}
+		return workBenchWindow.getShell();
+	}
+
+	/**
+	 * Returns the active workbench window
+	 *
+	 * @return the active workbench window
+	 */
+	public static IWorkbenchWindow getActiveWorkbenchWindow() {
+		if (getDefault() == null) {
+			return null;
+		}
+		IWorkbench workBench = getDefault().getWorkbench();
+		if (workBench == null) {
+			return null;
+		}
+		return workBench.getActiveWorkbenchWindow();
+	}
+
+	@Override
+	protected void initializeImageRegistry(ImageRegistry reg) {
+		super.initializeImageRegistry(reg);
+
+		reg.put(IMG_SEPARATOR, imageDescriptorFromPlugin(PLUGIN_ID, "icons/separator.gif")); //$NON-NLS-1$
+	}
+
+	public Image getIcon(String key) {
+		return getImageRegistry().get(key);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/menu/button/MoreButton.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/menu/button/MoreButton.java
index 2f82c7448c9..4d10a035c9b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/menu/button/MoreButton.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/menu/button/MoreButton.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2015 CEA LIST and others.
+ * Copyright (c) 2015, 2016 CEA LIST, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,16 +8,17 @@
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
+ *   Christian W. Damus - bug 485220
  *
  *****************************************************************************/
 
 package org.eclipse.papyrus.infra.gmfdiag.navigation.menu.button;
 
+import org.eclipse.papyrus.infra.gmfdiag.navigation.Activator;
 import org.eclipse.papyrus.infra.services.navigation.service.NavigationMenuButton;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 public class MoreButton extends NavigationMenuButton {
 	public MoreButton() {
-		super("More...", AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.papyrus.uml.diagram.common", "/icons/separator.gif").createImage(), "More...");
+		super("More...", Activator.getDefault().getIcon(Activator.IMG_SEPARATOR), "More...");
 	}
 } // end MoreButton
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF
index d516d8a81b4..cd4699ce510 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF
@@ -1,26 +1,27 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.outline,

- org.eclipse.papyrus.infra.gmfdiag.outline.internal;x-internal:=true,

- org.eclipse.papyrus.infra.gmfdiag.outline.overview

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

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

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

- org.eclipse.core.runtime;bundle-version="3.7.0",

- org.eclipse.emf.transaction;bundle-version="1.4.0",

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

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

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

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

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

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

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

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.outline.internal.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.outline;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.outline,
+ org.eclipse.papyrus.infra.gmfdiag.outline.internal;x-internal:=true,
+ org.eclipse.papyrus.infra.gmfdiag.outline.overview
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.emf.edit.ui;bundle-version="2.12.0",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.2.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.emf.transaction;bundle-version="1.4.0",
+ org.eclipse.gef;bundle-version="3.7.1",
+ org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.outline.internal.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.outline;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/pom.xml
index df4f385942e..b70d6e7c56c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.outline</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/DiagramNavigator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/DiagramNavigator.java
index d9495142590..5b1012a445f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/DiagramNavigator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/infra/gmfdiag/outline/DiagramNavigator.java
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2007, 2014 Anyware Technologies, Obeo, CEA, and others.
+ * Copyright (c) 2007, 2016 Anyware Technologies, Obeo, CEA, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -10,21 +10,14 @@
  *    Anyware Technologies - initial API and implementation
  *    Obeo
  *    Christian W. Damus (CEA) - bug 410346
+ *    Christian W. Damus - bug 485220
  *
  **********************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.outline;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IDisposable;
 import org.eclipse.emf.edit.provider.IViewerNotification;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.View;
@@ -44,7 +37,6 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.part.IPageSite;
-import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;
 
 /**
  * <b>Diagram navigator :</b><br>
@@ -157,17 +149,8 @@ public class DiagramNavigator extends Composite {
 	 * Set the tree providers for the outline
 	 */
 	protected void initProviders() {
-		final AdapterFactory adapterFactory = getAdapterFactory();
-		AdapterFactoryContentProvider adapterContentProvider = new NavigatorAdapterFactoryContentProvider(adapterFactory) {
-			@Override
-			public void dispose() {
-				// Dispose the adapter factory because we created it
-				if (adapterFactory instanceof IDisposable) {
-					((IDisposable) adapterFactory).dispose();
-				}
-				super.dispose();
-			}
-		};
+		final AdapterFactory adapterFactory = org.eclipse.papyrus.infra.gmfdiag.common.Activator.getInstance().getItemProvidersAdapterFactory();
+		AdapterFactoryContentProvider adapterContentProvider = new NavigatorAdapterFactoryContentProvider(adapterFactory);
 		adapterContentProvider.inputChanged(viewer, null, null);
 		viewer.setContentProvider(new DiagramOrientedContentProvider(adapterContentProvider));
 		try {
@@ -225,18 +208,4 @@ public class DiagramNavigator extends Composite {
 		super.dispose();
 	}
 
-	/**
-	 * Get the AdapterFactory associated with an editor
-	 *
-	 * @return AdapterFactory
-	 */
-	protected AdapterFactory getAdapterFactory() {
-		List<AdapterFactory> factories = new ArrayList<AdapterFactory>();
-		factories.add(new UMLItemProviderAdapterFactory());
-		factories.add(new EcoreItemProviderAdapterFactory());
-		factories.add(new ResourceItemProviderAdapterFactory());
-		factories.add(new ReflectiveItemProviderAdapterFactory());
-		return new ComposedAdapterFactory(factories);
-	}
-
 }
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 24abbd0b15b..83fac59ae07 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,26 +1,26 @@
-Manifest-Version: 1.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,

- org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.dialogs,

- org.eclipse.papyrus.infra.gmfdiag.preferences.pages,

- org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal;x-internal:=true,

- org.eclipse.papyrus.infra.gmfdiag.preferences.ui,

- org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram,

- org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor,

- org.eclipse.papyrus.infra.gmfdiag.preferences.utils

-Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties,

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

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

- com.ibm.icu,

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

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.preferences.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.preferences;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.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,
+ org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.dialogs,
+ org.eclipse.papyrus.infra.gmfdiag.preferences.pages,
+ org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal;x-internal:=true,
+ org.eclipse.papyrus.infra.gmfdiag.preferences.ui,
+ org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram,
+ org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor,
+ org.eclipse.papyrus.infra.gmfdiag.preferences.utils
+Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties,
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
+ com.ibm.icu,
+ org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.preferences.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.preferences;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/pom.xml
index 515a9227c37..f2d6c0cdbfc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.preferences</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusPreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusPreferencePage.java
index 016e82ccafa..f4083f0579e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusPreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusPreferencePage.java
@@ -1,245 +1,49 @@
-/****************************************************************************

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

-

-import java.util.HashSet;

-import java.util.Set;

-

-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.jface.preference.IPreferenceStore;

-import org.eclipse.jface.preference.PreferencePage;

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

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.VisiblePageSingleton;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.layout.GridLayout;

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

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

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPreferencePage;

-import org.eclipse.ui.IWorkbenchPropertyPage;

-import org.eclipse.ui.preferences.ScopedPreferenceStore;

-

-/**

- * An abstract implementation of a Preference page.

- *

- * This preference page allows clients to define preference page in the preference of Eclipse, and

- * in the properties of a project in the workspace.

- * <p>

- * Clients must implement :

- * <ul>

- * <li><code>getBundleId()</code> method in order to define the preference scope (Project or Instance) of the preference page.</li>

- * <li><code>createPageContents()</code> method to populate the preference page with the different {@link AbstractGroup}. </br>Each group added has to be declared through the <code>addAbstractGroup(AbstractGroup fe)</code> method</li>

- * </ul>

- * </p>

- */

-public abstract class AbstractPapyrusPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, IWorkbenchPropertyPage {

-

-	private IProject project;

-

-	private Set<AbstractGroup> groupSet;

-

-	private String key;

-

-	/**

-	 * @see org.eclipse.ui.IWorkbenchPropertyPage#getElement()

-	 */

-	public IAdaptable getElement() {

-		return project;

-	}

-

-	protected void setPreferenceKey(String aKey) {

-		this.key = aKey;

-	}

-

-	protected String getPreferenceKey() {

-		return this.key;

-	}

-

-	@Override

-	public IPreferenceStore getPreferenceStore() {

-		return Activator.getDefault().getPreferenceStore();

-	}

-

-	/**

-	 * @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()

-	 */

-	@Override

-	protected IPreferenceStore doGetPreferenceStore() {

-		IPreferenceStore store;

-		if (project != null) {

-			store = new ScopedPreferenceStore(new ProjectScope(project), getBundleId());

-		} else {

-			store = new ScopedPreferenceStore(new InstanceScope(), getBundleId());

-		}

-		return store;

-	}

-

-	/**

-	 * Initializes this preference page for the given workbench.

-	 *

-	 * @param workbench

-	 *            the workbench

-	 *

-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)

-	 *

-	 */

-	public void init(IWorkbench workbench) {

-		// Do nothing

-	}

-

-	/**

-	 * Create the Papyrus preference page and inits the different fields editor contained in the

-	 * page.

-	 * <p>

-	 * This method shouldn't be overriden by sub-classes

-	 * </p>

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Control createContents(Composite parent) {

-		// Create the container composite

-		Composite container = new Composite(parent, SWT.NONE);

-		GridLayout containerLayout = new GridLayout();

-		container.setLayout(containerLayout);

-

-		createPageContents(container);

-

-		initGroup();

-

-		return container;

-	}

-

-	/**

-	 * Populate the preference page with the different field editor.

-	 * <p>

-	 * Each field added has to be declared through the <code>addEditorFields(FieldEditor fe)</code> method

-	 * </p>

-	 *

-	 * @param parent

-	 *            the parent composite

-	 */

-	protected abstract void createPageContents(Composite parent);

-

-	/**

-	 * Add the given field editor to the page.

-	 */

-	protected void addAbstractGroup(AbstractGroup fe) {

-		if (groupSet == null) {

-			groupSet = new HashSet<AbstractGroup>();

-		}

-		groupSet.add(fe);

-	}

-

-	@Override

-	public boolean performOk() {

-		VisiblePageSingleton.getInstance().store();

-		return super.performOk();

-	}

-

-	/**

-	 * Stores the values of the fields contained in this page into the preference store.

-	 */

-	protected void storePreferences() {

-		if (groupSet != null) {

-			for (AbstractGroup gs : groupSet) {

-				gs.storePreferences();

-			}

-		}

-	}

-

-	/**

-	 * Store all preferences

-	 */

-	public void storeAllPreferences() {

-		storePreferences();

-

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()

-	 */

-	@Override

-	protected void performDefaults() {

-		loadDefaultPreferences();

-		super.performDefaults();

-	}

-

-	/**

-	 * Load the default preferences of the fields contained in this page

-	 */

-	private void loadDefaultPreferences() {

-		if (groupSet != null) {

-			for (AbstractGroup gs : groupSet) {

-				gs.loadDefault();

-			}

-		}

-

-	}

-

-	/**

-	 * Init groups contained in this page.

-	 */

-	private void initGroup() {

-		if (groupSet != null) {

-			for (AbstractGroup gs : groupSet) {

-				gs.setPreferenceStore(getPreferenceStore());

-				gs.load();

-			}

-		}

-	}

-

-	@Override

-	public void dispose() {

-		super.dispose();

-		if (groupSet != null) {

-			for (AbstractGroup gs : groupSet) {

-				gs.dispose();

-			}

-		}

-

-

-	}

-

-	@Override

-	public void setVisible(boolean visible) {

-		// TODO Auto-generated method stub

-		if (visible == true) {

-			VisiblePageSingleton.getInstance().setVisiblePage(this);

-			initGroup();

-		}

-		super.setVisible(visible);

-

-	}

-

-	/**

-	 * The bundle ID used to defined the preference store

-	 *

-	 * @return String

-	 */

-	protected abstract String getBundleId();

-

-}

+/****************************************************************************
+ * 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;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup;
+
+/**
+ * An abstract implementation of a Preference page.
+ *
+ * This preference page allows clients to define preference page in the preference of Eclipse, and
+ * in the properties of a project in the workspace.
+ * <p>
+ * Clients must implement :
+ * <ul>
+ * <li><code>getBundleId()</code> method in order to define the preference scope (Project or Instance) of the preference page.</li>
+ * <li><code>createPageContents()</code> method to populate the preference page with the different {@link AbstractGroup}. </br>
+ * Each group added has to be declared through the <code>addAbstractGroup(AbstractGroup fe)</code> method</li>
+ * </ul>
+ * </p>
+ * 
+ * @deprecated Use the {@link org.eclipse.papyrus.infra.ui.preferences.AbstractPapyrusPreferencePage} API, instead.
+ */
+@Deprecated
+public abstract class AbstractPapyrusPreferencePage extends org.eclipse.papyrus.infra.ui.preferences.AbstractPapyrusPreferencePage {
+
+	@Override
+	public IPreferenceStore getPreferenceStore() {
+		return Activator.getDefault().getPreferenceStore();
+	}
+
+	/**
+	 * Add the given {@code group} of field editors to the page.
+	 */
+	protected void addAbstractGroup(AbstractGroup fe) {
+		addPreferenceGroup(fe);
+	}
+}
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 4d7d35b372c..d78ad643ccc 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
@@ -1,186 +1,187 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.infra.gmfdiag.preferences.pages;

-

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.gmf.runtime.diagram.ui.preferences.DiagramsPreferencePage;

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

-import org.eclipse.papyrus.infra.gmfdiag.preferences.PapyrusPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.VisiblePageSingleton;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.BackgroundColor;

-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.ui.diagram.DiagramRulersAndGridGroup;

-import org.eclipse.swt.layout.GridLayout;

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

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

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

-

-/**

- */

-public class DiagramPreferencePage extends DiagramsPreferencePage {

-

-

-	private Set<AbstractGroup> groupSet;

-

-	@Override

-	public void createControl(Composite parent) {

-		super.createControl(parent);

-		initGroup();

-	}

-

-	private String key = null;

-

-	@Override

-	protected Control createContents(Composite parent) {

-		Group contentGroup = new Group(parent, 2);

-		contentGroup.setLayout(new GridLayout(4, false));

-

-		// FontGroup

-		FontGroup fontGroupComposite = new DiagramFontGroup(contentGroup, getPreferenceKey(), this);

-		addAbstractGroup(fontGroupComposite);

-		// color

-		NodeColorGroup colorGroupForNodeComposite = new DiagramNodeColorGroup(contentGroup, getPreferenceKey(), this);

-		addAbstractGroup(colorGroupForNodeComposite);

-

-

-		// router for links

-		ConnectionGroup connectionGroupComposite = new DiagramConnectionGroup(contentGroup, getPreferenceKey(), this);

-		addAbstractGroup(connectionGroupComposite);

-

-		// background

-		BackgroundColor backgroundColorGroup = new DiagramBackgroundColor(contentGroup, getPreferenceKey(), this);

-		addAbstractGroup(backgroundColorGroup);

-

-		DecorationGroup decorationGroupComposite = new DiagramDecorationGroup(contentGroup, getPreferenceKey(), this);

-		addAbstractGroup(decorationGroupComposite);

-

-		RulersAndGridGroup viewGroupComposite = new DiagramRulersAndGridGroup(parent, getPreferenceKey(), this);

-		addAbstractGroup(viewGroupComposite);

-		return super.createContents(parent);

-	}

-

-	protected String getPreferenceKey() {

-		return this.key;

-	}

-

-	/**

-	 * Init groups contained in this page.

-	 */

-	private void initGroup() {

-		if (groupSet != null) {

-			for (AbstractGroup gs : groupSet) {

-				gs.setPreferenceStore(getPreferenceStore());

-				gs.load();

-			}

-		}

-	}

-

-	@Override

-	public boolean performOk() {

-		VisiblePageSingleton.getInstance().store();

-		return super.performOk();

-	}

-

-	/**

-	 * Stores the values of the fields contained in this page into the preference store.

-	 */

-	public void storePreferences() {

-		if (groupSet != null) {

-			for (AbstractGroup gs : groupSet) {

-				gs.storePreferences();

-			}

-		}

-

-	}

-

-	/**

-	 * store all preferences

-	 */

-	public void storeAllPreferences() {

-		storePreferences();

-		((PapyrusPreferenceStore) getPreferenceStore()).deleteAllSubPreference(PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX);

-

-	}

-

-	protected void setPreferenceKey(String aKey) {

-		this.key = aKey;

-	}

-

-	@Override

-	public void dispose() {

-		super.dispose();

-		if (groupSet != null) {

-			for (AbstractGroup gs : groupSet) {

-				gs.dispose();

-			}

-		}

-

-

-	}

-

-	/**

-	 * Add the given field editor to the page.

-	 */

-	protected void addAbstractGroup(AbstractGroup fe) {

-		if (groupSet == null) {

-			groupSet = new HashSet<AbstractGroup>();

-		}

-		groupSet.add(fe);

-	}

-

-	/**

-	 * Load the default preferences of the fields contained in this page

-	 */

-	private void loadDefaultPreferences() {

-		if (groupSet != null) {

-			for (AbstractGroup gs : groupSet) {

-				gs.loadDefault();

-			}

-		}

-

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()

-	 */

-	@Override

-	protected void performDefaults() {

-		loadDefaultPreferences();

-		super.performDefaults();

-	}

-

-	@Override

-	public void setVisible(boolean visible) {

-		if (visible == true) {

-			VisiblePageSingleton.getInstance().setVisiblePage(this);

-			initGroup();

-		}

-		super.setVisible(visible);

-

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.pages;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.gmf.runtime.diagram.ui.preferences.DiagramsPreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.PapyrusPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.BackgroundColor;
+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.ui.diagram.DiagramRulersAndGridGroup;
+import org.eclipse.papyrus.infra.ui.preferences.IPapyrusPreferencePage;
+import org.eclipse.papyrus.infra.ui.preferences.VisiblePageSingleton;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+
+/**
+ */
+public class DiagramPreferencePage extends DiagramsPreferencePage implements IPapyrusPreferencePage {
+
+
+	private Set<AbstractGroup> groupSet;
+
+	@Override
+	public void createControl(Composite parent) {
+		super.createControl(parent);
+		initGroup();
+	}
+
+	private String key = null;
+
+	@Override
+	protected Control createContents(Composite parent) {
+		Group contentGroup = new Group(parent, 2);
+		contentGroup.setLayout(new GridLayout(4, false));
+
+		// FontGroup
+		FontGroup fontGroupComposite = new DiagramFontGroup(contentGroup, getPreferenceKey(), this);
+		addAbstractGroup(fontGroupComposite);
+		// color
+		NodeColorGroup colorGroupForNodeComposite = new DiagramNodeColorGroup(contentGroup, getPreferenceKey(), this);
+		addAbstractGroup(colorGroupForNodeComposite);
+
+
+		// router for links
+		ConnectionGroup connectionGroupComposite = new DiagramConnectionGroup(contentGroup, getPreferenceKey(), this);
+		addAbstractGroup(connectionGroupComposite);
+
+		// background
+		BackgroundColor backgroundColorGroup = new DiagramBackgroundColor(contentGroup, getPreferenceKey(), this);
+		addAbstractGroup(backgroundColorGroup);
+
+		DecorationGroup decorationGroupComposite = new DiagramDecorationGroup(contentGroup, getPreferenceKey(), this);
+		addAbstractGroup(decorationGroupComposite);
+
+		RulersAndGridGroup viewGroupComposite = new DiagramRulersAndGridGroup(parent, getPreferenceKey(), this);
+		addAbstractGroup(viewGroupComposite);
+		return super.createContents(parent);
+	}
+
+	protected String getPreferenceKey() {
+		return this.key;
+	}
+
+	/**
+	 * Init groups contained in this page.
+	 */
+	private void initGroup() {
+		if (groupSet != null) {
+			for (AbstractGroup gs : groupSet) {
+				gs.setPreferenceStore(getPreferenceStore());
+				gs.load();
+			}
+		}
+	}
+
+	@Override
+	public boolean performOk() {
+		VisiblePageSingleton.getInstance().store();
+		return super.performOk();
+	}
+
+	/**
+	 * Stores the values of the fields contained in this page into the preference store.
+	 */
+	public void storePreferences() {
+		if (groupSet != null) {
+			for (AbstractGroup gs : groupSet) {
+				gs.storePreferences();
+			}
+		}
+
+	}
+
+	/**
+	 * store all preferences
+	 */
+	public void storeAllPreferences() {
+		storePreferences();
+		((PapyrusPreferenceStore) getPreferenceStore()).deleteAllSubPreference(PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX);
+
+	}
+
+	protected void setPreferenceKey(String aKey) {
+		this.key = aKey;
+	}
+
+	@Override
+	public void dispose() {
+		super.dispose();
+		if (groupSet != null) {
+			for (AbstractGroup gs : groupSet) {
+				gs.dispose();
+			}
+		}
+
+
+	}
+
+	/**
+	 * Add the given field editor to the page.
+	 */
+	protected void addAbstractGroup(AbstractGroup fe) {
+		if (groupSet == null) {
+			groupSet = new HashSet<AbstractGroup>();
+		}
+		groupSet.add(fe);
+	}
+
+	/**
+	 * Load the default preferences of the fields contained in this page
+	 */
+	private void loadDefaultPreferences() {
+		if (groupSet != null) {
+			for (AbstractGroup gs : groupSet) {
+				gs.loadDefault();
+			}
+		}
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
+	 */
+	@Override
+	protected void performDefaults() {
+		loadDefaultPreferences();
+		super.performDefaults();
+	}
+
+	@Override
+	public void setVisible(boolean visible) {
+		if (visible == true) {
+			VisiblePageSingleton.getInstance().setVisiblePage(this);
+			initGroup();
+		}
+		super.setVisible(visible);
+
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/VisiblePageSingleton.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/VisiblePageSingleton.java
index 12248b9d021..8c131f5c7de 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/VisiblePageSingleton.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/VisiblePageSingleton.java
@@ -1,75 +1,69 @@
-/*****************************************************************************

- * 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.pages.internal;

-

-import org.eclipse.jface.preference.IPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;

-

-/**

- * This singleton has bee created to manage the button ok and apply of preference page.

- * In the case of button ok pressed, the behavior of eclipse try of apply in the first preference page found.

- * Here each page has a specific behavior. So to store the preference, the active page is called

- *

- */

-public class VisiblePageSingleton {

-

-	private static VisiblePageSingleton instance;

-

-	private IPreferencePage page;

-

-	/**

-	 *

-	 * @return the instance of the {@link VisiblePageSingleton}

-	 */

-	public static VisiblePageSingleton getInstance() {

-		if (instance == null) {

-			instance = new VisiblePageSingleton();

-		}

-		return instance;

-	}

-

-	/**

-	 * set the visible page

-	 *

-	 * @param page

-	 *            a {@link IPreferencePage} --> {@link DiagramPreferencePage} or {@link AbstractPapyrusPreferencePage}

-	 */

-	public void setVisiblePage(IPreferencePage page) {

-		this.page = page;

-	}

-

-	/**

-	 *

-	 * @return the Visible Page

-	 */

-	public IPreferencePage getVisiblePage() {

-		return this.page;

-	}

-

-	/**

-	 * call the visisble page in order to store preferences

-	 */

-	public void store() {

-		if (this.page != null) {

-			if (this.page instanceof DiagramPreferencePage) {

-				((DiagramPreferencePage) (this.page)).storeAllPreferences();

-			}

-			if (this.page instanceof AbstractPapyrusPreferencePage) {

-				((AbstractPapyrusPreferencePage) (this.page)).storeAllPreferences();

-			}

-

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal;
+
+import org.eclipse.jface.preference.IPreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusPreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;
+
+/**
+ * This singleton has bee created to manage the button ok and apply of preference page.
+ * In the case of button ok pressed, the behavior of eclipse try of apply in the first preference page found.
+ * Here each page has a specific behavior. So to store the preference, the active page is called
+ *
+ * @deprecated Use the {@link org.eclipse.papyrus.infra.ui.preferences.VisiblePageSingleton} API, instead.
+ */
+@Deprecated
+public class VisiblePageSingleton {
+
+	private static VisiblePageSingleton instance;
+
+	private final org.eclipse.papyrus.infra.ui.preferences.VisiblePageSingleton delegate = org.eclipse.papyrus.infra.ui.preferences.VisiblePageSingleton.getInstance();
+
+	/**
+	 *
+	 * @return the instance of the {@link VisiblePageSingleton}
+	 */
+	public static VisiblePageSingleton getInstance() {
+		if (instance == null) {
+			instance = new VisiblePageSingleton();
+		}
+		return instance;
+	}
+
+	/**
+	 * set the visible page
+	 *
+	 * @param page
+	 *            a {@link IPreferencePage} --> {@link DiagramPreferencePage} or {@link AbstractPapyrusPreferencePage}
+	 */
+	public void setVisiblePage(IPreferencePage page) {
+		delegate.setVisiblePage(page);
+	}
+
+	/**
+	 *
+	 * @return the Visible Page
+	 */
+	public IPreferencePage getVisiblePage() {
+		return delegate.getVisiblePage();
+	}
+
+	/**
+	 * call the visisble page in order to store preferences
+	 */
+	public void store() {
+		delegate.store();
+	}
+}
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 2704c6c91d1..b541cfaa027 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
@@ -1,173 +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:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr

- *  Thibault Landre (Atos Origin)

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

-package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;

-

-import java.util.HashSet;

-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.common.preferences.PreferencesConstantsHelper;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.layout.GridLayout;

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

-

-/**

- * The Class AbstractGroupComposite.

- */

-public abstract class AbstractGroup extends Composite {

-

-	/** The key to find preference */

-	private String key;

-

-	/**

-	 * The fieldsEditor : a set that will contain all editor in the composite. It is in charge of

-	 * loading / storing / setting the preference store / loading default of all its contained field

-	 * editor

-	 */

-	private Set<FieldEditor> fieldsEditor;

-

-	/**

-	 * Gets the dialog page.

-	 *

-	 * @return the dialogPage

-	 */

-	protected DialogPage getDialogPage() {

-		return dialogPage;

-	}

-

-	/** The dialog page. */

-	protected DialogPage dialogPage;

-

-	/**

-	 * Gets the title.

-	 *

-	 * @return the title

-	 */

-	public String getKey() {

-		return key;

-	}

-

-	/**

-	 * Sets the title.

-	 *

-	 * @param title

-	 *            the title to set

-	 */

-	protected void setKey(String title) {

-		this.key = title;

-	}

-

-	/**

-	 * Instantiates a new abstract group.

-	 *

-	 * @param parent

-	 *            the parent of the composite

-	 * @param String

-	 *            the title of the page

-	 * @param dialogPage

-	 *            to set the page in field editor

-	 */

-	public AbstractGroup(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, SWT.None);

-		this.key = key;

-		this.dialogPage = dialogPage;

-		this.setLayout(new GridLayout());

-		fieldsEditor = new HashSet<FieldEditor>();

-	}

-

-	/**

-	 * 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 PreferencesConstantsHelper}

-	 *

-	 * @return the preference constant used to store the given preference type.

-	 */

-	protected String getPreferenceConstant(int preferenceType) {

-		return PreferencesConstantsHelper.getElementConstant(key, preferenceType);

-	}

-

-	/**

-	 * Gets an encapsulated compo. This composite is used to contain a FieldEditor and to allow

-	 * developers to work with a FieldEditor like Composite element.

-	 *

-	 * @param parent

-	 *            the parent

-	 *

-	 * @return the encapsulated compo

-	 */

-	protected final Composite getEncapsulatedCompo(Composite parent) {

-		Composite compo = new Composite(parent, SWT.NONE);

-		compo.setLayout(new GridLayout());

-		return compo;

-	}

-

-	/**

-	 * Register field editor. It will add the fieldEditor to a map that will be used to

-	 * store/load/loadDefault/set the PreferenceStore of contained fieldEditor

-	 *

-	 * @param fieldEditor

-	 *            the fieldEditor to add.

-	 */

-	protected void addFieldEditor(FieldEditor fieldEditor) {

-		fieldsEditor.add(fieldEditor);

-	}

-

-	/**

-	 * Load preferences of all registered fieldEditors.

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#addFieldEditor(FieldEditor)

-	 */

-	public void load() {

-		for (FieldEditor fe : fieldsEditor) {

-			fe.load();

-		}

-	}

-

-	/**

-	 * Set the preference store of all registered fieldEditors.

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#addFieldEditor(FieldEditor)

-	 */

-	public final void setPreferenceStore(IPreferenceStore store) {

-		for (FieldEditor fe : fieldsEditor) {

-			fe.setPreferenceStore(store);

-		}

-	}

-

-	/**

-	 * Load default preferences of all registered fieldEditors.

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#addFieldEditor(FieldEditor)

-	 */

-	public final void loadDefault() {

-		for (FieldEditor fe : fieldsEditor) {

-			fe.loadDefault();

-		}

-	}

-

-	/**

-	 * Store preferences of the registered fieldEditors.

-	 *

-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#addFieldEditor(FieldEditor)

-	 */

-	public final void storePreferences() {

-		for (FieldEditor fe : fieldsEditor) {

-			fe.store();

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr
+ *  Thibault Landre (Atos Origin)
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+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.ui.preferences.AbstractPreferenceGroup;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * The Class AbstractGroupComposite.
+ */
+public abstract class AbstractGroup extends AbstractPreferenceGroup {
+
+	/**
+	 * Instantiates a new abstract group.
+	 *
+	 * @param parent
+	 *            the parent of the composite
+	 * @param String
+	 *            the title of the page
+	 * @param dialogPage
+	 *            to set the page in field editor
+	 */
+	public AbstractGroup(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+	}
+
+	/**
+	 * 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 PreferencesConstantsHelper}
+	 *
+	 * @return the preference constant used to store the given preference type.
+	 */
+	protected String getPreferenceConstant(int preferenceType) {
+		return PreferencesConstantsHelper.getElementConstant(getKey(), preferenceType);
+	}
+
+	/**
+	 * Gets an encapsulated compo. This composite is used to contain a FieldEditor and to allow
+	 * developers to work with a FieldEditor like Composite element.
+	 *
+	 * @param parent
+	 *            the parent
+	 *
+	 * @return the encapsulated compo
+	 * 
+	 * @deprecated Use the {@link AbstractPreferenceGroup#getEncapsulatedComposite(Composite)} API, instead
+	 */
+	@Deprecated
+	protected final Composite getEncapsulatedCompo(Composite parent) {
+		return getEncapsulatedComposite(parent);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.classpath
index 2d1a4302f04..eca7bdba8f0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.classpath
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.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.8"/>
+	<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/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..b3aa6d60f94 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-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

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
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 f5658f055dc..2b4abcf5b19 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
@@ -1,39 +1,39 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.properties.extension,

- org.eclipse.papyrus.infra.gmfdiag.properties.modelelement

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

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

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

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

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

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

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

- org.eclipse.emf.databinding;bundle-version="1.2.0",

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

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

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

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

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

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

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

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

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

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

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

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

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",

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

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

- org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.infra.gmfdiag.properties.constraint"

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %Bundle-Name

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.properties.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.properties;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.properties.extension,
+ org.eclipse.papyrus.infra.gmfdiag.properties.modelelement
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.notation;bundle-version="1.4.1",
+ org.eclipse.emf.edit;bundle-version="2.7.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
+ org.eclipse.core.databinding;bundle-version="1.4.0",
+ org.eclipse.emf.databinding;bundle-version="1.2.0",
+ org.eclipse.core.databinding.property;bundle-version="1.4.0",
+ org.eclipse.core.databinding.beans;bundle-version="1.2.100",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.emf.edit.ui;bundle-version="2.7.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.edit.ui;bundle-version="1.2.0"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.infra.gmfdiag.properties.constraint"
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.properties.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.properties;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 26438fcf027..f7f0e3d30db 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
@@ -391,7 +391,7 @@
   </views>
   <views xmi:id="_Lf9rSJLDEeWbp4A9_-WIrQ" name="Single RulersAndGrid" sections="_Lf8dHZLDEeWbp4A9_-WIrQ" datacontexts="_Lf_gapLDEeWbp4A9_-WIrQ">
     <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_Lf9rSZLDEeWbp4A9_-WIrQ" name="isSingleDiagramEditorConstraint" overrideable="false">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.4"/>
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.4"/>
       <properties xsi:type="constraints:ValueProperty" xmi:id="_Lf9rSpLDEeWbp4A9_-WIrQ" name="className" value="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.IsSingleDiagramEditorConstraint"/>
     </constraints>
   </views>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleAnchor.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleAnchor.xwt
index f852ec3e3dd..2a24fc3815c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleAnchor.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleAnchor.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

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

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	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>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBasicCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBasicCompartment.xwt
index d281c5148ec..7107365331e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBasicCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBasicCompartment.xwt
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

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

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	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>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBasicDecorationNode.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBasicDecorationNode.xwt
index 22210d02a6d..074f9386f3c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBasicDecorationNode.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBasicDecorationNode.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBasicSemanticCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBasicSemanticCompartment.xwt
index 4f92943cb38..edb18b46538 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBasicSemanticCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBasicSemanticCompartment.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	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:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBendpoints.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBendpoints.xwt
index d69369c20ec..2d251a2192c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBendpoints.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBendpoints.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<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">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBounds.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBounds.xwt
index 51204c02825..8b69f2a1492 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBounds.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleBounds.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleCompartment.xwt
index b4dbc17f019..872d422e3d8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleCompartment.xwt
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:TitleStyle:showTitle"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:CanonicalStyle:canonical"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:TitleStyle:showTitle"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:CanonicalStyle:canonical"></ppe:BooleanRadio>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleConnector.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleConnector.xwt
index 1a968cdc1c3..d9a3519baa4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleConnector.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleConnector.xwt
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	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:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleDecorationNode.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleDecorationNode.xwt
index 268a24a4311..0211b01e457 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleDecorationNode.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleDecorationNode.xwt
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleDiagram.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleDiagram.xwt
index 8a9743d2cdd..aa33534958b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleDiagram.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleDiagram.xwt
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="notation:Diagram:measurementUnit"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="notation:Diagram:measurementUnit"></ppe:EnumCombo>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleEdge.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleEdge.xwt
index c51b0dd6411..0e3ef4337de 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleEdge.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleEdge.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleGuide.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleGuide.xwt
index 4529a80b41c..3b0c4607da2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleGuide.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleGuide.xwt
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}" property="notation:Guide:position"></ppe:IntegerEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}" property="notation:Guide:position"></ppe:IntegerEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleIdentityAnchor.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleIdentityAnchor.xwt
index 0f03fd30c5d..78049e574ae 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleIdentityAnchor.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleIdentityAnchor.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleImage.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleImage.xwt
index 6708b2e86b8..71e2f0b09bf 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleImage.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleImage.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleLayoutConstraint.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleLayoutConstraint.xwt
index 9ba4ce8ae90..12b82270dd7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleLayoutConstraint.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleLayoutConstraint.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleListCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleListCompartment.xwt
index e58ebc5d6f2..085d3d5d9fc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleListCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleListCompartment.xwt
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:SortingStyle:sortingKeys"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:TitleStyle:showTitle"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="notation:SortingStyle:sorting"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}" property="notation:FilteringStyle:filtering"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:SortingStyle:sortedObjects"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:SortingStyle:sortingKeys"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:TitleStyle:showTitle"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="notation:SortingStyle:sorting"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="notation:FilteringStyle:filtering"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:SortingStyle:sortedObjects"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleLocation.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleLocation.xwt
index 0f03fd30c5d..78049e574ae 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleLocation.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleLocation.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleNode.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleNode.xwt
index 5811722ef42..816c71a4fb0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleNode.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleNode.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleNodeEntry.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleNodeEntry.xwt
index e497ea1764e..d1201b6a56a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleNodeEntry.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleNodeEntry.xwt
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="notation:NodeEntry:value"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="notation:NodeEntry:value"></ppe:EnumCombo>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultiplePropertyValue.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultiplePropertyValue.xwt
index 89517d2ad16..3b396a9929b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultiplePropertyValue.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultiplePropertyValue.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	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">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleRatio.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleRatio.xwt
index c92a78b1b3c..55517d349c4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleRatio.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleRatio.xwt
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="notation:Ratio:value"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="notation:Ratio:value"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleRelativeBendpoints.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleRelativeBendpoints.xwt
index 6a66b760328..8ee6141e132 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleRelativeBendpoints.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleRelativeBendpoints.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleSemanticListCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleSemanticListCompartment.xwt
index 3a1567c248e..f3dbf21bb03 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleSemanticListCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleSemanticListCompartment.xwt
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite 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:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:SortingStyle:sortingKeys"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:TitleStyle:showTitle"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="notation:SortingStyle:sorting"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}" property="notation:FilteringStyle:filtering"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:SortingStyle:sortedObjects"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:SortingStyle:sortingKeys"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:TitleStyle:showTitle"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="notation:SortingStyle:sorting"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="notation:FilteringStyle:filtering"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:SortingStyle:sortedObjects"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleShape.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleShape.xwt
index ff5d87bdcff..aaada625b56 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleShape.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleShape.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleSize.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleSize.xwt
index 6708b2e86b8..71e2f0b09bf 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleSize.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleSize.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleStandardDiagram.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleStandardDiagram.xwt
index 2560cc8a414..414cf02096b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleStandardDiagram.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleStandardDiagram.xwt
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageX"></ppe:IntegerEditor>

-		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageY"></ppe:IntegerEditor>

-		<ppe:IntegerEditor input="{Binding}"

-			property="notation:PageStyle:pageWidth"></ppe:IntegerEditor>

-		<ppe:IntegerEditor input="{Binding}"

-			property="notation:PageStyle:pageHeight"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="notation:Diagram:measurementUnit"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageX"></ppe:IntegerEditor>
+		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageY"></ppe:IntegerEditor>
+		<ppe:IntegerEditor input="{Binding}"
+			property="notation:PageStyle:pageWidth"></ppe:IntegerEditor>
+		<ppe:IntegerEditor input="{Binding}"
+			property="notation:PageStyle:pageHeight"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="notation:Diagram:measurementUnit"></ppe:EnumCombo>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleStringObjectConverter.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleStringObjectConverter.xwt
index cfb33162bc7..826244688cc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleStringObjectConverter.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleStringObjectConverter.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	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">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleStringToPropertyValueMapEntry.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleStringToPropertyValueMapEntry.xwt
index 6708b2e86b8..71e2f0b09bf 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleStringToPropertyValueMapEntry.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleStringToPropertyValueMapEntry.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleView.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleView.xwt
index bc1cfbde094..12fa8a4d568 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleView.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/MultipleView.xwt
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleAnchor.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleAnchor.xwt
index f852ec3e3dd..2a24fc3815c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleAnchor.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleAnchor.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

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

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	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>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBasicCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBasicCompartment.xwt
index 7e7f91de22e..b0501803c81 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBasicCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBasicCompartment.xwt
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}" property="notation:View:element"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:View:sourceEdges"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:View:targetEdges"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}" property="notation:View:element"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:View:sourceEdges"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:View:targetEdges"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBasicDecorationNode.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBasicDecorationNode.xwt
index 363105005ae..5145cc6340d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBasicDecorationNode.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBasicDecorationNode.xwt
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	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:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBasicSemanticCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBasicSemanticCompartment.xwt
index 10c44e01d2e..d98176ec513 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBasicSemanticCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBasicSemanticCompartment.xwt
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}" property="notation:View:element"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:View:sourceEdges"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:View:targetEdges"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}" property="notation:View:element"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:View:sourceEdges"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:View:targetEdges"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBendpoints.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBendpoints.xwt
index 9047bd98f8e..722da6c76c4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBendpoints.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBendpoints.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBounds.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBounds.xwt
index 6708b2e86b8..71e2f0b09bf 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBounds.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleBounds.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleCompartment.xwt
index 16ae2d27d37..9704a15541f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleCompartment.xwt
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:TitleStyle:showTitle"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:CanonicalStyle:canonical"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}" property="notation:View:element"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:View:sourceEdges"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:View:targetEdges"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:TitleStyle:showTitle"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:CanonicalStyle:canonical"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}" property="notation:View:element"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:View:sourceEdges"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:View:targetEdges"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleConnector.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleConnector.xwt
index 4615b13af09..1d1083135a0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleConnector.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleConnector.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
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 179acb0555c..721b60d3055 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,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<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">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Group text="Shape Decoration">

-		<Group.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Group.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="decoratedElement:ShapeDecorableElement:shapeVisibility"

-			customLabel="Visible"></ppe:BooleanRadio>

-		<ppe:ReferenceCombo input="{Binding}"

-			property="decoratedElement:ShapeDecorableElement:shapeDirection"

-			customLabel="Position"></ppe:ReferenceCombo>

-	</Group>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Group text="Shape Decoration">
+		<Group.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Group.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="decoratedElement:ShapeDecorableElement:shapeVisibility"
+			customLabel="Visible"></ppe:BooleanRadio>
+		<ppe:ReferenceCombo input="{Binding}"
+			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/SingleDecorationNode.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDecorationNode.xwt
index 4afd2ad2072..cd067c0f3ee 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDecorationNode.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDecorationNode.xwt
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDiagram.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDiagram.xwt
index d08acaed9e0..840b846b6db 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDiagram.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDiagram.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="notation:Diagram:name"></ppe:StringEditor>

-		<ppe:ReferenceLabel input="{Binding}" property="notation:View:prototype" readOnly="true" customLabel="View Type"></ppe:ReferenceLabel>

-		<ppe:ReferenceDialog input="{Binding}" property="notation:View:owner" customLabel="Owner"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}" property="notation:View:element" customLabel="Root element"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="notation:Diagram:name"></ppe:StringEditor>
+		<ppe:ReferenceLabel input="{Binding}" property="notation:View:prototype" readOnly="true" customLabel="View Type"></ppe:ReferenceLabel>
+		<ppe:ReferenceDialog input="{Binding}" property="notation:View:owner" customLabel="Owner"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}" property="notation:View:element" customLabel="Root element"></ppe:ReferenceDialog>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleEdge.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleEdge.xwt
index 2d97ebafc76..98b3e65b7d0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleEdge.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleEdge.xwt
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	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:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}" property="notation:View:element"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:View:sourceEdges"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:View:targetEdges"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}" property="notation:View:element"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:View:sourceEdges"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:View:targetEdges"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleGuide.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleGuide.xwt
index 6f343c6acbe..d33449588a8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleGuide.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleGuide.xwt
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}" property="notation:Guide:position"></ppe:IntegerEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}" property="notation:Guide:position"></ppe:IntegerEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleIdentityAnchor.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleIdentityAnchor.xwt
index f852ec3e3dd..2a24fc3815c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleIdentityAnchor.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleIdentityAnchor.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

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

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	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>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleImage.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleImage.xwt
index 373b1dde6ee..efe17f91016 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleImage.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleImage.xwt
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="notation:Image:data"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="notation:Image:data"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleLayoutConstraint.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleLayoutConstraint.xwt
index d69369c20ec..2d251a2192c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleLayoutConstraint.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleLayoutConstraint.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<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">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleListCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleListCompartment.xwt
index 0f9c5df8b47..951ed486081 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleListCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleListCompartment.xwt
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:SortingStyle:sortingKeys"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:FilteringStyle:filteringKeys"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:TitleStyle:showTitle"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="notation:SortingStyle:sorting"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}" property="notation:FilteringStyle:filtering"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}" property="notation:View:element"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:SortingStyle:sortedObjects"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:View:sourceEdges"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:View:targetEdges"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:FilteringStyle:filteredObjects"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:SortingStyle:sortingKeys"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:FilteringStyle:filteringKeys"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:TitleStyle:showTitle"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="notation:SortingStyle:sorting"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="notation:FilteringStyle:filtering"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}" property="notation:View:element"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:SortingStyle:sortedObjects"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:View:sourceEdges"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:View:targetEdges"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:FilteringStyle:filteredObjects"></ppe:MultiReference>
+	</Composite>
 </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 d69369c20ec..2d251a2192c 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,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<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">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleNode.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleNode.xwt
index 8c3f9a2082a..768ad64cfe6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleNode.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleNode.xwt
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}" property="notation:View:element"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:View:sourceEdges"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:View:targetEdges"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}" property="notation:View:element"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:View:sourceEdges"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:View:targetEdges"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleNodeEntry.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleNodeEntry.xwt
index 8c5a40ac3cb..dae1b8e0341 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleNodeEntry.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleNodeEntry.xwt
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="notation:NodeEntry:value"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="notation:NodeEntry:key"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="notation:NodeEntry:value"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="notation:NodeEntry:key"></ppe:ReferenceDialog>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SinglePropertyValue.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SinglePropertyValue.xwt
index c546e6203b7..89a0a605bb9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SinglePropertyValue.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SinglePropertyValue.xwt
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:PropertyValue:rawValue"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="notation:PropertyValue:instanceType"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:PropertyValue:rawValue"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="notation:PropertyValue:instanceType"></ppe:ReferenceDialog>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleRatio.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleRatio.xwt
index db88ca12577..4ac3356fb2f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleRatio.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleRatio.xwt
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="notation:Ratio:value"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="notation:Ratio:value"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleRelativeBendpoints.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleRelativeBendpoints.xwt
index d3b34f83106..4b01d3c8c84 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleRelativeBendpoints.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleRelativeBendpoints.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:RelativeBendpoints:points"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:RelativeBendpoints:points"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
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
index 1f133dd89e9..462e98d12af 100644
--- 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
@@ -1,2 +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
+<?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.infra.properties.ui.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.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/model/notation/ui/SingleSemanticListCompartment.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleSemanticListCompartment.xwt
index 28979da3b4e..f96fcda2203 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleSemanticListCompartment.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleSemanticListCompartment.xwt
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:SortingStyle:sortingKeys"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:FilteringStyle:filteringKeys"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:TitleStyle:showTitle"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="notation:SortingStyle:sorting"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}" property="notation:FilteringStyle:filtering"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}" property="notation:View:element"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:SortingStyle:sortedObjects"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:View:sourceEdges"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:View:targetEdges"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:FilteringStyle:filteredObjects"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:SortingStyle:sortingKeys"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:FilteringStyle:filteringKeys"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:TitleStyle:showTitle"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="notation:SortingStyle:sorting"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="notation:FilteringStyle:filtering"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}" property="notation:View:element"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:SortingStyle:sortedObjects"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:View:sourceEdges"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:View:targetEdges"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:FilteringStyle:filteredObjects"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleShape.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleShape.xwt
index c9a56c611db..4119bbbf785 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleShape.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleShape.xwt
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

-	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="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleSize.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleSize.xwt
index 9047bd98f8e..722da6c76c4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleSize.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleSize.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleStandardDiagram.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleStandardDiagram.xwt
index 1cbe406c172..3e409c80572 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleStandardDiagram.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleStandardDiagram.xwt
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="notation:Diagram:name"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:DescriptionStyle:description"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageX"></ppe:IntegerEditor>

-		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageY"></ppe:IntegerEditor>

-		<ppe:IntegerEditor input="{Binding}"

-			property="notation:PageStyle:pageWidth"></ppe:IntegerEditor>

-		<ppe:IntegerEditor input="{Binding}"

-			property="notation:PageStyle:pageHeight"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="notation:Diagram:measurementUnit"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}" property="notation:View:element"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:View:sourceEdges"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:View:targetEdges"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="notation:Diagram:name"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:DescriptionStyle:description"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageX"></ppe:IntegerEditor>
+		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageY"></ppe:IntegerEditor>
+		<ppe:IntegerEditor input="{Binding}"
+			property="notation:PageStyle:pageWidth"></ppe:IntegerEditor>
+		<ppe:IntegerEditor input="{Binding}"
+			property="notation:PageStyle:pageHeight"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="notation:Diagram:measurementUnit"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}" property="notation:View:element"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:View:sourceEdges"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:View:targetEdges"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleStringObjectConverter.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleStringObjectConverter.xwt
index c902f6a4fb0..4d360228f8d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleStringObjectConverter.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleStringObjectConverter.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

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

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	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>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleStringToPropertyValueMapEntry.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleStringToPropertyValueMapEntry.xwt
index eb4baf88759..b5e5d3623e6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleStringToPropertyValueMapEntry.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleStringToPropertyValueMapEntry.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:StringToPropertyValueMapEntry:key"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:StringToPropertyValueMapEntry:key"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleView.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleView.xwt
index d9bc2718b59..5fd2e3c058f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleView.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleView.xwt
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}" property="notation:View:element"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:View:sourceEdges"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:View:targetEdges"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:visible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="notation:View:mutable"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}" property="notation:View:element"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:View:sourceEdges"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:View:targetEdges"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/style.ctx b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/style.ctx
index e7afb83f8b7..99a6e25f53a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/style.ctx
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/style.ctx
@@ -774,7 +774,7 @@
   </views>
   <views xmi:id="_O2hXSpLDEeWbp4A9_-WIrQ" name="SingleGradientData" sections="_O2e7AZLDEeWbp4A9_-WIrQ">
     <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_O2hXS5LDEeWbp4A9_-WIrQ" name="isGradientData">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.3"/>
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.3"/>
       <properties xsi:type="constraints:ValueProperty" xmi:id="_O2hXTJLDEeWbp4A9_-WIrQ" name="class" value="org.eclipse.gmf.runtime.notation.datatype.GradientData"/>
     </constraints>
   </views>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/FillStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/FillStyle.xwt
index 236407b2849..bd843ae2945 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/FillStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/FillStyle.xwt
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="Fill">

-	<Composite.layout>

-		<GridLayout></GridLayout>

-	</Composite.layout>

-	<Group text="Fill">

-		<Group.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Group.layout>

-		<gmf:XWTAwareColorPicker input="{Binding}"

-			property="notation:FillStyle:fillColor"></gmf:XWTAwareColorPicker>

-		<ppe:IntegerSpinner input="{Binding}"

-			property="notation:FillStyle:transparency"></ppe:IntegerSpinner>

-	</Group>

-	<Group text="Gradient">

-		<Group.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Group.layout>

-		<ppe:ViewEditor view="style:SingleGradientData"

-			input="{Binding}" property="notation:FillStyle:gradient"></ppe:ViewEditor>

-	</Group>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="Fill">
+	<Composite.layout>
+		<GridLayout></GridLayout>
+	</Composite.layout>
+	<Group text="Fill">
+		<Group.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Group.layout>
+		<gmf:XWTAwareColorPicker input="{Binding}"
+			property="notation:FillStyle:fillColor"></gmf:XWTAwareColorPicker>
+		<ppe:IntegerSpinner input="{Binding}"
+			property="notation:FillStyle:transparency"></ppe:IntegerSpinner>
+	</Group>
+	<Group text="Gradient">
+		<Group.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Group.layout>
+		<ppe:ViewEditor view="style:SingleGradientData"
+			input="{Binding}" property="notation:FillStyle:gradient"></ppe:ViewEditor>
+	</Group>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/FontStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/FontStyle.xwt
index 46d642d8b9a..b475e169b6b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/FontStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/FontStyle.xwt
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<GridLayout></GridLayout>

-	</Composite.layout>

-	<Group text="Font">

-		<Group.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Group.layout>

-		<gmf:XWTAwareFontEditor input="{Binding}"

-			property="notation:FontStyle:fontName" showLabel="false"></gmf:XWTAwareFontEditor>

-		<ppe:IntegerEditor input="{Binding}"

-			property="notation:FontStyle:fontHeight"></ppe:IntegerEditor>

-		<ppe:BooleanToggle

-			image="/org.eclipse.gmf.runtime.diagram.ui.properties/icons/bold.gif"

-			input="{Binding}" property="notation:FontStyle:bold" showLabel="false"></ppe:BooleanToggle>

-		<gmf:XWTAwareColorPicker input="{Binding}"

-			property="notation:FontStyle:fontColor" showLabel="false"></gmf:XWTAwareColorPicker>

-	</Group>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<GridLayout></GridLayout>
+	</Composite.layout>
+	<Group text="Font">
+		<Group.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Group.layout>
+		<gmf:XWTAwareFontEditor input="{Binding}"
+			property="notation:FontStyle:fontName" showLabel="false"></gmf:XWTAwareFontEditor>
+		<ppe:IntegerEditor input="{Binding}"
+			property="notation:FontStyle:fontHeight"></ppe:IntegerEditor>
+		<ppe:BooleanToggle
+			image="/org.eclipse.gmf.runtime.diagram.ui.properties/icons/bold.gif"
+			input="{Binding}" property="notation:FontStyle:bold" showLabel="false"></ppe:BooleanToggle>
+		<gmf:XWTAwareColorPicker input="{Binding}"
+			property="notation:FontStyle:fontColor" showLabel="false"></gmf:XWTAwareColorPicker>
+	</Group>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/LineStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/LineStyle.xwt
index b67410f65e2..56e0bfe04db 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/LineStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/LineStyle.xwt
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang"

-	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="Line">

-	<Composite.layout>

-		<GridLayout></GridLayout>

-	</Composite.layout>

-	<Group text="Line">

-		<Group.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Group.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="notation:LineStyle:lineWidth"></ppe:IntegerEditor>

-		<gmf:XWTAwareColorPicker input="{Binding}"

-			property="notation:LineStyle:lineColor"></gmf:XWTAwareColorPicker>

-	</Group>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang"
+	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="Line">
+	<Composite.layout>
+		<GridLayout></GridLayout>
+	</Composite.layout>
+	<Group text="Line">
+		<Group.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Group.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="notation:LineStyle:lineWidth"></ppe:IntegerEditor>
+		<gmf:XWTAwareColorPicker input="{Binding}"
+			property="notation:LineStyle:lineColor"></gmf:XWTAwareColorPicker>
+	</Group>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleArrowStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleArrowStyle.xwt
index f826bd0ae84..bfc136d726c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleArrowStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleArrowStyle.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="notation:ArrowStyle:arrowSource"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}" property="notation:ArrowStyle:arrowTarget"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="notation:ArrowStyle:arrowSource"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="notation:ArrowStyle:arrowTarget"></ppe:EnumCombo>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleBooleanListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleBooleanListValueStyle.xwt
index 8fd1b2ad08e..58a47121f26 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleBooleanListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleBooleanListValueStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleBooleanValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleBooleanValueStyle.xwt
index 6a89e368bb1..e29bdbb8542 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleBooleanValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleBooleanValueStyle.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleByteArrayValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleByteArrayValueStyle.xwt
index 0972b3893fb..a780fae17ea 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleByteArrayValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleByteArrayValueStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleCanonicalStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleCanonicalStyle.xwt
index 97d5becd5d3..78d68fd639e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleCanonicalStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleCanonicalStyle.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:CanonicalStyle:canonical"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:CanonicalStyle:canonical"></ppe:BooleanRadio>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleConnectorStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleConnectorStyle.xwt
index 153489f2dc3..8850d925d2a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleConnectorStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleConnectorStyle.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDataTypeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDataTypeStyle.xwt
index 9047bd98f8e..722da6c76c4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDataTypeStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDataTypeStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDescriptionStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDescriptionStyle.xwt
index f852ec3e3dd..2a24fc3815c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDescriptionStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDescriptionStyle.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

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

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	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>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDiagramLinkStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDiagramLinkStyle.xwt
index f010630797c..0bf55bd8ccd 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDiagramLinkStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDiagramLinkStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDiagramStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDiagramStyle.xwt
index 69182c394d4..73eb8727531 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDiagramStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDiagramStyle.xwt
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageX"></ppe:IntegerEditor>

-		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageY"></ppe:IntegerEditor>

-		<ppe:IntegerEditor input="{Binding}"

-			property="notation:PageStyle:pageWidth"></ppe:IntegerEditor>

-		<ppe:IntegerEditor input="{Binding}"

-			property="notation:PageStyle:pageHeight"></ppe:IntegerEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageX"></ppe:IntegerEditor>
+		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageY"></ppe:IntegerEditor>
+		<ppe:IntegerEditor input="{Binding}"
+			property="notation:PageStyle:pageWidth"></ppe:IntegerEditor>
+		<ppe:IntegerEditor input="{Binding}"
+			property="notation:PageStyle:pageHeight"></ppe:IntegerEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDoubleListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDoubleListValueStyle.xwt
index 8d0743d63a1..68755b0d02e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDoubleListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDoubleListValueStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDoubleValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDoubleValueStyle.xwt
index 755961dc28d..6cb58001b1a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDoubleValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDoubleValueStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDrawerStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDrawerStyle.xwt
index 2888a0fe95d..621f6af55ec 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDrawerStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleDrawerStyle.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

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

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	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>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleEObjectListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleEObjectListValueStyle.xwt
index 0f03fd30c5d..78049e574ae 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleEObjectListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleEObjectListValueStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleEObjectValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleEObjectValueStyle.xwt
index 8d0743d63a1..68755b0d02e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleEObjectValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleEObjectValueStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleFillStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleFillStyle.xwt
index 92b43a2ebb4..abf94876672 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleFillStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleFillStyle.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	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:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Group text="Fill">

-		<Group.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Group.layout>

-		<gmf:XWTAwareColorPicker input="{Binding}"

-			property="notation:FillStyle:fillColor"></gmf:XWTAwareColorPicker>

-		<ppe:IntegerEditor input="{Binding}"

-			property="notation:FillStyle:transparency"></ppe:IntegerEditor>

-	</Group>

-	<Group text="Gradient">

-		<Group.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Group.layout>

-		<ppe:ViewEditor input="{Binding}" view="notation:SingleGradientData"

-			property="notation:FillStyle:gradient"></ppe:ViewEditor>

-	</Group>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Group text="Fill">
+		<Group.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Group.layout>
+		<gmf:XWTAwareColorPicker input="{Binding}"
+			property="notation:FillStyle:fillColor"></gmf:XWTAwareColorPicker>
+		<ppe:IntegerEditor input="{Binding}"
+			property="notation:FillStyle:transparency"></ppe:IntegerEditor>
+	</Group>
+	<Group text="Gradient">
+		<Group.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Group.layout>
+		<ppe:ViewEditor input="{Binding}" view="notation:SingleGradientData"
+			property="notation:FillStyle:gradient"></ppe:ViewEditor>
+	</Group>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleFilteringStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleFilteringStyle.xwt
index 40c5c99caa6..a79b3dfa3e2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleFilteringStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleFilteringStyle.xwt
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="notation:FilteringStyle:filtering"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="notation:FilteringStyle:filtering"></ppe:EnumCombo>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleFontStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleFontStyle.xwt
index ea846fff252..6bc8b6641c3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleFontStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleFontStyle.xwt
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" text="Font">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<gmf:XWTAwareFontEditor showLabel="false"

-			input="{Binding}" property="notation:FontStyle:fontName"></gmf:XWTAwareFontEditor>

-		<ppe:IntegerEditor input="{Binding}"

-			property="notation:FontStyle:fontHeight"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<GridLayout makeColumnsEqualWidth="false" numColumns="2"></GridLayout>

-		</Composite.layout>

-		<ppe:BooleanToggle

-			image="/org.eclipse.gmf.runtime.diagram.ui.properties/icons/bold.gif"

-			property="notation:FontStyle:bold" showLabel="false" input="{Binding}"></ppe:BooleanToggle>

-		<gmf:XWTAwareColorPicker showLabel="false"

-			property="notation:FontStyle:fontColor" input="{Binding}"></gmf:XWTAwareColorPicker>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt" text="Font">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<gmf:XWTAwareFontEditor showLabel="false"
+			input="{Binding}" property="notation:FontStyle:fontName"></gmf:XWTAwareFontEditor>
+		<ppe:IntegerEditor input="{Binding}"
+			property="notation:FontStyle:fontHeight"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<GridLayout makeColumnsEqualWidth="false" numColumns="2"></GridLayout>
+		</Composite.layout>
+		<ppe:BooleanToggle
+			image="/org.eclipse.gmf.runtime.diagram.ui.properties/icons/bold.gif"
+			property="notation:FontStyle:bold" showLabel="false" input="{Binding}"></ppe:BooleanToggle>
+		<gmf:XWTAwareColorPicker showLabel="false"
+			property="notation:FontStyle:fontColor" input="{Binding}"></gmf:XWTAwareColorPicker>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleGuideStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleGuideStyle.xwt
index 51204c02825..8b69f2a1492 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleGuideStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleGuideStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleHintedDiagramLinkStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleHintedDiagramLinkStyle.xwt
index 51204c02825..8b69f2a1492 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleHintedDiagramLinkStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleHintedDiagramLinkStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleImageBufferStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleImageBufferStyle.xwt
index 8d0743d63a1..68755b0d02e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleImageBufferStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleImageBufferStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleImageStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleImageStyle.xwt
index 9ba4ce8ae90..12b82270dd7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleImageStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleImageStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleIntListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleIntListValueStyle.xwt
index f010630797c..0bf55bd8ccd 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleIntListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleIntListValueStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleIntValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleIntValueStyle.xwt
index 9047bd98f8e..722da6c76c4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleIntValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleIntValueStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleLineStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleLineStyle.xwt
index 4aa07d55061..05b1cd7da9c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleLineStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleLineStyle.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="Line">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="notation:LineStyle:lineWidth"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<gmf:XWTAwareColorPicker input="{Binding}"

-			property="notation:LineStyle:lineColor"></gmf:XWTAwareColorPicker>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="Line">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="notation:LineStyle:lineWidth"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<gmf:XWTAwareColorPicker input="{Binding}"
+			property="notation:LineStyle:lineColor"></gmf:XWTAwareColorPicker>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleLineTypeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleLineTypeStyle.xwt
index 3e4724efc20..5ce772e954f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleLineTypeStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleLineTypeStyle.xwt
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="notation:LineTypeStyle:lineType"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="notation:LineTypeStyle:lineType"></ppe:EnumCombo>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleListValueStyle.xwt
index 4d0cc388e09..44f3cd02f24 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleListValueStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite 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="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleMultiDiagramLinkStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleMultiDiagramLinkStyle.xwt
index 9047bd98f8e..722da6c76c4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleMultiDiagramLinkStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleMultiDiagramLinkStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleNamedStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleNamedStyle.xwt
index b4b832b78ea..06715782ba9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleNamedStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleNamedStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultiplePageStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultiplePageStyle.xwt
index 02cf9b3ecc2..f49468e4410 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultiplePageStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultiplePageStyle.xwt
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageX"></ppe:IntegerEditor>

-		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageY"></ppe:IntegerEditor>

-		<ppe:IntegerEditor input="{Binding}"

-			property="notation:PageStyle:pageWidth"></ppe:IntegerEditor>

-		<ppe:IntegerEditor input="{Binding}"

-			property="notation:PageStyle:pageHeight"></ppe:IntegerEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageX"></ppe:IntegerEditor>
+		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageY"></ppe:IntegerEditor>
+		<ppe:IntegerEditor input="{Binding}"
+			property="notation:PageStyle:pageWidth"></ppe:IntegerEditor>
+		<ppe:IntegerEditor input="{Binding}"
+			property="notation:PageStyle:pageHeight"></ppe:IntegerEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultiplePropertiesSetStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultiplePropertiesSetStyle.xwt
index c902f6a4fb0..4d360228f8d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultiplePropertiesSetStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultiplePropertiesSetStyle.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

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

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	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>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleRoundedCornersStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleRoundedCornersStyle.xwt
index d6dfd8c9379..32ed8a8f7cb 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleRoundedCornersStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleRoundedCornersStyle.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleRoutingStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleRoutingStyle.xwt
index 21fb282c922..23abef781bc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleRoutingStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleRoutingStyle.xwt
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<GridLayout makeColumnsEqualWidth="true" numColumns="2"></GridLayout>

-	</Composite.layout>

-	<Group text="Routing">

-		<Group.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Group.layout>

-		<Group text="Styles">

-			<Group.layout>

-				<FillLayout></FillLayout>

-			</Group.layout>

-			<ppe:EnumCombo input="{Binding}" numColumns="2"

-				property="notation:RoutingStyle:routing" showLabel="false"></ppe:EnumCombo>

-		</Group>

-		<Composite>

-			<Composite.layout>

-				<ppel:PropertiesLayout numColumns="2"

-					makeColumnsEqualWidth="true"></ppel:PropertiesLayout>

-			</Composite.layout>

-			<ppe:BooleanCheckbox input="{Binding}"

-				property="notation:RoutingStyle:avoidObstructions"></ppe:BooleanCheckbox>

-			<ppe:BooleanCheckbox input="{Binding}"

-				property="notation:RoutingStyle:closestDistance"></ppe:BooleanCheckbox>

-		</Composite>

-	</Group>

-	<Group text="Jump links">

-		<Group.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Group.layout>

-		<Group text="Status">

-			<Group.layout>

-				<ppel:PropertiesLayout></ppel:PropertiesLayout>

-			</Group.layout>

-			<ppe:EnumCombo numColumns="2" input="{Binding}"

-				property="notation:RoutingStyle:jumpLinkStatus" showLabel="false"></ppe:EnumCombo>

-		</Group>

-		<Group text="Type">

-			<Group.layout>

-				<ppel:PropertiesLayout></ppel:PropertiesLayout>

-			</Group.layout>

-			<ppe:EnumCombo numColumns="2" input="{Binding}"

-				property="notation:RoutingStyle:jumpLinkType" showLabel="false"></ppe:EnumCombo>

-		</Group>

-		<ppe:BooleanCheckbox input="{Binding}"

-			property="notation:RoutingStyle:jumpLinksReverse"></ppe:BooleanCheckbox>

-	</Group>

-	<Group text="Smoothness">

-		<Group.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Group.layout>

-		<ppe:EnumCombo numColumns="2" input="{Binding}"

-			property="notation:RoutingStyle:smoothness" showLabel="false"></ppe:EnumCombo>

-	</Group>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<GridLayout makeColumnsEqualWidth="true" numColumns="2"></GridLayout>
+	</Composite.layout>
+	<Group text="Routing">
+		<Group.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Group.layout>
+		<Group text="Styles">
+			<Group.layout>
+				<FillLayout></FillLayout>
+			</Group.layout>
+			<ppe:EnumCombo input="{Binding}" numColumns="2"
+				property="notation:RoutingStyle:routing" showLabel="false"></ppe:EnumCombo>
+		</Group>
+		<Composite>
+			<Composite.layout>
+				<ppel:PropertiesLayout numColumns="2"
+					makeColumnsEqualWidth="true"></ppel:PropertiesLayout>
+			</Composite.layout>
+			<ppe:BooleanCheckbox input="{Binding}"
+				property="notation:RoutingStyle:avoidObstructions"></ppe:BooleanCheckbox>
+			<ppe:BooleanCheckbox input="{Binding}"
+				property="notation:RoutingStyle:closestDistance"></ppe:BooleanCheckbox>
+		</Composite>
+	</Group>
+	<Group text="Jump links">
+		<Group.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Group.layout>
+		<Group text="Status">
+			<Group.layout>
+				<ppel:PropertiesLayout></ppel:PropertiesLayout>
+			</Group.layout>
+			<ppe:EnumCombo numColumns="2" input="{Binding}"
+				property="notation:RoutingStyle:jumpLinkStatus" showLabel="false"></ppe:EnumCombo>
+		</Group>
+		<Group text="Type">
+			<Group.layout>
+				<ppel:PropertiesLayout></ppel:PropertiesLayout>
+			</Group.layout>
+			<ppe:EnumCombo numColumns="2" input="{Binding}"
+				property="notation:RoutingStyle:jumpLinkType" showLabel="false"></ppe:EnumCombo>
+		</Group>
+		<ppe:BooleanCheckbox input="{Binding}"
+			property="notation:RoutingStyle:jumpLinksReverse"></ppe:BooleanCheckbox>
+	</Group>
+	<Group text="Smoothness">
+		<Group.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Group.layout>
+		<ppe:EnumCombo numColumns="2" input="{Binding}"
+			property="notation:RoutingStyle:smoothness" showLabel="false"></ppe:EnumCombo>
+	</Group>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleShapeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleShapeStyle.xwt
index 153489f2dc3..8850d925d2a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleShapeStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleShapeStyle.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleSingleValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleSingleValueStyle.xwt
index 22ddc4a4d54..c795cf2cc04 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleSingleValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleSingleValueStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleSortingStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleSortingStyle.xwt
index 989161262b6..a6764f177c9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleSortingStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleSortingStyle.xwt
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	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:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:SortingStyle:sortingKeys"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="notation:SortingStyle:sorting"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:SortingStyle:sortedObjects"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:SortingStyle:sortingKeys"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="notation:SortingStyle:sorting"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:SortingStyle:sortedObjects"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleStringListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleStringListValueStyle.xwt
index cfb33162bc7..826244688cc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleStringListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleStringListValueStyle.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	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">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleStringValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleStringValueStyle.xwt
index 755961dc28d..6cb58001b1a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleStringValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleStringValueStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleStyle.xwt
index 9ba4ce8ae90..12b82270dd7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleTextStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleTextStyle.xwt
index f42a3714c9c..e94b25bb1ba 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleTextStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleTextStyle.xwt
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	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:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="notation:TextStyle:textAlignment"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="notation:TextStyle:textAlignment"></ppe:EnumCombo>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleTitleStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleTitleStyle.xwt
index 33965fb41e8..18419fe50af 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleTitleStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/MultipleTitleStyle.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:TitleStyle:showTitle"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:TitleStyle:showTitle"></ppe:BooleanRadio>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/RoundedCornersStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/RoundedCornersStyle.xwt
index 153489f2dc3..8850d925d2a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/RoundedCornersStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/RoundedCornersStyle.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/ShapeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/ShapeStyle.xwt
index 434feeaf3f2..662f3c6d3ff 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/ShapeStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/ShapeStyle.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleArrowStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleArrowStyle.xwt
index c04cab2ef03..271b40f0c72 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleArrowStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleArrowStyle.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="notation:ArrowStyle:arrowSource"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}" property="notation:ArrowStyle:arrowTarget"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="notation:ArrowStyle:arrowSource"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}" property="notation:ArrowStyle:arrowTarget"></ppe:EnumCombo>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleBooleanListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleBooleanListValueStyle.xwt
index f86615ca0e2..ca0c51ec48f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleBooleanListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleBooleanListValueStyle.xwt
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite 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:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="notation:BooleanListValueStyle:booleanListValue"></ppe:MultiString>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="notation:BooleanListValueStyle:booleanListValue"></ppe:MultiString>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleBooleanValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleBooleanValueStyle.xwt
index a973c70dd65..748ad531ac5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleBooleanValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleBooleanValueStyle.xwt
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:BooleanValueStyle:booleanValue"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:BooleanValueStyle:booleanValue"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleByteArrayValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleByteArrayValueStyle.xwt
index b453c0a0262..aa3126c84af 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleByteArrayValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleByteArrayValueStyle.xwt
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:ByteArrayValueStyle:byteArrayValue"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:ByteArrayValueStyle:byteArrayValue"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleCanonicalStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleCanonicalStyle.xwt
index 0913baccb44..74a8efc7600 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleCanonicalStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleCanonicalStyle.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:CanonicalStyle:canonical"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:CanonicalStyle:canonical"></ppe:BooleanRadio>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleConnectorStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleConnectorStyle.xwt
index 0d58bb08d27..7954cb59f6a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleConnectorStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleConnectorStyle.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDataTypeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDataTypeStyle.xwt
index 28de3f5e22b..a12ab68b8a7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDataTypeStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDataTypeStyle.xwt
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<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:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="notation:DataTypeStyle:instanceType"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="notation:DataTypeStyle:instanceType"></ppe:ReferenceDialog>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDescriptionStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDescriptionStyle.xwt
index 87a866e2802..8f7bbab47e7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDescriptionStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDescriptionStyle.xwt
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	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">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:DescriptionStyle:description"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:DescriptionStyle:description"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDiagramLinkStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDiagramLinkStyle.xwt
index 91de296578a..272d9b556f4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDiagramLinkStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDiagramLinkStyle.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="notation:DiagramLinkStyle:diagramLink"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="notation:DiagramLinkStyle:diagramLink"></ppe:ReferenceDialog>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDiagramStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDiagramStyle.xwt
index 1d63b34efd6..f0932aa34dd 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDiagramStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDiagramStyle.xwt
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:DescriptionStyle:description"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageX"></ppe:IntegerEditor>

-		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageY"></ppe:IntegerEditor>

-		<ppe:IntegerEditor input="{Binding}"

-			property="notation:PageStyle:pageWidth"></ppe:IntegerEditor>

-		<ppe:IntegerEditor input="{Binding}"

-			property="notation:PageStyle:pageHeight"></ppe:IntegerEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:DescriptionStyle:description"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageX"></ppe:IntegerEditor>
+		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageY"></ppe:IntegerEditor>
+		<ppe:IntegerEditor input="{Binding}"
+			property="notation:PageStyle:pageWidth"></ppe:IntegerEditor>
+		<ppe:IntegerEditor input="{Binding}"
+			property="notation:PageStyle:pageHeight"></ppe:IntegerEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDoubleListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDoubleListValueStyle.xwt
index 10bb31a6abc..cdf2122d723 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDoubleListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDoubleListValueStyle.xwt
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="notation:DoubleListValueStyle:doubleListValue"></ppe:MultiString>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="notation:DoubleListValueStyle:doubleListValue"></ppe:MultiString>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDoubleValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDoubleValueStyle.xwt
index bccaca939ef..d9080e13ffd 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDoubleValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDoubleValueStyle.xwt
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:DoubleValueStyle:doubleValue"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:DoubleValueStyle:doubleValue"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDrawerStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDrawerStyle.xwt
index 2287bd6beb7..bfce497204a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDrawerStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleDrawerStyle.xwt
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:DrawerStyle:collapsed"></ppe:BooleanRadio>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleEObjectListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleEObjectListValueStyle.xwt
index 6e2e5f7a4d9..d1c83d6fd0b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleEObjectListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleEObjectListValueStyle.xwt
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:EObjectListValueStyle:eObjectListValue"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:EObjectListValueStyle:eObjectListValue"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleEObjectValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleEObjectValueStyle.xwt
index fc8dc8ad60e..3c417e90ecf 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleEObjectValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleEObjectValueStyle.xwt
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="notation:EObjectValueStyle:eObjectValue"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="notation:EObjectValueStyle:eObjectValue"></ppe:ReferenceDialog>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleFillStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleFillStyle.xwt
index a9cfff796a8..304baf5d755 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleFillStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleFillStyle.xwt
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

-	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:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="Fill">

-	<Composite.layout>

-		<GridLayout></GridLayout>

-	</Composite.layout>

-	<Group text="Fill">

-		<Group.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Group.layout>

-		<gmf:XWTAwareColorPicker input="{Binding}"

-			property="notation:FillStyle:fillColor"></gmf:XWTAwareColorPicker>

-		<ppe:IntegerSpinner input="{Binding}"

-			property="notation:FillStyle:transparency"></ppe:IntegerSpinner>

-	</Group>

-	<Group text="Gradient">

-		<Group.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Group.layout>

-		<ppe:ViewEditor view="notation:SingleGradientData"

-			input="{Binding}" property="notation:FillStyle:gradient"></ppe:ViewEditor>

-	</Group>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="Fill">
+	<Composite.layout>
+		<GridLayout></GridLayout>
+	</Composite.layout>
+	<Group text="Fill">
+		<Group.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Group.layout>
+		<gmf:XWTAwareColorPicker input="{Binding}"
+			property="notation:FillStyle:fillColor"></gmf:XWTAwareColorPicker>
+		<ppe:IntegerSpinner input="{Binding}"
+			property="notation:FillStyle:transparency"></ppe:IntegerSpinner>
+	</Group>
+	<Group text="Gradient">
+		<Group.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Group.layout>
+		<ppe:ViewEditor view="notation:SingleGradientData"
+			input="{Binding}" property="notation:FillStyle:gradient"></ppe:ViewEditor>
+	</Group>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleFilteringStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleFilteringStyle.xwt
index 1b95e0d07b3..2d950359c29 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleFilteringStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleFilteringStyle.xwt
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<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:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:FilteringStyle:filteringKeys"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="notation:FilteringStyle:filtering"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:FilteringStyle:filteredObjects"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:FilteringStyle:filteringKeys"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="notation:FilteringStyle:filtering"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:FilteringStyle:filteredObjects"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleFontStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleFontStyle.xwt
index f6f48522265..903596474cc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleFontStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleFontStyle.xwt
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite 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:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors">

-	<Composite.layout>

-		<GridLayout></GridLayout>

-	</Composite.layout>

-	<Group text="Font">

-		<Group.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Group.layout>

-		<gmf:XWTAwareFontEditor input="{Binding}"

-			property="notation:FontStyle:fontName" showLabel="false"></gmf:XWTAwareFontEditor>

-		<ppe:IntegerEditor input="{Binding}"

-			property="notation:FontStyle:fontHeight"></ppe:IntegerEditor>

-		<ppe:BooleanToggle

-			image="/org.eclipse.gmf.runtime.diagram.ui.properties/icons/bold.gif"

-			showLabel="false" input="{Binding}" property="notation:FontStyle:bold"></ppe:BooleanToggle>

-		<gmf:XWTAwareColorPicker property="notation:FontStyle:fontColor"

-			showLabel="false" input="{Binding}"></gmf:XWTAwareColorPicker>

-	</Group>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors">
+	<Composite.layout>
+		<GridLayout></GridLayout>
+	</Composite.layout>
+	<Group text="Font">
+		<Group.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Group.layout>
+		<gmf:XWTAwareFontEditor input="{Binding}"
+			property="notation:FontStyle:fontName" showLabel="false"></gmf:XWTAwareFontEditor>
+		<ppe:IntegerEditor input="{Binding}"
+			property="notation:FontStyle:fontHeight"></ppe:IntegerEditor>
+		<ppe:BooleanToggle
+			image="/org.eclipse.gmf.runtime.diagram.ui.properties/icons/bold.gif"
+			showLabel="false" input="{Binding}" property="notation:FontStyle:bold"></ppe:BooleanToggle>
+		<gmf:XWTAwareColorPicker property="notation:FontStyle:fontColor"
+			showLabel="false" input="{Binding}"></gmf:XWTAwareColorPicker>
+	</Group>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleGradientData.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleGradientData.xwt
index 968d85ef708..f8934118b6f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleGradientData.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleGradientData.xwt
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

-	text="Gradient">

-	<Composite.layout>

-		<ppel:PropertiesLayout makeColumnsEqualWidth="false"

-			numColumns="1"></ppel:PropertiesLayout>

-	</Composite.layout>

-	<ppe:BooleanCheckbox input="{Binding}"

-		property="notation:GradientData:activate"></ppe:BooleanCheckbox>

-	<gmf:XWTAwareColorPicker input="{Binding}"

-		property="notation:GradientData:gradientColor1"></gmf:XWTAwareColorPicker>

-	<ppe:EnumCombo input="{Binding}"

-		property="notation:GradientData:gradientStyle"></ppe:EnumCombo>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"
+	text="Gradient">
+	<Composite.layout>
+		<ppel:PropertiesLayout makeColumnsEqualWidth="false"
+			numColumns="1"></ppel:PropertiesLayout>
+	</Composite.layout>
+	<ppe:BooleanCheckbox input="{Binding}"
+		property="notation:GradientData:activate"></ppe:BooleanCheckbox>
+	<gmf:XWTAwareColorPicker input="{Binding}"
+		property="notation:GradientData:gradientColor1"></gmf:XWTAwareColorPicker>
+	<ppe:EnumCombo input="{Binding}"
+		property="notation:GradientData:gradientStyle"></ppe:EnumCombo>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleGuideStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleGuideStyle.xwt
index 89517d2ad16..3b396a9929b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleGuideStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleGuideStyle.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	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">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleHintedDiagramLinkStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleHintedDiagramLinkStyle.xwt
index 47aae6913b5..402cd4d7158 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleHintedDiagramLinkStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleHintedDiagramLinkStyle.xwt
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:HintedDiagramLinkStyle:hint"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="notation:DiagramLinkStyle:diagramLink"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:HintedDiagramLinkStyle:hint"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="notation:DiagramLinkStyle:diagramLink"></ppe:ReferenceDialog>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleImageBufferStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleImageBufferStyle.xwt
index d14d0d984c4..a2746f87386 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleImageBufferStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleImageBufferStyle.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	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">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:ImageStyle:antiAlias"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:ImageStyle:maintainAspectRatio"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:ImageStyle:antiAlias"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:ImageStyle:maintainAspectRatio"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleImageStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleImageStyle.xwt
index 58952b1d058..b8d96b2adff 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleImageStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleImageStyle.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:ImageStyle:antiAlias"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:ImageStyle:maintainAspectRatio"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:ImageStyle:antiAlias"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:ImageStyle:maintainAspectRatio"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleIntListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleIntListValueStyle.xwt
index ba104356341..3cb4e247d75 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleIntListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleIntListValueStyle.xwt
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="notation:IntListValueStyle:intListValue"></ppe:MultiString>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="notation:IntListValueStyle:intListValue"></ppe:MultiString>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleIntValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleIntValueStyle.xwt
index 349258bc1c8..d82415dfc80 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleIntValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleIntValueStyle.xwt
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:IntValueStyle:intValue"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:IntValueStyle:intValue"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleLineStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleLineStyle.xwt
index 530a34ebc56..961a6d78ce5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleLineStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleLineStyle.xwt
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="Line">

-	<Composite.layout>

-		<GridLayout></GridLayout>

-	</Composite.layout>

-	<Group text="Line">

-		<Group.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Group.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="notation:LineStyle:lineWidth"></ppe:IntegerEditor>

-		<gmf:XWTAwareColorPicker input="{Binding}"

-			property="notation:LineStyle:lineColor"></gmf:XWTAwareColorPicker>

-	</Group>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="Line">
+	<Composite.layout>
+		<GridLayout></GridLayout>
+	</Composite.layout>
+	<Group text="Line">
+		<Group.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Group.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="notation:LineStyle:lineWidth"></ppe:IntegerEditor>
+		<gmf:XWTAwareColorPicker input="{Binding}"
+			property="notation:LineStyle:lineColor"></gmf:XWTAwareColorPicker>
+	</Group>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleLineTypeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleLineTypeStyle.xwt
index bb6a22eba65..681938a68ac 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleLineTypeStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleLineTypeStyle.xwt
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="notation:LineTypeStyle:lineType"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="notation:LineTypeStyle:lineType"></ppe:EnumCombo>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleListValueStyle.xwt
index 6449d0ac44b..9e7b38422c4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleListValueStyle.xwt
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="notation:DataTypeStyle:instanceType"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="notation:ListValueStyle:rawValuesList"></ppe:MultiString>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="notation:DataTypeStyle:instanceType"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="notation:ListValueStyle:rawValuesList"></ppe:MultiString>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleMultiDiagramLinkStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleMultiDiagramLinkStyle.xwt
index f03db7ba1bc..8a58ca4576f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleMultiDiagramLinkStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleMultiDiagramLinkStyle.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite 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">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:MultiDiagramLinkStyle:diagramLinks"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:MultiDiagramLinkStyle:diagramLinks"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleNamedStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleNamedStyle.xwt
index 827de6b772a..98c779fb989 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleNamedStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleNamedStyle.xwt
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SinglePageStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SinglePageStyle.xwt
index 665854e4057..979f75dfac1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SinglePageStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SinglePageStyle.xwt
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageX"></ppe:IntegerEditor>

-		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageY"></ppe:IntegerEditor>

-		<ppe:IntegerEditor input="{Binding}"

-			property="notation:PageStyle:pageWidth"></ppe:IntegerEditor>

-		<ppe:IntegerEditor input="{Binding}"

-			property="notation:PageStyle:pageHeight"></ppe:IntegerEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageX"></ppe:IntegerEditor>
+		<ppe:IntegerEditor input="{Binding}" property="notation:PageStyle:pageY"></ppe:IntegerEditor>
+		<ppe:IntegerEditor input="{Binding}"
+			property="notation:PageStyle:pageWidth"></ppe:IntegerEditor>
+		<ppe:IntegerEditor input="{Binding}"
+			property="notation:PageStyle:pageHeight"></ppe:IntegerEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SinglePropertiesSetStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SinglePropertiesSetStyle.xwt
index 58b6b56af01..fb3de3a3f79 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SinglePropertiesSetStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SinglePropertiesSetStyle.xwt
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleRoundedCornersStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleRoundedCornersStyle.xwt
index 153489f2dc3..8850d925d2a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleRoundedCornersStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleRoundedCornersStyle.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleRoutingStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleRoutingStyle.xwt
index 1e21f5b8fe7..b9b777ea152 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleRoutingStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleRoutingStyle.xwt
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<GridLayout makeColumnsEqualWidth="true" numColumns="2"></GridLayout>

-	</Composite.layout>

-	<Group text="Routing">

-		<Group.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Group.layout>

-		<Group text="Styles">

-			<Group.layout>

-				<FillLayout></FillLayout>

-			</Group.layout>

-			<ppe:EnumCombo input="{Binding}" numColumns="2"

-				property="notation:RoutingStyle:routing" showLabel="false"></ppe:EnumCombo>

-		</Group>

-		<Composite>

-			<Composite.layout>

-				<ppel:PropertiesLayout makeColumnsEqualWidth="true"

-					numColumns="2"></ppel:PropertiesLayout>

-			</Composite.layout>

-			<ppe:BooleanCheckbox input="{Binding}"

-				property="notation:RoutingStyle:avoidObstructions"></ppe:BooleanCheckbox>

-			<ppe:BooleanCheckbox input="{Binding}"

-				property="notation:RoutingStyle:closestDistance"></ppe:BooleanCheckbox>

-			<ppe:IntegerSpinner input="{Binding}"

-				property="notation:RoundedCornersStyle:roundedBendpointsRadius"></ppe:IntegerSpinner>

-		</Composite>

-	</Group>

-	<Group text="Jump links">

-		<Group.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Group.layout>

-		<Group text="Status">

-			<Group.layout>

-				<ppel:PropertiesLayout></ppel:PropertiesLayout>

-			</Group.layout>

-			<ppe:EnumCombo numColumns="2" input="{Binding}"

-				property="notation:RoutingStyle:jumpLinkStatus" showLabel="false"></ppe:EnumCombo>

-		</Group>

-		<Group text="Type">

-			<Group.layout>

-				<ppel:PropertiesLayout></ppel:PropertiesLayout>

-			</Group.layout>

-			<ppe:EnumCombo input="{Binding}" numColumns="2"

-				property="notation:RoutingStyle:jumpLinkType" showLabel="false"></ppe:EnumCombo>

-		</Group>

-		<ppe:BooleanCheckbox input="{Binding}"

-			property="notation:RoutingStyle:jumpLinksReverse"></ppe:BooleanCheckbox>

-	</Group>

-	<Group text="Smoothness">

-		<Group.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Group.layout>

-		<ppe:EnumCombo input="{Binding}" numColumns="2"

-			property="notation:RoutingStyle:smoothness" showLabel="false"></ppe:EnumCombo>

-	</Group>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<GridLayout makeColumnsEqualWidth="true" numColumns="2"></GridLayout>
+	</Composite.layout>
+	<Group text="Routing">
+		<Group.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Group.layout>
+		<Group text="Styles">
+			<Group.layout>
+				<FillLayout></FillLayout>
+			</Group.layout>
+			<ppe:EnumCombo input="{Binding}" numColumns="2"
+				property="notation:RoutingStyle:routing" showLabel="false"></ppe:EnumCombo>
+		</Group>
+		<Composite>
+			<Composite.layout>
+				<ppel:PropertiesLayout makeColumnsEqualWidth="true"
+					numColumns="2"></ppel:PropertiesLayout>
+			</Composite.layout>
+			<ppe:BooleanCheckbox input="{Binding}"
+				property="notation:RoutingStyle:avoidObstructions"></ppe:BooleanCheckbox>
+			<ppe:BooleanCheckbox input="{Binding}"
+				property="notation:RoutingStyle:closestDistance"></ppe:BooleanCheckbox>
+			<ppe:IntegerSpinner input="{Binding}"
+				property="notation:RoundedCornersStyle:roundedBendpointsRadius"></ppe:IntegerSpinner>
+		</Composite>
+	</Group>
+	<Group text="Jump links">
+		<Group.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Group.layout>
+		<Group text="Status">
+			<Group.layout>
+				<ppel:PropertiesLayout></ppel:PropertiesLayout>
+			</Group.layout>
+			<ppe:EnumCombo numColumns="2" input="{Binding}"
+				property="notation:RoutingStyle:jumpLinkStatus" showLabel="false"></ppe:EnumCombo>
+		</Group>
+		<Group text="Type">
+			<Group.layout>
+				<ppel:PropertiesLayout></ppel:PropertiesLayout>
+			</Group.layout>
+			<ppe:EnumCombo input="{Binding}" numColumns="2"
+				property="notation:RoutingStyle:jumpLinkType" showLabel="false"></ppe:EnumCombo>
+		</Group>
+		<ppe:BooleanCheckbox input="{Binding}"
+			property="notation:RoutingStyle:jumpLinksReverse"></ppe:BooleanCheckbox>
+	</Group>
+	<Group text="Smoothness">
+		<Group.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Group.layout>
+		<ppe:EnumCombo input="{Binding}" numColumns="2"
+			property="notation:RoutingStyle:smoothness" showLabel="false"></ppe:EnumCombo>
+	</Group>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleShapeStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleShapeStyle.xwt
index d2d785c0f3f..c935384ffc9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleShapeStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleShapeStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleSingleValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleSingleValueStyle.xwt
index caf13f8dbea..f1a76bc227e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleSingleValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleSingleValueStyle.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:SingleValueStyle:rawValue"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="notation:DataTypeStyle:instanceType"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:SingleValueStyle:rawValue"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="notation:DataTypeStyle:instanceType"></ppe:ReferenceDialog>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleSortingStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleSortingStyle.xwt
index 5c89867066e..94bbff45b94 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleSortingStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleSortingStyle.xwt
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:SortingStyle:sortingKeys"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="notation:SortingStyle:sorting"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="notation:SortingStyle:sortedObjects"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:SortingStyle:sortingKeys"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="notation:SortingStyle:sorting"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="notation:SortingStyle:sortedObjects"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleStringListValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleStringListValueStyle.xwt
index e501d018421..825fb2c4041 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleStringListValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleStringListValueStyle.xwt
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	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:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="notation:StringListValueStyle:stringListValue"></ppe:MultiString>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="notation:StringListValueStyle:stringListValue"></ppe:MultiString>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleStringValueStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleStringValueStyle.xwt
index 3a536453c42..850de84ca6a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleStringValueStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleStringValueStyle.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	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:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="notation:StringValueStyle:stringValue"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="notation:StringValueStyle:stringValue"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}" property="notation:NamedStyle:name"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleStyle.xwt
index 8fd1b2ad08e..58a47121f26 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleStyle.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleTextStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleTextStyle.xwt
index c88cf3710bb..91c629497bf 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleTextStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleTextStyle.xwt
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="notation:TextStyle:textAlignment"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}" property="notation:TextStyle:textAlignment"></ppe:EnumCombo>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleTitleStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleTitleStyle.xwt
index 5c0d9d725f6..f5aa9eaca4d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleTitleStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/style/ui/SingleTitleStyle.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="notation:TitleStyle:showTitle"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="notation:TitleStyle:showTitle"></ppe:BooleanRadio>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/synchronization/ui/MultipleCanonicalStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/synchronization/ui/MultipleCanonicalStyle.xwt
index b4c43a97557..94d53a7babe 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/synchronization/ui/MultipleCanonicalStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/synchronization/ui/MultipleCanonicalStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
 	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
 	xmlns:j="clr-namespace:java.lang">
 	<Composite.layout>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/synchronization/ui/SingleCanonicalStyle.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/synchronization/ui/SingleCanonicalStyle.xwt
index 65ddb8dab33..c2cefda3be7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/synchronization/ui/SingleCanonicalStyle.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/synchronization/ui/SingleCanonicalStyle.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
 	xmlns:j="clr-namespace:java.lang">
 	<Composite.layout>
 		<ppel:PropertiesLayout></ppel:PropertiesLayout>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/pom.xml
index 0ca4010c333..ac134f0cdd3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.properties</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/CanonicalObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/CanonicalObservableValue.java
index 74c45972252..8d105b60478 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/CanonicalObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/CanonicalObservableValue.java
@@ -27,10 +27,10 @@ import org.eclipse.papyrus.infra.gmfdiag.common.commands.SetCanonicalCommand;
 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.modelelement.SynchronizationModelElement;
+import org.eclipse.papyrus.infra.services.edit.ui.databinding.AggregatedPapyrusObservableValue;
 import org.eclipse.papyrus.infra.tools.databinding.AggregatedObservable;
+import org.eclipse.papyrus.infra.tools.databinding.CommandBasedObservableValue;
 import org.eclipse.papyrus.infra.tools.databinding.ReferenceCountedObservable;
-import org.eclipse.papyrus.uml.tools.databinding.AggregatedPapyrusObservableValue;
-import org.eclipse.papyrus.uml.tools.databinding.CommandBasedObservableValue;
 
 /**
  * The observable boolean "canonical synchronization" state of an {@link EditPart}, as represented by
@@ -51,6 +51,7 @@ public class CanonicalObservableValue extends ReferenceCountedObservable.Value i
 		this.editPart = editPart;
 
 		final Runnable update = new Runnable() {
+			@Override
 			public void run() {
 				boolean oldValue = lastComputed; // doGetValue updates this
 				fireValueChange(Diffs.createValueDiff(oldValue, doGetValue()));
@@ -63,10 +64,12 @@ public class CanonicalObservableValue extends ReferenceCountedObservable.Value i
 
 			refreshHandler = new CanonicalStateListener.Handler() {
 
+				@Override
 				public Runnable handleAdd(CanonicalStyle style) {
 					return update;
 				}
 
+				@Override
 				public Runnable handleRemove(CanonicalStyle style) {
 					return update;
 				}
@@ -88,10 +91,12 @@ public class CanonicalObservableValue extends ReferenceCountedObservable.Value i
 		}
 	}
 
+	@Override
 	public Object getObserved() {
 		return editPart;
 	}
 
+	@Override
 	public Object getValueType() {
 		return Boolean.class;
 	}
@@ -109,16 +114,19 @@ public class CanonicalObservableValue extends ReferenceCountedObservable.Value i
 		domain.getCommandStack().execute(command);
 	}
 
+	@Override
 	public Command getCommand(Object value) {
 		boolean canonical = (value instanceof Boolean) && ((Boolean) value).booleanValue();
 
 		return GMFtoEMFCommandWrapper.wrap(new SetCanonicalCommand(domain, NotationHelper.findView(editPart), canonical));
 	}
 
+	@Override
 	public AggregatedObservable aggregate(IObservable observable) {
 		return new AggregatedPapyrusObservableValue(domain, this, observable);
 	}
 
+	@Override
 	public boolean hasDifferentValues() {
 		return false; // Primitive component has only one value
 	}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/GradientObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/GradientObservableValue.java
index 3292c6243c4..c8217544dcc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/GradientObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/GradientObservableValue.java
@@ -1,59 +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:

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

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

-package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;

-

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

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

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

-import org.eclipse.gmf.runtime.notation.datatype.GradientData;

-import org.eclipse.papyrus.uml.tools.databinding.PapyrusObservableValue;

-

-/**

- * An IObservableValue for a Gradient

- *

- * @author Camille Letavernier

- *

- */

-public class GradientObservableValue extends PapyrusObservableValue {

-

-	private ObservableGradientData gradientData;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param source

-	 *            The EObject owning the gradient data

-	 * @param feature

-	 *            The Feature in which the gradient data is set

-	 * @param domain

-	 *            The editing domain on which the commands will be executed

-	 */

-	public GradientObservableValue(EObject source, EStructuralFeature feature, EditingDomain domain) {

-		super(source, feature, domain);

-	}

-

-	@Override

-	protected Object doGetValue() {

-		if (gradientData == null) {

-			GradientData data = (GradientData) eObject.eGet(eStructuralFeature);

-			gradientData = new ObservableGradientData(this, data);

-		}

-

-		return gradientData;

-	}

-

-	@Override

-	protected void doSetValue(Object value) {

-		super.doSetValue(value);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.notation.datatype.GradientData;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.GMFObservableValue;
+
+/**
+ * An IObservableValue for a Gradient
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class GradientObservableValue extends GMFObservableValue {
+
+	private ObservableGradientData gradientData;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param source
+	 *            The EObject owning the gradient data
+	 * @param feature
+	 *            The Feature in which the gradient data is set
+	 * @param domain
+	 *            The editing domain on which the commands will be executed
+	 */
+	public GradientObservableValue(EObject source, EStructuralFeature feature, EditingDomain domain) {
+		super(source, feature, domain);
+	}
+
+	@Override
+	protected Object doGetValue() {
+		if (gradientData == null) {
+			GradientData data = (GradientData) eObject.eGet(eStructuralFeature);
+			gradientData = new ObservableGradientData(this, data);
+		}
+
+		return gradientData;
+	}
+
+	@Override
+	protected void doSetValue(Object value) {
+		super.doSetValue(value);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/extension/NotationStyleHandlerProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/extension/NotationStyleHandlerProvider.java
index 2344dc4b223..2a69bab794a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/extension/NotationStyleHandlerProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/extension/NotationStyleHandlerProvider.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * 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.properties.extension;

-

-import org.eclipse.gmf.runtime.notation.datatype.GradientData;

-import org.eclipse.papyrus.infra.constraints.constraints.Constraint;

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

-import org.eclipse.papyrus.infra.gmfdiag.properties.constraint.GMFNotationConstraint;

-import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.NotationModelElementFactory;

-import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.StyleHandlerProvider;

-import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElementFactory;

-

-/**

- * Default implementation of StyleHandlerProvider

- * Handles the GMF Notation views (With a low priority)

- *

- * @author Camille Letavernier

- */

-public class NotationStyleHandlerProvider implements StyleHandlerProvider {

-

-	private ModelElementFactory factory = new NotationModelElementFactory();

-

-	public Constraint createConstraint() {

-		return new GMFNotationConstraint();

-	}

-

-	public boolean isProviderFor(Object selection) {

-		if (selection instanceof GradientData) {

-			return true;

-		}

-		return NotationHelper.findView(selection) != null;

-	}

-

-	public ModelElement createModelElement(Object selection, DataContextElement context) {

-		return factory.createFromSource(selection, context);

-	}

-

-}

+/*****************************************************************************
+ * 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.properties.extension;
+
+import org.eclipse.gmf.runtime.notation.datatype.GradientData;
+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;
+import org.eclipse.papyrus.infra.gmfdiag.properties.constraint.GMFNotationConstraint;
+import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.NotationModelElementFactory;
+import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.StyleHandlerProvider;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.ModelElement;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.ModelElementFactory;
+
+/**
+ * Default implementation of StyleHandlerProvider
+ * Handles the GMF Notation views (With a low priority)
+ *
+ * @author Camille Letavernier
+ */
+public class NotationStyleHandlerProvider implements StyleHandlerProvider {
+
+	private ModelElementFactory factory = new NotationModelElementFactory();
+
+	public Constraint createConstraint() {
+		return new GMFNotationConstraint();
+	}
+
+	public boolean isProviderFor(Object selection) {
+		if (selection instanceof GradientData) {
+			return true;
+		}
+		return NotationHelper.findView(selection) != null;
+	}
+
+	public ModelElement createModelElement(Object selection, DataContextElement context) {
+		return factory.createFromSource(selection, context);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/AppearanceModelElementFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/AppearanceModelElementFactory.java
index 0a11c132beb..fcb00898eb9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/AppearanceModelElementFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/AppearanceModelElementFactory.java
@@ -1,46 +1,46 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2014 CEA LIST and others.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *  Christian W. Damus (CEA) - bug 417409

- *

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

-package org.eclipse.papyrus.infra.gmfdiag.properties.modelelement;

-

-import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.properties.extension.StyleHandlerManager;

-import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElementFactory;

-

-/**

- * A ModelElementFactory for the Appearance property view. Dispatches the

- * creation of ModelElement to the registered StyleHandlerProvider with

- * the highest priority.

- *

- * @author Camille Letavernier

- */

-public class AppearanceModelElementFactory implements ModelElementFactory {

-

-	public ModelElement createFromSource(Object sourceElement, DataContextElement context) {

-		for (StyleHandlerProvider provider : StyleHandlerManager.instance.getStyleHandlerProviders()) {

-			if (provider.isProviderFor(sourceElement)) {

-				ModelElement element = provider.createModelElement(sourceElement, context);

-				if (element == null) {

-					Activator.log.warn("The StyleHandlerProvider " + provider.getClass().getName() + " provided an invalid ModelElement");

-				}

-				return element;

-			}

-		}

-

-		Activator.log.warn("No StyleHandlerProvider found for the following object: " + sourceElement);

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.properties.modelelement;
+
+import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.properties.extension.StyleHandlerManager;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.ModelElement;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.ModelElementFactory;
+
+/**
+ * A ModelElementFactory for the Appearance property view. Dispatches the
+ * creation of ModelElement to the registered StyleHandlerProvider with
+ * the highest priority.
+ *
+ * @author Camille Letavernier
+ */
+public class AppearanceModelElementFactory implements ModelElementFactory {
+
+	public ModelElement createFromSource(Object sourceElement, DataContextElement context) {
+		for (StyleHandlerProvider provider : StyleHandlerManager.instance.getStyleHandlerProviders()) {
+			if (provider.isProviderFor(sourceElement)) {
+				ModelElement element = provider.createModelElement(sourceElement, context);
+				if (element == null) {
+					Activator.log.warn("The StyleHandlerProvider " + provider.getClass().getName() + " provided an invalid ModelElement");
+				}
+				return element;
+			}
+		}
+
+		Activator.log.warn("No StyleHandlerProvider found for the following object: " + sourceElement);
+		return null;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/CustomStyleModelElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/CustomStyleModelElement.java
index 8c6cb123a05..e0cf96255e1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/CustomStyleModelElement.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/CustomStyleModelElement.java
@@ -1,171 +1,171 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * 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

- *  Christian W. Damus (CEA) - bug 323802

- *  Christian W. Damus - bug 455075

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.properties.modelelement;

-

-import org.eclipse.core.databinding.observable.IObservable;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomBooleanStyleObservableList;

-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomBooleanStyleObservableValue;

-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomEObjectStyleObservableList;

-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomEObjectStyleObservableValue;

-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomIntStyleObservableList;

-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomIntStyleObservableValue;

-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomStringStyleObservableList;

-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomStringStyleObservableValue;

-import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.infra.properties.contexts.Property;

-import org.eclipse.papyrus.infra.properties.environment.Type;

-import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

-import org.eclipse.papyrus.infra.widgets.creation.StringEditionFactory;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement;

-

-

-public class CustomStyleModelElement extends EMFModelElement {

-

-	private DataContextElement element;

-

-	View view;

-

-	public CustomStyleModelElement(View source, DataContextElement context) {

-		this(source, null, context);

-	}

-

-	public CustomStyleModelElement(View source, EditingDomain domain, DataContextElement element) {

-		super(source, domain);

-		this.element = element;

-		this.view = source;

-	}

-

-	protected Property findProperty(String propertyPath) {

-		for (Property property : element.getProperties()) {

-			if (propertyPath.equals(property.getName())) {

-				return property;

-			}

-		}

-		return null;

-	}

-

-	@Override

-	public IObservable doGetObservable(String propertyPath) {

-		Property property = findProperty(propertyPath);

-		if (property == null) {

-			return null;

-		}

-		if (property.getMultiplicity() == 1) {

-			switch (property.getType()) {

-			case BOOLEAN:

-				return new CustomBooleanStyleObservableValue(view, domain, propertyPath);

-			case INTEGER:

-				return new CustomIntStyleObservableValue(view, domain, propertyPath);

-			case REFERENCE:

-				return new CustomEObjectStyleObservableValue(view, domain, propertyPath);

-			case STRING:

-				return new CustomStringStyleObservableValue(view, domain, propertyPath);

-			default:

-				return null;

-			}

-		} else {

-			switch (property.getType()) {

-			case BOOLEAN:

-				return new CustomBooleanStyleObservableList(view, domain, propertyPath);

-			case INTEGER:

-				return new CustomIntStyleObservableList(view, domain, propertyPath);

-			case REFERENCE:

-				return new CustomEObjectStyleObservableList(view, domain, propertyPath);

-			case STRING:

-				return new CustomStringStyleObservableList(view, domain, propertyPath);

-			default:

-				return null;

-			}

-		}

-	}

-

-	@Override

-	protected boolean isFeatureEditable(String propertyPath) {

-		return findProperty(propertyPath) != null;

-	}

-

-

-	// TODO: Implement these methods for multivalued properties (XxxListStyle)

-

-	@Override

-	public IStaticContentProvider getContentProvider(String propertyPath) {

-		return super.getContentProvider(propertyPath);

-	}

-

-	@Override

-	public ILabelProvider getLabelProvider(String propertyPath) {

-		return super.getLabelProvider(propertyPath);

-	}

-

-	@Override

-	public boolean isOrdered(String propertyPath) {

-		return true;

-	}

-

-	@Override

-	public boolean isUnique(String propertyPath) {

-		return false;

-	}

-

-	@Override

-	public boolean isMandatory(String propertyPath) {

-		return false;

-	}

-

-	@Override

-	public boolean forceRefresh(String propertyPath) {

-		return false;

-	}

-

-	@Override

-	public ReferenceValueFactory getValueFactory(String propertyPath) {

-		Property property = findProperty(propertyPath);

-		if (property == null) {

-			return null;

-		}

-

-		switch (property.getType()) {

-		case STRING:

-			return new StringEditionFactory();

-		case INTEGER:

-		case BOOLEAN:

-			return null;

-		case REFERENCE:

-			return null;

-		default:

-			return null;

-		}

-	}

-

-	@Override

-	public Object getDefaultValue(String propertyPath) {

-		return null;

-	}

-

-	@Override

-	public boolean getDirectCreation(String propertyPath) {

-		Property property = findProperty(propertyPath);

-		if (property == null) {

-			return false;

-		}

-

-		return property.getType() != Type.REFERENCE;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * 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
+ *  Christian W. Damus (CEA) - bug 323802
+ *  Christian W. Damus - bug 455075
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.properties.modelelement;
+
+import org.eclipse.core.databinding.observable.IObservable;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomBooleanStyleObservableList;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomBooleanStyleObservableValue;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomEObjectStyleObservableList;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomEObjectStyleObservableValue;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomIntStyleObservableList;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomIntStyleObservableValue;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomStringStyleObservableList;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomStringStyleObservableValue;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.contexts.Property;
+import org.eclipse.papyrus.infra.properties.environment.Type;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement;
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.papyrus.infra.widgets.creation.StringEditionFactory;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+
+
+public class CustomStyleModelElement extends EMFModelElement {
+
+	private DataContextElement element;
+
+	View view;
+
+	public CustomStyleModelElement(View source, DataContextElement context) {
+		this(source, null, context);
+	}
+
+	public CustomStyleModelElement(View source, EditingDomain domain, DataContextElement element) {
+		super(source, domain);
+		this.element = element;
+		this.view = source;
+	}
+
+	protected Property findProperty(String propertyPath) {
+		for (Property property : element.getProperties()) {
+			if (propertyPath.equals(property.getName())) {
+				return property;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public IObservable doGetObservable(String propertyPath) {
+		Property property = findProperty(propertyPath);
+		if (property == null) {
+			return null;
+		}
+		if (property.getMultiplicity() == 1) {
+			switch (property.getType()) {
+			case BOOLEAN:
+				return new CustomBooleanStyleObservableValue(view, domain, propertyPath);
+			case INTEGER:
+				return new CustomIntStyleObservableValue(view, domain, propertyPath);
+			case REFERENCE:
+				return new CustomEObjectStyleObservableValue(view, domain, propertyPath);
+			case STRING:
+				return new CustomStringStyleObservableValue(view, domain, propertyPath);
+			default:
+				return null;
+			}
+		} else {
+			switch (property.getType()) {
+			case BOOLEAN:
+				return new CustomBooleanStyleObservableList(view, domain, propertyPath);
+			case INTEGER:
+				return new CustomIntStyleObservableList(view, domain, propertyPath);
+			case REFERENCE:
+				return new CustomEObjectStyleObservableList(view, domain, propertyPath);
+			case STRING:
+				return new CustomStringStyleObservableList(view, domain, propertyPath);
+			default:
+				return null;
+			}
+		}
+	}
+
+	@Override
+	protected boolean isFeatureEditable(String propertyPath) {
+		return findProperty(propertyPath) != null;
+	}
+
+
+	// TODO: Implement these methods for multivalued properties (XxxListStyle)
+
+	@Override
+	public IStaticContentProvider getContentProvider(String propertyPath) {
+		return super.getContentProvider(propertyPath);
+	}
+
+	@Override
+	public ILabelProvider getLabelProvider(String propertyPath) {
+		return super.getLabelProvider(propertyPath);
+	}
+
+	@Override
+	public boolean isOrdered(String propertyPath) {
+		return true;
+	}
+
+	@Override
+	public boolean isUnique(String propertyPath) {
+		return false;
+	}
+
+	@Override
+	public boolean isMandatory(String propertyPath) {
+		return false;
+	}
+
+	@Override
+	public boolean forceRefresh(String propertyPath) {
+		return false;
+	}
+
+	@Override
+	public ReferenceValueFactory getValueFactory(String propertyPath) {
+		Property property = findProperty(propertyPath);
+		if (property == null) {
+			return null;
+		}
+
+		switch (property.getType()) {
+		case STRING:
+			return new StringEditionFactory();
+		case INTEGER:
+		case BOOLEAN:
+			return null;
+		case REFERENCE:
+			return null;
+		default:
+			return null;
+		}
+	}
+
+	@Override
+	public Object getDefaultValue(String propertyPath) {
+		return null;
+	}
+
+	@Override
+	public boolean getDirectCreation(String propertyPath) {
+		Property property = findProperty(propertyPath);
+		if (property == null) {
+			return false;
+		}
+
+		return property.getType() != Type.REFERENCE;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/CustomStyleModelElementFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/CustomStyleModelElementFactory.java
index ba79180cb05..09936e4f83e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/CustomStyleModelElementFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/CustomStyleModelElementFactory.java
@@ -1,52 +1,52 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * 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

- *  Christian W. Damus (CEA) - bug 417409

- *  Christian W. Damus - bug 455075

- *

- *****************************************************************************/

-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.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;

-import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;

-import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.modelelement.AbstractEMFModelElementFactory;

-

-

-public class CustomStyleModelElementFactory extends AbstractEMFModelElementFactory<CustomStyleModelElement> {

-

-	@Override

-	protected CustomStyleModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {

-		View view = NotationHelper.findView(sourceElement);

-

-		if (view != null) {

-			EditingDomain domain = AdapterFactoryEditingDomain.getEditingDomainFor(view);

-			return new CustomStyleModelElement(view, domain, context);

-		}

-

-		Activator.log.warn("The selected element cannot be resolved to a GMF View");

-		return null;

-	}

-

-	@Override

-	protected void updateModelElement(CustomStyleModelElement modelElement, Object newSourceElement) {

-		View view = NotationHelper.findView(newSourceElement);

-		if (view == null) {

-			throw new IllegalArgumentException("Cannot resolve GMF notation view selection: " + newSourceElement);

-		}

-

-		updateEMFModelElement(modelElement, view);

-		modelElement.view = view;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * 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
+ *  Christian W. Damus (CEA) - bug 417409
+ *  Christian W. Damus - bug 455075
+ *
+ *****************************************************************************/
+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.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;
+import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.AbstractEMFModelElementFactory;
+
+
+public class CustomStyleModelElementFactory extends AbstractEMFModelElementFactory<CustomStyleModelElement> {
+
+	@Override
+	protected CustomStyleModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {
+		View view = NotationHelper.findView(sourceElement);
+
+		if (view != null) {
+			EditingDomain domain = AdapterFactoryEditingDomain.getEditingDomainFor(view);
+			return new CustomStyleModelElement(view, domain, context);
+		}
+
+		Activator.log.warn("The selected element cannot be resolved to a GMF View");
+		return null;
+	}
+
+	@Override
+	protected void updateModelElement(CustomStyleModelElement modelElement, Object newSourceElement) {
+		View view = NotationHelper.findView(newSourceElement);
+		if (view == null) {
+			throw new IllegalArgumentException("Cannot resolve GMF notation view selection: " + newSourceElement);
+		}
+
+		updateEMFModelElement(modelElement, view);
+		modelElement.view = view;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/DecoratedModelElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/DecoratedModelElement.java
index a03f111ee31..6e5747cd36a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/DecoratedModelElement.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/DecoratedModelElement.java
@@ -1,156 +1,156 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *		CEA LIST - Initial API and implementation

- *      Christian W. Damus (CEA) - bug 323802

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.properties.modelelement;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.databinding.observable.IObservable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomBooleanStyleObservableValue;

-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomIntStyleObservableValue;

-import org.eclipse.papyrus.infra.gmfdiag.common.providers.ShapeDecorator;

-import org.eclipse.papyrus.infra.gmfdiag.properties.messages.Messages;

-import org.eclipse.papyrus.infra.widgets.providers.AbstractStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.MapLabelProvider;

-import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElement;

-

-/**

- * Model element for the decorated view in GMF. This is not a model element, as the properties to search are non-EMF Properties

- */

-public class DecoratedModelElement extends AbstractModelElement {

-

-	private final static Map<Object, String> labels = new HashMap<Object, String>();

-	static {

-		labels.put(0, Messages.DecoratedModelElement_NORTH_WEST);

-		labels.put(1, Messages.DecoratedModelElement_NORTH);

-		labels.put(2, Messages.DecoratedModelElement_NORTH_EAST);

-		labels.put(3, Messages.DecoratedModelElement_WEST);

-		labels.put(4, Messages.DecoratedModelElement_CENTER);

-		labels.put(5, Messages.DecoratedModelElement_EAST);

-		labels.put(6, Messages.DecoratedModelElement_SOUTH_WEST);

-		labels.put(7, Messages.DecoratedModelElement_SOUTH);

-		labels.put(8, Messages.DecoratedModelElement_SOUTH_EAST);

-	}

-

-	/**

-	 * The EObject manipulated by this ModelElement

-	 */

-	protected EObject source;

-

-	/**

-	 * The Editing Domain of the EObject for this ModelElement

-	 */

-	protected EditingDomain domain;

-

-	/**

-	 *

-	 * Constructs a new EMFModelElement for the given EObject

-	 *

-	 * @param source

-	 */

-	public DecoratedModelElement(EObject source) {

-		this(source, null);

-	}

-

-	/**

-	 *

-	 * Constructs a new EMFModelElement for the given EObject and Editing Domain

-	 *

-	 * @param source

-	 * @param domain

-	 */

-	public DecoratedModelElement(EObject source, EditingDomain domain) {

-		this.source = source;

-		this.domain = domain;

-	}

-

-	/**

-	 * @return the EditingDomain for this ModelElement

-	 */

-	public EditingDomain getDomain() {

-		return domain;

-	}

-

-	/**

-	 * @return the EObject for this ModelElement

-	 */

-	public EObject getSource() {

-		return source;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected IObservable doGetObservable(String propertyPath) {

-		if (ShapeDecorator.SHAPE_DECORATOR_VISIBILITY.equals(propertyPath)) {

-			return new CustomBooleanStyleObservableValue((View) source, domain, ShapeDecorator.SHAPE_DECORATOR_VISIBILITY);

-		}

-

-		if (ShapeDecorator.SHAPE_DECORATOR_DIRECTION.equals(propertyPath)) {

-			return new CustomIntStyleObservableValue((View) source, domain, ShapeDecorator.SHAPE_DECORATOR_DIRECTION);

-		}

-		return super.getObservable(propertyPath);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean isEditable(String propertyPath) {

-		if (ShapeDecorator.SHAPE_DECORATOR_DIRECTION.equals(propertyPath) || ShapeDecorator.SHAPE_DECORATOR_VISIBILITY.equals(propertyPath)) {

-			return !EMFHelper.isReadOnly(source);

-		}

-

-		return super.isEditable(propertyPath);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public ILabelProvider getLabelProvider(String propertyPath) {

-		if (ShapeDecorator.SHAPE_DECORATOR_DIRECTION.equals(propertyPath)) {

-			return new MapLabelProvider(labels);

-		}

-		return super.getLabelProvider(propertyPath);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public IStaticContentProvider getContentProvider(String propertyPath) {

-		if (ShapeDecorator.SHAPE_DECORATOR_DIRECTION.equals(propertyPath)) {

-			return new AbstractStaticContentProvider() {

-

-				/**

-				 * {@inheritDoc}

-				 */

-				public Object[] getElements() {

-					return labels.keySet().toArray(new Integer[0]);

-				}

-			};

-		}

-

-		return super.getContentProvider(propertyPath);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *		CEA LIST - Initial API and implementation
+ *      Christian W. Damus (CEA) - bug 323802
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.properties.modelelement;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.databinding.observable.IObservable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomBooleanStyleObservableValue;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomIntStyleObservableValue;
+import org.eclipse.papyrus.infra.gmfdiag.common.providers.ShapeDecorator;
+import org.eclipse.papyrus.infra.gmfdiag.properties.messages.Messages;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.AbstractModelElement;
+import org.eclipse.papyrus.infra.widgets.providers.AbstractStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.MapLabelProvider;
+
+/**
+ * Model element for the decorated view in GMF. This is not a model element, as the properties to search are non-EMF Properties
+ */
+public class DecoratedModelElement extends AbstractModelElement {
+
+	private final static Map<Object, String> labels = new HashMap<Object, String>();
+	static {
+		labels.put(0, Messages.DecoratedModelElement_NORTH_WEST);
+		labels.put(1, Messages.DecoratedModelElement_NORTH);
+		labels.put(2, Messages.DecoratedModelElement_NORTH_EAST);
+		labels.put(3, Messages.DecoratedModelElement_WEST);
+		labels.put(4, Messages.DecoratedModelElement_CENTER);
+		labels.put(5, Messages.DecoratedModelElement_EAST);
+		labels.put(6, Messages.DecoratedModelElement_SOUTH_WEST);
+		labels.put(7, Messages.DecoratedModelElement_SOUTH);
+		labels.put(8, Messages.DecoratedModelElement_SOUTH_EAST);
+	}
+
+	/**
+	 * The EObject manipulated by this ModelElement
+	 */
+	protected EObject source;
+
+	/**
+	 * The Editing Domain of the EObject for this ModelElement
+	 */
+	protected EditingDomain domain;
+
+	/**
+	 *
+	 * Constructs a new EMFModelElement for the given EObject
+	 *
+	 * @param source
+	 */
+	public DecoratedModelElement(EObject source) {
+		this(source, null);
+	}
+
+	/**
+	 *
+	 * Constructs a new EMFModelElement for the given EObject and Editing Domain
+	 *
+	 * @param source
+	 * @param domain
+	 */
+	public DecoratedModelElement(EObject source, EditingDomain domain) {
+		this.source = source;
+		this.domain = domain;
+	}
+
+	/**
+	 * @return the EditingDomain for this ModelElement
+	 */
+	public EditingDomain getDomain() {
+		return domain;
+	}
+
+	/**
+	 * @return the EObject for this ModelElement
+	 */
+	public EObject getSource() {
+		return source;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected IObservable doGetObservable(String propertyPath) {
+		if (ShapeDecorator.SHAPE_DECORATOR_VISIBILITY.equals(propertyPath)) {
+			return new CustomBooleanStyleObservableValue((View) source, domain, ShapeDecorator.SHAPE_DECORATOR_VISIBILITY);
+		}
+
+		if (ShapeDecorator.SHAPE_DECORATOR_DIRECTION.equals(propertyPath)) {
+			return new CustomIntStyleObservableValue((View) source, domain, ShapeDecorator.SHAPE_DECORATOR_DIRECTION);
+		}
+		return super.getObservable(propertyPath);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isEditable(String propertyPath) {
+		if (ShapeDecorator.SHAPE_DECORATOR_DIRECTION.equals(propertyPath) || ShapeDecorator.SHAPE_DECORATOR_VISIBILITY.equals(propertyPath)) {
+			return !EMFHelper.isReadOnly(source);
+		}
+
+		return super.isEditable(propertyPath);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ILabelProvider getLabelProvider(String propertyPath) {
+		if (ShapeDecorator.SHAPE_DECORATOR_DIRECTION.equals(propertyPath)) {
+			return new MapLabelProvider(labels);
+		}
+		return super.getLabelProvider(propertyPath);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public IStaticContentProvider getContentProvider(String propertyPath) {
+		if (ShapeDecorator.SHAPE_DECORATOR_DIRECTION.equals(propertyPath)) {
+			return new AbstractStaticContentProvider() {
+
+				/**
+				 * {@inheritDoc}
+				 */
+				public Object[] getElements() {
+					return labels.keySet().toArray(new Integer[0]);
+				}
+			};
+		}
+
+		return super.getContentProvider(propertyPath);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/DecoratedModelElementFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/DecoratedModelElementFactory.java
index 48f2685b328..a2adbc5e570 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/DecoratedModelElementFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/DecoratedModelElementFactory.java
@@ -1,56 +1,56 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 417409

- *

- *****************************************************************************/

-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.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.providers.ShapeDecorator;

-import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;

-import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElementFactory;

-

-/**

- * A factory for handling the GMF decorated elements

- */

-public class DecoratedModelElementFactory extends AbstractModelElementFactory<DecoratedModelElement> {

-

-	@Override

-	protected DecoratedModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {

-		View view = NotationHelper.findView(sourceElement);

-

-		if (view != null) {

-			EditingDomain domain = AdapterFactoryEditingDomain.getEditingDomainFor(view);

-			if (ShapeDecorator.isDecorable(view)) {

-				return new DecoratedModelElement(view, domain);

-			}

-

-		}

-

-		Activator.log.warn("The selected element cannot be resolved to a Decorated element");

-		return null;

-	}

-

-	@Override

-	protected void updateModelElement(DecoratedModelElement modelElement, Object newSourceElement) {

-		View view = NotationHelper.findView(newSourceElement);

-		if ((view == null) || !ShapeDecorator.isDecorable(view)) {

-			throw new IllegalArgumentException("Cannot resolve decorable View selection: " + newSourceElement);

-		}

-		modelElement.source = view;

-		modelElement.domain = EMFHelper.resolveEditingDomain(view);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *
+ *****************************************************************************/
+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.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.providers.ShapeDecorator;
+import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.AbstractModelElementFactory;
+
+/**
+ * A factory for handling the GMF decorated elements
+ */
+public class DecoratedModelElementFactory extends AbstractModelElementFactory<DecoratedModelElement> {
+
+	@Override
+	protected DecoratedModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {
+		View view = NotationHelper.findView(sourceElement);
+
+		if (view != null) {
+			EditingDomain domain = AdapterFactoryEditingDomain.getEditingDomainFor(view);
+			if (ShapeDecorator.isDecorable(view)) {
+				return new DecoratedModelElement(view, domain);
+			}
+
+		}
+
+		Activator.log.warn("The selected element cannot be resolved to a Decorated element");
+		return null;
+	}
+
+	@Override
+	protected void updateModelElement(DecoratedModelElement modelElement, Object newSourceElement) {
+		View view = NotationHelper.findView(newSourceElement);
+		if ((view == null) || !ShapeDecorator.isDecorable(view)) {
+			throw new IllegalArgumentException("Cannot resolve decorable View selection: " + newSourceElement);
+		}
+		modelElement.source = view;
+		modelElement.domain = EMFHelper.resolveEditingDomain(view);
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GMFModelElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GMFModelElement.java
index c8438ebeb0e..27f0fb0c118 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GMFModelElement.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GMFModelElement.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
+ * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,6 +9,8 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *  Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 454891
+ *  Christian W. Damus - bug 485220
+ *  
  *****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.properties.modelelement;
 
@@ -28,20 +30,20 @@ import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.GMFObservableList;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.GMFObservableValue;
 import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
 import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;
 import org.eclipse.papyrus.infra.gmfdiag.properties.databinding.GradientObservableValue;
 import org.eclipse.papyrus.infra.gmfdiag.properties.provider.ModelContentProvider;
 import org.eclipse.papyrus.infra.gmfdiag.properties.util.LegacyOwnerObservable;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement;
 import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
 import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 import org.eclipse.papyrus.infra.viewpoints.style.StylePackage;
 import org.eclipse.papyrus.infra.widgets.providers.EmptyContentProvider;
 import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
-import org.eclipse.papyrus.uml.tools.databinding.PapyrusObservableList;
-import org.eclipse.papyrus.uml.tools.databinding.PapyrusObservableValue;
-import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement;
 import org.eclipse.swt.graphics.Image;
 
 /**
@@ -91,14 +93,14 @@ public class GMFModelElement extends EMFModelElement {
 			Diagram diagram = (Diagram) source;
 			Style style = diagram.getStyle(StylePackage.Literals.PAPYRUS_VIEW_STYLE);
 			if (style != null) {
-				return new PapyrusObservableValue(style, StylePackage.Literals.PAPYRUS_VIEW_STYLE__OWNER, domain);
+				return new GMFObservableValue(style, StylePackage.Literals.PAPYRUS_VIEW_STYLE__OWNER, domain);
 			}
 			return new LegacyOwnerObservable(diagram, StylePackage.Literals.PAPYRUS_VIEW_STYLE__OWNER, domain);
 		} else if (propertyPath.endsWith("prototype")) {
 			Diagram diagram = (Diagram) source;
 			Style style = diagram.getStyle(StylePackage.Literals.PAPYRUS_VIEW_STYLE);
 			if (style != null) {
-				return new PapyrusObservableValue(style, StylePackage.Literals.PAPYRUS_VIEW_STYLE__CONFIGURATION, domain);
+				return new GMFObservableValue(style, StylePackage.Literals.PAPYRUS_VIEW_STYLE__CONFIGURATION, domain);
 			}
 			return new LegacyOwnerObservable(diagram, StylePackage.Literals.PAPYRUS_VIEW_STYLE__CONFIGURATION, domain);
 		}
@@ -115,11 +117,11 @@ public class GMFModelElement extends EMFModelElement {
 		}
 
 		if (feature.getUpperBound() != 1) {
-			IObservableList list = domain == null ? EMFProperties.list(featurePath).observe(source) : new PapyrusObservableList(EMFProperties.list(featurePath).observe(source), domain, getSource(featurePath), feature);
+			IObservableList list = domain == null ? EMFProperties.list(featurePath).observe(source) : new GMFObservableList(EMFProperties.list(featurePath).observe(source), domain, getSource(featurePath), feature);
 			return list;
 		}
 
-		IObservableValue value = domain == null ? EMFProperties.value(featurePath).observe(source) : new PapyrusObservableValue(getSource(featurePath), feature, domain);
+		IObservableValue value = domain == null ? EMFProperties.value(featurePath).observe(source) : new GMFObservableValue(getSource(featurePath), feature, domain);
 		return value;
 	}
 
@@ -128,24 +130,30 @@ public class GMFModelElement extends EMFModelElement {
 		if (propertyPath.endsWith("prototype")) {
 			return new ILabelProvider() {
 
+				@Override
 				public void addListener(ILabelProviderListener listener) {
 				}
 
+				@Override
 				public void removeListener(ILabelProviderListener listener) {
 				}
 
+				@Override
 				public void dispose() {
 				}
 
+				@Override
 				public boolean isLabelProperty(Object element, String property) {
 					return false;
 				}
 
+				@Override
 				public Image getImage(Object element) {
 					ViewPrototype proto = DiagramUtils.getPrototype((Diagram) source);
 					return proto.getIcon();
 				}
 
+				@Override
 				public String getText(Object element) {
 					ViewPrototype proto = DiagramUtils.getPrototype((Diagram) source);
 					return proto.getQualifiedName();
@@ -161,7 +169,7 @@ public class GMFModelElement extends EMFModelElement {
 	}
 
 	/**
-	 * @see org.eclipse.papyrus.views.properties.modelelement.EMFModelElement#getContentProvider(java.lang.String)
+	 * @see org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement#getContentProvider(java.lang.String)
 	 */
 	@Override
 	public IStaticContentProvider getContentProvider(String propertyPath) {
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GradientDataModelElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GradientDataModelElement.java
index a3d514dc21b..1634c551d2e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GradientDataModelElement.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/GradientDataModelElement.java
@@ -1,147 +1,147 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 323802

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.properties.modelelement;

-

-import org.eclipse.core.databinding.observable.IObservable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.notation.datatype.GradientData;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.properties.databinding.GradientDataObservableValue;

-import org.eclipse.papyrus.infra.gmfdiag.properties.databinding.GradientDataObservableValue.GradientProperty;

-import org.eclipse.papyrus.infra.gmfdiag.properties.messages.Messages;

-import org.eclipse.papyrus.infra.widgets.providers.AbstractStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElement;

-

-/**

- * A ModelElement for manipulating GradientData

- *

- * @author Camille Letavernier

- *

- */

-public class GradientDataModelElement extends AbstractModelElement {

-

-	private static final String PROPERTY_PATH = "gradientStyle"; //$NON-NLS-1$

-

-	/**

-	 * The source GradientData

-	 */

-	protected GradientData sourceElement;

-

-	/**

-	 * The notation style element that owns the {@link GradientData}.

-	 */

-	protected EObject owner;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param sourceElement

-	 *            the source GradientData

-	 * @param owner

-	 *            the owner of the gradient data (may be {@code null})

-	 */

-	public GradientDataModelElement(GradientData sourceElement, EObject owner) {

-		this.sourceElement = sourceElement;

-		this.owner = owner;

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param sourceElement

-	 *            the source GradientData

-	 */

-	public GradientDataModelElement(GradientData sourceElement) {

-		this(sourceElement, null);

-	}

-

-	@Override

-	public IObservable doGetObservable(String propertyPath) {

-		return new GradientDataObservableValue(sourceElement, propertyPath);

-	}

-

-	@Override

-	public boolean isMandatory(String propertyPath) {

-		return true;

-	}

-

-	@Override

-	public boolean isEditable(String propertyPath) {

-		// Let owner be null for compatibility with plain GradientData objects that we don't know their owners

-		return (owner == null) || !EMFHelper.isReadOnly(owner);

-	}

-

-	@Override

-	public IStaticContentProvider getContentProvider(String propertyPath) {

-		if (propertyPath.equals(PROPERTY_PATH)) {

-			return new AbstractStaticContentProvider() {

-

-				public Object[] getElements() {

-					return new Integer[] { 0, 1 };

-				}

-

-			};

-		}

-

-		return null;

-	}

-

-	@Override

-	public ILabelProvider getLabelProvider(String propertyPath) {

-		if (propertyPath.equals(PROPERTY_PATH)) {

-			return new LabelProvider() {

-

-				@Override

-				public String getText(Object element) {

-					if (element instanceof Integer) {

-						int value = (Integer) element;

-						if (value == 0) {

-							return Messages.GradientDataModelElement_Vertical;

-						} else {

-							return Messages.GradientDataModelElement_Horizontal;

-						}

-					}

-

-					return null;

-				}

-			};

-		}

-

-		return null;

-	}

-

-	@Override

-	public Object getDefaultValue(String propertyPath) {

-		GradientProperty property = GradientProperty.valueOf(propertyPath);

-		switch (property) {

-		case activate:

-			return false;

-		case gradientColor1:

-			return GradientData.getDefaultGradientData().getGradientColor1();

-		case gradientColor2:

-			return GradientData.getDefaultGradientData().getGradientColor2();

-		case gradientStyle:

-			return GradientData.getDefaultGradientData().getGradientStyle();

-		default:

-			Activator.log.warn("Cannot find a default value for property : " + propertyPath); //$NON-NLS-1$

-			return null;

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 323802
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.properties.modelelement;
+
+import org.eclipse.core.databinding.observable.IObservable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.datatype.GradientData;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.properties.databinding.GradientDataObservableValue;
+import org.eclipse.papyrus.infra.gmfdiag.properties.databinding.GradientDataObservableValue.GradientProperty;
+import org.eclipse.papyrus.infra.gmfdiag.properties.messages.Messages;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.AbstractModelElement;
+import org.eclipse.papyrus.infra.widgets.providers.AbstractStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+
+/**
+ * A ModelElement for manipulating GradientData
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class GradientDataModelElement extends AbstractModelElement {
+
+	private static final String PROPERTY_PATH = "gradientStyle"; //$NON-NLS-1$
+
+	/**
+	 * The source GradientData
+	 */
+	protected GradientData sourceElement;
+
+	/**
+	 * The notation style element that owns the {@link GradientData}.
+	 */
+	protected EObject owner;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param sourceElement
+	 *            the source GradientData
+	 * @param owner
+	 *            the owner of the gradient data (may be {@code null})
+	 */
+	public GradientDataModelElement(GradientData sourceElement, EObject owner) {
+		this.sourceElement = sourceElement;
+		this.owner = owner;
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param sourceElement
+	 *            the source GradientData
+	 */
+	public GradientDataModelElement(GradientData sourceElement) {
+		this(sourceElement, null);
+	}
+
+	@Override
+	public IObservable doGetObservable(String propertyPath) {
+		return new GradientDataObservableValue(sourceElement, propertyPath);
+	}
+
+	@Override
+	public boolean isMandatory(String propertyPath) {
+		return true;
+	}
+
+	@Override
+	public boolean isEditable(String propertyPath) {
+		// Let owner be null for compatibility with plain GradientData objects that we don't know their owners
+		return (owner == null) || !EMFHelper.isReadOnly(owner);
+	}
+
+	@Override
+	public IStaticContentProvider getContentProvider(String propertyPath) {
+		if (propertyPath.equals(PROPERTY_PATH)) {
+			return new AbstractStaticContentProvider() {
+
+				public Object[] getElements() {
+					return new Integer[] { 0, 1 };
+				}
+
+			};
+		}
+
+		return null;
+	}
+
+	@Override
+	public ILabelProvider getLabelProvider(String propertyPath) {
+		if (propertyPath.equals(PROPERTY_PATH)) {
+			return new LabelProvider() {
+
+				@Override
+				public String getText(Object element) {
+					if (element instanceof Integer) {
+						int value = (Integer) element;
+						if (value == 0) {
+							return Messages.GradientDataModelElement_Vertical;
+						} else {
+							return Messages.GradientDataModelElement_Horizontal;
+						}
+					}
+
+					return null;
+				}
+			};
+		}
+
+		return null;
+	}
+
+	@Override
+	public Object getDefaultValue(String propertyPath) {
+		GradientProperty property = GradientProperty.valueOf(propertyPath);
+		switch (property) {
+		case activate:
+			return false;
+		case gradientColor1:
+			return GradientData.getDefaultGradientData().getGradientColor1();
+		case gradientColor2:
+			return GradientData.getDefaultGradientData().getGradientColor2();
+		case gradientStyle:
+			return GradientData.getDefaultGradientData().getGradientStyle();
+		default:
+			Activator.log.warn("Cannot find a default value for property : " + propertyPath); //$NON-NLS-1$
+			return null;
+		}
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/NotationModelElementFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/NotationModelElementFactory.java
index 01e1782388e..0489c0a51f7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/NotationModelElementFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/NotationModelElementFactory.java
@@ -1,85 +1,85 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 323802

- *  Christian W. Damus (CEA) - bug 417409

- *

- *****************************************************************************/

-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.gmf.runtime.notation.View;

-import org.eclipse.gmf.runtime.notation.datatype.GradientData;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;

-import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.properties.databinding.ObservableGradientData;

-import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.modelelement.AbstractEMFModelElementFactory;

-import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElement;

-import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElementFactory;

-

-/**

- * A factory for handling the GMF Notation elements

- *

- * @author Camille Letavernier

- */

-public class NotationModelElementFactory extends AbstractModelElementFactory<AbstractModelElement> {

-	@Override

-	protected AbstractModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {

-

-		if (sourceElement instanceof ObservableGradientData) {

-			ObservableGradientData gradientData = (ObservableGradientData) sourceElement;

-			return new GradientDataModelElement(gradientData, gradientData.getOwner());

-		} else if (sourceElement instanceof GradientData) {

-			return new GradientDataModelElement((GradientData) sourceElement);

-		}

-		View view = NotationHelper.findView(sourceElement);

-

-		if (view != null) {

-			EditingDomain domain = AdapterFactoryEditingDomain.getEditingDomainFor(view);

-			return new GMFModelElement(view, domain);

-		}

-

-		Activator.log.warn("The selected element cannot be resolved to a GMF View");

-		return null;

-	}

-

-	@Override

-	protected void updateModelElement(AbstractModelElement modelElement, Object newSourceElement) {

-		if (modelElement instanceof GMFModelElement) {

-			updateModelElement((GMFModelElement) modelElement, newSourceElement);

-		} else if (modelElement instanceof GradientDataModelElement) {

-			updateModelElement((GradientDataModelElement) modelElement, newSourceElement);

-		}

-	}

-

-	void updateModelElement(GradientDataModelElement modelElement, Object newSourceElement) {

-		if (newSourceElement instanceof ObservableGradientData) {

-			ObservableGradientData ogd = (ObservableGradientData) newSourceElement;

-			modelElement.sourceElement = ogd;

-			modelElement.owner = ogd.getOwner();

-		} else if (newSourceElement instanceof GradientData) {

-			modelElement.sourceElement = (GradientData) newSourceElement;

-			modelElement.owner = null;

-		} else {

-			throw new IllegalArgumentException("Cannot resolve GradientData selection: " + newSourceElement);

-		}

-	}

-

-	void updateModelElement(GMFModelElement modelElement, Object newSourceElement) {

-		View view = NotationHelper.findView(newSourceElement);

-		if (view == null) {

-			throw new IllegalArgumentException("Cannot resolve View selection: " + newSourceElement);

-		}

-

-		AbstractEMFModelElementFactory.updateEMFModelElement(modelElement, view);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 323802
+ *  Christian W. Damus (CEA) - bug 417409
+ *
+ *****************************************************************************/
+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.gmf.runtime.notation.View;
+import org.eclipse.gmf.runtime.notation.datatype.GradientData;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;
+import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.properties.databinding.ObservableGradientData;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.AbstractEMFModelElementFactory;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.AbstractModelElement;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.AbstractModelElementFactory;
+
+/**
+ * A factory for handling the GMF Notation elements
+ *
+ * @author Camille Letavernier
+ */
+public class NotationModelElementFactory extends AbstractModelElementFactory<AbstractModelElement> {
+	@Override
+	protected AbstractModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {
+
+		if (sourceElement instanceof ObservableGradientData) {
+			ObservableGradientData gradientData = (ObservableGradientData) sourceElement;
+			return new GradientDataModelElement(gradientData, gradientData.getOwner());
+		} else if (sourceElement instanceof GradientData) {
+			return new GradientDataModelElement((GradientData) sourceElement);
+		}
+		View view = NotationHelper.findView(sourceElement);
+
+		if (view != null) {
+			EditingDomain domain = AdapterFactoryEditingDomain.getEditingDomainFor(view);
+			return new GMFModelElement(view, domain);
+		}
+
+		Activator.log.warn("The selected element cannot be resolved to a GMF View");
+		return null;
+	}
+
+	@Override
+	protected void updateModelElement(AbstractModelElement modelElement, Object newSourceElement) {
+		if (modelElement instanceof GMFModelElement) {
+			updateModelElement((GMFModelElement) modelElement, newSourceElement);
+		} else if (modelElement instanceof GradientDataModelElement) {
+			updateModelElement((GradientDataModelElement) modelElement, newSourceElement);
+		}
+	}
+
+	void updateModelElement(GradientDataModelElement modelElement, Object newSourceElement) {
+		if (newSourceElement instanceof ObservableGradientData) {
+			ObservableGradientData ogd = (ObservableGradientData) newSourceElement;
+			modelElement.sourceElement = ogd;
+			modelElement.owner = ogd.getOwner();
+		} else if (newSourceElement instanceof GradientData) {
+			modelElement.sourceElement = (GradientData) newSourceElement;
+			modelElement.owner = null;
+		} else {
+			throw new IllegalArgumentException("Cannot resolve GradientData selection: " + newSourceElement);
+		}
+	}
+
+	void updateModelElement(GMFModelElement modelElement, Object newSourceElement) {
+		View view = NotationHelper.findView(newSourceElement);
+		if (view == null) {
+			throw new IllegalArgumentException("Cannot resolve View selection: " + newSourceElement);
+		}
+
+		AbstractEMFModelElementFactory.updateEMFModelElement(modelElement, view);
+	}
+}
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
index e6b602b366b..fea100390d4 100644
--- 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
@@ -1,192 +1,192 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 417409

- *

- *****************************************************************************/

-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.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.StaticContentProvider;

-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

-	 */

-	protected Diagram diagram;

-

-	/**

-	 * the edited preference store

-	 */

-	protected 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;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *
+ *****************************************************************************/
+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.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.AbstractModelElement;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.StaticContentProvider;
+
+/**
+ *
+ * @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
+	 */
+	protected Diagram diagram;
+
+	/**
+	 * the edited preference store
+	 */
+	protected 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.infra.properties.ui.modelelement.AbstractModelElement#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		super.dispose();
+		this.diagram = null;
+		this.store = null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.properties.ui.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.infra.properties.ui.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.infra.properties.ui.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.infra.properties.ui.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.infra.properties.ui.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
index 1b84e55c05e..bec1a9e7de6 100644
--- 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
@@ -1,61 +1,61 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 417409

- *

- *****************************************************************************/

-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.infra.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElementFactory;

-

-/**

- *

- * @author vl222926

- *         The factory used to edit Rulers and Grid properties

- */

-public class RulersAndGridModelElementFactory extends AbstractModelElementFactory<RulerAndGridModelElement> {

-

-	@Override

-	protected RulerAndGridModelElement doCreateFromSource(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;

-	}

-

-	@Override

-	protected void updateModelElement(RulerAndGridModelElement modelElement, Object newSourceElement) {

-		if (!(newSourceElement instanceof EditPart)) {

-			throw new IllegalArgumentException("Cannot resolve EditPart selection: " + newSourceElement);

-		}

-		EditPart editPart = (EditPart) newSourceElement;

-		modelElement.store = DiagramEditPartsUtil.getDiagramWorkspacePreferenceStore(editPart);

-		modelElement.diagram = (Diagram) NotationHelper.findView(DiagramEditPartsUtil.getDiagramEditPart(editPart));

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *
+ *****************************************************************************/
+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.infra.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.AbstractModelElementFactory;
+
+/**
+ *
+ * @author vl222926
+ *         The factory used to edit Rulers and Grid properties
+ */
+public class RulersAndGridModelElementFactory extends AbstractModelElementFactory<RulerAndGridModelElement> {
+
+	@Override
+	protected RulerAndGridModelElement doCreateFromSource(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;
+	}
+
+	@Override
+	protected void updateModelElement(RulerAndGridModelElement modelElement, Object newSourceElement) {
+		if (!(newSourceElement instanceof EditPart)) {
+			throw new IllegalArgumentException("Cannot resolve EditPart selection: " + newSourceElement);
+		}
+		EditPart editPart = (EditPart) newSourceElement;
+		modelElement.store = DiagramEditPartsUtil.getDiagramWorkspacePreferenceStore(editPart);
+		modelElement.diagram = (Diagram) NotationHelper.findView(DiagramEditPartsUtil.getDiagramEditPart(editPart));
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/StyleHandlerProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/StyleHandlerProvider.java
index 3870ed9daba..4d1b3dbeb68 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/StyleHandlerProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/StyleHandlerProvider.java
@@ -1,61 +1,61 @@
-/*****************************************************************************

- * 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.properties.modelelement;

-

-import org.eclipse.papyrus.infra.constraints.constraints.Constraint;

-import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

-

-/**

- *

- * Provides a ModelElement and a Constraint implementation for a given

- * selection.

- *

- * More than one implementation can be provided, with different priorities,

- * so that the Appearance property view can be used to edit different models,

- * in different contexts (e.g. Notation model, CSS stylesheet, Preferences...)

- *

- * The Providers can be registered through the extension point:

- * org.eclipse.papyrus.infra.gmfdiag.properties.stylehandler

- *

- * @author Camille Letavernier

- *

- */

-// TODO: Can this be generalized to the whole property view framework?

-public interface StyleHandlerProvider {

-

-	/**

-	 * Returns a Constraint implementation

-	 *

-	 * @return

-	 */

-	public Constraint createConstraint();

-

-	/**

-	 * Tests whether this provider can handle the given selection.

-	 *

-	 * @param selection

-	 * @return

-	 */

-	public boolean isProviderFor(Object selection);

-

-	/**

-	 * Returns a ModelElement for the given selection. This method can only be

-	 * called when {@link #isProviderFor(Object)} returns true for the given

-	 * selection.

-	 *

-	 * @param selection

-	 * @param context

-	 * @return

-	 */

-	public ModelElement createModelElement(Object selection, DataContextElement context);

-}

+/*****************************************************************************
+ * 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.properties.modelelement;
+
+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.ModelElement;
+
+/**
+ *
+ * Provides a ModelElement and a Constraint implementation for a given
+ * selection.
+ *
+ * More than one implementation can be provided, with different priorities,
+ * so that the Appearance property view can be used to edit different models,
+ * in different contexts (e.g. Notation model, CSS stylesheet, Preferences...)
+ *
+ * The Providers can be registered through the extension point:
+ * org.eclipse.papyrus.infra.gmfdiag.properties.stylehandler
+ *
+ * @author Camille Letavernier
+ *
+ */
+// TODO: Can this be generalized to the whole property view framework?
+public interface StyleHandlerProvider {
+
+	/**
+	 * Returns a Constraint implementation
+	 *
+	 * @return
+	 */
+	public Constraint createConstraint();
+
+	/**
+	 * Tests whether this provider can handle the given selection.
+	 *
+	 * @param selection
+	 * @return
+	 */
+	public boolean isProviderFor(Object selection);
+
+	/**
+	 * Returns a ModelElement for the given selection. This method can only be
+	 * called when {@link #isProviderFor(Object)} returns true for the given
+	 * selection.
+	 *
+	 * @param selection
+	 * @param context
+	 * @return
+	 */
+	public ModelElement createModelElement(Object selection, DataContextElement context);
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/SynchronizationModelElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/SynchronizationModelElement.java
index 73e13cec874..4401a967e92 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/SynchronizationModelElement.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/SynchronizationModelElement.java
@@ -16,7 +16,7 @@ import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gef.EditPart;
 import org.eclipse.papyrus.infra.gmfdiag.properties.databinding.CanonicalObservableValue;
-import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElement;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.AbstractModelElement;
 
 /**
  * An encapsulation of the synthetic synchronization-related properties of an {@link EditPart} in the diagrams.
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/SynchronizationModelElementFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/SynchronizationModelElementFactory.java
index 762d9c276aa..92761956259 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/SynchronizationModelElementFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/SynchronizationModelElementFactory.java
@@ -16,7 +16,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.papyrus.infra.core.utils.AdapterUtils;
 import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;
 import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
-import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElementFactory;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.AbstractModelElementFactory;
 
 /**
  * Model-element factory for synthetic synchronization properties of GMF notation views.
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/LegacyOwnerObservable.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/LegacyOwnerObservable.java
index 7b978cf8aff..6457df798b8 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/LegacyOwnerObservable.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/LegacyOwnerObservable.java
@@ -1,182 +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:

- *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.properties.util;

-

-import org.eclipse.core.databinding.observable.ChangeEvent;

-import org.eclipse.core.databinding.observable.IChangeListener;

-import org.eclipse.core.databinding.observable.Realm;

-import org.eclipse.core.databinding.observable.value.AbstractObservableValue;

-import org.eclipse.core.databinding.observable.value.ValueDiff;

-import org.eclipse.emf.common.command.AbstractCommand;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.Style;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

-import org.eclipse.papyrus.infra.viewpoints.style.StylePackage;

-import org.eclipse.papyrus.uml.tools.databinding.PapyrusObservableValue;

-

-/**

- * Represents the observable value of a diagram's owner in the case where the diagram does not yet have the viewpoints-compatible style for holding the value itself

- *

- * @author Laurent Wouters

- */

-public class LegacyOwnerObservable extends AbstractObservableValue {

-

-	private EditingDomain domain;

-	private Diagram diagram;

-	private EReference reference;

-	private IChangeListener styleListener;

-	private IChangeListener valueListener;

-	private PapyrusObservableValue styleObservable;

-	private PapyrusObservableValue valueObservable;

-

-	/**

-	 * Initializes the observables

-	 *

-	 * @param diagram

-	 *            The diagram to be observed

-	 * @param domain

-	 *            The editing domain

-	 */

-	public LegacyOwnerObservable(Diagram diagram, EReference feature, EditingDomain domain) {

-		super(Realm.getDefault());

-		this.domain = domain;

-		this.diagram = diagram;

-		this.reference = feature;

-		buildStyleListener();

-		this.styleObservable = new PapyrusObservableValue(diagram, NotationPackage.Literals.VIEW__STYLES, domain);

-		this.styleObservable.addChangeListener(styleListener);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#isStale()

-	 */

-	@Override

-	public boolean isStale() {

-		return (valueListener != null);

-	}

-

-	/**

-	 * Builds the listener for the styles property of the diagram

-	 */

-	private void buildStyleListener() {

-		this.styleListener = new IChangeListener() {

-			public void handleChange(ChangeEvent event) {

-				if (valueListener != null) {

-					return;

-				}

-				Style style = LegacyOwnerObservable.this.diagram.getStyle(StylePackage.Literals.PAPYRUS_VIEW_STYLE);

-				if (style != null) {

-					buildValueListener(style);

-				}

-			}

-		};

-	}

-

-	/**

-	 * Builds the listener for the EObjectValue property of the style

-	 *

-	 * @param style

-	 *            The style to be observed

-	 */

-	private void buildValueListener(Style style) {

-		this.valueListener = new IChangeListener() {

-			public void handleChange(ChangeEvent event) {

-				fireValueChange(new ValueDiff() {

-					@Override

-					public Object getOldValue() {

-						return null;

-					}

-

-					@Override

-					public Object getNewValue() {

-						return DiagramUtils.getOwner(diagram);

-					}

-				});

-			}

-		};

-		valueObservable = new PapyrusObservableValue(style, reference, domain);

-		valueObservable.addChangeListener(valueListener);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

-	 */

-	public Object getValueType() {

-		return EcorePackage.Literals.EOBJECT;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doGetValue()

-	 */

-	@Override

-	protected Object doGetValue() {

-		return DiagramUtils.getOwner(diagram);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)

-	 */

-	@Override

-	protected void doSetValue(Object value) {

-		Command emfCommand = getCommand((EObject) value);

-		domain.getCommandStack().execute(emfCommand);

-	}

-

-	private Command getCommand(final EObject newValue) {

-		final EObject oldValue = DiagramUtils.getOwner(diagram);

-

-		return new AbstractCommand("Change diagram's owner") {

-			private boolean createStyle = true;

-

-			public void execute() {

-				Style style = diagram.getStyle(StylePackage.Literals.PAPYRUS_VIEW_STYLE);

-				createStyle = (style == null);

-				DiagramUtils.setOwner(diagram, newValue);

-			}

-

-			public void redo() {

-				DiagramUtils.setOwner(diagram, newValue);

-			}

-

-			@Override

-			public void undo() {

-				if (createStyle) {

-					Style style = diagram.getStyle(StylePackage.Literals.PAPYRUS_VIEW_STYLE);

-					diagram.getStyles().remove(style);

-				} else {

-					DiagramUtils.setOwner(diagram, oldValue);

-				}

-			}

-

-			@Override

-			public boolean prepare() {

-				return true;

-			}

-		};

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.properties.util;
+
+import org.eclipse.core.databinding.observable.ChangeEvent;
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.core.databinding.observable.Realm;
+import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
+import org.eclipse.core.databinding.observable.value.ValueDiff;
+import org.eclipse.emf.common.command.AbstractCommand;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.Style;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.GMFObservableValue;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
+import org.eclipse.papyrus.infra.services.edit.ui.databinding.PapyrusObservableValue;
+import org.eclipse.papyrus.infra.viewpoints.style.StylePackage;
+
+/**
+ * Represents the observable value of a diagram's owner in the case where the diagram does not yet have the viewpoints-compatible style for holding the value itself
+ *
+ * @author Laurent Wouters
+ */
+public class LegacyOwnerObservable extends AbstractObservableValue {
+
+	private EditingDomain domain;
+	private Diagram diagram;
+	private EReference reference;
+	private IChangeListener styleListener;
+	private IChangeListener valueListener;
+	private PapyrusObservableValue styleObservable;
+	private PapyrusObservableValue valueObservable;
+
+	/**
+	 * Initializes the observables
+	 *
+	 * @param diagram
+	 *            The diagram to be observed
+	 * @param domain
+	 *            The editing domain
+	 */
+	public LegacyOwnerObservable(Diagram diagram, EReference feature, EditingDomain domain) {
+		super(Realm.getDefault());
+		this.domain = domain;
+		this.diagram = diagram;
+		this.reference = feature;
+		buildStyleListener();
+		this.styleObservable = new GMFObservableValue(diagram, NotationPackage.Literals.VIEW__STYLES, domain);
+		this.styleObservable.addChangeListener(styleListener);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#isStale()
+	 */
+	@Override
+	public boolean isStale() {
+		return (valueListener != null);
+	}
+
+	/**
+	 * Builds the listener for the styles property of the diagram
+	 */
+	private void buildStyleListener() {
+		this.styleListener = new IChangeListener() {
+			@Override
+			public void handleChange(ChangeEvent event) {
+				if (valueListener != null) {
+					return;
+				}
+				Style style = LegacyOwnerObservable.this.diagram.getStyle(StylePackage.Literals.PAPYRUS_VIEW_STYLE);
+				if (style != null) {
+					buildValueListener(style);
+				}
+			}
+		};
+	}
+
+	/**
+	 * Builds the listener for the EObjectValue property of the style
+	 *
+	 * @param style
+	 *            The style to be observed
+	 */
+	private void buildValueListener(Style style) {
+		this.valueListener = new IChangeListener() {
+			@Override
+			public void handleChange(ChangeEvent event) {
+				fireValueChange(new ValueDiff() {
+					@Override
+					public Object getOldValue() {
+						return null;
+					}
+
+					@Override
+					public Object getNewValue() {
+						return DiagramUtils.getOwner(diagram);
+					}
+				});
+			}
+		};
+		valueObservable = new GMFObservableValue(style, reference, domain);
+		valueObservable.addChangeListener(valueListener);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.Literals.EOBJECT;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doGetValue()
+	 */
+	@Override
+	protected Object doGetValue() {
+		return DiagramUtils.getOwner(diagram);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)
+	 */
+	@Override
+	protected void doSetValue(Object value) {
+		Command emfCommand = getCommand((EObject) value);
+		domain.getCommandStack().execute(emfCommand);
+	}
+
+	private Command getCommand(final EObject newValue) {
+		final EObject oldValue = DiagramUtils.getOwner(diagram);
+
+		return new AbstractCommand("Change diagram's owner") {
+			private boolean createStyle = true;
+
+			@Override
+			public void execute() {
+				Style style = diagram.getStyle(StylePackage.Literals.PAPYRUS_VIEW_STYLE);
+				createStyle = (style == null);
+				DiagramUtils.setOwner(diagram, newValue);
+			}
+
+			@Override
+			public void redo() {
+				DiagramUtils.setOwner(diagram, newValue);
+			}
+
+			@Override
+			public void undo() {
+				if (createStyle) {
+					Style style = diagram.getStyle(StylePackage.Literals.PAPYRUS_VIEW_STYLE);
+					diagram.getStyles().remove(style);
+				} else {
+					DiagramUtils.setOwner(diagram, oldValue);
+				}
+			}
+
+			@Override
+			public boolean prepare() {
+				return true;
+			}
+		};
+	}
+}
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
index 0bdd18efd9b..dd37d24d7e9 100644
--- 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
@@ -1,171 +1,171 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.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$

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.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.infra.properties.ui.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/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/pom.xml
index 8a0358b9991..948af3f9d1e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.viewersearcher</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF
index caabaa06faa..89aa9905c1d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF
@@ -19,8 +19,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
  org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0",
  org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
  org.eclipse.core.databinding;bundle-version="1.6.0",
  org.eclipse.emf.databinding;bundle-version="1.3.0",
@@ -29,7 +28,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
  org.eclipse.papyrus.infra.editor.welcome.nattable;bundle-version="1.2.0",
  org.eclipse.nebula.widgets.nattable.core;bundle-version="1.4.0",
  org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/model/diagrams/ui/SingleDiagrams.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/model/diagrams/ui/SingleDiagrams.xwt
index 470a58c399c..f105dc5cbe1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/model/diagrams/ui/SingleDiagrams.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/model/diagrams/ui/SingleDiagrams.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
 	xmlns:x="http://www.eclipse.org/xwt"
 	xmlns:ppew="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.welcome.internal.widgets"
 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/plugin.xml
index cc4669b7fed..f5d442eaaba 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/plugin.xml
@@ -19,7 +19,7 @@
       </context>
    </extension>
    <extension
-         point="org.eclipse.papyrus.views.properties.context">
+         point="org.eclipse.papyrus.infra.properties.ui.context">
       <preferencePageBinding
             context="welcome-diagrams"
             page="org.eclipse.papyrus.infra.editor.welcome.content">
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/pom.xml
index be9e5c5b4e0..e8ca4a1a28b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.welcome</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/src/org/eclipse/papyrus/infra/gmfdiag/welcome/internal/modelelements/WelcomeModelElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/src/org/eclipse/papyrus/infra/gmfdiag/welcome/internal/modelelements/WelcomeModelElement.java
index 3df14a0f52c..9ae29a2b12e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/src/org/eclipse/papyrus/infra/gmfdiag/welcome/internal/modelelements/WelcomeModelElement.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/src/org/eclipse/papyrus/infra/gmfdiag/welcome/internal/modelelements/WelcomeModelElement.java
@@ -16,7 +16,7 @@ package org.eclipse.papyrus.infra.gmfdiag.welcome.internal.modelelements;
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement;
 
 /**
  * @author damus
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/src/org/eclipse/papyrus/infra/gmfdiag/welcome/internal/modelelements/WelcomeModelElementFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/src/org/eclipse/papyrus/infra/gmfdiag/welcome/internal/modelelements/WelcomeModelElementFactory.java
index 5d5db0da477..dde30f7699c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/src/org/eclipse/papyrus/infra/gmfdiag/welcome/internal/modelelements/WelcomeModelElementFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/src/org/eclipse/papyrus/infra/gmfdiag/welcome/internal/modelelements/WelcomeModelElementFactory.java
@@ -16,9 +16,9 @@ package org.eclipse.papyrus.infra.gmfdiag.welcome.internal.modelelements;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.welcome.internal.Activator;
 import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
-import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.modelelement.AbstractEMFModelElementFactory;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.AbstractEMFModelElementFactory;
 
 /**
  * @author damus
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/src/org/eclipse/papyrus/infra/gmfdiag/welcome/internal/widgets/CreateNewNotationButton.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/src/org/eclipse/papyrus/infra/gmfdiag/welcome/internal/widgets/CreateNewNotationButton.java
index 2f590e1e49b..577901f1026 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/src/org/eclipse/papyrus/infra/gmfdiag/welcome/internal/widgets/CreateNewNotationButton.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/src/org/eclipse/papyrus/infra/gmfdiag/welcome/internal/widgets/CreateNewNotationButton.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2015 Christian W. Damus and others.
+ * Copyright (c) 2015, 2016 Christian W. Damus and others.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -19,6 +19,7 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.window.Window;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
@@ -26,13 +27,13 @@ import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResourceSet;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.DataSource;
 import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
-import org.eclipse.papyrus.infra.ui.emf.providers.strategy.SemanticEMFContentProvider;
+import org.eclipse.papyrus.infra.ui.emf.utils.ProviderHelper;
+import org.eclipse.papyrus.infra.ui.providers.DelegatingPapyrusContentProvider;
 import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 import org.eclipse.papyrus.infra.widgets.editors.TreeSelectorDialog;
-import org.eclipse.papyrus.uml.tools.providers.SemanticUMLContentProvider;
-import org.eclipse.papyrus.views.properties.modelelement.DataSource;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -114,7 +115,8 @@ public class CreateNewNotationButton extends Composite {
 			throw new IllegalStateException(e);
 		}
 
-		SemanticEMFContentProvider content = new SemanticUMLContentProvider(modelSet) {
+		ITreeContentProvider content = ProviderHelper.getContentProvider(modelSet);
+		content = new DelegatingPapyrusContentProvider(content) {
 
 			@Override
 			public boolean isValidValue(Object element) {
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF
index 3b0b02c510c..9165840a956 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.4.2",

- org.eclipse.core.databinding;bundle-version="1.4.0",

- org.eclipse.jface.databinding;bundle-version="1.5.0",

- org.eclipse.core.databinding.property;bundle-version="1.4.0",

- org.eclipse.papyrus.views.properties;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.widgets,

- org.eclipse.papyrus.infra.gmfdiag.widgets.editors

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %Bundle-Name

-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.widgets.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.widgets;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.4.2",
+ org.eclipse.core.databinding;bundle-version="1.4.0",
+ org.eclipse.jface.databinding;bundle-version="1.5.0",
+ org.eclipse.core.databinding.property;bundle-version="1.4.0",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0"
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.widgets,
+ org.eclipse.papyrus.infra.gmfdiag.widgets.editors
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.widgets.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.widgets;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/pom.xml
index 0e9c072d32e..672fe5221a1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.widgets</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/infra/gmfdiag/widgets/editors/XWTAwareColorPicker.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/infra/gmfdiag/widgets/editors/XWTAwareColorPicker.java
index d1742767c1a..79c764245c6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/infra/gmfdiag/widgets/editors/XWTAwareColorPicker.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/infra/gmfdiag/widgets/editors/XWTAwareColorPicker.java
@@ -1,98 +1,98 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.widgets.editors;

-

-import org.eclipse.papyrus.infra.gmfdiag.widgets.Activator;

-import org.eclipse.papyrus.views.properties.widgets.AbstractPropertyEditor;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.graphics.Rectangle;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * A widget to edit Colors represented by an Integer (RGB) value

- * The editor is a Button with a color-picker popup.

- *

- * @author Camille Letavernier

- *

- */

-public class XWTAwareColorPicker extends AbstractPropertyEditor {

-

-	private ColorPickerEditor editor;

-

-	private String imagePath;

-

-	private int x = -1, y = -1, width = -1, height = -1;

-

-	public XWTAwareColorPicker(Composite parent, int style) {

-		editor = new ColorPickerEditor(parent, style);

-		setEditor(editor);

-	}

-

-	public void setImage(String imagePath) {

-		this.imagePath = imagePath;

-		Image image = Activator.getDefault().getImageFromPlugin(imagePath);

-		if (image != null) {

-			editor.setImage(image);

-		}

-	}

-

-	@Override

-	protected void doBinding() {

-		super.doBinding();

-		Object defaultValue = input.getDefaultValue(propertyPath);

-		if (defaultValue instanceof Integer) {

-			editor.setDefaultColor((Integer) defaultValue);

-		}

-	}

-

-	public String getImage() {

-		return imagePath;

-	}

-

-	protected void checkBounds() {

-		if (x > -1 && y > -1 && width > -1 && height > -1) {

-			editor.setColorBounds(new Rectangle(x, y, width, height));

-		}

-	}

-

-	public int getX() {

-		return x;

-	}

-

-	public void setX(int x) {

-		this.x = x;

-	}

-

-	public int getY() {

-		return y;

-	}

-

-	public void setY(int y) {

-		this.y = y;

-	}

-

-	public int getWidth() {

-		return width;

-	}

-

-	public void setWidth(int width) {

-		this.width = width;

-	}

-

-	public int getHeight() {

-		return height;

-	}

-

-	public void setHeight(int height) {

-		this.height = height;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.widgets.editors;
+
+import org.eclipse.papyrus.infra.gmfdiag.widgets.Activator;
+import org.eclipse.papyrus.infra.properties.ui.widgets.AbstractPropertyEditor;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A widget to edit Colors represented by an Integer (RGB) value
+ * The editor is a Button with a color-picker popup.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class XWTAwareColorPicker extends AbstractPropertyEditor {
+
+	private ColorPickerEditor editor;
+
+	private String imagePath;
+
+	private int x = -1, y = -1, width = -1, height = -1;
+
+	public XWTAwareColorPicker(Composite parent, int style) {
+		editor = new ColorPickerEditor(parent, style);
+		setEditor(editor);
+	}
+
+	public void setImage(String imagePath) {
+		this.imagePath = imagePath;
+		Image image = Activator.getDefault().getImageFromPlugin(imagePath);
+		if (image != null) {
+			editor.setImage(image);
+		}
+	}
+
+	@Override
+	protected void doBinding() {
+		super.doBinding();
+		Object defaultValue = input.getDefaultValue(propertyPath);
+		if (defaultValue instanceof Integer) {
+			editor.setDefaultColor((Integer) defaultValue);
+		}
+	}
+
+	public String getImage() {
+		return imagePath;
+	}
+
+	protected void checkBounds() {
+		if (x > -1 && y > -1 && width > -1 && height > -1) {
+			editor.setColorBounds(new Rectangle(x, y, width, height));
+		}
+	}
+
+	public int getX() {
+		return x;
+	}
+
+	public void setX(int x) {
+		this.x = x;
+	}
+
+	public int getY() {
+		return y;
+	}
+
+	public void setY(int y) {
+		this.y = y;
+	}
+
+	public int getWidth() {
+		return width;
+	}
+
+	public void setWidth(int width) {
+		this.width = width;
+	}
+
+	public int getHeight() {
+		return height;
+	}
+
+	public void setHeight(int height) {
+		this.height = height;
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/infra/gmfdiag/widgets/editors/XWTAwareFontEditor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/infra/gmfdiag/widgets/editors/XWTAwareFontEditor.java
index ea935adff62..5697d30f6f8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/infra/gmfdiag/widgets/editors/XWTAwareFontEditor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/infra/gmfdiag/widgets/editors/XWTAwareFontEditor.java
@@ -1,68 +1,68 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.widgets.editors;

-

-import java.text.Collator;

-import java.util.Arrays;

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.papyrus.infra.widgets.editors.ReferenceCombo;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.StaticContentProvider;

-import org.eclipse.papyrus.views.properties.widgets.AbstractPropertyEditor;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-

-

-public class XWTAwareFontEditor extends AbstractPropertyEditor {

-

-	private ReferenceCombo editor;

-

-	private static IStaticContentProvider fontContentProvider;

-

-	public XWTAwareFontEditor(Composite parent, int style) {

-		editor = new ReferenceCombo(parent, style);

-		setEditor(editor);

-	}

-

-	@Override

-	protected void doBinding() {

-		IStaticContentProvider contentProvider = getFontContentProvider();

-

-		editor.setContentProvider(contentProvider);

-		editor.setUnsettable(!input.isMandatory(propertyPath));

-

-		super.doBinding();

-	}

-

-	private synchronized static IStaticContentProvider getFontContentProvider() {

-		if (fontContentProvider == null) {

-			FontData[] fontDatas = Display.getDefault().getFontList(null, true);

-

-			Set<String> fontNames = new HashSet<String>();

-			for (FontData data : fontDatas) {

-				if (data.getName() != null) {

-					fontNames.add(data.getName());

-				}

-			}

-

-			String[] uniqueFontNames = fontNames.toArray(new String[fontNames.size()]);

-			Arrays.sort(uniqueFontNames, Collator.getInstance());

-

-			fontContentProvider = new StaticContentProvider(uniqueFontNames);

-		}

-		return fontContentProvider;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.widgets.editors;
+
+import java.text.Collator;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.papyrus.infra.properties.ui.widgets.AbstractPropertyEditor;
+import org.eclipse.papyrus.infra.widgets.editors.ReferenceCombo;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.StaticContentProvider;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+
+public class XWTAwareFontEditor extends AbstractPropertyEditor {
+
+	private ReferenceCombo editor;
+
+	private static IStaticContentProvider fontContentProvider;
+
+	public XWTAwareFontEditor(Composite parent, int style) {
+		editor = new ReferenceCombo(parent, style);
+		setEditor(editor);
+	}
+
+	@Override
+	protected void doBinding() {
+		IStaticContentProvider contentProvider = getFontContentProvider();
+
+		editor.setContentProvider(contentProvider);
+		editor.setUnsettable(!input.isMandatory(propertyPath));
+
+		super.doBinding();
+	}
+
+	private synchronized static IStaticContentProvider getFontContentProvider() {
+		if (fontContentProvider == null) {
+			FontData[] fontDatas = Display.getDefault().getFontList(null, true);
+
+			Set<String> fontNames = new HashSet<String>();
+			for (FontData data : fontDatas) {
+				if (data.getName() != null) {
+					fontNames.add(data.getName());
+				}
+			}
+
+			String[] uniqueFontNames = fontNames.toArray(new String[fontNames.size()]);
+			Arrays.sort(uniqueFontNames, Collator.getInstance());
+
+			fontContentProvider = new StaticContentProvider(uniqueFontNames);
+		}
+		return fontContentProvider;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/pom.xml b/plugins/infra/gmfdiag/pom.xml
new file mode 100644
index 00000000000..dfcf8d6f09c
--- /dev/null
+++ b/plugins/infra/gmfdiag/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+	<name>Papyrus Diagram Infrastructure</name>
+	<description>Common language-agnostic frameworks for GMF-based diagram editors.</description>
+
+	<modules>
+		<module>org.eclipse.papyrus.extensionpoints.editors</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.canonical</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.commands</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.common</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.controlmode</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.css.model</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.dnd</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.export</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.gef</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.hyperlink</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.menu</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.modelexplorer</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.navigation</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.outline</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.preferences</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.properties</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.viewersearcher</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.welcome</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.widgets</module>
+		<module>assistant</module>
+		<module>css</module>
+	</modules>
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/.classpath b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/.classpath
index 64c5e31b7a2..64c5e31b7a2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/.classpath
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/.classpath
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/.project b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/.project
index 697247cf508..395ecbac5fc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/.project
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.hyperlink</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>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.hyperlink</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/org.eclipse.papyrus.infra.extendedtypes.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/.settings/org.eclipse.jdt.core.prefs
index c585cc455ae..c585cc455ae 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF
index 865c06b76c1..32af3bfaf2e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.emf.transaction,
  org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
  org.eclipse.core.filesystem;bundle-version="1.3.200",
  org.eclipse.papyrus.infra.services.openelement;bundle-version="1.2.0",
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/about.html b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/about.html
index 209103075a7..dd3c089a94c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/about.html
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/about.html
@@ -1,28 +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>

+<!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/infra/org.eclipse.papyrus.infra.hyperlink/build.properties b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/build.properties
index f210587952a..a125ab2694e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/build.properties
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/build.properties
@@ -1,10 +1,10 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               schema/,\

-               about.html,\

-               plugin.xml,\

-               build.properties,\

-               plugin.properties

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               schema/,\
+               about.html,\
+               plugin.xml,\
+               build.properties,\
+               plugin.properties
+src.includes = about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/icons/ArrowDown_16x16.gif b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/icons/ArrowDown_16x16.gif
index 072b1844572..072b1844572 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/icons/ArrowDown_16x16.gif
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/icons/ArrowDown_16x16.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/icons/ArrowLeft_16x16.gif b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/icons/ArrowLeft_16x16.gif
index 4fb41501036..4fb41501036 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/icons/ArrowLeft_16x16.gif
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/icons/ArrowLeft_16x16.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/icons/ArrowRight_16x16.gif b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/icons/ArrowRight_16x16.gif
index 19567890aa8..19567890aa8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/icons/ArrowRight_16x16.gif
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/icons/ArrowRight_16x16.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/icons/ArrowUp_16x16.gif b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/icons/ArrowUp_16x16.gif
index 07164754e5c..07164754e5c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/icons/ArrowUp_16x16.gif
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/icons/ArrowUp_16x16.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/icons/file.gif b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/icons/file.gif
index ef302880717..ef302880717 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/icons/file.gif
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/icons/file.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/icons/hyperlink.gif b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/icons/hyperlink.gif
index 1e09d979520..1e09d979520 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/icons/hyperlink.gif
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/icons/hyperlink.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/icons/insp_sbook.gif b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/icons/insp_sbook.gif
index e936fbabfec..e936fbabfec 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/icons/insp_sbook.gif
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/icons/insp_sbook.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/plugin.properties b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/plugin.properties
index dfea23767cb..dfea23767cb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/plugin.properties
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/plugin.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/plugin.xml b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/plugin.xml
index 818f9f2270b..8f303867d31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/plugin.xml
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/plugin.xml
@@ -26,11 +26,6 @@
    <extension
          point="org.eclipse.papyrus.infra.hyperlink.registration">
       <hyperlink
-            helper="org.eclipse.papyrus.infra.hyperlink.helper.EditorHyperLinkHelper"
-            position="50"
-            tabId="org.eclipse.papyrus.infra.hyperlink.editor">
-      </hyperlink>
-      <hyperlink
             helper="org.eclipse.papyrus.infra.hyperlink.helper.ObjectHyperLinkHelper"
             position="75"
             tabId="org.eclipse.papyrus.infra.hyperlink.object">
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/pom.xml b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/pom.xml
index b791c01a7be..4c41e49fef6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/pom.xml
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-misc</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.hyperlink</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/schema/hyperlinkContributor.exsd b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/schema/hyperlinkContributor.exsd
index 5b93f0dc93b..5b93f0dc93b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/schema/hyperlinkContributor.exsd
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/schema/hyperlinkContributor.exsd
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/schema/org.eclipse.papyrus.infra.hyperlink.registration.exsd b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/schema/org.eclipse.papyrus.infra.hyperlink.registration.exsd
index 28085599478..28085599478 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/schema/org.eclipse.papyrus.infra.hyperlink.registration.exsd
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/schema/org.eclipse.papyrus.infra.hyperlink.registration.exsd
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/schema/org.eclipse.papyrus.infra.hyperlink.tab.registration.exsd b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/schema/org.eclipse.papyrus.infra.hyperlink.tab.registration.exsd
index da96d1f277d..b3fa5253393 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/schema/org.eclipse.papyrus.infra.hyperlink.tab.registration.exsd
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/schema/org.eclipse.papyrus.infra.hyperlink.tab.registration.exsd
@@ -1,121 +1,121 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.hyperlink" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.hyperlink" id="org.eclipse.papyrus.infra.hyperlink.tab.registration" name="org.eclipse.papyrus.infra.hyperlink.tab.registration"/>

-      </appinfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <choice>

-            <element ref="hyperlinktab"/>

-         </choice>

-         <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="hyperlinktab">

-      <annotation>

-         <documentation>

-            This extension point allows to register your own tab in the hyperlink dialog

-         </documentation>

-      </annotation>

-      <complexType>

-         <attribute name="tabId" type="string" use="required">

-            <annotation>

-               <documentation>

-                  The id of your tab. This id should be unique.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="tab" type="string" use="required">

-            <annotation>

-               <documentation>

-                  The class which implements your tab.

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.infra.hyperlink.ui.AbstractHyperLinkTab:"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-         <attribute name="position" type="string" use="required">

-            <annotation>

-               <documentation>

-                  The position of your tab.The papyrus tabs take each 50* positions (50-100-150,...)

-               </documentation>

-            </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>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.hyperlink" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.hyperlink" id="org.eclipse.papyrus.infra.hyperlink.tab.registration" name="org.eclipse.papyrus.infra.hyperlink.tab.registration"/>
+      </appinfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <choice>
+            <element ref="hyperlinktab"/>
+         </choice>
+         <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="hyperlinktab">
+      <annotation>
+         <documentation>
+            This extension point allows to register your own tab in the hyperlink dialog
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="tabId" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The id of your tab. This id should be unique.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="tab" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The class which implements your tab.
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.infra.hyperlink.ui.AbstractHyperLinkTab:"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+         <attribute name="position" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The position of your tab.The papyrus tabs take each 50* positions (50-100-150,...)
+               </documentation>
+            </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.hyperlink/schema/specificHyperLinks.exsd b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/schema/specificHyperLinks.exsd
index 0f9fdcdcfd2..72decce84ec 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/schema/specificHyperLinks.exsd
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/schema/specificHyperLinks.exsd
@@ -1,102 +1,102 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.hyperlink" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.hyperlink" id="specificHyperLinks" name="specificHyperLinks"/>

-      </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="specificHyperLink"/>

-         </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="specificHyperLink">

-      <complexType>

-         <attribute name="contentProvider" type="string" use="required">

-            <annotation>

-               <documentation>

-                  The contribution to the SpecificObjectHyperLink content provider

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.jface.viewers.ITreeContentProvider"/>

-               </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>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.hyperlink" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.hyperlink" id="specificHyperLinks" name="specificHyperLinks"/>
+      </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="specificHyperLink"/>
+         </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="specificHyperLink">
+      <complexType>
+         <attribute name="contentProvider" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The contribution to the SpecificObjectHyperLink content provider
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.jface.viewers.ITreeContentProvider"/>
+               </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.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/Activator.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/Activator.java
index b0cf956f27f..54416b37cea 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/Activator.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/Activator.java
@@ -1,88 +1,88 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink;

-

-import org.eclipse.jface.resource.ImageRegistry;

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.swt.graphics.Image;

-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.hyperlink"; //$NON-NLS-1$

-

-	public static final String IMG_LOUPE = "loupe"; //$NON-NLS-1$

-

-	public static final String IMG_ARROW_UP = "arrowUp"; //$NON-NLS-1$

-

-	public static final String IMG_ARROW_DOWN = "arrowDown"; //$NON-NLS-1$

-

-	public static final String IMG_ARROW_LEFT = "arrowLeft"; //$NON-NLS-1$

-

-	public static final String IMG_ARROW_RIGHT = "arrowRight"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/** Logging helper */

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	@Override

-	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

-	protected void initializeImageRegistry(ImageRegistry reg) {

-		super.initializeImageRegistry(reg);

-

-		reg.put(IMG_LOUPE, imageDescriptorFromPlugin(PLUGIN_ID, "icons/insp_sbook.gif")); //$NON-NLS-1$

-		reg.put(IMG_ARROW_UP, imageDescriptorFromPlugin(PLUGIN_ID, "icons/ArrowUp_16x16.gif")); //$NON-NLS-1$

-		reg.put(IMG_ARROW_DOWN, imageDescriptorFromPlugin(PLUGIN_ID, "icons/ArrowDown_16x16.gif")); //$NON-NLS-1$

-		reg.put(IMG_ARROW_LEFT, imageDescriptorFromPlugin(PLUGIN_ID, "icons/ArrowLeft_16x16.gif")); //$NON-NLS-1$

-		reg.put(IMG_ARROW_RIGHT, imageDescriptorFromPlugin(PLUGIN_ID, "icons/ArrowRight_16x16.gif")); //$NON-NLS-1$

-	}

-

-	public Image getIcon(String key) {

-		return getImageRegistry().get(key);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink;
+
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.swt.graphics.Image;
+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.hyperlink"; //$NON-NLS-1$
+
+	public static final String IMG_LOUPE = "loupe"; //$NON-NLS-1$
+
+	public static final String IMG_ARROW_UP = "arrowUp"; //$NON-NLS-1$
+
+	public static final String IMG_ARROW_DOWN = "arrowDown"; //$NON-NLS-1$
+
+	public static final String IMG_ARROW_LEFT = "arrowLeft"; //$NON-NLS-1$
+
+	public static final String IMG_ARROW_RIGHT = "arrowRight"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/** Logging helper */
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	@Override
+	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
+	protected void initializeImageRegistry(ImageRegistry reg) {
+		super.initializeImageRegistry(reg);
+
+		reg.put(IMG_LOUPE, imageDescriptorFromPlugin(PLUGIN_ID, "icons/insp_sbook.gif")); //$NON-NLS-1$
+		reg.put(IMG_ARROW_UP, imageDescriptorFromPlugin(PLUGIN_ID, "icons/ArrowUp_16x16.gif")); //$NON-NLS-1$
+		reg.put(IMG_ARROW_DOWN, imageDescriptorFromPlugin(PLUGIN_ID, "icons/ArrowDown_16x16.gif")); //$NON-NLS-1$
+		reg.put(IMG_ARROW_LEFT, imageDescriptorFromPlugin(PLUGIN_ID, "icons/ArrowLeft_16x16.gif")); //$NON-NLS-1$
+		reg.put(IMG_ARROW_RIGHT, imageDescriptorFromPlugin(PLUGIN_ID, "icons/ArrowRight_16x16.gif")); //$NON-NLS-1$
+	}
+
+	public Image getIcon(String key) {
+		return getImageRegistry().get(key);
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/AbstractDeleteHyperLinkCommand.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/AbstractDeleteHyperLinkCommand.java
index 9046be3f3c1..a4e57381773 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/AbstractDeleteHyperLinkCommand.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/AbstractDeleteHyperLinkCommand.java
@@ -1,83 +1,83 @@
-/*****************************************************************************

- * 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.commands;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-

-/**

- *

- * An abstract class to remove eannotation

- *

- */

-public abstract class AbstractDeleteHyperLinkCommand extends RecordingCommand {

-

-	/**

-	 * the edited object

-	 */

-	private final EModelElement object;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param domain

-	 *            the editing domain for this command

-	 * @param object

-	 *            the edited EModelElement

-	 */

-	public AbstractDeleteHyperLinkCommand(final TransactionalEditingDomain domain, final EModelElement object) {

-		super(domain);

-		this.object = object;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()

-	 *

-	 */

-	@Override

-	protected void doExecute() {

-		// remove annotations

-		for (EAnnotation current : getEAnnotationsToRemove()) {

-			this.object.getEAnnotations().remove(current);

-		}

-

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the list of the EAnnotation to remove

-	 */

-	protected List<EAnnotation> getEAnnotationsToRemove() {

-		List<EAnnotation> toRemove = new ArrayList<EAnnotation>();

-		return toRemove;

-	}

-

-	/**

-	 * Getter for {@link this#object}

-	 *

-	 * @return

-	 */

-	protected EModelElement getObject() {

-		return this.object;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+
+/**
+ *
+ * An abstract class to remove eannotation
+ *
+ */
+public abstract class AbstractDeleteHyperLinkCommand extends RecordingCommand {
+
+	/**
+	 * the edited object
+	 */
+	private final EModelElement object;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param domain
+	 *            the editing domain for this command
+	 * @param object
+	 *            the edited EModelElement
+	 */
+	public AbstractDeleteHyperLinkCommand(final TransactionalEditingDomain domain, final EModelElement object) {
+		super(domain);
+		this.object = object;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()
+	 *
+	 */
+	@Override
+	protected void doExecute() {
+		// remove annotations
+		for (EAnnotation current : getEAnnotationsToRemove()) {
+			this.object.getEAnnotations().remove(current);
+		}
+
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the list of the EAnnotation to remove
+	 */
+	protected List<EAnnotation> getEAnnotationsToRemove() {
+		List<EAnnotation> toRemove = new ArrayList<EAnnotation>();
+		return toRemove;
+	}
+
+	/**
+	 * Getter for {@link this#object}
+	 *
+	 * @return
+	 */
+	protected EModelElement getObject() {
+		return this.object;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/CreateHyperLinkDocumentCommand.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/CreateHyperLinkDocumentCommand.java
index 01171fb5c05..ef7e4e68a99 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/CreateHyperLinkDocumentCommand.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/CreateHyperLinkDocumentCommand.java
@@ -1,72 +1,72 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.commands;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.emf.commands.CreateEAnnotationCommand;

-import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;

-

-

-/**

- * The Class CreateHyperLinkCommand. this has in charge to add a new entry list

- * of hyperlinks

- *

- */

-public class CreateHyperLinkDocumentCommand extends CreateEAnnotationCommand {

-

-	/** The hyperlink kind. */

-	public String tooltiptext;

-

-	/** The localization. */

-	public String localization;

-

-	/** to set if is a default hyperlink */

-	public boolean isDefault;

-

-	/**

-	 * Instantiates a new creates the hyper link command.

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param object

-	 *            the object for example the view

-	 * @param tooltiptext

-	 *            the hyperlink kind see {@link VisualInformationPapyrusConstant}

-	 * @param localization

-	 *            the localization

-	 * @param isDefault

-	 *            to set this hyperlink as default

-	 */

-	public CreateHyperLinkDocumentCommand(TransactionalEditingDomain domain, EModelElement object, String tooltiptext, String localization, boolean isDefault) {

-		super(domain, object, HyperLinkConstants.HYPERLINK_DOCUMENT);

-		this.tooltiptext = tooltiptext;

-		this.localization = localization;

-		this.isDefault = isDefault;

-	}

-

-	/**

-	 * {@inheritedDoc}

-	 */

-	@Override

-	protected void doExecute() {

-		EAnnotation eAnnotation = createEAnnotation();

-		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_TOOLTYPE_TEXT, this.tooltiptext);

-		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_DOCUMENT_LOCALIZATION, this.localization);

-		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_IS_DEFAULT_NAVIGATION, "" + this.isDefault); //$NON-NLS-1$

-		attachEannotation(eAnnotation, getObject());

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.commands;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.emf.commands.CreateEAnnotationCommand;
+import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;
+
+
+/**
+ * The Class CreateHyperLinkCommand. this has in charge to add a new entry list
+ * of hyperlinks
+ *
+ */
+public class CreateHyperLinkDocumentCommand extends CreateEAnnotationCommand {
+
+	/** The hyperlink kind. */
+	public String tooltiptext;
+
+	/** The localization. */
+	public String localization;
+
+	/** to set if is a default hyperlink */
+	public boolean isDefault;
+
+	/**
+	 * Instantiates a new creates the hyper link command.
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param object
+	 *            the object for example the view
+	 * @param tooltiptext
+	 *            the hyperlink kind see {@link VisualInformationPapyrusConstant}
+	 * @param localization
+	 *            the localization
+	 * @param isDefault
+	 *            to set this hyperlink as default
+	 */
+	public CreateHyperLinkDocumentCommand(TransactionalEditingDomain domain, EModelElement object, String tooltiptext, String localization, boolean isDefault) {
+		super(domain, object, HyperLinkConstants.HYPERLINK_DOCUMENT);
+		this.tooltiptext = tooltiptext;
+		this.localization = localization;
+		this.isDefault = isDefault;
+	}
+
+	/**
+	 * {@inheritedDoc}
+	 */
+	@Override
+	protected void doExecute() {
+		EAnnotation eAnnotation = createEAnnotation();
+		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_TOOLTYPE_TEXT, this.tooltiptext);
+		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_DOCUMENT_LOCALIZATION, this.localization);
+		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_IS_DEFAULT_NAVIGATION, "" + this.isDefault); //$NON-NLS-1$
+		attachEannotation(eAnnotation, getObject());
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/CreateHyperLinkObjectCommand.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/CreateHyperLinkObjectCommand.java
index aef72cd3c8e..e415a907817 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/CreateHyperLinkObjectCommand.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/CreateHyperLinkObjectCommand.java
@@ -1,56 +1,56 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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 (camille.letavernier@cea.fr) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.commands;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.emf.commands.CreateEAnnotationCommand;

-import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;

-

-

-public class CreateHyperLinkObjectCommand extends CreateEAnnotationCommand {

-

-	public String tooltiptext;

-

-	public String name;

-

-	private EObject targetElement;

-

-	protected boolean isDefaultNavigation;

-

-

-	public CreateHyperLinkObjectCommand(TransactionalEditingDomain domain, EModelElement object, String tooltiptext, String name, EObject targetElement, boolean isDefaultNavigation) {

-		super(domain, object, HyperLinkConstants.PAPYRUS_HYPERLINK_SPECIFIC_ELEMENT);

-		this.tooltiptext = tooltiptext;

-		this.name = name;

-		this.targetElement = targetElement;

-		this.isDefaultNavigation = isDefaultNavigation;

-	}

-

-	/**

-	 * {@inheritedDoc}

-	 */

-	@Override

-	protected void doExecute() {

-		EAnnotation eAnnotation = createEAnnotation();

-		eAnnotation.getReferences().add(targetElement);

-		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_TOOLTYPE_TEXT, this.tooltiptext);

-		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_PAGE_NAME, this.name);

-		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_IS_DEFAULT_NAVIGATION, Boolean.toString(this.isDefaultNavigation));

-		attachEannotation(eAnnotation, getObject());

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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 (camille.letavernier@cea.fr) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.commands;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.emf.commands.CreateEAnnotationCommand;
+import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;
+
+
+public class CreateHyperLinkObjectCommand extends CreateEAnnotationCommand {
+
+	public String tooltiptext;
+
+	public String name;
+
+	private EObject targetElement;
+
+	protected boolean isDefaultNavigation;
+
+
+	public CreateHyperLinkObjectCommand(TransactionalEditingDomain domain, EModelElement object, String tooltiptext, String name, EObject targetElement, boolean isDefaultNavigation) {
+		super(domain, object, HyperLinkConstants.PAPYRUS_HYPERLINK_SPECIFIC_ELEMENT);
+		this.tooltiptext = tooltiptext;
+		this.name = name;
+		this.targetElement = targetElement;
+		this.isDefaultNavigation = isDefaultNavigation;
+	}
+
+	/**
+	 * {@inheritedDoc}
+	 */
+	@Override
+	protected void doExecute() {
+		EAnnotation eAnnotation = createEAnnotation();
+		eAnnotation.getReferences().add(targetElement);
+		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_TOOLTYPE_TEXT, this.tooltiptext);
+		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_PAGE_NAME, this.name);
+		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_IS_DEFAULT_NAVIGATION, Boolean.toString(this.isDefaultNavigation));
+		attachEannotation(eAnnotation, getObject());
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/CreateHyperLinkPageCommand.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/CreateHyperLinkPageCommand.java
index a912979503f..5162cb714c8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/CreateHyperLinkPageCommand.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/CreateHyperLinkPageCommand.java
@@ -1,78 +1,78 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.commands;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.emf.commands.CreateEAnnotationCommand;

-import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;

-

-/**

- * The Class CreateHyperLinkCommand. this has in charge to add a new entry list

- * of hyperlinks

- *

- */

-public class CreateHyperLinkPageCommand extends CreateEAnnotationCommand {

-

-	/** The hyperlink kind. */

-	public String tooltiptext;

-

-	/** The localization. */

-	public String name;

-

-	/**

-	 * The pageIdentifier to open

-	 */

-	private EObject pageIdentifier;

-

-	protected boolean isDefaultNavigation;

-

-	/**

-	 * Instantiates a new creates the hyper link command.

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param object

-	 *            the object for example the view

-	 * @param tooltiptext

-	 *            the hyperlink kind see {@link UMLVisualInformationPapyrusConstant}

-	 * @param name

-	 *            the localization

-	 * @param pageIdentifier

-	 * @param isDefaultNavigation

-	 */

-	public CreateHyperLinkPageCommand(TransactionalEditingDomain domain, EModelElement object, String tooltiptext, String name, EObject pageIdentifier, boolean isDefaultNavigation) {

-		super(domain, object, HyperLinkConstants.PAPYRUS_HYPERLINK_PAGE);

-		this.tooltiptext = tooltiptext;

-		this.name = name;

-		this.pageIdentifier = pageIdentifier;

-		this.isDefaultNavigation = isDefaultNavigation;

-	}

-

-	/**

-	 * {@inheritedDoc}

-	 */

-	@Override

-	protected void doExecute() {

-		EAnnotation eAnnotation = createEAnnotation();

-		eAnnotation.getReferences().add(pageIdentifier);

-		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_TOOLTYPE_TEXT, this.tooltiptext);

-		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_PAGE_NAME, this.name);

-		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_IS_DEFAULT_NAVIGATION, Boolean.toString(this.isDefaultNavigation));

-		attachEannotation(eAnnotation, getObject());

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.commands;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.emf.commands.CreateEAnnotationCommand;
+import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;
+
+/**
+ * The Class CreateHyperLinkCommand. this has in charge to add a new entry list
+ * of hyperlinks
+ *
+ */
+public class CreateHyperLinkPageCommand extends CreateEAnnotationCommand {
+
+	/** The hyperlink kind. */
+	public String tooltiptext;
+
+	/** The localization. */
+	public String name;
+
+	/**
+	 * The pageIdentifier to open
+	 */
+	private EObject pageIdentifier;
+
+	protected boolean isDefaultNavigation;
+
+	/**
+	 * Instantiates a new creates the hyper link command.
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param object
+	 *            the object for example the view
+	 * @param tooltiptext
+	 *            the hyperlink kind see {@link UMLVisualInformationPapyrusConstant}
+	 * @param name
+	 *            the localization
+	 * @param pageIdentifier
+	 * @param isDefaultNavigation
+	 */
+	public CreateHyperLinkPageCommand(TransactionalEditingDomain domain, EModelElement object, String tooltiptext, String name, EObject pageIdentifier, boolean isDefaultNavigation) {
+		super(domain, object, HyperLinkConstants.PAPYRUS_HYPERLINK_PAGE);
+		this.tooltiptext = tooltiptext;
+		this.name = name;
+		this.pageIdentifier = pageIdentifier;
+		this.isDefaultNavigation = isDefaultNavigation;
+	}
+
+	/**
+	 * {@inheritedDoc}
+	 */
+	@Override
+	protected void doExecute() {
+		EAnnotation eAnnotation = createEAnnotation();
+		eAnnotation.getReferences().add(pageIdentifier);
+		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_TOOLTYPE_TEXT, this.tooltiptext);
+		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_PAGE_NAME, this.name);
+		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_IS_DEFAULT_NAVIGATION, Boolean.toString(this.isDefaultNavigation));
+		attachEannotation(eAnnotation, getObject());
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/CreateHyperLinkWebCommand.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/CreateHyperLinkWebCommand.java
index 75523d1cc4c..27594eec363 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/CreateHyperLinkWebCommand.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/CreateHyperLinkWebCommand.java
@@ -1,72 +1,72 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.commands;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.emf.commands.CreateEAnnotationCommand;

-import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;

-

-

-/**

- * The Class CreateHyperLinkCommand. this has in charge to add a new entry list

- * of hyperlinks

- *

- */

-public class CreateHyperLinkWebCommand extends CreateEAnnotationCommand {

-

-	/** The hyperlink kind. */

-	public String tooltiptext;

-

-	/** The localization. */

-	public String link;

-

-	/** to set if is a default hyperlink */

-	public boolean isDefault;

-

-	/**

-	 * Instantiates a new creates the hyper link command.

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param object

-	 *            the object for example the view

-	 * @param tooltiptext

-	 *            the hyperlink kind see {@link VisualInformationPapyrusConstant}

-	 * @param link

-	 *            the localization

-	 * @param isDefault

-	 *            to set this hyperlink as default

-	 */

-	public CreateHyperLinkWebCommand(TransactionalEditingDomain domain, EModelElement object, String tooltiptext, String link, boolean isDefault) {

-		super(domain, object, HyperLinkConstants.HYPERLINK_WEB);

-		this.tooltiptext = tooltiptext;

-		this.link = link;

-		this.isDefault = isDefault;

-	}

-

-	/**

-	 * {@inheritedDoc}

-	 */

-	@Override

-	protected void doExecute() {

-		EAnnotation eAnnotation = createEAnnotation();

-		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_TOOLTYPE_TEXT, this.tooltiptext);

-		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_WEB_LINK, this.link);

-		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_IS_DEFAULT_NAVIGATION, "" + this.isDefault); //$NON-NLS-1$

-		attachEannotation(eAnnotation, getObject());

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.commands;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.emf.commands.CreateEAnnotationCommand;
+import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;
+
+
+/**
+ * The Class CreateHyperLinkCommand. this has in charge to add a new entry list
+ * of hyperlinks
+ *
+ */
+public class CreateHyperLinkWebCommand extends CreateEAnnotationCommand {
+
+	/** The hyperlink kind. */
+	public String tooltiptext;
+
+	/** The localization. */
+	public String link;
+
+	/** to set if is a default hyperlink */
+	public boolean isDefault;
+
+	/**
+	 * Instantiates a new creates the hyper link command.
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param object
+	 *            the object for example the view
+	 * @param tooltiptext
+	 *            the hyperlink kind see {@link VisualInformationPapyrusConstant}
+	 * @param link
+	 *            the localization
+	 * @param isDefault
+	 *            to set this hyperlink as default
+	 */
+	public CreateHyperLinkWebCommand(TransactionalEditingDomain domain, EModelElement object, String tooltiptext, String link, boolean isDefault) {
+		super(domain, object, HyperLinkConstants.HYPERLINK_WEB);
+		this.tooltiptext = tooltiptext;
+		this.link = link;
+		this.isDefault = isDefault;
+	}
+
+	/**
+	 * {@inheritedDoc}
+	 */
+	@Override
+	protected void doExecute() {
+		EAnnotation eAnnotation = createEAnnotation();
+		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_TOOLTYPE_TEXT, this.tooltiptext);
+		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_WEB_LINK, this.link);
+		eAnnotation.getDetails().put(HyperLinkConstants.HYPERLINK_IS_DEFAULT_NAVIGATION, "" + this.isDefault); //$NON-NLS-1$
+		attachEannotation(eAnnotation, getObject());
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/DeleteHyperLinkDocumentCommand.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/DeleteHyperLinkDocumentCommand.java
index 51fb1616722..16056236983 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/DeleteHyperLinkDocumentCommand.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/DeleteHyperLinkDocumentCommand.java
@@ -1,73 +1,73 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.commands;

-

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;

-

-

-/**

- * The Class DeleteHyperLinkCommand. it can be used also to remove an hyperlink

- * web. It will remove the first eannotation that corresponds to the link or the

- * localization of the hyperlink

- */

-

-public class DeleteHyperLinkDocumentCommand extends AbstractDeleteHyperLinkCommand {

-

-	/** The localization. */

-	public String link;

-

-	/**

-	 * Instantiates a new delete hyper link command used to suppress a link in

-	 * the view

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param object

-	 *            the object

-	 * @param link

-	 *            the localization of the link

-	 */

-	public DeleteHyperLinkDocumentCommand(TransactionalEditingDomain domain, EModelElement object, String link) {

-		super(domain, object);// TODO an error?

-		this.link = link;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.hyperlink.commands.AbstractDeleteHyperLinkCommand#getEAnnotationsToRemove()

-	 *

-	 * @return

-	 */

-	@Override

-	protected List<EAnnotation> getEAnnotationsToRemove() {

-		List<EAnnotation> toRemove = super.getEAnnotationsToRemove();

-		Iterator<EAnnotation> iter = getObject().getEAnnotations().iterator();

-		// look for interesting eannotations

-		while (iter.hasNext()) {

-			EAnnotation currentAnnotation = iter.next();

-			if (currentAnnotation.getSource().equals(HyperLinkConstants.HYPERLINK_DOCUMENT) || currentAnnotation.getSource().equals(HyperLinkConstants.HYPERLINK_WEB)) {

-				if (currentAnnotation.getDetails().containsValue(link)) {

-					toRemove.add(currentAnnotation);

-				}

-			}

-		}

-		return toRemove;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.commands;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;
+
+
+/**
+ * The Class DeleteHyperLinkCommand. it can be used also to remove an hyperlink
+ * web. It will remove the first eannotation that corresponds to the link or the
+ * localization of the hyperlink
+ */
+
+public class DeleteHyperLinkDocumentCommand extends AbstractDeleteHyperLinkCommand {
+
+	/** The localization. */
+	public String link;
+
+	/**
+	 * Instantiates a new delete hyper link command used to suppress a link in
+	 * the view
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param object
+	 *            the object
+	 * @param link
+	 *            the localization of the link
+	 */
+	public DeleteHyperLinkDocumentCommand(TransactionalEditingDomain domain, EModelElement object, String link) {
+		super(domain, object);// TODO an error?
+		this.link = link;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.hyperlink.commands.AbstractDeleteHyperLinkCommand#getEAnnotationsToRemove()
+	 *
+	 * @return
+	 */
+	@Override
+	protected List<EAnnotation> getEAnnotationsToRemove() {
+		List<EAnnotation> toRemove = super.getEAnnotationsToRemove();
+		Iterator<EAnnotation> iter = getObject().getEAnnotations().iterator();
+		// look for interesting eannotations
+		while (iter.hasNext()) {
+			EAnnotation currentAnnotation = iter.next();
+			if (currentAnnotation.getSource().equals(HyperLinkConstants.HYPERLINK_DOCUMENT) || currentAnnotation.getSource().equals(HyperLinkConstants.HYPERLINK_WEB)) {
+				if (currentAnnotation.getDetails().containsValue(link)) {
+					toRemove.add(currentAnnotation);
+				}
+			}
+		}
+		return toRemove;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/DeleteHyperLinkPageCommand.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/DeleteHyperLinkPageCommand.java
index 315363276cb..c8bdc8fb942 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/DeleteHyperLinkPageCommand.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/DeleteHyperLinkPageCommand.java
@@ -1,75 +1,75 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Refactoring & simplification

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.commands;

-

-import java.util.Iterator;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;

-

-

-/**

- * The Class DeleteHyperLinkCommand. it can be used also to remove an hyperlink

- * web. It will remove the first eannotation that corresponds to the link or the

- * localization of the hyperlink

- */

-public class DeleteHyperLinkPageCommand extends RecordingCommand {

-

-	/** The hyperlink target. */

-	protected EObject page;

-

-	protected EModelElement sourceElement;

-

-	/**

-	 * Instantiates a new delete hyper link command used to suppress a link in

-	 * the view

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param object

-	 *            the object

-	 * @param page

-	 *            the target of the link

-	 */

-	public DeleteHyperLinkPageCommand(TransactionalEditingDomain domain, EModelElement object, EObject page) {

-		super(domain);

-		this.page = page;

-		this.sourceElement = object;

-	}

-

-	/**

-	 * {@inheritedDoc}

-	 */

-	@Override

-	protected void doExecute() {

-		Iterator<EAnnotation> iter = sourceElement.getEAnnotations().iterator();

-

-		// Remove interesting eannotations

-		while (iter.hasNext()) {

-			EAnnotation currentAnnotation = iter.next();

-			for (String annotationName : HyperLinkConstants.validHyperLinkPageSources) {

-				if (annotationName.equals(currentAnnotation.getSource())) {

-					if (currentAnnotation.getReferences().contains(page)) {

-						iter.remove();

-					}

-				}

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Refactoring & simplification
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.commands;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;
+
+
+/**
+ * The Class DeleteHyperLinkCommand. it can be used also to remove an hyperlink
+ * web. It will remove the first eannotation that corresponds to the link or the
+ * localization of the hyperlink
+ */
+public class DeleteHyperLinkPageCommand extends RecordingCommand {
+
+	/** The hyperlink target. */
+	protected EObject page;
+
+	protected EModelElement sourceElement;
+
+	/**
+	 * Instantiates a new delete hyper link command used to suppress a link in
+	 * the view
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param object
+	 *            the object
+	 * @param page
+	 *            the target of the link
+	 */
+	public DeleteHyperLinkPageCommand(TransactionalEditingDomain domain, EModelElement object, EObject page) {
+		super(domain);
+		this.page = page;
+		this.sourceElement = object;
+	}
+
+	/**
+	 * {@inheritedDoc}
+	 */
+	@Override
+	protected void doExecute() {
+		Iterator<EAnnotation> iter = sourceElement.getEAnnotations().iterator();
+
+		// Remove interesting eannotations
+		while (iter.hasNext()) {
+			EAnnotation currentAnnotation = iter.next();
+			for (String annotationName : HyperLinkConstants.validHyperLinkPageSources) {
+				if (annotationName.equals(currentAnnotation.getSource())) {
+					if (currentAnnotation.getReferences().contains(page)) {
+						iter.remove();
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/EmptyAllHyperLinkCommand.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/EmptyAllHyperLinkCommand.java
index 82cafe69599..2540f1e4f1d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/EmptyAllHyperLinkCommand.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/commands/EmptyAllHyperLinkCommand.java
@@ -1,68 +1,68 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.commands;

-

-

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;

-

-/**

- * The Class DeleteHyperLinkCommand. it can be used also to remove an hyperlink

- * web. It will remove the first eannotation that corresponds to the link or the

- * localization of the hyperlink

- */

-public class EmptyAllHyperLinkCommand extends AbstractDeleteHyperLinkCommand {

-

-	/**

-	 * Instantiates a new delete hyper link command used to suppress a link in

-	 * the view

-	 *

-	 * @param domain

-	 *            the domain

-	 * @param object

-	 *            the object

-	 * @param link

-	 *            the localization of the link

-	 */

-	public EmptyAllHyperLinkCommand(TransactionalEditingDomain domain, EModelElement object) {

-		super(domain, object);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.hyperlink.commands.AbstractDeleteHyperLinkCommand#getEAnnotationsToRemove()

-	 *

-	 * @return

-	 */

-	@Override

-	protected List<EAnnotation> getEAnnotationsToRemove() {

-		List<EAnnotation> toRemove = super.getEAnnotationsToRemove();

-		Iterator<EAnnotation> iter = getObject().getEAnnotations().iterator();

-		// look for interesting eannotations

-		while (iter.hasNext()) {

-			EAnnotation currentAnnotation = iter.next();

-			String source = currentAnnotation.getSource();

-			if (source.startsWith(HyperLinkConstants.PAPYRUS_HYPERLINK_PREFIX)) {

-				toRemove.add(currentAnnotation);

-			}

-		}

-		return toRemove;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.commands;
+
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;
+
+/**
+ * The Class DeleteHyperLinkCommand. it can be used also to remove an hyperlink
+ * web. It will remove the first eannotation that corresponds to the link or the
+ * localization of the hyperlink
+ */
+public class EmptyAllHyperLinkCommand extends AbstractDeleteHyperLinkCommand {
+
+	/**
+	 * Instantiates a new delete hyper link command used to suppress a link in
+	 * the view
+	 *
+	 * @param domain
+	 *            the domain
+	 * @param object
+	 *            the object
+	 * @param link
+	 *            the localization of the link
+	 */
+	public EmptyAllHyperLinkCommand(TransactionalEditingDomain domain, EModelElement object) {
+		super(domain, object);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.hyperlink.commands.AbstractDeleteHyperLinkCommand#getEAnnotationsToRemove()
+	 *
+	 * @return
+	 */
+	@Override
+	protected List<EAnnotation> getEAnnotationsToRemove() {
+		List<EAnnotation> toRemove = super.getEAnnotationsToRemove();
+		Iterator<EAnnotation> iter = getObject().getEAnnotations().iterator();
+		// look for interesting eannotations
+		while (iter.hasNext()) {
+			EAnnotation currentAnnotation = iter.next();
+			String source = currentAnnotation.getSource();
+			if (source.startsWith(HyperLinkConstants.PAPYRUS_HYPERLINK_PREFIX)) {
+				toRemove.add(currentAnnotation);
+			}
+		}
+		return toRemove;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/AbstractHyperLinkHelper.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/AbstractHyperLinkHelper.java
index 3661a5e0a75..00ed44b4892 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/AbstractHyperLinkHelper.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/AbstractHyperLinkHelper.java
@@ -1,121 +1,121 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.hyperlink.helper;

-

-import java.util.List;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;

-

-/**

- * this class is an abstract helper used to serialize and deserialize a HyperLink Object

- *

- */

-public abstract class AbstractHyperLinkHelper {

-

-	/**

-	 * the id of the tab

-	 */

-	private String tabid;

-

-	/**

-	 * Getter for this{@link #tabid}

-	 *

-	 * @return

-	 *         this{@link #tabid}

-	 */

-	public final String getTabId() {

-		return this.tabid;

-	}

-

-	/**

-	 * Setter for this{@link #tabid}

-	 *

-	 * @param tabId

-	 *            the id of the tab

-	 */

-	public final void setTabId(final String tabId) {

-		this.tabid = tabId;

-	}

-

-	/**

-	 *

-	 * @return as string of the kind of hyperlink to display

-	 */

-	public abstract String getNameofManagedHyperLink();

-

-	/**

-	 * this method is called in order to create an HyperLinkObject and add into

-	 * a given HyperLinkObject list

-	 *

-	 * @param list

-	 *            a list of hyperlink Object

-	 * @param aModel

-	 *            TODO

-	 */

-	// TODO remove this method

-	public abstract void executeNewMousePressed(List<HyperLinkObject> list, EObject aModel);

-

-

-	/**

-	 * this method is called in order to edit an HyperLinkObject and add into a

-	 * given HyperLinkObject list

-	 *

-	 * @param list

-	 *            a list of hyperlink Object

-	 * @param amodel

-	 *            the root model

-	 * @param HyperLinkObject

-	 *            the HyperLinkObject to edit

-	 */

-	public void executeEditMousePressed(List<HyperLinkObject> list, HyperLinkObject HyperLinkObject, EObject amodel) {

-		HyperLinkObject.executeEditMousePressed(list, amodel);

-	}

-

-	/**

-	 * from a list of hyperlinks, it return a list of hyperlink with the same

-	 * kind. for example return a list of diagramhyperlink

-	 *

-	 * @param HyperLinkObjects

-	 *            the list of HyperLinkObjects

-	 * @return a list of hyperlink object with the same kind

-	 */

-	public abstract List<HyperLinkObject> getFilteredObject(List<HyperLinkObject> HyperLinkObjects);

-

-	/**

-	 *

-	 * @param eAnnotation

-	 *            that represents a hyperlink object

-	 * @return the hyperlink object from the eannotation

-	 */

-	public abstract HyperLinkObject getHyperLinkObject(EAnnotation eAnnotation);

-

-	/**

-	 * get a command to serailize a hyperlink object

-	 *

-	 * @param domain

-	 *            the editing domain

-	 * @param object

-	 *            the EModelElement to which the hyperlink as attached

-	 * @param HyperLinkObject

-	 *            the HyperLinkObject to serailize

-	 * @return the command in charge of the serialization

-	 */

-	public abstract RecordingCommand getAddHyperLinkCommand(TransactionalEditingDomain domain, EModelElement object, HyperLinkObject HyperLinkObject);

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.hyperlink.helper;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;
+
+/**
+ * this class is an abstract helper used to serialize and deserialize a HyperLink Object
+ *
+ */
+public abstract class AbstractHyperLinkHelper {
+
+	/**
+	 * the id of the tab
+	 */
+	private String tabid;
+
+	/**
+	 * Getter for this{@link #tabid}
+	 *
+	 * @return
+	 *         this{@link #tabid}
+	 */
+	public final String getTabId() {
+		return this.tabid;
+	}
+
+	/**
+	 * Setter for this{@link #tabid}
+	 *
+	 * @param tabId
+	 *            the id of the tab
+	 */
+	public final void setTabId(final String tabId) {
+		this.tabid = tabId;
+	}
+
+	/**
+	 *
+	 * @return as string of the kind of hyperlink to display
+	 */
+	public abstract String getNameofManagedHyperLink();
+
+	/**
+	 * this method is called in order to create an HyperLinkObject and add into
+	 * a given HyperLinkObject list
+	 *
+	 * @param list
+	 *            a list of hyperlink Object
+	 * @param aModel
+	 *            TODO
+	 */
+	// TODO remove this method
+	public abstract void executeNewMousePressed(List<HyperLinkObject> list, EObject aModel);
+
+
+	/**
+	 * this method is called in order to edit an HyperLinkObject and add into a
+	 * given HyperLinkObject list
+	 *
+	 * @param list
+	 *            a list of hyperlink Object
+	 * @param amodel
+	 *            the root model
+	 * @param HyperLinkObject
+	 *            the HyperLinkObject to edit
+	 */
+	public void executeEditMousePressed(List<HyperLinkObject> list, HyperLinkObject HyperLinkObject, EObject amodel) {
+		HyperLinkObject.executeEditMousePressed(list, amodel);
+	}
+
+	/**
+	 * from a list of hyperlinks, it return a list of hyperlink with the same
+	 * kind. for example return a list of diagramhyperlink
+	 *
+	 * @param HyperLinkObjects
+	 *            the list of HyperLinkObjects
+	 * @return a list of hyperlink object with the same kind
+	 */
+	public abstract List<HyperLinkObject> getFilteredObject(List<HyperLinkObject> HyperLinkObjects);
+
+	/**
+	 *
+	 * @param eAnnotation
+	 *            that represents a hyperlink object
+	 * @return the hyperlink object from the eannotation
+	 */
+	public abstract HyperLinkObject getHyperLinkObject(EAnnotation eAnnotation);
+
+	/**
+	 * get a command to serailize a hyperlink object
+	 *
+	 * @param domain
+	 *            the editing domain
+	 * @param object
+	 *            the EModelElement to which the hyperlink as attached
+	 * @param HyperLinkObject
+	 *            the HyperLinkObject to serailize
+	 * @return the command in charge of the serialization
+	 */
+	public abstract RecordingCommand getAddHyperLinkCommand(TransactionalEditingDomain domain, EModelElement object, HyperLinkObject HyperLinkObject);
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/CompositeHyperlinkHelper.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/CompositeHyperlinkHelper.java
index 75cc7b17f75..75cc7b17f75 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/CompositeHyperlinkHelper.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/CompositeHyperlinkHelper.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/DocumentHyperLinkHelper.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/DocumentHyperLinkHelper.java
index 005d0de3673..e32d3924752 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/DocumentHyperLinkHelper.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/DocumentHyperLinkHelper.java
@@ -1,98 +1,98 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.hyperlink.helper;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.hyperlink.commands.CreateHyperLinkDocumentCommand;

-import org.eclipse.papyrus.infra.hyperlink.messages.Messages;

-import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkDocument;

-import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;

-import org.eclipse.papyrus.infra.hyperlink.ui.EditorHyperlinkDocumentShell;

-import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;

-

-

-

-/**

- * this an helper to manage hyperlink document

- *

- */

-public class DocumentHyperLinkHelper extends AbstractHyperLinkHelper {

-

-

-	@Override

-	public HyperLinkObject getHyperLinkObject(EAnnotation eAnnotation) {

-		if (eAnnotation.getSource().equals(HyperLinkConstants.HYPERLINK_DOCUMENT)) {

-			HyperLinkDocument hyperLinkDocument = new HyperLinkDocument();

-			hyperLinkDocument.setHyperlinkDocument(eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_DOCUMENT_LOCALIZATION));

-			hyperLinkDocument.setTooltipText(eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_TOOLTYPE_TEXT));

-			if (eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_IS_DEFAULT_NAVIGATION) != null) {

-				boolean isDefaultNaviagation = Boolean.parseBoolean(eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_IS_DEFAULT_NAVIGATION));

-				hyperLinkDocument.setIsDefault(isDefaultNaviagation);

-			} else {

-				hyperLinkDocument.setIsDefault(false);

-			}

-

-			return hyperLinkDocument;

-		}

-

-		return null;

-	}

-

-	@Override

-	public RecordingCommand getAddHyperLinkCommand(TransactionalEditingDomain domain, EModelElement object, HyperLinkObject hyperlinkObject) {

-		if (hyperlinkObject instanceof HyperLinkDocument) {

-			HyperLinkDocument hyperLinkDocument = (HyperLinkDocument) hyperlinkObject;

-			return new CreateHyperLinkDocumentCommand(domain, object, hyperLinkDocument.getTooltipText(), hyperLinkDocument.getHyperlinkDocument(), hyperlinkObject.getIsDefault());

-		} else {

-			return null;

-		}

-	}

-

-	@Override

-	public String getNameofManagedHyperLink() {

-		return Messages.DocumentHyperLinkHelper_Document;

-	}

-

-	@Override

-	public void executeNewMousePressed(List<HyperLinkObject> list, EObject aModel) {

-		EditorHyperlinkDocumentShell editor = new EditorHyperlinkDocumentShell();

-		editor.open();

-		if (editor.getHyperlinkDocument() != null) {

-			list.add(editor.getHyperlinkDocument());

-		}

-

-	}

-

-	@Override

-	public List<HyperLinkObject> getFilteredObject(List<HyperLinkObject> hyperlinkObjects) {

-		ArrayList<HyperLinkObject> result = new ArrayList<HyperLinkObject>();

-		Iterator<HyperLinkObject> iterator = hyperlinkObjects.iterator();

-		while (iterator.hasNext()) {

-			HyperLinkObject hyperlinkObject = iterator.next();

-			if (hyperlinkObject instanceof HyperLinkDocument) {

-				result.add(hyperlinkObject);

-			}

-		}

-		return result;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.hyperlink.helper;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.hyperlink.commands.CreateHyperLinkDocumentCommand;
+import org.eclipse.papyrus.infra.hyperlink.messages.Messages;
+import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkDocument;
+import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;
+import org.eclipse.papyrus.infra.hyperlink.ui.EditorHyperlinkDocumentShell;
+import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;
+
+
+
+/**
+ * this an helper to manage hyperlink document
+ *
+ */
+public class DocumentHyperLinkHelper extends AbstractHyperLinkHelper {
+
+
+	@Override
+	public HyperLinkObject getHyperLinkObject(EAnnotation eAnnotation) {
+		if (eAnnotation.getSource().equals(HyperLinkConstants.HYPERLINK_DOCUMENT)) {
+			HyperLinkDocument hyperLinkDocument = new HyperLinkDocument();
+			hyperLinkDocument.setHyperlinkDocument(eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_DOCUMENT_LOCALIZATION));
+			hyperLinkDocument.setTooltipText(eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_TOOLTYPE_TEXT));
+			if (eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_IS_DEFAULT_NAVIGATION) != null) {
+				boolean isDefaultNaviagation = Boolean.parseBoolean(eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_IS_DEFAULT_NAVIGATION));
+				hyperLinkDocument.setIsDefault(isDefaultNaviagation);
+			} else {
+				hyperLinkDocument.setIsDefault(false);
+			}
+
+			return hyperLinkDocument;
+		}
+
+		return null;
+	}
+
+	@Override
+	public RecordingCommand getAddHyperLinkCommand(TransactionalEditingDomain domain, EModelElement object, HyperLinkObject hyperlinkObject) {
+		if (hyperlinkObject instanceof HyperLinkDocument) {
+			HyperLinkDocument hyperLinkDocument = (HyperLinkDocument) hyperlinkObject;
+			return new CreateHyperLinkDocumentCommand(domain, object, hyperLinkDocument.getTooltipText(), hyperLinkDocument.getHyperlinkDocument(), hyperlinkObject.getIsDefault());
+		} else {
+			return null;
+		}
+	}
+
+	@Override
+	public String getNameofManagedHyperLink() {
+		return Messages.DocumentHyperLinkHelper_Document;
+	}
+
+	@Override
+	public void executeNewMousePressed(List<HyperLinkObject> list, EObject aModel) {
+		EditorHyperlinkDocumentShell editor = new EditorHyperlinkDocumentShell();
+		editor.open();
+		if (editor.getHyperlinkDocument() != null) {
+			list.add(editor.getHyperlinkDocument());
+		}
+
+	}
+
+	@Override
+	public List<HyperLinkObject> getFilteredObject(List<HyperLinkObject> hyperlinkObjects) {
+		ArrayList<HyperLinkObject> result = new ArrayList<HyperLinkObject>();
+		Iterator<HyperLinkObject> iterator = hyperlinkObjects.iterator();
+		while (iterator.hasNext()) {
+			HyperLinkObject hyperlinkObject = iterator.next();
+			if (hyperlinkObject instanceof HyperLinkDocument) {
+				result.add(hyperlinkObject);
+			}
+		}
+		return result;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/HyperLinkHelperFactory.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/HyperLinkHelperFactory.java
index b8fd1669122..ecb1dfe0e66 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/HyperLinkHelperFactory.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/HyperLinkHelperFactory.java
@@ -1,143 +1,143 @@
-/*****************************************************************************

- * 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:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.helper;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CompoundCommand;

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.hyperlink.commands.DeleteHyperLinkDocumentCommand;

-import org.eclipse.papyrus.infra.hyperlink.commands.EmptyAllHyperLinkCommand;

-import org.eclipse.papyrus.infra.hyperlink.messages.Messages;

-import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;

-import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkException;

-

-

-/**

- * The Class HyperlinkHelper, contains all methods to manipulate information

- * about hyperlinks in a model

- */

-public class HyperLinkHelperFactory {

-

-	protected List<AbstractHyperLinkHelper> hyperLinkHelpers = new ArrayList<AbstractHyperLinkHelper>();

-

-	public List<AbstractHyperLinkHelper> getHyperLinkHelpers() {

-		return hyperLinkHelpers;

-	}

-

-	public HyperLinkHelperFactory(List<AbstractHyperLinkHelper> hyperLinkHelpers) {

-		this.hyperLinkHelpers.clear();

-		this.hyperLinkHelpers.addAll(hyperLinkHelpers);

-	}

-

-	/**

-	 * Gets the adds the hyper link command.

-	 *

-	 * @param domain

-	 *            the domain to execute command

-	 * @param object

-	 *            the object where it is attached the information

-	 * @param localization

-	 *            the localization of the document

-	 * @param tooltipText

-	 *            the tooltip text

-	 * @param isDefault

-	 *            to set this hyperlink as default

-	 * @return the adds the hyper link command

-	 */

-	public Command getAddHyperLinkCommand(TransactionalEditingDomain domain, EModelElement object, List<HyperLinkObject> hyperlinkObjects) throws HyperLinkException {

-		CompoundCommand cmpCommand = new CompoundCommand(Messages.HyperLinkHelperFactory_addHyperLinksCommand);

-		Iterator<HyperLinkObject> iterator = hyperlinkObjects.iterator();

-		while (iterator.hasNext()) {

-			HyperLinkObject hyperlinkObject = iterator.next();

-			RecordingCommand cmd = null;

-			int i = 0;

-			while (cmd == null && i < hyperLinkHelpers.size()) {

-				cmd = hyperLinkHelpers.get(i).getAddHyperLinkCommand(domain, object, hyperlinkObject);

-				i++;

-			}

-			if (cmd == null) {

-				throw new HyperLinkException(Messages.HyperLinkHelperFactory_ImpossibleToFindACommandToSerialize + hyperlinkObject);

-			}

-			cmpCommand.append(cmd);

-		}

-		return cmpCommand.isEmpty() ? null : cmpCommand;

-	}

-

-	/**

-	 * use to remove a hyperlink web or document

-	 *

-	 * @param domain

-	 *            the domain to execute the command

-	 * @param object

-	 *            the object where was attached the information

-	 * @param localization

-	 *            the localization or link

-	 *

-	 * @return the removes the element command

-	 */

-	public static RecordingCommand getRemoveHyperlinkCommand(TransactionalEditingDomain domain, EModelElement object, String localization) {

-		return new DeleteHyperLinkDocumentCommand(domain, object, localization);

-

-	}

-

-	/**

-	 * Gets the allreferenced element.

-	 *

-	 * @param object

-	 *            the object where we look for information

-	 *

-	 * @return the allreferenced

-	 */

-	public ArrayList<?> getAllreferenced(EModelElement object) throws HyperLinkException {

-		ArrayList<HyperLinkObject> result = new ArrayList<HyperLinkObject>();

-		Iterator<EAnnotation> iter = object.getEAnnotations().iterator();

-		while (iter.hasNext()) {

-			EAnnotation currentAnnotation = iter.next();

-			int i = 0;

-			HyperLinkObject hyperlinkObject = null;

-			while (hyperlinkObject == null && i < hyperLinkHelpers.size()) {

-				hyperlinkObject = hyperLinkHelpers.get(i).getHyperLinkObject(currentAnnotation);

-				i++;

-			}

-			if (hyperlinkObject != null) {

-				result.add(hyperlinkObject);

-			}

-		}

-

-		return result;

-

-	}

-

-	/**

-	 * Gets the empty all hyper link command. to clean all hyperlinks

-	 *

-	 * @param domain

-	 *            the domain to execute the command

-	 * @param object

-	 *            the object where is attached information

-	 *

-	 * @return the empty all hyper link command

-	 */

-	public static EmptyAllHyperLinkCommand getEmptyAllHyperLinkCommand(TransactionalEditingDomain domain, EModelElement object) {

-		return new EmptyAllHyperLinkCommand(domain, object);

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.helper;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.hyperlink.commands.DeleteHyperLinkDocumentCommand;
+import org.eclipse.papyrus.infra.hyperlink.commands.EmptyAllHyperLinkCommand;
+import org.eclipse.papyrus.infra.hyperlink.messages.Messages;
+import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;
+import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkException;
+
+
+/**
+ * The Class HyperlinkHelper, contains all methods to manipulate information
+ * about hyperlinks in a model
+ */
+public class HyperLinkHelperFactory {
+
+	protected List<AbstractHyperLinkHelper> hyperLinkHelpers = new ArrayList<AbstractHyperLinkHelper>();
+
+	public List<AbstractHyperLinkHelper> getHyperLinkHelpers() {
+		return hyperLinkHelpers;
+	}
+
+	public HyperLinkHelperFactory(List<AbstractHyperLinkHelper> hyperLinkHelpers) {
+		this.hyperLinkHelpers.clear();
+		this.hyperLinkHelpers.addAll(hyperLinkHelpers);
+	}
+
+	/**
+	 * Gets the adds the hyper link command.
+	 *
+	 * @param domain
+	 *            the domain to execute command
+	 * @param object
+	 *            the object where it is attached the information
+	 * @param localization
+	 *            the localization of the document
+	 * @param tooltipText
+	 *            the tooltip text
+	 * @param isDefault
+	 *            to set this hyperlink as default
+	 * @return the adds the hyper link command
+	 */
+	public Command getAddHyperLinkCommand(TransactionalEditingDomain domain, EModelElement object, List<HyperLinkObject> hyperlinkObjects) throws HyperLinkException {
+		CompoundCommand cmpCommand = new CompoundCommand(Messages.HyperLinkHelperFactory_addHyperLinksCommand);
+		Iterator<HyperLinkObject> iterator = hyperlinkObjects.iterator();
+		while (iterator.hasNext()) {
+			HyperLinkObject hyperlinkObject = iterator.next();
+			RecordingCommand cmd = null;
+			int i = 0;
+			while (cmd == null && i < hyperLinkHelpers.size()) {
+				cmd = hyperLinkHelpers.get(i).getAddHyperLinkCommand(domain, object, hyperlinkObject);
+				i++;
+			}
+			if (cmd == null) {
+				throw new HyperLinkException(Messages.HyperLinkHelperFactory_ImpossibleToFindACommandToSerialize + hyperlinkObject);
+			}
+			cmpCommand.append(cmd);
+		}
+		return cmpCommand.isEmpty() ? null : cmpCommand;
+	}
+
+	/**
+	 * use to remove a hyperlink web or document
+	 *
+	 * @param domain
+	 *            the domain to execute the command
+	 * @param object
+	 *            the object where was attached the information
+	 * @param localization
+	 *            the localization or link
+	 *
+	 * @return the removes the element command
+	 */
+	public static RecordingCommand getRemoveHyperlinkCommand(TransactionalEditingDomain domain, EModelElement object, String localization) {
+		return new DeleteHyperLinkDocumentCommand(domain, object, localization);
+
+	}
+
+	/**
+	 * Gets the allreferenced element.
+	 *
+	 * @param object
+	 *            the object where we look for information
+	 *
+	 * @return the allreferenced
+	 */
+	public ArrayList<?> getAllreferenced(EModelElement object) throws HyperLinkException {
+		ArrayList<HyperLinkObject> result = new ArrayList<HyperLinkObject>();
+		Iterator<EAnnotation> iter = object.getEAnnotations().iterator();
+		while (iter.hasNext()) {
+			EAnnotation currentAnnotation = iter.next();
+			int i = 0;
+			HyperLinkObject hyperlinkObject = null;
+			while (hyperlinkObject == null && i < hyperLinkHelpers.size()) {
+				hyperlinkObject = hyperLinkHelpers.get(i).getHyperLinkObject(currentAnnotation);
+				i++;
+			}
+			if (hyperlinkObject != null) {
+				result.add(hyperlinkObject);
+			}
+		}
+
+		return result;
+
+	}
+
+	/**
+	 * Gets the empty all hyper link command. to clean all hyperlinks
+	 *
+	 * @param domain
+	 *            the domain to execute the command
+	 * @param object
+	 *            the object where is attached information
+	 *
+	 * @return the empty all hyper link command
+	 */
+	public static EmptyAllHyperLinkCommand getEmptyAllHyperLinkCommand(TransactionalEditingDomain domain, EModelElement object) {
+		return new EmptyAllHyperLinkCommand(domain, object);
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/IHyperlinkHelperExtension.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/IHyperlinkHelperExtension.java
index 580d7d02d9f..580d7d02d9f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/IHyperlinkHelperExtension.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/IHyperlinkHelperExtension.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/ObjectHyperLinkHelper.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/ObjectHyperLinkHelper.java
index f52e4158fda..f52e4158fda 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/ObjectHyperLinkHelper.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/ObjectHyperLinkHelper.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/WebHyperLinkHelper.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/WebHyperLinkHelper.java
index ee24956d5c9..e263b4dc5c1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/WebHyperLinkHelper.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/WebHyperLinkHelper.java
@@ -1,100 +1,100 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.helper;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.hyperlink.commands.CreateHyperLinkWebCommand;

-import org.eclipse.papyrus.infra.hyperlink.messages.Messages;

-import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;

-import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkWeb;

-import org.eclipse.papyrus.infra.hyperlink.ui.EditorHyperLinkWebShell;

-import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;

-

-/**

- * this is an helper to manager hyperlink web

- *

- * @author PT202707

- *

- */

-public class WebHyperLinkHelper extends AbstractHyperLinkHelper {

-

-

-	@Override

-	public HyperLinkObject getHyperLinkObject(EAnnotation eAnnotation) {

-		if (eAnnotation.getSource().equals(HyperLinkConstants.HYPERLINK_WEB)) {

-			HyperLinkWeb hyperLinkWeb = new HyperLinkWeb();

-			hyperLinkWeb.setHyperLinkWeb(eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_WEB_LINK));

-			hyperLinkWeb.setTooltipText(eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_TOOLTYPE_TEXT));

-			if (eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_IS_DEFAULT_NAVIGATION) != null) {

-				boolean isDefaultNaviagation = Boolean.parseBoolean(eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_IS_DEFAULT_NAVIGATION));

-				hyperLinkWeb.setIsDefault(isDefaultNaviagation);

-			}

-			else {

-				hyperLinkWeb.setIsDefault(false);

-			}

-

-			return hyperLinkWeb;

-		}

-

-		return null;

-	}

-

-	@Override

-	public RecordingCommand getAddHyperLinkCommand(TransactionalEditingDomain domain, EModelElement object, HyperLinkObject HyperLinkObject) {

-		if (HyperLinkObject instanceof HyperLinkWeb) {

-			HyperLinkWeb hyperLinkWeb = (HyperLinkWeb) HyperLinkObject;

-			return new CreateHyperLinkWebCommand(domain, object, hyperLinkWeb.getTooltipText(), hyperLinkWeb.getHyperLinkWeb(), HyperLinkObject.getIsDefault());

-		}

-		else {

-			return null;

-		}

-	}

-

-	@Override

-	public String getNameofManagedHyperLink() {

-		return Messages.WebHyperLinkHelper_Web;

-	}

-

-	@Override

-	public void executeNewMousePressed(List<HyperLinkObject> list, EObject aModel) {

-		EditorHyperLinkWebShell editor = new EditorHyperLinkWebShell();

-		editor.open();

-		if (editor.getHyperLinkWeb() != null) {

-			list.add(editor.getHyperLinkWeb());

-		}

-

-	}

-

-	@Override

-	public ArrayList<HyperLinkObject> getFilteredObject(List<HyperLinkObject> HyperLinkObjects) {

-		ArrayList<HyperLinkObject> result = new ArrayList<HyperLinkObject>();

-		Iterator<HyperLinkObject> iterator = HyperLinkObjects.iterator();

-		while (iterator.hasNext()) {

-			HyperLinkObject HyperLinkObject = iterator.next();

-			if (HyperLinkObject instanceof HyperLinkWeb) {

-				result.add(HyperLinkObject);

-			}

-		}

-		return result;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.helper;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.hyperlink.commands.CreateHyperLinkWebCommand;
+import org.eclipse.papyrus.infra.hyperlink.messages.Messages;
+import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;
+import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkWeb;
+import org.eclipse.papyrus.infra.hyperlink.ui.EditorHyperLinkWebShell;
+import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkConstants;
+
+/**
+ * this is an helper to manager hyperlink web
+ *
+ * @author PT202707
+ *
+ */
+public class WebHyperLinkHelper extends AbstractHyperLinkHelper {
+
+
+	@Override
+	public HyperLinkObject getHyperLinkObject(EAnnotation eAnnotation) {
+		if (eAnnotation.getSource().equals(HyperLinkConstants.HYPERLINK_WEB)) {
+			HyperLinkWeb hyperLinkWeb = new HyperLinkWeb();
+			hyperLinkWeb.setHyperLinkWeb(eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_WEB_LINK));
+			hyperLinkWeb.setTooltipText(eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_TOOLTYPE_TEXT));
+			if (eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_IS_DEFAULT_NAVIGATION) != null) {
+				boolean isDefaultNaviagation = Boolean.parseBoolean(eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_IS_DEFAULT_NAVIGATION));
+				hyperLinkWeb.setIsDefault(isDefaultNaviagation);
+			}
+			else {
+				hyperLinkWeb.setIsDefault(false);
+			}
+
+			return hyperLinkWeb;
+		}
+
+		return null;
+	}
+
+	@Override
+	public RecordingCommand getAddHyperLinkCommand(TransactionalEditingDomain domain, EModelElement object, HyperLinkObject HyperLinkObject) {
+		if (HyperLinkObject instanceof HyperLinkWeb) {
+			HyperLinkWeb hyperLinkWeb = (HyperLinkWeb) HyperLinkObject;
+			return new CreateHyperLinkWebCommand(domain, object, hyperLinkWeb.getTooltipText(), hyperLinkWeb.getHyperLinkWeb(), HyperLinkObject.getIsDefault());
+		}
+		else {
+			return null;
+		}
+	}
+
+	@Override
+	public String getNameofManagedHyperLink() {
+		return Messages.WebHyperLinkHelper_Web;
+	}
+
+	@Override
+	public void executeNewMousePressed(List<HyperLinkObject> list, EObject aModel) {
+		EditorHyperLinkWebShell editor = new EditorHyperLinkWebShell();
+		editor.open();
+		if (editor.getHyperLinkWeb() != null) {
+			list.add(editor.getHyperLinkWeb());
+		}
+
+	}
+
+	@Override
+	public ArrayList<HyperLinkObject> getFilteredObject(List<HyperLinkObject> HyperLinkObjects) {
+		ArrayList<HyperLinkObject> result = new ArrayList<HyperLinkObject>();
+		Iterator<HyperLinkObject> iterator = HyperLinkObjects.iterator();
+		while (iterator.hasNext()) {
+			HyperLinkObject HyperLinkObject = iterator.next();
+			if (HyperLinkObject instanceof HyperLinkWeb) {
+				result.add(HyperLinkObject);
+			}
+		}
+		return result;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/Messages.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/Messages.java
index 818c51eb38d..7ce443f8893 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/Messages.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/Messages.java
@@ -1,142 +1,137 @@
-/*****************************************************************************

- * Copyright (c) 2011, 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA LIST) - Consolidate all hyperlink helper contributions into one tab

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.messages;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.hyperlink.messages.messages"; //$NON-NLS-1$

-

-	public static String EditorHyperLinkEditorShell_ICanFindTheHyperLinkEditorObject;

-

-	public static String EditorHyperLinkEditorShell_View;

-

-	public static String EditorHyperLinkHelper_Editor;

-

-	public static String HyperLinkEditorHelpersRegistrationUtil_ICantCreateTheClassForAnHelper;

-

-	public static String HyperLinkEditorHelpersRegistrationUtil_NotAnInstanceOf;

-

-	public static String HyperLinkHelpersRegistrationUtil_ICantCreateTheClassForAnHelper;

-

-	public static String HyperLinkHelpersRegistrationUtil_TheHelperWillBeIgnored;

-

-	public static String HyperLinkTabRegistrationUtil_ICantCreateTheTab;

-

-	public static String HyperLinkTabRegistrationUtil_tabWillBeIgnored;

-

-	public static String HyperLinkTabRegistrationUtil_NotAnInstanceOf;

-

-	public static String AbstractEditHyperlinkDocumentShell_Cancel;

-

-	public static String AbstractEditHyperlinkDocumentShell_Diagram;

-

-	public static String AbstractEditHyperlinkDocumentShell_Document;

-

-	public static String AbstractEditHyperlinkDocumentShell_EditHyperlink;

-

-	public static String AbstractEditHyperlinkDocumentShell_EditionOfAHyperLink;

-

-	public static String AbstractEditHyperlinkDocumentShell_OK;

-

-	public static String AbstractEditHyperlinkDocumentShell_TooltipText;

-

-	public static String AbstractEditHyperlinkDocumentShell_ToolTipText;

-

-	public static String AbstractEditHyperlinkDocumentShell_UseDefault;

-

-	public static String AbstractEditHyperlinkShell_Cancel;

-

-	public static String AbstractEditHyperlinkShell_EditHyperLink;

-

-	public static String AbstractEditHyperlinkShell_EditionOfAHyperLink;

-

-	public static String AbstractEditHyperlinkShell_object;

-

-	public static String AbstractEditHyperlinkShell_OK;

-

-	public static String AbstractEditHyperlinkShell_ToolTipText;

-

-	public static String AbstractEditHyperlinkShell_ToolTipText_;

-

-	public static String AbstractEditHyperlinkShell_UseDefault;

-

-	public static String AbstractHyperLinkManagerShell_Cancel;

-

-	public static String AbstractHyperLinkManagerShell_HyperLink;

-

-	public static String AbstractHyperLinkManagerShell_OK;

-

-	public static String AbstractLookForEditorShell_Cancel;

-

-	public static String AbstractLookForEditorShell_EditorsList;

-

-	public static String AbstractLookForEditorShell_New;

-

-	public static String AbstractLookForEditorShell_OK;

-

-	public static String AbstractLookForEditorShell_Remove;

-

-	public static String AbstractLookForEditorShell_TreeView;

-

-	public static String DefaultHyperLinkTab_DefaultHyperlinks;

-

-	public static String DefaultHyperLinkTab_DefaultHyperLinks;

-

-	public static String DefaultHyperLinkTab_HyperLinks;

-

-	public static String DiagramNavigationDialog_ChooseHyperLinks;

-

-	public static String DiagramNavigationDialog_WhichHyperLinksWouldYouToNavigateTo;

-

-	public static String EditorHyperlinkDocumentShell_Open;

-

-	public static String EditorHyperLinkWebShell_Hyperlinks;

-

-	public static String HyperLinkManagerShell_HyperLinksCommands;

-	public static String HyperLinkManagerShell_ImpossibleToReadPreferences;

-

-	public static String HyperLinkManagerShell_InputOutputException;

-	public static String HyperLinkTab_addTooltip;

-

-	public static String HyperLinkTab_Hyperlink;

-

-	public static String HyperLinkTab_Hyperlinks;

-

-	public static String HyperLinkTab_hyperLinks;

-

-	public static String HyperLinkTab_title;

-

-	public static String HyperLinkTab_Listof;

-

-	public static String HyperLinkTab_SetOf;

-

-	public static String DocumentHyperLinkHelper_Document;

-

-	public static String HyperLinkHelperFactory_addHyperLinksCommand;

-

-	public static String HyperLinkHelperFactory_ImpossibleToFindACommandToSerialize;

-

-	public static String WebHyperLinkHelper_Web;

-	public static String HyperLinkDocument_ExternalFiles;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA LIST) - Consolidate all hyperlink helper contributions into one tab
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.hyperlink.messages.messages"; //$NON-NLS-1$
+
+	public static String HyperLinkEditorHelpersRegistrationUtil_ICantCreateTheClassForAnHelper;
+
+	public static String HyperLinkEditorHelpersRegistrationUtil_NotAnInstanceOf;
+
+	public static String HyperLinkHelpersRegistrationUtil_ICantCreateTheClassForAnHelper;
+
+	public static String HyperLinkHelpersRegistrationUtil_TheHelperWillBeIgnored;
+
+	public static String HyperLinkTabRegistrationUtil_ICantCreateTheTab;
+
+	public static String HyperLinkTabRegistrationUtil_tabWillBeIgnored;
+
+	public static String HyperLinkTabRegistrationUtil_NotAnInstanceOf;
+
+	public static String AbstractEditHyperlinkDocumentShell_Cancel;
+
+	public static String AbstractEditHyperlinkDocumentShell_Diagram;
+
+	public static String AbstractEditHyperlinkDocumentShell_Document;
+
+	public static String AbstractEditHyperlinkDocumentShell_EditHyperlink;
+
+	public static String AbstractEditHyperlinkDocumentShell_EditionOfAHyperLink;
+
+	public static String AbstractEditHyperlinkDocumentShell_OK;
+
+	public static String AbstractEditHyperlinkDocumentShell_TooltipText;
+
+	public static String AbstractEditHyperlinkDocumentShell_ToolTipText;
+
+	public static String AbstractEditHyperlinkDocumentShell_UseDefault;
+
+	public static String AbstractEditHyperlinkShell_Cancel;
+
+	public static String AbstractEditHyperlinkShell_EditHyperLink;
+
+	public static String AbstractEditHyperlinkShell_EditionOfAHyperLink;
+
+	public static String AbstractEditHyperlinkShell_object;
+
+	public static String AbstractEditHyperlinkShell_OK;
+
+	public static String AbstractEditHyperlinkShell_ToolTipText;
+
+	public static String AbstractEditHyperlinkShell_ToolTipText_;
+
+	public static String AbstractEditHyperlinkShell_UseDefault;
+
+	public static String AbstractHyperLinkManagerShell_Cancel;
+
+	public static String AbstractHyperLinkManagerShell_HyperLink;
+
+	public static String AbstractHyperLinkManagerShell_OK;
+
+	public static String AbstractLookForEditorShell_Cancel;
+
+	public static String AbstractLookForEditorShell_EditorsList;
+
+	public static String AbstractLookForEditorShell_New;
+
+	public static String AbstractLookForEditorShell_OK;
+
+	public static String AbstractLookForEditorShell_Remove;
+
+	public static String AbstractLookForEditorShell_TreeView;
+
+	public static String DefaultHyperLinkTab_DefaultHyperlinks;
+
+	public static String DefaultHyperLinkTab_DefaultHyperLinks;
+
+	public static String DefaultHyperLinkTab_HyperLinks;
+
+	public static String DiagramNavigationDialog_ChooseHyperLinks;
+
+	public static String DiagramNavigationDialog_WhichHyperLinksWouldYouToNavigateTo;
+
+	public static String EditorHyperlinkDocumentShell_Open;
+
+	public static String EditorHyperLinkWebShell_Hyperlinks;
+
+	public static String HyperLinkManagerShell_HyperLinksCommands;
+	public static String HyperLinkManagerShell_ImpossibleToReadPreferences;
+
+	public static String HyperLinkManagerShell_InputOutputException;
+	public static String HyperLinkTab_addTooltip;
+
+	public static String HyperLinkTab_Hyperlink;
+
+	public static String HyperLinkTab_Hyperlinks;
+
+	public static String HyperLinkTab_hyperLinks;
+
+	public static String HyperLinkTab_title;
+
+	public static String HyperLinkTab_Listof;
+
+	public static String HyperLinkTab_SetOf;
+
+	public static String DocumentHyperLinkHelper_Document;
+
+	public static String HyperLinkHelperFactory_addHyperLinksCommand;
+
+	public static String HyperLinkHelperFactory_ImpossibleToFindACommandToSerialize;
+
+	public static String WebHyperLinkHelper_Web;
+	public static String HyperLinkDocument_ExternalFiles;
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/messages.properties b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/messages.properties
index cd95b42ae52..3b8138bee92 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/messages.properties
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/messages/messages.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2013 CEA LIST and others.
+# Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
 # 
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
@@ -8,10 +8,8 @@
 # Contributors:
 #   CEA LIST - Initial API and implementation
 #   Christian W. Damus (CEA LIST) - Consolidate all hyperlink helper contributions into one tab
+#   Christian W. Damus - bug 485220
 
-EditorHyperLinkEditorShell_ICanFindTheHyperLinkEditorObject=I can't find the HyperlinkEditorObject for : {0}
-EditorHyperLinkEditorShell_View=View :
-EditorHyperLinkHelper_Editor=View
 HyperLinkEditorHelpersRegistrationUtil_ICantCreateTheClassForAnHelper=I can't create the class for an helper
 HyperLinkEditorHelpersRegistrationUtil_NotAnInstanceOf={0} is not an instanceof {1}
 HyperLinkHelpersRegistrationUtil_ICantCreateTheClassForAnHelper=I can't create the class for an helper
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkDocument.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkDocument.java
index 6b52450caee..6b52450caee 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkDocument.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkDocument.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkObject.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkObject.java
index c6356545f28..2d96fb8daf0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkObject.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkObject.java
@@ -1,114 +1,114 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.object;

-

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-

-

-/**

- * This is the Object use to manipulate into hyperlinks

- *

- */

-public abstract class HyperLinkObject {

-

-	/**

-	 * the associated tool tip

-	 */

-	protected String tooltipText;

-

-	/** the object that is the target of the hyperlink **/

-	protected Object object;

-

-	/**

-	 * boolean to known if this hyperlink is a default hyperlink

-	 */

-	protected boolean isDefault = false;

-

-	/**

-	 * @return the associated tooltip

-	 */

-	public String getTooltipText() {

-		return tooltipText;

-	}

-

-	/**

-	 * set a string that is the associated tool tup

-	 *

-	 * @param tooltipText

-	 */

-	public void setTooltipText(String tooltipText) {

-		this.tooltipText = tooltipText;

-	}

-

-	/**

-	 *

-	 * @return the object that is the target of the hyperlink

-	 */

-	public Object getObject() {

-		return object;

-	}

-

-	/**

-	 * set the object that will be the target of the hyperlink

-	 *

-	 * @param object

-	 *            the targeted object

-	 */

-	public void setObject(Object object) {

-		this.object = object;

-	}

-

-	/**

-	 * set a boolean in order to make this hyperlink as default

-	 *

-	 * @param isDefault

-	 *            true or false

-	 */

-	public void setIsDefault(boolean isDefault) {

-		this.isDefault = isDefault;

-	}

-

-	/**

-	 *

-	 * @return true is the hyperlink is default

-	 */

-	public boolean getIsDefault() {

-		return this.isDefault;

-	}

-

-	/**

-	 * Used to execute an action when the hyperlink object is selected and clicked to be edited

-	 *

-	 * @param list

-	 *            of hyperlink that are containted by a graphical element

-	 * @param amodel

-	 *            the top package root element

-	 */

-	public abstract void executeEditMousePressed(List<HyperLinkObject> list, EObject amodel);

-

-	/**

-	 * Tells whether openLink() should be called within an EMF command

-	 *

-	 * @return

-	 */

-	public abstract boolean needsOpenCommand();

-

-	/**

-	 * Opens the current hyperlink.

-	 */

-	public abstract void openLink();

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.object;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+
+
+/**
+ * This is the Object use to manipulate into hyperlinks
+ *
+ */
+public abstract class HyperLinkObject {
+
+	/**
+	 * the associated tool tip
+	 */
+	protected String tooltipText;
+
+	/** the object that is the target of the hyperlink **/
+	protected Object object;
+
+	/**
+	 * boolean to known if this hyperlink is a default hyperlink
+	 */
+	protected boolean isDefault = false;
+
+	/**
+	 * @return the associated tooltip
+	 */
+	public String getTooltipText() {
+		return tooltipText;
+	}
+
+	/**
+	 * set a string that is the associated tool tup
+	 *
+	 * @param tooltipText
+	 */
+	public void setTooltipText(String tooltipText) {
+		this.tooltipText = tooltipText;
+	}
+
+	/**
+	 *
+	 * @return the object that is the target of the hyperlink
+	 */
+	public Object getObject() {
+		return object;
+	}
+
+	/**
+	 * set the object that will be the target of the hyperlink
+	 *
+	 * @param object
+	 *            the targeted object
+	 */
+	public void setObject(Object object) {
+		this.object = object;
+	}
+
+	/**
+	 * set a boolean in order to make this hyperlink as default
+	 *
+	 * @param isDefault
+	 *            true or false
+	 */
+	public void setIsDefault(boolean isDefault) {
+		this.isDefault = isDefault;
+	}
+
+	/**
+	 *
+	 * @return true is the hyperlink is default
+	 */
+	public boolean getIsDefault() {
+		return this.isDefault;
+	}
+
+	/**
+	 * Used to execute an action when the hyperlink object is selected and clicked to be edited
+	 *
+	 * @param list
+	 *            of hyperlink that are containted by a graphical element
+	 * @param amodel
+	 *            the top package root element
+	 */
+	public abstract void executeEditMousePressed(List<HyperLinkObject> list, EObject amodel);
+
+	/**
+	 * Tells whether openLink() should be called within an EMF command
+	 *
+	 * @return
+	 */
+	public abstract boolean needsOpenCommand();
+
+	/**
+	 * Opens the current hyperlink.
+	 */
+	public abstract void openLink();
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkSpecificObject.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkSpecificObject.java
index 842d6088a5c..9728c59aed1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkSpecificObject.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkSpecificObject.java
@@ -1,84 +1,84 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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 (camille.letavernier@cea.fr) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.object;

-

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.Activator;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.services.openelement.service.OpenElementService;

-

-/**

- * References a specific object in a View (Diagram/Table/...)

- *

- * @author Camille

- *

- */

-public class HyperLinkSpecificObject extends HyperLinkObject {

-

-	private EObject targetElement;

-

-	public HyperLinkSpecificObject(EObject targetElement) {

-		this.targetElement = targetElement;

-	}

-

-	public HyperLinkSpecificObject() {

-		// Nothing

-	}

-

-	@Override

-	public void executeEditMousePressed(List<HyperLinkObject> list, EObject amodel) {

-		// TODO Auto-generated method stub

-		// Edit the hyperlink

-	}

-

-	public void setTargetElement(EObject targetElement) {

-		this.targetElement = targetElement;

-	}

-

-	@Override

-	public boolean needsOpenCommand() {

-		return false;

-	}

-

-	@Override

-	public void openLink() {

-		if (targetElement == null) {

-			return;

-		}

-

-		OpenElementService openElementService;

-		// IMultiDiagramEditor editor;

-		try {

-			openElementService = ServiceUtilsForEObject.getInstance().getService(OpenElementService.class, targetElement);

-			// editor = ServiceUtilsForEObject.getInstance().getService(IMultiDiagramEditor.class, targetElement);

-		} catch (ServiceException ex) {

-			Activator.log.error(ex);

-			return;

-		}

-

-		try {

-			openElementService.openElement(targetElement);

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	public EObject getTargetElement() {

-		return targetElement;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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 (camille.letavernier@cea.fr) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.object;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.Activator;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.services.openelement.service.OpenElementService;
+
+/**
+ * References a specific object in a View (Diagram/Table/...)
+ *
+ * @author Camille
+ *
+ */
+public class HyperLinkSpecificObject extends HyperLinkObject {
+
+	private EObject targetElement;
+
+	public HyperLinkSpecificObject(EObject targetElement) {
+		this.targetElement = targetElement;
+	}
+
+	public HyperLinkSpecificObject() {
+		// Nothing
+	}
+
+	@Override
+	public void executeEditMousePressed(List<HyperLinkObject> list, EObject amodel) {
+		// TODO Auto-generated method stub
+		// Edit the hyperlink
+	}
+
+	public void setTargetElement(EObject targetElement) {
+		this.targetElement = targetElement;
+	}
+
+	@Override
+	public boolean needsOpenCommand() {
+		return false;
+	}
+
+	@Override
+	public void openLink() {
+		if (targetElement == null) {
+			return;
+		}
+
+		OpenElementService openElementService;
+		// IMultiDiagramEditor editor;
+		try {
+			openElementService = ServiceUtilsForEObject.getInstance().getService(OpenElementService.class, targetElement);
+			// editor = ServiceUtilsForEObject.getInstance().getService(IMultiDiagramEditor.class, targetElement);
+		} catch (ServiceException ex) {
+			Activator.log.error(ex);
+			return;
+		}
+
+		try {
+			openElementService.openElement(targetElement);
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	public EObject getTargetElement() {
+		return targetElement;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkWeb.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkWeb.java
index 40fd9fa284c..8bf354142df 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkWeb.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkWeb.java
@@ -1,67 +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:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.object;

-

-import java.net.URL;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.hyperlink.Activator;

-import org.eclipse.papyrus.infra.hyperlink.ui.EditorHyperLinkWebShell;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;

-

-/**

- * this is an hyperlink to manage web link (it open a web browser when it is selected)

- *

- */

-public class HyperLinkWeb extends HyperLinkObject {

-

-	public String getHyperLinkWeb() {

-		// TODO Auto-generated method stub

-		return (String) super.getObject();

-	}

-

-	public void setHyperLinkWeb(String object) {

-		// TODO Auto-generated method stub

-		super.setObject(object);

-	}

-

-	@Override

-	public void openLink() {

-		try {

-			// this is an url

-			PlatformUI.getWorkbench().getBrowserSupport().createBrowser(IWorkbenchBrowserSupport.AS_EXTERNAL, "aCustomId", "url", "url").openURL(new URL(this.getHyperLinkWeb())); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-		} catch (Exception e) {

-			Activator.log.error(e);

-		}

-

-	}

-

-	@Override

-	public void executeEditMousePressed(List<HyperLinkObject> list, EObject amodel) {

-		EditorHyperLinkWebShell editor = new EditorHyperLinkWebShell();

-		editor.setHyperLinkWeb(this);

-		editor.open();

-		int index = list.indexOf(this);

-		list.remove(this);

-		list.add(index, editor.getHyperLinkWeb());

-

-	}

-

-	@Override

-	public boolean needsOpenCommand() {

-		return false;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.object;
+
+import java.net.URL;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.hyperlink.Activator;
+import org.eclipse.papyrus.infra.hyperlink.ui.EditorHyperLinkWebShell;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
+
+/**
+ * this is an hyperlink to manage web link (it open a web browser when it is selected)
+ *
+ */
+public class HyperLinkWeb extends HyperLinkObject {
+
+	public String getHyperLinkWeb() {
+		// TODO Auto-generated method stub
+		return (String) super.getObject();
+	}
+
+	public void setHyperLinkWeb(String object) {
+		// TODO Auto-generated method stub
+		super.setObject(object);
+	}
+
+	@Override
+	public void openLink() {
+		try {
+			// this is an url
+			PlatformUI.getWorkbench().getBrowserSupport().createBrowser(IWorkbenchBrowserSupport.AS_EXTERNAL, "aCustomId", "url", "url").openURL(new URL(this.getHyperLinkWeb())); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		} catch (Exception e) {
+			Activator.log.error(e);
+		}
+
+	}
+
+	@Override
+	public void executeEditMousePressed(List<HyperLinkObject> list, EObject amodel) {
+		EditorHyperLinkWebShell editor = new EditorHyperLinkWebShell();
+		editor.setHyperLinkWeb(this);
+		editor.open();
+		int index = list.indexOf(this);
+		list.remove(this);
+		list.add(index, editor.getHyperLinkWeb());
+
+	}
+
+	@Override
+	public boolean needsOpenCommand() {
+		return false;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/preferences/HyperlinkServicePreferencesPage.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/preferences/HyperlinkServicePreferencesPage.java
index 3756482688b..3756482688b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/preferences/HyperlinkServicePreferencesPage.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/preferences/HyperlinkServicePreferencesPage.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/service/HyperlinkContributor.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/service/HyperlinkContributor.java
index 6d0c4f1def5..6d0c4f1def5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/service/HyperlinkContributor.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/service/HyperlinkContributor.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/service/HyperlinkService.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/service/HyperlinkService.java
index 21f46613089..21f46613089 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/service/HyperlinkService.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/service/HyperlinkService.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/service/impl/HyperlinkServiceImpl.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/service/impl/HyperlinkServiceImpl.java
index fe9944da69b..fe9944da69b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/service/impl/HyperlinkServiceImpl.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/service/impl/HyperlinkServiceImpl.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractEditHyperlinkDocumentShell.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractEditHyperlinkDocumentShell.java
index 59780d14db9..6d9d3bb3057 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractEditHyperlinkDocumentShell.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractEditHyperlinkDocumentShell.java
@@ -1,235 +1,235 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.ui;

-

-import org.eclipse.papyrus.infra.hyperlink.Activator;

-import org.eclipse.papyrus.infra.hyperlink.messages.Messages;

-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.Button;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.swt.widgets.Text;

-import org.eclipse.ui.PlatformUI;

-

-// TODO: Auto-generated Javadoc

-/**

- * The Class AbstractEditHyperlinkDocumentShell. This Class has been generated

- * from VisualEditor. Do not modify it manually by adding behavior! you will

- * lose the capacity to open with VE. So this class is abstract and it contains

- * set of getter in order to connect behavior in subclasses

- */

-public class AbstractEditHyperlinkDocumentShell {

-

-	/** The Constant OBJECT_LABEL. */

-	// @unused

-	protected static final String OBJECT_LABEL = Messages.AbstractEditHyperlinkDocumentShell_Diagram;

-

-	/** The edit hyperlink shell. */

-	private Shell editHyperlinkShell = null; // @jve:decl-index=0:visual-constraint="44,36"

-

-	/** The Ok button. */

-	private Button OkButton = null;

-

-	/** The cancel button. */

-	private Button cancelButton = null;

-

-	/** The tooltip input text. */

-	private Text tooltipInputText = null;

-

-	/** The tooltip input label. */

-	private CLabel tooltipInputLabel = null;

-

-	/** The Object labeltext. */

-	private Text ObjectLabeltext = null;

-

-	/** The Objectc label. */

-	private CLabel ObjectcLabel = null;

-

-	/** The choose diagram button. */

-	private Button chooseDiagramButton = null;

-

-	/** The use defaultcheck box. */

-	private Button useDefaultcheckBox = null;

-

-	/**

-	 * This method initializes editHyperlinkShell.

-	 */

-	protected void createEditHyperlinkShell() {

-		GridData gridData51 = new GridData();

-		gridData51.horizontalAlignment = GridData.FILL;

-		gridData51.verticalAlignment = GridData.CENTER;

-		GridData gridData3 = new GridData();

-		gridData3.grabExcessHorizontalSpace = true;

-		gridData3.verticalAlignment = GridData.CENTER;

-		gridData3.horizontalAlignment = GridData.FILL;

-		GridData gridData2 = new GridData();

-		gridData2.grabExcessHorizontalSpace = true;

-		gridData2.verticalAlignment = GridData.CENTER;

-		gridData2.horizontalAlignment = GridData.FILL;

-		GridData gridData1 = new GridData();

-		gridData1.verticalAlignment = GridData.CENTER;

-		gridData1.grabExcessHorizontalSpace = true;

-		gridData1.grabExcessVerticalSpace = false;

-		gridData1.horizontalSpan = 5;

-		gridData1.horizontalAlignment = GridData.FILL;

-		GridData gridData = new GridData();

-		gridData.horizontalAlignment = GridData.FILL;

-		gridData.verticalAlignment = GridData.CENTER;

-		gridData.horizontalSpan = 5;

-		gridData.grabExcessHorizontalSpace = true;

-		GridLayout gridLayout = new GridLayout();

-		gridLayout.numColumns = 7;

-		gridLayout.makeColumnsEqualWidth = true;

-		// this line has to be commented in order to open with VISUAL EDITOR

-		editHyperlinkShell = new Shell(PlatformUI.getWorkbench().getDisplay().getActiveShell(), SWT.DIALOG_TRIM | SWT.RESIZE);

-

-		// editHyperlinkShell = new Shell();

-		editHyperlinkShell.setText(Messages.AbstractEditHyperlinkDocumentShell_EditHyperlink);

-		editHyperlinkShell.setToolTipText(Messages.AbstractEditHyperlinkDocumentShell_EditionOfAHyperLink);

-		editHyperlinkShell.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));

-		editHyperlinkShell.setLayout(gridLayout);

-		// editHyperlinkShell.setSize(new Point(625, 119));

-		ObjectcLabel = new CLabel(editHyperlinkShell, SWT.NONE);

-		ObjectcLabel.setText(Messages.AbstractEditHyperlinkDocumentShell_Document);

-		ObjectcLabel.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));

-		ObjectLabeltext = new Text(getEditHyperlinkShell(), SWT.BORDER);

-		ObjectLabeltext.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));

-		ObjectLabeltext.setEditable(true);

-		ObjectLabeltext.setLayoutData(gridData1);

-		chooseDiagramButton = new Button(getEditHyperlinkShell(), SWT.NONE);

-		chooseDiagramButton.setImage(Activator.getDefault().getIcon(Activator.IMG_LOUPE));

-		chooseDiagramButton.setLayoutData(gridData51);

-		chooseDiagramButton.setText(""); //$NON-NLS-1$

-		tooltipInputLabel = new CLabel(editHyperlinkShell, SWT.NONE);

-		tooltipInputLabel.setText(Messages.AbstractEditHyperlinkDocumentShell_TooltipText);

-		tooltipInputLabel.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));

-		tooltipInputLabel.setToolTipText(Messages.AbstractEditHyperlinkDocumentShell_ToolTipText);

-		tooltipInputText = new Text(getEditHyperlinkShell(), SWT.BORDER);

-		tooltipInputText.setLayoutData(gridData);

-		useDefaultcheckBox = new Button(getEditHyperlinkShell(), SWT.CHECK);

-		useDefaultcheckBox.setText(Messages.AbstractEditHyperlinkDocumentShell_UseDefault);

-		useDefaultcheckBox.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));

-		new Label(editHyperlinkShell, SWT.NONE);

-		new Label(getEditHyperlinkShell(), SWT.NONE);

-		new Label(editHyperlinkShell, SWT.NONE);

-		new Label(editHyperlinkShell, SWT.NONE);

-		new Label(getEditHyperlinkShell(), SWT.NONE);

-		OkButton = new Button(getEditHyperlinkShell(), SWT.NONE);

-		OkButton.setText(Messages.AbstractEditHyperlinkDocumentShell_OK);

-		OkButton.setLayoutData(gridData2);

-		cancelButton = new Button(getEditHyperlinkShell(), SWT.NONE);

-		cancelButton.setText(Messages.AbstractEditHyperlinkDocumentShell_Cancel);

-		cancelButton.setLayoutData(gridData3);

-

-		editHyperlinkShell.pack();

-	}

-

-	/**

-	 * Gets the edit hyperlink shell.

-	 *

-	 * @return the editHyperlinkShell

-	 */

-	protected Shell getEditHyperlinkShell() {

-		return editHyperlinkShell;

-	}

-

-	/**

-	 * Gets the ok button.

-	 *

-	 * @return the okButton

-	 */

-	protected Button getOkButton() {

-		return OkButton;

-	}

-

-	/**

-	 * Gets the cancel button.

-	 *

-	 * @return the cancelButton

-	 */

-	protected Button getCancelButton() {

-		return cancelButton;

-	}

-

-	/**

-	 * Gets the tooltip input text.

-	 *

-	 * @return the tooltipInputText

-	 */

-	protected Text getTooltipInputText() {

-		return tooltipInputText;

-	}

-

-	/**

-	 * Gets the object labeltext.

-	 *

-	 * @return the objectLabeltext

-	 */

-	protected Text getObjectLabeltext() {

-		return ObjectLabeltext;

-	}

-

-	/**

-	 * Gets the choose diagram button.

-	 *

-	 * @return the chooseDiagramButton

-	 */

-	protected Button getChooseDiagramButton() {

-		return chooseDiagramButton;

-	}

-

-	/**

-	 * Gets the tooltip input label.

-	 *

-	 * @return the tooltipInputLabel

-	 */

-	// @unused

-	protected CLabel getTooltipInputLabel() {

-		return tooltipInputLabel;

-	}

-

-	/**

-	 * Gets the objectc label.

-	 *

-	 * @return the objectcLabel

-	 */

-	protected CLabel getObjectcLabel() {

-		return ObjectcLabel;

-	}

-

-	/**

-	 * Gets the use default check box.

-	 *

-	 * @return the useDefaultcheckBox

-	 */

-	protected Button getUseDefaultCheckBox() {

-		return useDefaultcheckBox;

-	}

-

-	/**

-	 * Sets the cancel button.

-	 *

-	 * @param cancelButton

-	 *            the cancelButton to set

-	 */

-	// @unused

-	protected void setCancelButton(Button cancelButton) {

-		this.cancelButton = cancelButton;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.ui;
+
+import org.eclipse.papyrus.infra.hyperlink.Activator;
+import org.eclipse.papyrus.infra.hyperlink.messages.Messages;
+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.Button;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.PlatformUI;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class AbstractEditHyperlinkDocumentShell. This Class has been generated
+ * from VisualEditor. Do not modify it manually by adding behavior! you will
+ * lose the capacity to open with VE. So this class is abstract and it contains
+ * set of getter in order to connect behavior in subclasses
+ */
+public class AbstractEditHyperlinkDocumentShell {
+
+	/** The Constant OBJECT_LABEL. */
+	// @unused
+	protected static final String OBJECT_LABEL = Messages.AbstractEditHyperlinkDocumentShell_Diagram;
+
+	/** The edit hyperlink shell. */
+	private Shell editHyperlinkShell = null; // @jve:decl-index=0:visual-constraint="44,36"
+
+	/** The Ok button. */
+	private Button OkButton = null;
+
+	/** The cancel button. */
+	private Button cancelButton = null;
+
+	/** The tooltip input text. */
+	private Text tooltipInputText = null;
+
+	/** The tooltip input label. */
+	private CLabel tooltipInputLabel = null;
+
+	/** The Object labeltext. */
+	private Text ObjectLabeltext = null;
+
+	/** The Objectc label. */
+	private CLabel ObjectcLabel = null;
+
+	/** The choose diagram button. */
+	private Button chooseDiagramButton = null;
+
+	/** The use defaultcheck box. */
+	private Button useDefaultcheckBox = null;
+
+	/**
+	 * This method initializes editHyperlinkShell.
+	 */
+	protected void createEditHyperlinkShell() {
+		GridData gridData51 = new GridData();
+		gridData51.horizontalAlignment = GridData.FILL;
+		gridData51.verticalAlignment = GridData.CENTER;
+		GridData gridData3 = new GridData();
+		gridData3.grabExcessHorizontalSpace = true;
+		gridData3.verticalAlignment = GridData.CENTER;
+		gridData3.horizontalAlignment = GridData.FILL;
+		GridData gridData2 = new GridData();
+		gridData2.grabExcessHorizontalSpace = true;
+		gridData2.verticalAlignment = GridData.CENTER;
+		gridData2.horizontalAlignment = GridData.FILL;
+		GridData gridData1 = new GridData();
+		gridData1.verticalAlignment = GridData.CENTER;
+		gridData1.grabExcessHorizontalSpace = true;
+		gridData1.grabExcessVerticalSpace = false;
+		gridData1.horizontalSpan = 5;
+		gridData1.horizontalAlignment = GridData.FILL;
+		GridData gridData = new GridData();
+		gridData.horizontalAlignment = GridData.FILL;
+		gridData.verticalAlignment = GridData.CENTER;
+		gridData.horizontalSpan = 5;
+		gridData.grabExcessHorizontalSpace = true;
+		GridLayout gridLayout = new GridLayout();
+		gridLayout.numColumns = 7;
+		gridLayout.makeColumnsEqualWidth = true;
+		// this line has to be commented in order to open with VISUAL EDITOR
+		editHyperlinkShell = new Shell(PlatformUI.getWorkbench().getDisplay().getActiveShell(), SWT.DIALOG_TRIM | SWT.RESIZE);
+
+		// editHyperlinkShell = new Shell();
+		editHyperlinkShell.setText(Messages.AbstractEditHyperlinkDocumentShell_EditHyperlink);
+		editHyperlinkShell.setToolTipText(Messages.AbstractEditHyperlinkDocumentShell_EditionOfAHyperLink);
+		editHyperlinkShell.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
+		editHyperlinkShell.setLayout(gridLayout);
+		// editHyperlinkShell.setSize(new Point(625, 119));
+		ObjectcLabel = new CLabel(editHyperlinkShell, SWT.NONE);
+		ObjectcLabel.setText(Messages.AbstractEditHyperlinkDocumentShell_Document);
+		ObjectcLabel.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
+		ObjectLabeltext = new Text(getEditHyperlinkShell(), SWT.BORDER);
+		ObjectLabeltext.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
+		ObjectLabeltext.setEditable(true);
+		ObjectLabeltext.setLayoutData(gridData1);
+		chooseDiagramButton = new Button(getEditHyperlinkShell(), SWT.NONE);
+		chooseDiagramButton.setImage(Activator.getDefault().getIcon(Activator.IMG_LOUPE));
+		chooseDiagramButton.setLayoutData(gridData51);
+		chooseDiagramButton.setText(""); //$NON-NLS-1$
+		tooltipInputLabel = new CLabel(editHyperlinkShell, SWT.NONE);
+		tooltipInputLabel.setText(Messages.AbstractEditHyperlinkDocumentShell_TooltipText);
+		tooltipInputLabel.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
+		tooltipInputLabel.setToolTipText(Messages.AbstractEditHyperlinkDocumentShell_ToolTipText);
+		tooltipInputText = new Text(getEditHyperlinkShell(), SWT.BORDER);
+		tooltipInputText.setLayoutData(gridData);
+		useDefaultcheckBox = new Button(getEditHyperlinkShell(), SWT.CHECK);
+		useDefaultcheckBox.setText(Messages.AbstractEditHyperlinkDocumentShell_UseDefault);
+		useDefaultcheckBox.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
+		new Label(editHyperlinkShell, SWT.NONE);
+		new Label(getEditHyperlinkShell(), SWT.NONE);
+		new Label(editHyperlinkShell, SWT.NONE);
+		new Label(editHyperlinkShell, SWT.NONE);
+		new Label(getEditHyperlinkShell(), SWT.NONE);
+		OkButton = new Button(getEditHyperlinkShell(), SWT.NONE);
+		OkButton.setText(Messages.AbstractEditHyperlinkDocumentShell_OK);
+		OkButton.setLayoutData(gridData2);
+		cancelButton = new Button(getEditHyperlinkShell(), SWT.NONE);
+		cancelButton.setText(Messages.AbstractEditHyperlinkDocumentShell_Cancel);
+		cancelButton.setLayoutData(gridData3);
+
+		editHyperlinkShell.pack();
+	}
+
+	/**
+	 * Gets the edit hyperlink shell.
+	 *
+	 * @return the editHyperlinkShell
+	 */
+	protected Shell getEditHyperlinkShell() {
+		return editHyperlinkShell;
+	}
+
+	/**
+	 * Gets the ok button.
+	 *
+	 * @return the okButton
+	 */
+	protected Button getOkButton() {
+		return OkButton;
+	}
+
+	/**
+	 * Gets the cancel button.
+	 *
+	 * @return the cancelButton
+	 */
+	protected Button getCancelButton() {
+		return cancelButton;
+	}
+
+	/**
+	 * Gets the tooltip input text.
+	 *
+	 * @return the tooltipInputText
+	 */
+	protected Text getTooltipInputText() {
+		return tooltipInputText;
+	}
+
+	/**
+	 * Gets the object labeltext.
+	 *
+	 * @return the objectLabeltext
+	 */
+	protected Text getObjectLabeltext() {
+		return ObjectLabeltext;
+	}
+
+	/**
+	 * Gets the choose diagram button.
+	 *
+	 * @return the chooseDiagramButton
+	 */
+	protected Button getChooseDiagramButton() {
+		return chooseDiagramButton;
+	}
+
+	/**
+	 * Gets the tooltip input label.
+	 *
+	 * @return the tooltipInputLabel
+	 */
+	// @unused
+	protected CLabel getTooltipInputLabel() {
+		return tooltipInputLabel;
+	}
+
+	/**
+	 * Gets the objectc label.
+	 *
+	 * @return the objectcLabel
+	 */
+	protected CLabel getObjectcLabel() {
+		return ObjectcLabel;
+	}
+
+	/**
+	 * Gets the use default check box.
+	 *
+	 * @return the useDefaultcheckBox
+	 */
+	protected Button getUseDefaultCheckBox() {
+		return useDefaultcheckBox;
+	}
+
+	/**
+	 * Sets the cancel button.
+	 *
+	 * @param cancelButton
+	 *            the cancelButton to set
+	 */
+	// @unused
+	protected void setCancelButton(Button cancelButton) {
+		this.cancelButton = cancelButton;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractEditHyperlinkShell.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractEditHyperlinkShell.java
index bcfcc316c4a..bcfcc316c4a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractEditHyperlinkShell.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractEditHyperlinkShell.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractHyperLinkManagerShell.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractHyperLinkManagerShell.java
index 5693a4be01b..5693a4be01b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractHyperLinkManagerShell.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractHyperLinkManagerShell.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractHyperLinkTab.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractHyperLinkTab.java
index fbc14786a0e..5ab795acd66 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractHyperLinkTab.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractHyperLinkTab.java
@@ -1,141 +1,141 @@
-/*****************************************************************************

- * Copyright (c) 2011, 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA LIST) - Consolidate all hyperlink helper contributions into one tab

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.ui;

-

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper;

-import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;

-import org.eclipse.swt.custom.CTabFolder;

-

-/**

- *

- * Each new tab should extends this class

- *

- */

-public abstract class AbstractHyperLinkTab {

-

-	/**

-	 * The id of the tab

-	 */

-	private String tabId;

-

-	// TODO these parameters should be privated

-	/**

-	 * The HyperLinkHelper for this tab

-	 */

-	protected AbstractHyperLinkHelper hyperLinkHelper;

-

-	/**

-	 * The hyperlink object

-	 */

-	protected List<HyperLinkObject> hyperlinkObjects;

-

-	/**

-	 * the CTabFolder

-	 */

-	protected CTabFolder cTabFolder;

-

-	/**

-	 * The edited element

-	 */

-	protected EObject element;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tabId

-	 *            the id of the tab

-	 * @param helper

-	 *            the helper for this tab

-	 */

-	public AbstractHyperLinkTab(final String tabId, final AbstractHyperLinkHelper helper) {

-		this.tabId = tabId;

-		this.hyperLinkHelper = helper;

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public AbstractHyperLinkTab() {

-		// nothing to do

-		// used to create the tab from the extension point

-	}

-

-	/**

-	 * Getter for {@link #tabId}

-	 *

-	 * @return

-	 *         this{@link #tabId}

-	 */

-	public final String getTabId() {

-		return this.tabId;

-	}

-

-	/**

-	 *

-	 * @param hyperLinkObjectList

-	 */

-	public abstract void setInput(final List<HyperLinkObject> hyperLinkObjectList);

-

-	/**

-	 *

-	 * @param tabId

-	 *            the id of the tab. This parameter can be set only one time!

-	 */

-	public void setTabId(String tabId) {

-		if (this.tabId == null) {

-			this.tabId = tabId;

-		}

-	}

-

-	/**

-	 * This method allows to init the parameter of the tab. These parameter can be set only one time!

-	 *

-	 * @param cTabFolder

-	 *            the CTabFolder for this tab

-	 * @param hyperlinkObjects

-	 *            the hyperlink objects

-	 * @param element

-	 *            the edited element

-	 */

-	public void init(final CTabFolder cTabFolder, List<HyperLinkObject> hyperlinkObjects, final EObject element/* , final IHyperLinkShell shell */) {

-		if (this.cTabFolder == null) {

-			this.cTabFolder = cTabFolder;

-		}

-		if (this.hyperlinkObjects == null) {

-			this.hyperlinkObjects = hyperlinkObjects;

-		}

-		if (this.element == null) {

-			this.element = element;

-		}

-	}

-

-	/**

-	 * Getter for {@link #hyperlinkObjects}

-	 *

-	 * @return

-	 *         this{@link #hyperlinkObjects}

-	 */

-	public List<HyperLinkObject> getHyperlinkObjects() {

-		return this.hyperlinkObjects;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA LIST) - Consolidate all hyperlink helper contributions into one tab
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.ui;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper;
+import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;
+import org.eclipse.swt.custom.CTabFolder;
+
+/**
+ *
+ * Each new tab should extends this class
+ *
+ */
+public abstract class AbstractHyperLinkTab {
+
+	/**
+	 * The id of the tab
+	 */
+	private String tabId;
+
+	// TODO these parameters should be privated
+	/**
+	 * The HyperLinkHelper for this tab
+	 */
+	protected AbstractHyperLinkHelper hyperLinkHelper;
+
+	/**
+	 * The hyperlink object
+	 */
+	protected List<HyperLinkObject> hyperlinkObjects;
+
+	/**
+	 * the CTabFolder
+	 */
+	protected CTabFolder cTabFolder;
+
+	/**
+	 * The edited element
+	 */
+	protected EObject element;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tabId
+	 *            the id of the tab
+	 * @param helper
+	 *            the helper for this tab
+	 */
+	public AbstractHyperLinkTab(final String tabId, final AbstractHyperLinkHelper helper) {
+		this.tabId = tabId;
+		this.hyperLinkHelper = helper;
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public AbstractHyperLinkTab() {
+		// nothing to do
+		// used to create the tab from the extension point
+	}
+
+	/**
+	 * Getter for {@link #tabId}
+	 *
+	 * @return
+	 *         this{@link #tabId}
+	 */
+	public final String getTabId() {
+		return this.tabId;
+	}
+
+	/**
+	 *
+	 * @param hyperLinkObjectList
+	 */
+	public abstract void setInput(final List<HyperLinkObject> hyperLinkObjectList);
+
+	/**
+	 *
+	 * @param tabId
+	 *            the id of the tab. This parameter can be set only one time!
+	 */
+	public void setTabId(String tabId) {
+		if (this.tabId == null) {
+			this.tabId = tabId;
+		}
+	}
+
+	/**
+	 * This method allows to init the parameter of the tab. These parameter can be set only one time!
+	 *
+	 * @param cTabFolder
+	 *            the CTabFolder for this tab
+	 * @param hyperlinkObjects
+	 *            the hyperlink objects
+	 * @param element
+	 *            the edited element
+	 */
+	public void init(final CTabFolder cTabFolder, List<HyperLinkObject> hyperlinkObjects, final EObject element/* , final IHyperLinkShell shell */) {
+		if (this.cTabFolder == null) {
+			this.cTabFolder = cTabFolder;
+		}
+		if (this.hyperlinkObjects == null) {
+			this.hyperlinkObjects = hyperlinkObjects;
+		}
+		if (this.element == null) {
+			this.element = element;
+		}
+	}
+
+	/**
+	 * Getter for {@link #hyperlinkObjects}
+	 *
+	 * @return
+	 *         this{@link #hyperlinkObjects}
+	 */
+	public List<HyperLinkObject> getHyperlinkObjects() {
+		return this.hyperlinkObjects;
+	}
+
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractLookForEditorShell.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractLookForEditorShell.java
index 3c6b413a37e..3c6b413a37e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractLookForEditorShell.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/AbstractLookForEditorShell.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/DefaultHyperLinkTab.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/DefaultHyperLinkTab.java
index 3fde695630a..c1d246d9279 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/DefaultHyperLinkTab.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/DefaultHyperLinkTab.java
@@ -1,349 +1,349 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.ui;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.hyperlink.Activator;

-import org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper;

-import org.eclipse.papyrus.infra.hyperlink.messages.Messages;

-import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.custom.CTabItem;

-import org.eclipse.swt.events.MouseEvent;

-import org.eclipse.swt.events.MouseListener;

-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.Label;

-import org.eclipse.swt.widgets.Table;

-

-/**

- * this is the tab in charge to display the hyperlink for the property defaut

- *

- */

-public class DefaultHyperLinkTab extends AbstractHyperLinkTab {

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public DefaultHyperLinkTab() {

-		super();

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param tabId

-	 * @param helper

-	 */

-	public DefaultHyperLinkTab(final String tabId, final AbstractHyperLinkHelper helper) {

-		super(tabId, helper);

-	}

-

-	protected TableViewer availableHyperLinkViewer;

-

-	protected Button defaultHRight;

-

-	protected Button defaultHleft;

-

-	protected Button defaultHup;

-

-	protected Button defaultHdown;

-

-	protected TableViewer defaultHyperLinkViewer;

-

-	protected List<HyperLinkObject> defaultHyperLinkObject = new ArrayList<HyperLinkObject>();

-

-	protected List<HyperLinkObject> availableHyperLinkObject = new ArrayList<HyperLinkObject>();

-

-	protected Composite defaultHyperlinkComposite;

-

-

-	/**

-	 *

-	 * @return get the list of hyperlink that are to be as default hyperlinks

-	 */

-	public List<HyperLinkObject> getDefaultHyperLinkObject() {

-		return defaultHyperLinkObject;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.hyperlink.ui.AbstractHyperLinkTab#init(org.eclipse.swt.custom.CTabFolder, java.util.List, org.eclipse.emf.ecore.EObject)

-	 *

-	 * @param cTabFolder

-	 * @param hyperlinkObjects

-	 * @param element

-	 */

-	@Override

-	public void init(final CTabFolder cTabFolder, List<HyperLinkObject> hyperlinkObjects, EObject element) {

-		super.init(cTabFolder, hyperlinkObjects, element);

-		CTabItem tbtmDefaultsHyperlinks = new CTabItem(cTabFolder, SWT.NONE);

-		tbtmDefaultsHyperlinks.setText(Messages.DefaultHyperLinkTab_DefaultHyperlinks);

-		defaultHyperlinkComposite = new Composite(cTabFolder, SWT.NONE);

-		defaultHyperlinkComposite.setBackgroundMode(SWT.INHERIT_DEFAULT);

-		defaultHyperlinkComposite.setBackground(defaultHyperlinkComposite.getDisplay().getSystemColor(SWT.COLOR_WHITE));

-

-		defaultHyperlinkComposite.setLayoutData(new GridData(GridData.FILL_BOTH));

-		defaultHyperlinkComposite.setLayout(new GridLayout(4, false));

-

-		Composite availableHyperlinks = new Composite(defaultHyperlinkComposite, SWT.NONE);

-		availableHyperlinks.setLayout(new GridLayout(1, true));

-		availableHyperlinks.setLayoutData(new GridData(GridData.FILL_BOTH));

-

-		Composite addRemoveButtonsComposite = new Composite(defaultHyperlinkComposite, SWT.NONE);

-		addRemoveButtonsComposite.setLayout(new GridLayout(1, true));

-		addRemoveButtonsComposite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_CENTER));

-

-		Composite defaultHyperlinks = new Composite(defaultHyperlinkComposite, SWT.NONE);

-		defaultHyperlinks.setLayout(new GridLayout(1, true));

-		defaultHyperlinks.setLayoutData(new GridData(GridData.FILL_BOTH));

-

-		Composite upDownButtonsComposite = new Composite(defaultHyperlinkComposite, SWT.NONE);

-		upDownButtonsComposite.setLayout(new GridLayout(1, true));

-		upDownButtonsComposite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_CENTER));

-

-		tbtmDefaultsHyperlinks.setControl(defaultHyperlinkComposite);

-

-		Label lblHyperlinks = new Label(availableHyperlinks, SWT.NONE);

-		lblHyperlinks.setText(Messages.DefaultHyperLinkTab_HyperLinks);

-

-		Label lblDefaultHyperlinksby = new Label(defaultHyperlinks, SWT.NONE);

-		lblDefaultHyperlinksby.setText(Messages.DefaultHyperLinkTab_DefaultHyperLinks);

-

-		Table availableHyperLink = new Table(availableHyperlinks, SWT.BORDER | SWT.FULL_SELECTION);

-		availableHyperLink.setLayoutData(new GridData(GridData.FILL_BOTH));

-

-

-		defaultHRight = new Button(addRemoveButtonsComposite, SWT.NONE);

-		defaultHRight.addMouseListener(new MouseListener() {

-

-			public void mouseUp(MouseEvent e) {

-

-			}

-

-			public void mouseDown(MouseEvent e) {

-				// move element left to right

-				if (availableHyperLinkViewer.getSelection() != null) {

-					// normally this viewer contains only hyperlinkObject

-					if (availableHyperLinkViewer.getSelection() instanceof IStructuredSelection) {

-						HyperLinkObject hyperlinkObjectToMove = (HyperLinkObject) ((IStructuredSelection) availableHyperLinkViewer.getSelection()).getFirstElement();

-						hyperlinkObjectToMove.setIsDefault(true);

-						availableHyperLinkObject.remove(hyperlinkObjectToMove);

-						defaultHyperLinkObject.add(hyperlinkObjectToMove);

-						refresh();

-					}

-				}

-			}

-

-			public void mouseDoubleClick(MouseEvent e) {

-

-			}

-		});

-		defaultHRight.setToolTipText("Set default hyperlink");

-

-		defaultHleft = new Button(addRemoveButtonsComposite, SWT.NONE);

-		defaultHleft.addMouseListener(new MouseListener() {

-

-			public void mouseUp(MouseEvent e) {

-

-			}

-

-			public void mouseDown(MouseEvent e) {

-				// move element right to left

-				if (defaultHyperLinkViewer.getSelection() != null) {

-					// normally this viewer contains only hyperlinkObject

-					if (defaultHyperLinkViewer.getSelection() instanceof IStructuredSelection) {

-

-						HyperLinkObject hyperlinkObjectToMove = (HyperLinkObject) ((IStructuredSelection) defaultHyperLinkViewer.getSelection()).getFirstElement();

-						hyperlinkObjectToMove.setIsDefault(false);

-						defaultHyperLinkObject.remove(hyperlinkObjectToMove);

-						availableHyperLinkObject.add(hyperlinkObjectToMove);

-						refresh();

-					}

-				}

-			}

-

-			public void mouseDoubleClick(MouseEvent e) {

-

-			}

-		});

-		defaultHleft.setToolTipText("Remove default hyperlink");

-

-

-		Table defaultHyperLink = new Table(defaultHyperlinks, SWT.BORDER | SWT.FULL_SELECTION);

-		defaultHyperLink.setLayoutData(new GridData(GridData.FILL_BOTH));

-

-

-		defaultHup = new Button(upDownButtonsComposite, SWT.NONE);

-		defaultHup.setToolTipText("Move default hyperlink up");

-

-		defaultHup.addMouseListener(new MouseListener() {

-

-			public void mouseUp(MouseEvent e) {

-

-			}

-

-			public void mouseDown(MouseEvent e) {

-				// move element bottom to top

-				if (defaultHyperLinkViewer.getSelection() != null) {

-					// normally this viewer contains only hyperlinkObject

-					if (defaultHyperLinkViewer.getSelection() instanceof IStructuredSelection) {

-

-						HyperLinkObject hyperlinkObjectToMove = (HyperLinkObject) ((IStructuredSelection) defaultHyperLinkViewer.getSelection()).getFirstElement();

-						int index = defaultHyperLinkObject.indexOf(hyperlinkObjectToMove);

-						if (index > 0) {

-							defaultHyperLinkObject.remove(hyperlinkObjectToMove);

-							defaultHyperLinkObject.add(index - 1, hyperlinkObjectToMove);

-							refresh();

-						}

-					}

-				}

-			}

-

-			public void mouseDoubleClick(MouseEvent e) {

-

-			}

-		});

-

-		defaultHdown = new Button(upDownButtonsComposite, SWT.NONE);

-		defaultHdown.setToolTipText("Move default hyperlink down");

-

-		defaultHdown.addMouseListener(new MouseListener() {

-

-			public void mouseUp(MouseEvent e) {

-

-			}

-

-			public void mouseDown(MouseEvent e) {

-				// move element top to bottom

-				if (defaultHyperLinkViewer.getSelection() != null) {

-					// normally this viewer contains only hyperlinkObject

-					if (defaultHyperLinkViewer.getSelection() instanceof IStructuredSelection) {

-

-						HyperLinkObject hyperlinkObjectToMove = (HyperLinkObject) ((IStructuredSelection) defaultHyperLinkViewer.getSelection()).getFirstElement();

-						int index = defaultHyperLinkObject.indexOf(hyperlinkObjectToMove);

-						if (index < defaultHyperLinkObject.size() - 1) {

-

-							defaultHyperLinkObject.remove(hyperlinkObjectToMove);

-							defaultHyperLinkObject.add(index + 1, hyperlinkObjectToMove);

-							refresh();

-						}

-					}

-				}

-			}

-

-			public void mouseDoubleClick(MouseEvent e) {

-

-			}

-		});

-

-

-		// associate image to buttons

-		defaultHdown.setImage(Activator.getDefault().getIcon(Activator.IMG_ARROW_DOWN));

-		defaultHup.setImage(Activator.getDefault().getIcon(Activator.IMG_ARROW_UP));

-		defaultHleft.setImage(Activator.getDefault().getIcon(Activator.IMG_ARROW_LEFT));

-		defaultHRight.setImage(Activator.getDefault().getIcon(Activator.IMG_ARROW_RIGHT));

-

-		EObject contextElement = EMFHelper.getEObject(element);

-

-		ILabelProvider provider = null;

-		if (contextElement != null) {

-			try {

-				provider = ServiceUtilsForEObject.getInstance().getService(LabelProviderService.class, contextElement).getLabelProvider();

-			} catch (ServiceException ex) {

-				Activator.log.error(ex);

-			}

-		}

-

-		if (provider == null) {

-			provider = new LabelProvider();

-		}

-

-

-		// init tableviewer

-		availableHyperLinkViewer = new TableViewer(availableHyperLink);

-		availableHyperLinkViewer.setLabelProvider(provider);

-		availableHyperLinkViewer.setContentProvider(CollectionContentProvider.instance);

-

-		availableHyperLinkViewer.setInput(hyperlinkObjects);

-

-		defaultHyperLinkViewer = new TableViewer(defaultHyperLink);

-		defaultHyperLinkViewer.setLabelProvider(provider);

-		defaultHyperLinkViewer.setContentProvider(CollectionContentProvider.instance);

-	}

-

-	/**

-	 *

-	 * @return the composite that manage all widgets in the this tab

-	 */

-	protected Composite getMainComposite() {

-		return defaultHyperlinkComposite;

-	}

-

-	/**

-	 * used to refresh table

-	 */

-	protected void refresh() {

-		availableHyperLinkViewer.setInput(availableHyperLinkObject);

-		defaultHyperLinkViewer.setInput(defaultHyperLinkObject);

-	}

-

-

-

-	/**

-	 * input of this tab

-	 * --> fill all available hyperlinks

-	 * --> fill all default hyperlinks

-	 *

-	 * @param hyperLinkObjectList

-	 *            the list of hyperlinks

-	 */

-	@Override

-	public void setInput(List<HyperLinkObject> hyperLinkObjectList) {

-		defaultHyperLinkObject.clear();

-		availableHyperLinkObject.clear();

-		// filter between default and not default

-		Iterator<HyperLinkObject> iterator = hyperLinkObjectList.iterator();

-		while (iterator.hasNext()) {

-			HyperLinkObject hyperlinkObject = iterator.next();

-			if (hyperlinkObject.getIsDefault()) {

-				defaultHyperLinkObject.add(hyperlinkObject);

-			} else {

-				availableHyperLinkObject.add(hyperlinkObject);

-			}

-

-		}

-		refresh();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.ui;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.hyperlink.Activator;
+import org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper;
+import org.eclipse.papyrus.infra.hyperlink.messages.Messages;
+import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
+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.Label;
+import org.eclipse.swt.widgets.Table;
+
+/**
+ * this is the tab in charge to display the hyperlink for the property defaut
+ *
+ */
+public class DefaultHyperLinkTab extends AbstractHyperLinkTab {
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public DefaultHyperLinkTab() {
+		super();
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param tabId
+	 * @param helper
+	 */
+	public DefaultHyperLinkTab(final String tabId, final AbstractHyperLinkHelper helper) {
+		super(tabId, helper);
+	}
+
+	protected TableViewer availableHyperLinkViewer;
+
+	protected Button defaultHRight;
+
+	protected Button defaultHleft;
+
+	protected Button defaultHup;
+
+	protected Button defaultHdown;
+
+	protected TableViewer defaultHyperLinkViewer;
+
+	protected List<HyperLinkObject> defaultHyperLinkObject = new ArrayList<HyperLinkObject>();
+
+	protected List<HyperLinkObject> availableHyperLinkObject = new ArrayList<HyperLinkObject>();
+
+	protected Composite defaultHyperlinkComposite;
+
+
+	/**
+	 *
+	 * @return get the list of hyperlink that are to be as default hyperlinks
+	 */
+	public List<HyperLinkObject> getDefaultHyperLinkObject() {
+		return defaultHyperLinkObject;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.hyperlink.ui.AbstractHyperLinkTab#init(org.eclipse.swt.custom.CTabFolder, java.util.List, org.eclipse.emf.ecore.EObject)
+	 *
+	 * @param cTabFolder
+	 * @param hyperlinkObjects
+	 * @param element
+	 */
+	@Override
+	public void init(final CTabFolder cTabFolder, List<HyperLinkObject> hyperlinkObjects, EObject element) {
+		super.init(cTabFolder, hyperlinkObjects, element);
+		CTabItem tbtmDefaultsHyperlinks = new CTabItem(cTabFolder, SWT.NONE);
+		tbtmDefaultsHyperlinks.setText(Messages.DefaultHyperLinkTab_DefaultHyperlinks);
+		defaultHyperlinkComposite = new Composite(cTabFolder, SWT.NONE);
+		defaultHyperlinkComposite.setBackgroundMode(SWT.INHERIT_DEFAULT);
+		defaultHyperlinkComposite.setBackground(defaultHyperlinkComposite.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+
+		defaultHyperlinkComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
+		defaultHyperlinkComposite.setLayout(new GridLayout(4, false));
+
+		Composite availableHyperlinks = new Composite(defaultHyperlinkComposite, SWT.NONE);
+		availableHyperlinks.setLayout(new GridLayout(1, true));
+		availableHyperlinks.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+		Composite addRemoveButtonsComposite = new Composite(defaultHyperlinkComposite, SWT.NONE);
+		addRemoveButtonsComposite.setLayout(new GridLayout(1, true));
+		addRemoveButtonsComposite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_CENTER));
+
+		Composite defaultHyperlinks = new Composite(defaultHyperlinkComposite, SWT.NONE);
+		defaultHyperlinks.setLayout(new GridLayout(1, true));
+		defaultHyperlinks.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+		Composite upDownButtonsComposite = new Composite(defaultHyperlinkComposite, SWT.NONE);
+		upDownButtonsComposite.setLayout(new GridLayout(1, true));
+		upDownButtonsComposite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_CENTER));
+
+		tbtmDefaultsHyperlinks.setControl(defaultHyperlinkComposite);
+
+		Label lblHyperlinks = new Label(availableHyperlinks, SWT.NONE);
+		lblHyperlinks.setText(Messages.DefaultHyperLinkTab_HyperLinks);
+
+		Label lblDefaultHyperlinksby = new Label(defaultHyperlinks, SWT.NONE);
+		lblDefaultHyperlinksby.setText(Messages.DefaultHyperLinkTab_DefaultHyperLinks);
+
+		Table availableHyperLink = new Table(availableHyperlinks, SWT.BORDER | SWT.FULL_SELECTION);
+		availableHyperLink.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+
+		defaultHRight = new Button(addRemoveButtonsComposite, SWT.NONE);
+		defaultHRight.addMouseListener(new MouseListener() {
+
+			public void mouseUp(MouseEvent e) {
+
+			}
+
+			public void mouseDown(MouseEvent e) {
+				// move element left to right
+				if (availableHyperLinkViewer.getSelection() != null) {
+					// normally this viewer contains only hyperlinkObject
+					if (availableHyperLinkViewer.getSelection() instanceof IStructuredSelection) {
+						HyperLinkObject hyperlinkObjectToMove = (HyperLinkObject) ((IStructuredSelection) availableHyperLinkViewer.getSelection()).getFirstElement();
+						hyperlinkObjectToMove.setIsDefault(true);
+						availableHyperLinkObject.remove(hyperlinkObjectToMove);
+						defaultHyperLinkObject.add(hyperlinkObjectToMove);
+						refresh();
+					}
+				}
+			}
+
+			public void mouseDoubleClick(MouseEvent e) {
+
+			}
+		});
+		defaultHRight.setToolTipText("Set default hyperlink");
+
+		defaultHleft = new Button(addRemoveButtonsComposite, SWT.NONE);
+		defaultHleft.addMouseListener(new MouseListener() {
+
+			public void mouseUp(MouseEvent e) {
+
+			}
+
+			public void mouseDown(MouseEvent e) {
+				// move element right to left
+				if (defaultHyperLinkViewer.getSelection() != null) {
+					// normally this viewer contains only hyperlinkObject
+					if (defaultHyperLinkViewer.getSelection() instanceof IStructuredSelection) {
+
+						HyperLinkObject hyperlinkObjectToMove = (HyperLinkObject) ((IStructuredSelection) defaultHyperLinkViewer.getSelection()).getFirstElement();
+						hyperlinkObjectToMove.setIsDefault(false);
+						defaultHyperLinkObject.remove(hyperlinkObjectToMove);
+						availableHyperLinkObject.add(hyperlinkObjectToMove);
+						refresh();
+					}
+				}
+			}
+
+			public void mouseDoubleClick(MouseEvent e) {
+
+			}
+		});
+		defaultHleft.setToolTipText("Remove default hyperlink");
+
+
+		Table defaultHyperLink = new Table(defaultHyperlinks, SWT.BORDER | SWT.FULL_SELECTION);
+		defaultHyperLink.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+
+		defaultHup = new Button(upDownButtonsComposite, SWT.NONE);
+		defaultHup.setToolTipText("Move default hyperlink up");
+
+		defaultHup.addMouseListener(new MouseListener() {
+
+			public void mouseUp(MouseEvent e) {
+
+			}
+
+			public void mouseDown(MouseEvent e) {
+				// move element bottom to top
+				if (defaultHyperLinkViewer.getSelection() != null) {
+					// normally this viewer contains only hyperlinkObject
+					if (defaultHyperLinkViewer.getSelection() instanceof IStructuredSelection) {
+
+						HyperLinkObject hyperlinkObjectToMove = (HyperLinkObject) ((IStructuredSelection) defaultHyperLinkViewer.getSelection()).getFirstElement();
+						int index = defaultHyperLinkObject.indexOf(hyperlinkObjectToMove);
+						if (index > 0) {
+							defaultHyperLinkObject.remove(hyperlinkObjectToMove);
+							defaultHyperLinkObject.add(index - 1, hyperlinkObjectToMove);
+							refresh();
+						}
+					}
+				}
+			}
+
+			public void mouseDoubleClick(MouseEvent e) {
+
+			}
+		});
+
+		defaultHdown = new Button(upDownButtonsComposite, SWT.NONE);
+		defaultHdown.setToolTipText("Move default hyperlink down");
+
+		defaultHdown.addMouseListener(new MouseListener() {
+
+			public void mouseUp(MouseEvent e) {
+
+			}
+
+			public void mouseDown(MouseEvent e) {
+				// move element top to bottom
+				if (defaultHyperLinkViewer.getSelection() != null) {
+					// normally this viewer contains only hyperlinkObject
+					if (defaultHyperLinkViewer.getSelection() instanceof IStructuredSelection) {
+
+						HyperLinkObject hyperlinkObjectToMove = (HyperLinkObject) ((IStructuredSelection) defaultHyperLinkViewer.getSelection()).getFirstElement();
+						int index = defaultHyperLinkObject.indexOf(hyperlinkObjectToMove);
+						if (index < defaultHyperLinkObject.size() - 1) {
+
+							defaultHyperLinkObject.remove(hyperlinkObjectToMove);
+							defaultHyperLinkObject.add(index + 1, hyperlinkObjectToMove);
+							refresh();
+						}
+					}
+				}
+			}
+
+			public void mouseDoubleClick(MouseEvent e) {
+
+			}
+		});
+
+
+		// associate image to buttons
+		defaultHdown.setImage(Activator.getDefault().getIcon(Activator.IMG_ARROW_DOWN));
+		defaultHup.setImage(Activator.getDefault().getIcon(Activator.IMG_ARROW_UP));
+		defaultHleft.setImage(Activator.getDefault().getIcon(Activator.IMG_ARROW_LEFT));
+		defaultHRight.setImage(Activator.getDefault().getIcon(Activator.IMG_ARROW_RIGHT));
+
+		EObject contextElement = EMFHelper.getEObject(element);
+
+		ILabelProvider provider = null;
+		if (contextElement != null) {
+			try {
+				provider = ServiceUtilsForEObject.getInstance().getService(LabelProviderService.class, contextElement).getLabelProvider();
+			} catch (ServiceException ex) {
+				Activator.log.error(ex);
+			}
+		}
+
+		if (provider == null) {
+			provider = new LabelProvider();
+		}
+
+
+		// init tableviewer
+		availableHyperLinkViewer = new TableViewer(availableHyperLink);
+		availableHyperLinkViewer.setLabelProvider(provider);
+		availableHyperLinkViewer.setContentProvider(CollectionContentProvider.instance);
+
+		availableHyperLinkViewer.setInput(hyperlinkObjects);
+
+		defaultHyperLinkViewer = new TableViewer(defaultHyperLink);
+		defaultHyperLinkViewer.setLabelProvider(provider);
+		defaultHyperLinkViewer.setContentProvider(CollectionContentProvider.instance);
+	}
+
+	/**
+	 *
+	 * @return the composite that manage all widgets in the this tab
+	 */
+	protected Composite getMainComposite() {
+		return defaultHyperlinkComposite;
+	}
+
+	/**
+	 * used to refresh table
+	 */
+	protected void refresh() {
+		availableHyperLinkViewer.setInput(availableHyperLinkObject);
+		defaultHyperLinkViewer.setInput(defaultHyperLinkObject);
+	}
+
+
+
+	/**
+	 * input of this tab
+	 * --> fill all available hyperlinks
+	 * --> fill all default hyperlinks
+	 *
+	 * @param hyperLinkObjectList
+	 *            the list of hyperlinks
+	 */
+	@Override
+	public void setInput(List<HyperLinkObject> hyperLinkObjectList) {
+		defaultHyperLinkObject.clear();
+		availableHyperLinkObject.clear();
+		// filter between default and not default
+		Iterator<HyperLinkObject> iterator = hyperLinkObjectList.iterator();
+		while (iterator.hasNext()) {
+			HyperLinkObject hyperlinkObject = iterator.next();
+			if (hyperlinkObject.getIsDefault()) {
+				defaultHyperLinkObject.add(hyperlinkObject);
+			} else {
+				availableHyperLinkObject.add(hyperlinkObject);
+			}
+
+		}
+		refresh();
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorHyperLinkWebShell.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorHyperLinkWebShell.java
index ae88d12b9c1..6376778beb7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorHyperLinkWebShell.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorHyperLinkWebShell.java
@@ -1,172 +1,172 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.ui;

-

-

-import org.eclipse.papyrus.infra.hyperlink.messages.Messages;

-import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkWeb;

-import org.eclipse.swt.events.KeyEvent;

-import org.eclipse.swt.events.KeyListener;

-import org.eclipse.swt.events.MouseEvent;

-import org.eclipse.swt.events.MouseListener;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * The Class HyperlinkWebEditor is used to add or modify an hyperlink web entry.

- * you can use the default button for the tooltip.

- */

-public class EditorHyperLinkWebShell extends AbstractEditHyperlinkShell {

-

-	/** The Constant HYPERLINKS_LABEL. */

-	protected static final String HYPERLINKS_LABEL = Messages.EditorHyperLinkWebShell_Hyperlinks;

-

-	/** The Constant HTTP. */

-	protected static final String HTTP = "http://"; //$NON-NLS-1$

-

-	/** The hyper link web. */

-	private HyperLinkWeb hyperLinkWeb = null;

-

-	/** The usedefault tooltip. */

-	private boolean usedefaultTooltip = true;

-

-	/**

-	 * Open.

-	 */

-	public void open() {

-		Display display = Display.getCurrent();

-

-		// code use to wait for an action from the user

-		getEditHyperlinkShell().pack();

-		// getEditHyperlinkShell().setBounds(500, 500, 600, 120);

-		getEditHyperlinkShell().open();

-		while (!getEditHyperlinkShell().isDisposed()) {

-			if (!display.readAndDispatch()) {

-				display.sleep();

-			}

-		}

-	}

-

-	/**

-	 * Instantiates a new hyperlink web editor.

-	 */

-	public EditorHyperLinkWebShell() {

-		super();

-		createEditHyperlinkShell();

-

-		this.getObjectcLabel().setText(HYPERLINKS_LABEL);

-		// fill information

-		if (hyperLinkWeb != null) {

-			this.getObjectLabeltext().setText(hyperLinkWeb.getHyperLinkWeb());

-			this.getTooltipInputText().setText(hyperLinkWeb.getTooltipText());

-		} else {

-			this.getObjectLabeltext().setText(HTTP);

-			this.getObjectLabeltext().setSelection(HTTP.length());

-		}

-		// listener to cancel

-		this.getCancelButton().addMouseListener(new MouseListener() {

-

-			public void mouseUp(MouseEvent e) {

-			}

-

-			public void mouseDown(MouseEvent e) {

-				hyperLinkWeb = null;

-				getEditHyperlinkShell().close();

-			}

-

-			public void mouseDoubleClick(MouseEvent e) {

-			}

-		});

-		// listener to click on OK

-		this.getOkButton().addMouseListener(new MouseListener() {

-

-			public void mouseUp(MouseEvent e) {

-			}

-

-			public void mouseDown(MouseEvent e) {

-				if (hyperLinkWeb == null) {

-					hyperLinkWeb = new HyperLinkWeb();

-				}

-				hyperLinkWeb.setHyperLinkWeb(getObjectLabeltext().getText().trim());

-				hyperLinkWeb.setTooltipText(getTooltipInputText().getText().trim());

-

-				getEditHyperlinkShell().close();

-			}

-

-			public void mouseDoubleClick(MouseEvent e) {

-			}

-		});

-		// intialize "use default" check box

-		getUseDefaultCheckBox().setSelection(usedefaultTooltip);

-		if (usedefaultTooltip) {

-			getTooltipInputText().setEditable(false);

-			getTooltipInputText().setText(getObjectLabeltext().getText());

-		}

-		// add listener "use default button"

-		getUseDefaultCheckBox().addMouseListener(new MouseListener() {

-

-			public void mouseUp(MouseEvent e) {

-				usedefaultTooltip = getUseDefaultCheckBox().getSelection();

-				if (usedefaultTooltip) {

-					getTooltipInputText().setEditable(false);

-					getTooltipInputText().setText(getObjectLabeltext().getText());

-				} else {

-					getTooltipInputText().setEditable(true);

-				}

-			}

-

-			public void mouseDown(MouseEvent e) {

-			}

-

-			public void mouseDoubleClick(MouseEvent e) {

-			}

-		});

-

-		// add a key listener on inputText to synchronize with the tooltip in

-		// the case of use

-		// default

-		getObjectLabeltext().addKeyListener(new KeyListener() {

-

-			public void keyReleased(KeyEvent e) {

-				if (usedefaultTooltip) {

-					getTooltipInputText().setText(getObjectLabeltext().getText());

-				}

-			}

-

-			public void keyPressed(KeyEvent e) {

-			}

-		});

-	}

-

-	/**

-	 * Gets the hyper link web.

-	 *

-	 * @return the hyperLinkWeb

-	 */

-	public HyperLinkWeb getHyperLinkWeb() {

-		return hyperLinkWeb;

-	}

-

-	/**

-	 * Sets the hyper link web.

-	 *

-	 * @param hyperLinkWeb

-	 *            the hyperLinkWeb to set

-	 */

-	public void setHyperLinkWeb(HyperLinkWeb hyperLinkWeb) {

-		this.hyperLinkWeb = hyperLinkWeb;

-		this.getObjectLabeltext().setText(hyperLinkWeb.getHyperLinkWeb());

-		this.getTooltipInputText().setText(hyperLinkWeb.getTooltipText());

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.ui;
+
+
+import org.eclipse.papyrus.infra.hyperlink.messages.Messages;
+import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkWeb;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * The Class HyperlinkWebEditor is used to add or modify an hyperlink web entry.
+ * you can use the default button for the tooltip.
+ */
+public class EditorHyperLinkWebShell extends AbstractEditHyperlinkShell {
+
+	/** The Constant HYPERLINKS_LABEL. */
+	protected static final String HYPERLINKS_LABEL = Messages.EditorHyperLinkWebShell_Hyperlinks;
+
+	/** The Constant HTTP. */
+	protected static final String HTTP = "http://"; //$NON-NLS-1$
+
+	/** The hyper link web. */
+	private HyperLinkWeb hyperLinkWeb = null;
+
+	/** The usedefault tooltip. */
+	private boolean usedefaultTooltip = true;
+
+	/**
+	 * Open.
+	 */
+	public void open() {
+		Display display = Display.getCurrent();
+
+		// code use to wait for an action from the user
+		getEditHyperlinkShell().pack();
+		// getEditHyperlinkShell().setBounds(500, 500, 600, 120);
+		getEditHyperlinkShell().open();
+		while (!getEditHyperlinkShell().isDisposed()) {
+			if (!display.readAndDispatch()) {
+				display.sleep();
+			}
+		}
+	}
+
+	/**
+	 * Instantiates a new hyperlink web editor.
+	 */
+	public EditorHyperLinkWebShell() {
+		super();
+		createEditHyperlinkShell();
+
+		this.getObjectcLabel().setText(HYPERLINKS_LABEL);
+		// fill information
+		if (hyperLinkWeb != null) {
+			this.getObjectLabeltext().setText(hyperLinkWeb.getHyperLinkWeb());
+			this.getTooltipInputText().setText(hyperLinkWeb.getTooltipText());
+		} else {
+			this.getObjectLabeltext().setText(HTTP);
+			this.getObjectLabeltext().setSelection(HTTP.length());
+		}
+		// listener to cancel
+		this.getCancelButton().addMouseListener(new MouseListener() {
+
+			public void mouseUp(MouseEvent e) {
+			}
+
+			public void mouseDown(MouseEvent e) {
+				hyperLinkWeb = null;
+				getEditHyperlinkShell().close();
+			}
+
+			public void mouseDoubleClick(MouseEvent e) {
+			}
+		});
+		// listener to click on OK
+		this.getOkButton().addMouseListener(new MouseListener() {
+
+			public void mouseUp(MouseEvent e) {
+			}
+
+			public void mouseDown(MouseEvent e) {
+				if (hyperLinkWeb == null) {
+					hyperLinkWeb = new HyperLinkWeb();
+				}
+				hyperLinkWeb.setHyperLinkWeb(getObjectLabeltext().getText().trim());
+				hyperLinkWeb.setTooltipText(getTooltipInputText().getText().trim());
+
+				getEditHyperlinkShell().close();
+			}
+
+			public void mouseDoubleClick(MouseEvent e) {
+			}
+		});
+		// intialize "use default" check box
+		getUseDefaultCheckBox().setSelection(usedefaultTooltip);
+		if (usedefaultTooltip) {
+			getTooltipInputText().setEditable(false);
+			getTooltipInputText().setText(getObjectLabeltext().getText());
+		}
+		// add listener "use default button"
+		getUseDefaultCheckBox().addMouseListener(new MouseListener() {
+
+			public void mouseUp(MouseEvent e) {
+				usedefaultTooltip = getUseDefaultCheckBox().getSelection();
+				if (usedefaultTooltip) {
+					getTooltipInputText().setEditable(false);
+					getTooltipInputText().setText(getObjectLabeltext().getText());
+				} else {
+					getTooltipInputText().setEditable(true);
+				}
+			}
+
+			public void mouseDown(MouseEvent e) {
+			}
+
+			public void mouseDoubleClick(MouseEvent e) {
+			}
+		});
+
+		// add a key listener on inputText to synchronize with the tooltip in
+		// the case of use
+		// default
+		getObjectLabeltext().addKeyListener(new KeyListener() {
+
+			public void keyReleased(KeyEvent e) {
+				if (usedefaultTooltip) {
+					getTooltipInputText().setText(getObjectLabeltext().getText());
+				}
+			}
+
+			public void keyPressed(KeyEvent e) {
+			}
+		});
+	}
+
+	/**
+	 * Gets the hyper link web.
+	 *
+	 * @return the hyperLinkWeb
+	 */
+	public HyperLinkWeb getHyperLinkWeb() {
+		return hyperLinkWeb;
+	}
+
+	/**
+	 * Sets the hyper link web.
+	 *
+	 * @param hyperLinkWeb
+	 *            the hyperLinkWeb to set
+	 */
+	public void setHyperLinkWeb(HyperLinkWeb hyperLinkWeb) {
+		this.hyperLinkWeb = hyperLinkWeb;
+		this.getObjectLabeltext().setText(hyperLinkWeb.getHyperLinkWeb());
+		this.getTooltipInputText().setText(hyperLinkWeb.getTooltipText());
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorHyperlinkDocumentShell.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorHyperlinkDocumentShell.java
index 04221a75255..2fc7da1a338 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorHyperlinkDocumentShell.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorHyperlinkDocumentShell.java
@@ -1,164 +1,164 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.ui;

-

-import org.eclipse.papyrus.infra.hyperlink.messages.Messages;

-import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkDocument;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.MouseEvent;

-import org.eclipse.swt.events.MouseListener;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.FileDialog;

-

-/**

- * The Class EditorHyperlinkDocumentShell.

- */

-public class EditorHyperlinkDocumentShell extends AbstractEditHyperlinkDocumentShell {

-

-	/** The usedefault tooltip. */

-	protected boolean usedefaultTooltip = true;

-

-	/** The hyperlink document. */

-	protected HyperLinkDocument hyperlinkDocument;

-

-	/**

-	 * Gets the hyperlink document.

-	 *

-	 * @return the hyperlinkDocument

-	 */

-	public HyperLinkDocument getHyperlinkDocument() {

-		return hyperlinkDocument;

-	}

-

-	/**

-	 * Sets the hyperlink document.

-	 *

-	 * @param hyperlinkDocument

-	 *            the hyperlinkDocument to set

-	 */

-	public void setHyperlinkDocument(HyperLinkDocument hyperlinkDocument) {

-		this.hyperlinkDocument = hyperlinkDocument;

-		getObjectLabeltext().setText(getHyperlinkDocument().getHyperlinkDocument());

-		getTooltipInputText().setText(getHyperlinkDocument().getTooltipText());

-	}

-

-	/**

-	 * Open.

-	 */

-	public void open() {

-		Display display = Display.getCurrent();

-

-		// code use to wait for an action from the user

-		// getEditHyperlinkShell().setBounds(500, 500, 600, 120);

-		getEditHyperlinkShell().pack();

-		getEditHyperlinkShell().open();

-		while (!getEditHyperlinkShell().isDisposed()) {

-			if (!display.readAndDispatch()) {

-				display.sleep();

-			}

-		}

-	}

-

-	/**

-	 * Instantiates a new editor hyperlink document shell.

-	 */

-	public EditorHyperlinkDocumentShell() {

-		super();

-		createEditHyperlinkShell();

-

-		// intialize "use default" check box

-		getUseDefaultCheckBox().setSelection(usedefaultTooltip);

-		getObjectLabeltext().setEditable(false);

-		if (usedefaultTooltip) {

-			getTooltipInputText().setEditable(false);

-			getTooltipInputText().setText(getObjectLabeltext().getText());

-		}

-		// add listener "use default button"

-		getUseDefaultCheckBox().addMouseListener(new MouseListener() {

-

-			public void mouseUp(MouseEvent e) {

-				usedefaultTooltip = getUseDefaultCheckBox().getSelection();

-				if (usedefaultTooltip) {

-					getTooltipInputText().setEditable(false);

-					getTooltipInputText().setText(getObjectLabeltext().getText());

-				} else {

-					getTooltipInputText().setEditable(true);

-				}

-			}

-

-			public void mouseDown(MouseEvent e) {

-			}

-

-			public void mouseDoubleClick(MouseEvent e) {

-			}

-		});

-

-		getChooseDiagramButton().addMouseListener(new MouseListener() {

-

-			public void mouseUp(MouseEvent e) {

-			}

-

-			public void mouseDown(MouseEvent e) {

-				FileDialog fd = new FileDialog(getEditHyperlinkShell(), SWT.OPEN);

-				fd.setText(Messages.EditorHyperlinkDocumentShell_Open);

-				String[] filterExt = { "*.pdf", "*.doc", "*.txt", "*" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$

-				fd.setFilterExtensions(filterExt);

-				String selected = fd.open();

-				if (selected != null) {

-					getObjectLabeltext().setText(selected);

-					if (usedefaultTooltip) {

-						getTooltipInputText().setText(selected);

-					}

-				}

-			}

-

-			public void mouseDoubleClick(MouseEvent e) {

-			}

-		});

-

-		// listener to cancel

-		this.getCancelButton().addMouseListener(new MouseListener() {

-

-			public void mouseUp(MouseEvent e) {

-			}

-

-			public void mouseDown(MouseEvent e) {

-				hyperlinkDocument = null;

-				getEditHyperlinkShell().close();

-			}

-

-			public void mouseDoubleClick(MouseEvent e) {

-			}

-		});

-		// listener to click on OK

-		this.getOkButton().addMouseListener(new MouseListener() {

-

-			public void mouseUp(MouseEvent e) {

-			}

-

-			public void mouseDown(MouseEvent e) {

-				if (hyperlinkDocument == null) {

-					hyperlinkDocument = new HyperLinkDocument();

-				}

-				hyperlinkDocument.setHyperlinkDocument(getObjectLabeltext().getText().trim());

-				hyperlinkDocument.setTooltipText(getTooltipInputText().getText().trim());

-

-				getEditHyperlinkShell().close();

-			}

-

-			public void mouseDoubleClick(MouseEvent e) {

-			}

-		});

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.ui;
+
+import org.eclipse.papyrus.infra.hyperlink.messages.Messages;
+import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkDocument;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.FileDialog;
+
+/**
+ * The Class EditorHyperlinkDocumentShell.
+ */
+public class EditorHyperlinkDocumentShell extends AbstractEditHyperlinkDocumentShell {
+
+	/** The usedefault tooltip. */
+	protected boolean usedefaultTooltip = true;
+
+	/** The hyperlink document. */
+	protected HyperLinkDocument hyperlinkDocument;
+
+	/**
+	 * Gets the hyperlink document.
+	 *
+	 * @return the hyperlinkDocument
+	 */
+	public HyperLinkDocument getHyperlinkDocument() {
+		return hyperlinkDocument;
+	}
+
+	/**
+	 * Sets the hyperlink document.
+	 *
+	 * @param hyperlinkDocument
+	 *            the hyperlinkDocument to set
+	 */
+	public void setHyperlinkDocument(HyperLinkDocument hyperlinkDocument) {
+		this.hyperlinkDocument = hyperlinkDocument;
+		getObjectLabeltext().setText(getHyperlinkDocument().getHyperlinkDocument());
+		getTooltipInputText().setText(getHyperlinkDocument().getTooltipText());
+	}
+
+	/**
+	 * Open.
+	 */
+	public void open() {
+		Display display = Display.getCurrent();
+
+		// code use to wait for an action from the user
+		// getEditHyperlinkShell().setBounds(500, 500, 600, 120);
+		getEditHyperlinkShell().pack();
+		getEditHyperlinkShell().open();
+		while (!getEditHyperlinkShell().isDisposed()) {
+			if (!display.readAndDispatch()) {
+				display.sleep();
+			}
+		}
+	}
+
+	/**
+	 * Instantiates a new editor hyperlink document shell.
+	 */
+	public EditorHyperlinkDocumentShell() {
+		super();
+		createEditHyperlinkShell();
+
+		// intialize "use default" check box
+		getUseDefaultCheckBox().setSelection(usedefaultTooltip);
+		getObjectLabeltext().setEditable(false);
+		if (usedefaultTooltip) {
+			getTooltipInputText().setEditable(false);
+			getTooltipInputText().setText(getObjectLabeltext().getText());
+		}
+		// add listener "use default button"
+		getUseDefaultCheckBox().addMouseListener(new MouseListener() {
+
+			public void mouseUp(MouseEvent e) {
+				usedefaultTooltip = getUseDefaultCheckBox().getSelection();
+				if (usedefaultTooltip) {
+					getTooltipInputText().setEditable(false);
+					getTooltipInputText().setText(getObjectLabeltext().getText());
+				} else {
+					getTooltipInputText().setEditable(true);
+				}
+			}
+
+			public void mouseDown(MouseEvent e) {
+			}
+
+			public void mouseDoubleClick(MouseEvent e) {
+			}
+		});
+
+		getChooseDiagramButton().addMouseListener(new MouseListener() {
+
+			public void mouseUp(MouseEvent e) {
+			}
+
+			public void mouseDown(MouseEvent e) {
+				FileDialog fd = new FileDialog(getEditHyperlinkShell(), SWT.OPEN);
+				fd.setText(Messages.EditorHyperlinkDocumentShell_Open);
+				String[] filterExt = { "*.pdf", "*.doc", "*.txt", "*" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+				fd.setFilterExtensions(filterExt);
+				String selected = fd.open();
+				if (selected != null) {
+					getObjectLabeltext().setText(selected);
+					if (usedefaultTooltip) {
+						getTooltipInputText().setText(selected);
+					}
+				}
+			}
+
+			public void mouseDoubleClick(MouseEvent e) {
+			}
+		});
+
+		// listener to cancel
+		this.getCancelButton().addMouseListener(new MouseListener() {
+
+			public void mouseUp(MouseEvent e) {
+			}
+
+			public void mouseDown(MouseEvent e) {
+				hyperlinkDocument = null;
+				getEditHyperlinkShell().close();
+			}
+
+			public void mouseDoubleClick(MouseEvent e) {
+			}
+		});
+		// listener to click on OK
+		this.getOkButton().addMouseListener(new MouseListener() {
+
+			public void mouseUp(MouseEvent e) {
+			}
+
+			public void mouseDown(MouseEvent e) {
+				if (hyperlinkDocument == null) {
+					hyperlinkDocument = new HyperLinkDocument();
+				}
+				hyperlinkDocument.setHyperlinkDocument(getObjectLabeltext().getText().trim());
+				hyperlinkDocument.setTooltipText(getTooltipInputText().getText().trim());
+
+				getEditHyperlinkShell().close();
+			}
+
+			public void mouseDoubleClick(MouseEvent e) {
+			}
+		});
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorNavigationDialog.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorNavigationDialog.java
index 3585ed14b6b..ebc676d50f8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorNavigationDialog.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorNavigationDialog.java
@@ -1,155 +1,155 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.hyperlink.ui;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.hyperlink.Activator;

-import org.eclipse.papyrus.infra.hyperlink.messages.Messages;

-import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableItem;

-

-/**

- * dialog to display a list of hyperlinks. the button ok is use to excute the

- * action linked to the hyperlink (open new diagram, open new editor...)

- *

- */

-public class EditorNavigationDialog extends Dialog {

-

-	// prefered dimension

-	protected int width = 350;

-

-	protected int height = 150;

-

-	protected List<HyperLinkObject> hyperlinkObjects;

-

-	private TableViewer tableViewer;

-

-	protected Table availableHyperLink;

-

-	protected List<HyperLinkObject> hyperlinkResult = new ArrayList<HyperLinkObject>();

-

-	protected EObject contextElement;

-

-	/**

-	 *

-	 * dialog to display a list of hyperlinks. the button ok is use to excute

-	 * the action linked to the hyperlink (open new diagram, open new editor...)

-	 *

-	 * @param parentShell

-	 *            a shell

-	 * @param hyperlinkObjects

-	 *            the list of hyperlinkObjects

-	 */

-	public EditorNavigationDialog(Shell parentShell, ArrayList<HyperLinkObject> hyperlinkObjects, EObject contextElement) {

-		super(parentShell);

-		this.hyperlinkObjects = hyperlinkObjects;

-		this.contextElement = contextElement;

-	}

-

-	@Override

-	protected boolean isResizable() {

-		return true;

-	}

-

-	@Override

-	protected Control createContents(Composite parent) {

-		super.createContents(parent);

-		Composite defaultHyperlinkComposite = (Composite) getDialogArea();

-

-		Label lblHyperlinks = new Label(defaultHyperlinkComposite, SWT.NONE);

-		lblHyperlinks.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLACK));

-		lblHyperlinks.setText(Messages.DiagramNavigationDialog_WhichHyperLinksWouldYouToNavigateTo);

-

-		// creation of the table

-		availableHyperLink = new Table(defaultHyperlinkComposite, SWT.CHECK | SWT.BORDER | SWT.FULL_SELECTION);

-		availableHyperLink.setLayoutData(new GridData(GridData.FILL_BOTH));

-

-		// set the content provider

-		tableViewer = new TableViewer(availableHyperLink);

-		tableViewer.setContentProvider(CollectionContentProvider.instance);

-

-		// set the label provider

-		ILabelProvider provider = null;

-		if (contextElement != null) {

-			try {

-				provider = ServiceUtilsForEObject.getInstance().getService(LabelProviderService.class, contextElement).getLabelProvider();

-			} catch (ServiceException ex) {

-				Activator.log.error(ex);

-			}

-		}

-

-		if (provider == null) {

-			provider = new LabelProvider();

-		}

-

-		tableViewer.setLabelProvider(provider);

-		tableViewer.setInput(this.hyperlinkObjects);

-

-		// Check all elements by default

-		for (TableItem item : availableHyperLink.getItems()) {

-			item.setChecked(true);

-		}

-

-		getShell().setText(Messages.DiagramNavigationDialog_ChooseHyperLinks);

-		getShell().pack();

-

-		return defaultHyperlinkComposite;

-	}

-

-	/**

-	 * get the list of selected hyperlinks

-	 *

-	 * @return the list

-	 */

-	public List<HyperLinkObject> getSelectedHyperlinks() {

-		return hyperlinkResult;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()

-	 *

-	 */

-	@Override

-	protected void okPressed() {

-

-		hyperlinkResult = new ArrayList<HyperLinkObject>();

-		TableItem[] tableItems = availableHyperLink.getItems();

-		for (int i = 0; i < tableItems.length; i++) {

-			if (tableItems[i].getChecked()) {

-				hyperlinkResult.add((HyperLinkObject) tableItems[i].getData());

-			}

-		}

-

-		super.okPressed();

-	}

-}

+/*****************************************************************************
+ * 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.hyperlink.ui;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.hyperlink.Activator;
+import org.eclipse.papyrus.infra.hyperlink.messages.Messages;
+import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableItem;
+
+/**
+ * dialog to display a list of hyperlinks. the button ok is use to excute the
+ * action linked to the hyperlink (open new diagram, open new editor...)
+ *
+ */
+public class EditorNavigationDialog extends Dialog {
+
+	// prefered dimension
+	protected int width = 350;
+
+	protected int height = 150;
+
+	protected List<HyperLinkObject> hyperlinkObjects;
+
+	private TableViewer tableViewer;
+
+	protected Table availableHyperLink;
+
+	protected List<HyperLinkObject> hyperlinkResult = new ArrayList<HyperLinkObject>();
+
+	protected EObject contextElement;
+
+	/**
+	 *
+	 * dialog to display a list of hyperlinks. the button ok is use to excute
+	 * the action linked to the hyperlink (open new diagram, open new editor...)
+	 *
+	 * @param parentShell
+	 *            a shell
+	 * @param hyperlinkObjects
+	 *            the list of hyperlinkObjects
+	 */
+	public EditorNavigationDialog(Shell parentShell, ArrayList<HyperLinkObject> hyperlinkObjects, EObject contextElement) {
+		super(parentShell);
+		this.hyperlinkObjects = hyperlinkObjects;
+		this.contextElement = contextElement;
+	}
+
+	@Override
+	protected boolean isResizable() {
+		return true;
+	}
+
+	@Override
+	protected Control createContents(Composite parent) {
+		super.createContents(parent);
+		Composite defaultHyperlinkComposite = (Composite) getDialogArea();
+
+		Label lblHyperlinks = new Label(defaultHyperlinkComposite, SWT.NONE);
+		lblHyperlinks.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLACK));
+		lblHyperlinks.setText(Messages.DiagramNavigationDialog_WhichHyperLinksWouldYouToNavigateTo);
+
+		// creation of the table
+		availableHyperLink = new Table(defaultHyperlinkComposite, SWT.CHECK | SWT.BORDER | SWT.FULL_SELECTION);
+		availableHyperLink.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+		// set the content provider
+		tableViewer = new TableViewer(availableHyperLink);
+		tableViewer.setContentProvider(CollectionContentProvider.instance);
+
+		// set the label provider
+		ILabelProvider provider = null;
+		if (contextElement != null) {
+			try {
+				provider = ServiceUtilsForEObject.getInstance().getService(LabelProviderService.class, contextElement).getLabelProvider();
+			} catch (ServiceException ex) {
+				Activator.log.error(ex);
+			}
+		}
+
+		if (provider == null) {
+			provider = new LabelProvider();
+		}
+
+		tableViewer.setLabelProvider(provider);
+		tableViewer.setInput(this.hyperlinkObjects);
+
+		// Check all elements by default
+		for (TableItem item : availableHyperLink.getItems()) {
+			item.setChecked(true);
+		}
+
+		getShell().setText(Messages.DiagramNavigationDialog_ChooseHyperLinks);
+		getShell().pack();
+
+		return defaultHyperlinkComposite;
+	}
+
+	/**
+	 * get the list of selected hyperlinks
+	 *
+	 * @return the list
+	 */
+	public List<HyperLinkObject> getSelectedHyperlinks() {
+		return hyperlinkResult;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
+	 *
+	 */
+	@Override
+	protected void okPressed() {
+
+		hyperlinkResult = new ArrayList<HyperLinkObject>();
+		TableItem[] tableItems = availableHyperLink.getItems();
+		for (int i = 0; i < tableItems.length; i++) {
+			if (tableItems[i].getChecked()) {
+				hyperlinkResult.add((HyperLinkObject) tableItems[i].getData());
+			}
+		}
+
+		super.okPressed();
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/HyperLinkManagerShell.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/HyperLinkManagerShell.java
index d006e578e38..8570d849a8d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/HyperLinkManagerShell.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/HyperLinkManagerShell.java
@@ -1,415 +1,415 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Arthut Daussy (Atos) arthur.daussy@atos.net - Bug 363827 - [Improvement] Diagram creation, remember the latest tab chosen

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.ui;

-

-import java.io.IOException;

-import java.io.StringReader;

-import java.io.StringWriter;

-import java.util.ArrayList;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.emf.common.command.CompoundCommand;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.hyperlink.Activator;

-import org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper;

-import org.eclipse.papyrus.infra.hyperlink.helper.HyperLinkHelperFactory;

-import org.eclipse.papyrus.infra.hyperlink.messages.Messages;

-import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;

-import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkException;

-import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkTabsRegistrationUtil;

-import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistry;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Event;

-import org.eclipse.swt.widgets.Listener;

-import org.eclipse.ui.IMemento;

-import org.eclipse.ui.WorkbenchException;

-import org.eclipse.ui.XMLMemento;

-

-/**

- * The Class HyperLinkManagerShell2.

- */

-public class HyperLinkManagerShell extends AbstractHyperLinkManagerShell {

-

-	/**

-	 * Memento's name to store Hyper Link Shell data

-	 */

-	private static final String HYPER_LINK_SHELL_MEMENTO = "HYPER_LINK_SHELL_MEMENTO"; //$NON-NLS-1$

-

-	/**

-	 * Memento's name to store index of the last tab used for a specific element type

-	 */

-	private static final String LAST_TAB_USE_MEMENTO = "LAST_TAB_USE_MEMENTO"; //$NON-NLS-1$

-

-	/**

-	 * Memento's name to store index of the last tab (for all element)

-	 */

-	protected static final String LAST_GLOBAL_TAB_USED = "LAST_USED_MEMENTO"; //$NON-NLS-1$

-

-	/**

-	 * The command to execute to set the new eannotation

-	 */

-	private CompoundCommand cmd;

-

-	final protected List<HyperLinkObject> allhypHyperlinkObjects = new ArrayList<HyperLinkObject>();

-

-	/** The graphical representation of the element (a View in GMF) */

-	protected EModelElement view;

-

-	protected EObject semanticElement;

-

-	/** The domain. */

-	protected TransactionalEditingDomain transactionalEditingDomain;

-

-	protected HyperLinkHelperFactory hyperLinkHelperFactory;

-

-

-

-	public void setInput(List<HyperLinkObject> hyperLinkObjectList) {

-		this.allhypHyperlinkObjects.clear();

-		this.allhypHyperlinkObjects.addAll(hyperLinkObjectList);

-		Iterator<AbstractHyperLinkTab> iter = tabList.iterator();

-		while (iter.hasNext()) {

-			AbstractHyperLinkTab hyperLinkTab = iter.next();

-			hyperLinkTab.setInput(allhypHyperlinkObjects);

-		}

-	}

-

-	/**

-	 * Instantiates a new hyper link manager shell2.

-	 *

-	 * @param editorFactoryRegistry

-	 *            the editor factory registry

-	 * @param model

-	 *            the model that contains all elements

-	 * @param domain

-	 *            the domain inorder to execute command

-	 * @param umlElement

-	 *            the uml element linked to the view

-	 * @param aview

-	 *            the aview of the uml element

-	 */

-	public HyperLinkManagerShell(IPageIconsRegistry editorFactoryRegistry, TransactionalEditingDomain domain, EModelElement semanticElement, EModelElement aview, HyperLinkHelperFactory hyperHelperFactory) {

-		super();

-		this.hyperLinkHelperFactory = hyperHelperFactory;

-		this.view = aview;

-		this.semanticElement = semanticElement;

-		this.transactionalEditingDomain = domain;

-		createHyperLinkShell();

-

-		initializeFolder(null);

-

-		// // associate tableViewer for each table

-		// Iterator<AbstractHyperLinkHelper> iter = hyperHelperFactory.getHyperLinkHelpers().iterator();

-		// while(iter.hasNext()) {

-		// AbstractHyperLinkHelper abstractHyperLinkHelper = (AbstractHyperLinkHelper)iter.next();

-		// initializeFolder(abstractHyperLinkHelper);

-		// }

-		// listener for the button cancel

-		getCancelButton().addSelectionListener(new SelectionListener() {

-

-			public void widgetSelected(SelectionEvent e) {

-				tabList.clear();

-				getHyperLinkShell().close();

-			}

-

-			public void widgetDefaultSelected(SelectionEvent e) {

-			};

-		});

-		// listener for the button OK

-		SelectionListener okListener = new SelectionListener() {

-

-			public void widgetSelected(SelectionEvent e) {

-				executeOkButton();

-			}

-

-			public void widgetDefaultSelected(SelectionEvent e) {

-			}

-		};

-		getOkButton().addSelectionListener(okListener);

-	}

-

-	protected void executeOkButton() {// should be final?

-		CompoundCommand myCommand = getCommand();

-		// clear the current annotations

-		myCommand.append(HyperLinkHelperFactory.getEmptyAllHyperLinkCommand(transactionalEditingDomain, view));

-		doAction();

-

-		// store eannotation command

-		try {

-			myCommand.append(hyperLinkHelperFactory.getAddHyperLinkCommand(transactionalEditingDomain, view, allhypHyperlinkObjects));

-		} catch (HyperLinkException e) {

-			Activator.log.error(e);

-		}

-

-		// execute the command

-		Assert.isTrue(myCommand.canExecute());

-		this.transactionalEditingDomain.getCommandStack().execute(myCommand);

-		closeDialog();

-	}

-

-

-

-	/**

-	 * do the action and fill the command

-	 */

-	protected void doAction() {

-		// empty all hyperlinks

-		// clear command

-		// CompoundCommand tmp = getCommand();

-		// tmp.append(HyperLinkHelperFactory.getEmptyAllHyperLinkCommand(transactionalEditingDomain, view));

-

-

-		allhypHyperlinkObjects.clear();

-		allhypHyperlinkObjects.addAll(getSelectedHyperLinkObjectCrossingTabs());

-		// set all hyper links is default to false

-		Iterator<HyperLinkObject> iterator = allhypHyperlinkObjects.iterator();

-		while (iterator.hasNext()) {

-			HyperLinkObject hyperLink = iterator.next();

-			hyperLink.setIsDefault(false);

-		}

-

-

-		// specific behavior for the DefautHyperLinkTab

-		DefaultHyperLinkTab defaultHyperLinkTab = getDefaultHyperLinkTab();

-

-		// look for all hyperlink default and put it as default at the top of the list

-		int i = defaultHyperLinkTab.getDefaultHyperLinkObject().size() - 1;

-		while (i >= 0) {

-			HyperLinkObject hyperLinkObject = defaultHyperLinkTab.getDefaultHyperLinkObject().get(i);

-			hyperLinkObject.setIsDefault(true);

-			if (allhypHyperlinkObjects.contains(hyperLinkObject)) {

-				allhypHyperlinkObjects.remove(hyperLinkObject);

-				allhypHyperlinkObjects.add(0, hyperLinkObject);

-			}

-			i--;

-		}

-

-		// //store eannotation command

-		// try {

-		// tmp.append(hyperLinkHelperFactory.getAddHyperLinkCommand(transactionalEditingDomain, view, allhypHyperlinkObjects));

-		// } catch (HyperLinkException e) {

-		// Activator.log.error(e);

-		// }

-	}

-

-	private void closeDialog() {

-		// save the corresponding tab

-		saveCorrespondingTab();

-		tabList.clear();

-		getHyperLinkShell().close();

-	}

-

-	protected CompoundCommand getCommand() {

-		if (cmd == null) {

-			cmd = new CompoundCommand(Messages.HyperLinkManagerShell_HyperLinksCommands);

-		}

-		return cmd;

-	}

-

-	/**

-	 * Initialize diagram folder.

-	 */

-	public void initializeFolder(final AbstractHyperLinkHelper abstractHyperLinkHelper) { // TODO remove this parameter which is not used!

-		Iterator<AbstractHyperLinkTab> iter = HyperLinkTabsRegistrationUtil.INSTANCE.getAllHyperLinkTab().iterator();

-		while (iter.hasNext()) {

-			AbstractHyperLinkTab current = iter.next();

-			current.init(getcTabFolder(), allhypHyperlinkObjects, semanticElement);

-			tabList.add(current);

-		}

-

-		// specific behavior for the default tab :

-		final DefaultHyperLinkTab defaultTab = getDefaultHyperLinkTab();

-		defaultTab.getMainComposite().addListener(SWT.Show, new Listener() {

-

-			public void handleEvent(Event event) {

-				defaultTab.setInput(HyperLinkManagerShell.this.getSelectedHyperLinkObjectCrossingTabs());

-			}

-		});

-

-	}

-

-	/**

-	 * Open the shell.

-	 */

-	public void open() {

-		Display display = Display.getCurrent();

-		getHyperLinkShell().pack();

-		// getHyperLinkShell().setBounds(500, 500, 700, 300);

-		getHyperLinkShell().open();

-		// Select the good tab

-		selectLastTab();

-		// code use to wait for an action from the user

-		while (!getHyperLinkShell().isDisposed()) {

-			if (!display.readAndDispatch()) {

-				display.sleep();

-			}

-		}

-	}

-

-	/**

-	 * Save the last tab used for the specific element and the global last tab used

-	 *

-	 * @param rootMemento

-	 *            {@link IMemento} use to save information about last tab used

-	 */

-	protected void saveCorrespondingTab() {

-		IMemento rootMemento = getExistingHPMemento();

-		IMemento memento = getLastTabUseMemento(rootMemento);

-		if (semanticElement != null) {

-			// Save the corresponding tab for the element

-			// Use InstanceTypeName in order to make a convenient ID

-			int selectionIndex = getcTabFolder().getSelectionIndex();

-			memento.putInteger(semanticElement.eClass().getInstanceTypeName(), selectionIndex);

-			// Save the global last tab used

-			memento.putInteger(LAST_GLOBAL_TAB_USED, selectionIndex);

-		}

-		saveMemento((XMLMemento) rootMemento, HYPER_LINK_SHELL_MEMENTO);

-	}

-

-	/**

-	 * Select the last tab used.

-	 * If an element of the same type has already been encountered then it open the last tab used for this type

-	 * else open the last tab used for all element

-	 */

-	protected void selectLastTab() {

-		IMemento rootMemento = getExistingHPMemento();

-		Integer lastIndexUsed = null;

-		if (semanticElement != null) {

-			lastIndexUsed = getLastTabUseMemento(rootMemento, semanticElement.eClass().getInstanceTypeName());

-		}

-		if (lastIndexUsed == null) {

-			lastIndexUsed = getLastTabUseMemento(rootMemento, LAST_GLOBAL_TAB_USED);

-			if (lastIndexUsed == null) {

-				lastIndexUsed = 0;

-			}

-		}

-		try {

-			getcTabFolder().setSelection(lastIndexUsed);

-		} catch (IndexOutOfBoundsException e) {

-			getcTabFolder().setSelection(0);

-		}

-	}

-

-	/**

-	 * Save the the moment into the Preference store

-	 *

-	 * @param xmlMemento

-	 * @param key

-	 */

-	public static void saveMemento(XMLMemento xmlMemento, String key) {

-		// save memento

-		StringWriter writer = new StringWriter();

-		try {

-			xmlMemento.save(writer);

-			if (getPreferenceStore() != null) {

-				getPreferenceStore().setValue(key, writer.toString());

-			}

-		} catch (IOException e) {

-			Activator.log.error(Messages.HyperLinkManagerShell_InputOutputException, e);

-		}

-	}

-

-	/**

-	 * Retrieves the root memento for Hyper Link Date Shell data from the plugin preferences if any or create a new one if none

-	 *

-	 * @return the root memento for Hyper Links Data

-	 */

-	public static IMemento getExistingHPMemento() {

-		String sValue = getPreferenceStore().getString(HYPER_LINK_SHELL_MEMENTO);

-		try {

-			if (sValue != null && !sValue.equals("")) { //$NON-NLS-1$

-				XMLMemento rootMemento = XMLMemento.createReadRoot(new StringReader(sValue));

-				return rootMemento;

-			} else {

-				return XMLMemento.createWriteRoot(HYPER_LINK_SHELL_MEMENTO);

-			}

-		} catch (WorkbenchException e) {

-			Activator.log.error(Messages.HyperLinkManagerShell_ImpossibleToReadPreferences, e);

-		}

-		return null;

-	}

-

-	/**

-	 * Return the index of the last tab used for the type (represented by semantic hinted) or null if none

-	 *

-	 * @param rootMemento

-	 *            Root memento used for Hyper Link Data

-	 * @param elementSemanticHint

-	 *            String to represent the EClass of the EObject

-	 * @return

-	 */

-	public static Integer getLastTabUseMemento(IMemento rootMemento, String elementSemanticHint) {

-		IMemento lastTabUsedMemento = getLastTabUseMemento(rootMemento);

-		if (lastTabUsedMemento != null) {

-			return lastTabUsedMemento.getInteger(elementSemanticHint);

-		}

-		return null;

-	}

-

-	/**

-	 * @param memento

-	 * @return

-	 */

-	protected static IMemento getLastTabUseMemento(IMemento memento) {

-		IMemento lastTabUsedMemento = memento.getChild(LAST_TAB_USE_MEMENTO);

-		if (lastTabUsedMemento == null) {

-			lastTabUsedMemento = memento.createChild(LAST_TAB_USE_MEMENTO);

-		}

-		return lastTabUsedMemento;

-	}

-

-	private static IPreferenceStore getPreferenceStore() {

-		return Activator.getDefault().getPreferenceStore();

-	}

-

-	// TODO : should be a set ?

-	public List<HyperLinkObject> getSelectedHyperLinkObjectCrossingTabs() {

-		Set<HyperLinkObject> selectedObjects = new HashSet<HyperLinkObject>();

-		for (AbstractHyperLinkTab current : tabList) {

-			if (!(current instanceof DefaultHyperLinkTab)) {

-				List<HyperLinkObject> tmp = current.getHyperlinkObjects();

-				if (tmp != null) {

-					selectedObjects.addAll(tmp);

-				}

-			}

-		}

-		return new ArrayList<HyperLinkObject>(selectedObjects);

-	}

-

-	protected DefaultHyperLinkTab getDefaultHyperLinkTab() {

-		int nbTab = 0;

-		DefaultHyperLinkTab defaultHyperLinkTab = null;

-		for (AbstractHyperLinkTab current : tabList) {

-			if (current instanceof DefaultHyperLinkTab) {

-				defaultHyperLinkTab = (DefaultHyperLinkTab) current;

-				nbTab++;

-			}

-		}

-		// there is only one DefaultHyperLinkTab in the dialog!

-		Assert.isTrue(nbTab == 1);

-		Assert.isNotNull(defaultHyperLinkTab);

-		return defaultHyperLinkTab;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Arthut Daussy (Atos) arthur.daussy@atos.net - Bug 363827 - [Improvement] Diagram creation, remember the latest tab chosen
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.ui;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.hyperlink.Activator;
+import org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper;
+import org.eclipse.papyrus.infra.hyperlink.helper.HyperLinkHelperFactory;
+import org.eclipse.papyrus.infra.hyperlink.messages.Messages;
+import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;
+import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkException;
+import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkTabsRegistrationUtil;
+import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistry;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.WorkbenchException;
+import org.eclipse.ui.XMLMemento;
+
+/**
+ * The Class HyperLinkManagerShell2.
+ */
+public class HyperLinkManagerShell extends AbstractHyperLinkManagerShell {
+
+	/**
+	 * Memento's name to store Hyper Link Shell data
+	 */
+	private static final String HYPER_LINK_SHELL_MEMENTO = "HYPER_LINK_SHELL_MEMENTO"; //$NON-NLS-1$
+
+	/**
+	 * Memento's name to store index of the last tab used for a specific element type
+	 */
+	private static final String LAST_TAB_USE_MEMENTO = "LAST_TAB_USE_MEMENTO"; //$NON-NLS-1$
+
+	/**
+	 * Memento's name to store index of the last tab (for all element)
+	 */
+	protected static final String LAST_GLOBAL_TAB_USED = "LAST_USED_MEMENTO"; //$NON-NLS-1$
+
+	/**
+	 * The command to execute to set the new eannotation
+	 */
+	private CompoundCommand cmd;
+
+	final protected List<HyperLinkObject> allhypHyperlinkObjects = new ArrayList<HyperLinkObject>();
+
+	/** The graphical representation of the element (a View in GMF) */
+	protected EModelElement view;
+
+	protected EObject semanticElement;
+
+	/** The domain. */
+	protected TransactionalEditingDomain transactionalEditingDomain;
+
+	protected HyperLinkHelperFactory hyperLinkHelperFactory;
+
+
+
+	public void setInput(List<HyperLinkObject> hyperLinkObjectList) {
+		this.allhypHyperlinkObjects.clear();
+		this.allhypHyperlinkObjects.addAll(hyperLinkObjectList);
+		Iterator<AbstractHyperLinkTab> iter = tabList.iterator();
+		while (iter.hasNext()) {
+			AbstractHyperLinkTab hyperLinkTab = iter.next();
+			hyperLinkTab.setInput(allhypHyperlinkObjects);
+		}
+	}
+
+	/**
+	 * Instantiates a new hyper link manager shell2.
+	 *
+	 * @param editorFactoryRegistry
+	 *            the editor factory registry
+	 * @param model
+	 *            the model that contains all elements
+	 * @param domain
+	 *            the domain inorder to execute command
+	 * @param umlElement
+	 *            the uml element linked to the view
+	 * @param aview
+	 *            the aview of the uml element
+	 */
+	public HyperLinkManagerShell(IPageIconsRegistry editorFactoryRegistry, TransactionalEditingDomain domain, EModelElement semanticElement, EModelElement aview, HyperLinkHelperFactory hyperHelperFactory) {
+		super();
+		this.hyperLinkHelperFactory = hyperHelperFactory;
+		this.view = aview;
+		this.semanticElement = semanticElement;
+		this.transactionalEditingDomain = domain;
+		createHyperLinkShell();
+
+		initializeFolder(null);
+
+		// // associate tableViewer for each table
+		// Iterator<AbstractHyperLinkHelper> iter = hyperHelperFactory.getHyperLinkHelpers().iterator();
+		// while(iter.hasNext()) {
+		// AbstractHyperLinkHelper abstractHyperLinkHelper = (AbstractHyperLinkHelper)iter.next();
+		// initializeFolder(abstractHyperLinkHelper);
+		// }
+		// listener for the button cancel
+		getCancelButton().addSelectionListener(new SelectionListener() {
+
+			public void widgetSelected(SelectionEvent e) {
+				tabList.clear();
+				getHyperLinkShell().close();
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+			};
+		});
+		// listener for the button OK
+		SelectionListener okListener = new SelectionListener() {
+
+			public void widgetSelected(SelectionEvent e) {
+				executeOkButton();
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		};
+		getOkButton().addSelectionListener(okListener);
+	}
+
+	protected void executeOkButton() {// should be final?
+		CompoundCommand myCommand = getCommand();
+		// clear the current annotations
+		myCommand.append(HyperLinkHelperFactory.getEmptyAllHyperLinkCommand(transactionalEditingDomain, view));
+		doAction();
+
+		// store eannotation command
+		try {
+			myCommand.append(hyperLinkHelperFactory.getAddHyperLinkCommand(transactionalEditingDomain, view, allhypHyperlinkObjects));
+		} catch (HyperLinkException e) {
+			Activator.log.error(e);
+		}
+
+		// execute the command
+		Assert.isTrue(myCommand.canExecute());
+		this.transactionalEditingDomain.getCommandStack().execute(myCommand);
+		closeDialog();
+	}
+
+
+
+	/**
+	 * do the action and fill the command
+	 */
+	protected void doAction() {
+		// empty all hyperlinks
+		// clear command
+		// CompoundCommand tmp = getCommand();
+		// tmp.append(HyperLinkHelperFactory.getEmptyAllHyperLinkCommand(transactionalEditingDomain, view));
+
+
+		allhypHyperlinkObjects.clear();
+		allhypHyperlinkObjects.addAll(getSelectedHyperLinkObjectCrossingTabs());
+		// set all hyper links is default to false
+		Iterator<HyperLinkObject> iterator = allhypHyperlinkObjects.iterator();
+		while (iterator.hasNext()) {
+			HyperLinkObject hyperLink = iterator.next();
+			hyperLink.setIsDefault(false);
+		}
+
+
+		// specific behavior for the DefautHyperLinkTab
+		DefaultHyperLinkTab defaultHyperLinkTab = getDefaultHyperLinkTab();
+
+		// look for all hyperlink default and put it as default at the top of the list
+		int i = defaultHyperLinkTab.getDefaultHyperLinkObject().size() - 1;
+		while (i >= 0) {
+			HyperLinkObject hyperLinkObject = defaultHyperLinkTab.getDefaultHyperLinkObject().get(i);
+			hyperLinkObject.setIsDefault(true);
+			if (allhypHyperlinkObjects.contains(hyperLinkObject)) {
+				allhypHyperlinkObjects.remove(hyperLinkObject);
+				allhypHyperlinkObjects.add(0, hyperLinkObject);
+			}
+			i--;
+		}
+
+		// //store eannotation command
+		// try {
+		// tmp.append(hyperLinkHelperFactory.getAddHyperLinkCommand(transactionalEditingDomain, view, allhypHyperlinkObjects));
+		// } catch (HyperLinkException e) {
+		// Activator.log.error(e);
+		// }
+	}
+
+	private void closeDialog() {
+		// save the corresponding tab
+		saveCorrespondingTab();
+		tabList.clear();
+		getHyperLinkShell().close();
+	}
+
+	protected CompoundCommand getCommand() {
+		if (cmd == null) {
+			cmd = new CompoundCommand(Messages.HyperLinkManagerShell_HyperLinksCommands);
+		}
+		return cmd;
+	}
+
+	/**
+	 * Initialize diagram folder.
+	 */
+	public void initializeFolder(final AbstractHyperLinkHelper abstractHyperLinkHelper) { // TODO remove this parameter which is not used!
+		Iterator<AbstractHyperLinkTab> iter = HyperLinkTabsRegistrationUtil.INSTANCE.getAllHyperLinkTab().iterator();
+		while (iter.hasNext()) {
+			AbstractHyperLinkTab current = iter.next();
+			current.init(getcTabFolder(), allhypHyperlinkObjects, semanticElement);
+			tabList.add(current);
+		}
+
+		// specific behavior for the default tab :
+		final DefaultHyperLinkTab defaultTab = getDefaultHyperLinkTab();
+		defaultTab.getMainComposite().addListener(SWT.Show, new Listener() {
+
+			public void handleEvent(Event event) {
+				defaultTab.setInput(HyperLinkManagerShell.this.getSelectedHyperLinkObjectCrossingTabs());
+			}
+		});
+
+	}
+
+	/**
+	 * Open the shell.
+	 */
+	public void open() {
+		Display display = Display.getCurrent();
+		getHyperLinkShell().pack();
+		// getHyperLinkShell().setBounds(500, 500, 700, 300);
+		getHyperLinkShell().open();
+		// Select the good tab
+		selectLastTab();
+		// code use to wait for an action from the user
+		while (!getHyperLinkShell().isDisposed()) {
+			if (!display.readAndDispatch()) {
+				display.sleep();
+			}
+		}
+	}
+
+	/**
+	 * Save the last tab used for the specific element and the global last tab used
+	 *
+	 * @param rootMemento
+	 *            {@link IMemento} use to save information about last tab used
+	 */
+	protected void saveCorrespondingTab() {
+		IMemento rootMemento = getExistingHPMemento();
+		IMemento memento = getLastTabUseMemento(rootMemento);
+		if (semanticElement != null) {
+			// Save the corresponding tab for the element
+			// Use InstanceTypeName in order to make a convenient ID
+			int selectionIndex = getcTabFolder().getSelectionIndex();
+			memento.putInteger(semanticElement.eClass().getInstanceTypeName(), selectionIndex);
+			// Save the global last tab used
+			memento.putInteger(LAST_GLOBAL_TAB_USED, selectionIndex);
+		}
+		saveMemento((XMLMemento) rootMemento, HYPER_LINK_SHELL_MEMENTO);
+	}
+
+	/**
+	 * Select the last tab used.
+	 * If an element of the same type has already been encountered then it open the last tab used for this type
+	 * else open the last tab used for all element
+	 */
+	protected void selectLastTab() {
+		IMemento rootMemento = getExistingHPMemento();
+		Integer lastIndexUsed = null;
+		if (semanticElement != null) {
+			lastIndexUsed = getLastTabUseMemento(rootMemento, semanticElement.eClass().getInstanceTypeName());
+		}
+		if (lastIndexUsed == null) {
+			lastIndexUsed = getLastTabUseMemento(rootMemento, LAST_GLOBAL_TAB_USED);
+			if (lastIndexUsed == null) {
+				lastIndexUsed = 0;
+			}
+		}
+		try {
+			getcTabFolder().setSelection(lastIndexUsed);
+		} catch (IndexOutOfBoundsException e) {
+			getcTabFolder().setSelection(0);
+		}
+	}
+
+	/**
+	 * Save the the moment into the Preference store
+	 *
+	 * @param xmlMemento
+	 * @param key
+	 */
+	public static void saveMemento(XMLMemento xmlMemento, String key) {
+		// save memento
+		StringWriter writer = new StringWriter();
+		try {
+			xmlMemento.save(writer);
+			if (getPreferenceStore() != null) {
+				getPreferenceStore().setValue(key, writer.toString());
+			}
+		} catch (IOException e) {
+			Activator.log.error(Messages.HyperLinkManagerShell_InputOutputException, e);
+		}
+	}
+
+	/**
+	 * Retrieves the root memento for Hyper Link Date Shell data from the plugin preferences if any or create a new one if none
+	 *
+	 * @return the root memento for Hyper Links Data
+	 */
+	public static IMemento getExistingHPMemento() {
+		String sValue = getPreferenceStore().getString(HYPER_LINK_SHELL_MEMENTO);
+		try {
+			if (sValue != null && !sValue.equals("")) { //$NON-NLS-1$
+				XMLMemento rootMemento = XMLMemento.createReadRoot(new StringReader(sValue));
+				return rootMemento;
+			} else {
+				return XMLMemento.createWriteRoot(HYPER_LINK_SHELL_MEMENTO);
+			}
+		} catch (WorkbenchException e) {
+			Activator.log.error(Messages.HyperLinkManagerShell_ImpossibleToReadPreferences, e);
+		}
+		return null;
+	}
+
+	/**
+	 * Return the index of the last tab used for the type (represented by semantic hinted) or null if none
+	 *
+	 * @param rootMemento
+	 *            Root memento used for Hyper Link Data
+	 * @param elementSemanticHint
+	 *            String to represent the EClass of the EObject
+	 * @return
+	 */
+	public static Integer getLastTabUseMemento(IMemento rootMemento, String elementSemanticHint) {
+		IMemento lastTabUsedMemento = getLastTabUseMemento(rootMemento);
+		if (lastTabUsedMemento != null) {
+			return lastTabUsedMemento.getInteger(elementSemanticHint);
+		}
+		return null;
+	}
+
+	/**
+	 * @param memento
+	 * @return
+	 */
+	protected static IMemento getLastTabUseMemento(IMemento memento) {
+		IMemento lastTabUsedMemento = memento.getChild(LAST_TAB_USE_MEMENTO);
+		if (lastTabUsedMemento == null) {
+			lastTabUsedMemento = memento.createChild(LAST_TAB_USE_MEMENTO);
+		}
+		return lastTabUsedMemento;
+	}
+
+	private static IPreferenceStore getPreferenceStore() {
+		return Activator.getDefault().getPreferenceStore();
+	}
+
+	// TODO : should be a set ?
+	public List<HyperLinkObject> getSelectedHyperLinkObjectCrossingTabs() {
+		Set<HyperLinkObject> selectedObjects = new HashSet<HyperLinkObject>();
+		for (AbstractHyperLinkTab current : tabList) {
+			if (!(current instanceof DefaultHyperLinkTab)) {
+				List<HyperLinkObject> tmp = current.getHyperlinkObjects();
+				if (tmp != null) {
+					selectedObjects.addAll(tmp);
+				}
+			}
+		}
+		return new ArrayList<HyperLinkObject>(selectedObjects);
+	}
+
+	protected DefaultHyperLinkTab getDefaultHyperLinkTab() {
+		int nbTab = 0;
+		DefaultHyperLinkTab defaultHyperLinkTab = null;
+		for (AbstractHyperLinkTab current : tabList) {
+			if (current instanceof DefaultHyperLinkTab) {
+				defaultHyperLinkTab = (DefaultHyperLinkTab) current;
+				nbTab++;
+			}
+		}
+		// there is only one DefaultHyperLinkTab in the dialog!
+		Assert.isTrue(nbTab == 1);
+		Assert.isNotNull(defaultHyperLinkTab);
+		return defaultHyperLinkTab;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/HyperLinkTab.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/HyperLinkTab.java
index 9d916a5589e..9d916a5589e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/HyperLinkTab.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/HyperLinkTab.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/EditorListContentProvider.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/EditorListContentProvider.java
index 84a8e63c2c3..1b21ecf27ac 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/EditorListContentProvider.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/EditorListContentProvider.java
@@ -1,97 +1,97 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.util;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.hyperlink.Activator;

-

-

-/**

- * The Class EditorListContentProvider.

- */

-// TODO why a tree content provider

-public class EditorListContentProvider implements ITreeContentProvider {

-

-	// The context of the ContentProvider

-	private EObject model;

-

-	public EditorListContentProvider(EObject model) {

-		this.model = model;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Object[] getChildren(Object parentElement) {

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Object getParent(Object element) {

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public boolean hasChildren(Object element) {

-		return false;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Object[] getElements(Object inputElement) {

-		try {

-			IPageManager iPageMngr = ServiceUtilsForEObject.getInstance().getService(IPageManager.class, model);

-			Object[] result = iPageMngr.allPages().toArray();

-

-			List<Object> res = new ArrayList<Object>();

-			for (Object current : result) {

-				if (current != null /* && current instanceof PapyrusTableInstance */) {

-					// if the model is a little bit corrupted, we can have a null element in the list

-					res.add(current);

-				}

-			}

-			return res.toArray();

-

-		} catch (Exception e) {

-			Activator.log.error(e);

-		}

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void dispose() {

-		// nothing to do

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		// nothing to do

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.hyperlink.Activator;
+
+
+/**
+ * The Class EditorListContentProvider.
+ */
+// TODO why a tree content provider
+public class EditorListContentProvider implements ITreeContentProvider {
+
+	// The context of the ContentProvider
+	private EObject model;
+
+	public EditorListContentProvider(EObject model) {
+		this.model = model;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public Object[] getChildren(Object parentElement) {
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public Object getParent(Object element) {
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public boolean hasChildren(Object element) {
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public Object[] getElements(Object inputElement) {
+		try {
+			IPageManager iPageMngr = ServiceUtilsForEObject.getInstance().getService(IPageManager.class, model);
+			Object[] result = iPageMngr.allPages().toArray();
+
+			List<Object> res = new ArrayList<Object>();
+			for (Object current : result) {
+				if (current != null /* && current instanceof PapyrusTableInstance */) {
+					// if the model is a little bit corrupted, we can have a null element in the list
+					res.add(current);
+				}
+			}
+			return res.toArray();
+
+		} catch (Exception e) {
+			Activator.log.error(e);
+		}
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void dispose() {
+		// nothing to do
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		// nothing to do
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkConstants.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkConstants.java
index 17dea59555a..17dea59555a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkConstants.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkConstants.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkException.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkException.java
index d0748ed10c4..7cdab5ad097 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkException.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkException.java
@@ -1,55 +1,55 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.util;

-

-/**

- * this is an exception that can be raised when hyperlinks are manipulated

- *

- */

-public class HyperLinkException extends Exception {

-

-	/**

-	 * a serial version

-	 */

-	private static final long serialVersionUID = 1L;

-

-

-	/**

-	 * constructor

-	 */

-	public HyperLinkException() {

-	}

-

-	/**

-	 * @param message

-	 */

-	public HyperLinkException(String message) {

-		super(message);

-	}

-

-	/**

-	 * @param cause

-	 */

-	public HyperLinkException(Throwable cause) {

-		super(cause);

-	}

-

-	/**

-	 * @param message

-	 * @param cause

-	 */

-	public HyperLinkException(String message, Throwable cause) {

-		super(message, cause);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.util;
+
+/**
+ * this is an exception that can be raised when hyperlinks are manipulated
+ *
+ */
+public class HyperLinkException extends Exception {
+
+	/**
+	 * a serial version
+	 */
+	private static final long serialVersionUID = 1L;
+
+
+	/**
+	 * constructor
+	 */
+	public HyperLinkException() {
+	}
+
+	/**
+	 * @param message
+	 */
+	public HyperLinkException(String message) {
+		super(message);
+	}
+
+	/**
+	 * @param cause
+	 */
+	public HyperLinkException(Throwable cause) {
+		super(cause);
+	}
+
+	/**
+	 * @param message
+	 * @param cause
+	 */
+	public HyperLinkException(String message, Throwable cause) {
+		super(message, cause);
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkFilteredLabelProvider.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkFilteredLabelProvider.java
index 0264681aacd..574da550305 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkFilteredLabelProvider.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkFilteredLabelProvider.java
@@ -1,25 +1,25 @@
-/*****************************************************************************

- * 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.hyperlink.util;

-

-import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;

-import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;

-

-

-public class HyperLinkFilteredLabelProvider extends HyperLinkLabelProvider implements IFilteredLabelProvider {

-

-	public boolean accept(Object element) {

-		return element instanceof HyperLinkObject;

-	}

-

-

-}

+/*****************************************************************************
+ * 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.hyperlink.util;
+
+import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;
+import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;
+
+
+public class HyperLinkFilteredLabelProvider extends HyperLinkLabelProvider implements IFilteredLabelProvider {
+
+	public boolean accept(Object element) {
+		return element instanceof HyperLinkObject;
+	}
+
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkHelpersRegistrationUtil.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkHelpersRegistrationUtil.java
index d02c1a2328a..48dfe2c9c37 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkHelpersRegistrationUtil.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkHelpersRegistrationUtil.java
@@ -1,113 +1,113 @@
-/*****************************************************************************

- * 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.util;

-

-import java.util.Collection;

-import java.util.Map;

-import java.util.TreeMap;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.hyperlink.Activator;

-import org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper;

-import org.eclipse.papyrus.infra.hyperlink.messages.Messages;

-

-/**

- *

- * This class allows to get all registered helpers

- *

- */

-public class HyperLinkHelpersRegistrationUtil {

-

-	/**

-	 * The extension point id for helpers

-	 */

-	public static final String HYPERLINK_REGISTRATION_ID = "org.eclipse.papyrus.infra.hyperlink.registration"; //$NON-NLS-1$

-

-	/**

-	 * The 3 parameters for of the helper extension point

-	 */

-	public static final String HELPER = "helper"; //$NON-NLS-1$

-

-	public static final String TAB_ID = "tabId"; //$NON-NLS-1$

-

-	public static final String POSITION = "position"; //$NON-NLS-1$

-

-	/**

-	 * A map sorting the helpers by position

-	 */

-	private Map<Integer, AbstractHyperLinkHelper> map = null;

-

-	/**

-	 * The instance of HyperLinkHelpersRegistrationUtil

-	 */

-	public static final HyperLinkHelpersRegistrationUtil INSTANCE = new HyperLinkHelpersRegistrationUtil();

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	private HyperLinkHelpersRegistrationUtil() {

-		// nothing to do

-	}

-

-	/**

-	 *

-	 * @return

-	 * 		the list of registered helpers

-	 */

-	public Collection<AbstractHyperLinkHelper> getAllRegisteredHyperLinkHelper() {

-		if (map == null) {

-			getHelperWithPosition();

-		}

-		return map.values();

-	}

-

-	/**

-	 *

-	 * @return

-	 * 		a map owning the registered helpers, sorted by position

-	 */

-	public Map<Integer, AbstractHyperLinkHelper> getHelperWithPosition() {

-		if (map == null) {

-			map = new TreeMap<Integer, AbstractHyperLinkHelper>();

-			IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(HYPERLINK_REGISTRATION_ID);

-			for (IConfigurationElement e : config) {

-				AbstractHyperLinkHelper helper = null;

-				try {

-					final Object h = e.createExecutableExtension(HELPER);

-					if (h instanceof AbstractHyperLinkHelper) {

-						helper = (AbstractHyperLinkHelper) h;

-						String o = e.getAttribute(POSITION);

-						Integer order = Integer.valueOf(o);

-						String tabId = e.getAttribute(TAB_ID);

-						helper.setTabId(tabId);

-						map.put(order, helper);

-					} else {

-						Activator.log.info(NLS.bind(Messages.HyperLinkTabRegistrationUtil_NotAnInstanceOf, new Object[] { h, AbstractHyperLinkHelper.class }));

-					}

-				} catch (NumberFormatException exception) {

-					Activator.log.error(NLS.bind(Messages.HyperLinkHelpersRegistrationUtil_TheHelperWillBeIgnored, helper), exception);

-				} catch (CoreException ex) {

-					Activator.log.error(Messages.HyperLinkHelpersRegistrationUtil_ICantCreateTheClassForAnHelper, ex);

-				}

-			}

-		}

-

-		return map;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.util;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.hyperlink.Activator;
+import org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper;
+import org.eclipse.papyrus.infra.hyperlink.messages.Messages;
+
+/**
+ *
+ * This class allows to get all registered helpers
+ *
+ */
+public class HyperLinkHelpersRegistrationUtil {
+
+	/**
+	 * The extension point id for helpers
+	 */
+	public static final String HYPERLINK_REGISTRATION_ID = "org.eclipse.papyrus.infra.hyperlink.registration"; //$NON-NLS-1$
+
+	/**
+	 * The 3 parameters for of the helper extension point
+	 */
+	public static final String HELPER = "helper"; //$NON-NLS-1$
+
+	public static final String TAB_ID = "tabId"; //$NON-NLS-1$
+
+	public static final String POSITION = "position"; //$NON-NLS-1$
+
+	/**
+	 * A map sorting the helpers by position
+	 */
+	private Map<Integer, AbstractHyperLinkHelper> map = null;
+
+	/**
+	 * The instance of HyperLinkHelpersRegistrationUtil
+	 */
+	public static final HyperLinkHelpersRegistrationUtil INSTANCE = new HyperLinkHelpersRegistrationUtil();
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	private HyperLinkHelpersRegistrationUtil() {
+		// nothing to do
+	}
+
+	/**
+	 *
+	 * @return
+	 * 		the list of registered helpers
+	 */
+	public Collection<AbstractHyperLinkHelper> getAllRegisteredHyperLinkHelper() {
+		if (map == null) {
+			getHelperWithPosition();
+		}
+		return map.values();
+	}
+
+	/**
+	 *
+	 * @return
+	 * 		a map owning the registered helpers, sorted by position
+	 */
+	public Map<Integer, AbstractHyperLinkHelper> getHelperWithPosition() {
+		if (map == null) {
+			map = new TreeMap<Integer, AbstractHyperLinkHelper>();
+			IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(HYPERLINK_REGISTRATION_ID);
+			for (IConfigurationElement e : config) {
+				AbstractHyperLinkHelper helper = null;
+				try {
+					final Object h = e.createExecutableExtension(HELPER);
+					if (h instanceof AbstractHyperLinkHelper) {
+						helper = (AbstractHyperLinkHelper) h;
+						String o = e.getAttribute(POSITION);
+						Integer order = Integer.valueOf(o);
+						String tabId = e.getAttribute(TAB_ID);
+						helper.setTabId(tabId);
+						map.put(order, helper);
+					} else {
+						Activator.log.info(NLS.bind(Messages.HyperLinkTabRegistrationUtil_NotAnInstanceOf, new Object[] { h, AbstractHyperLinkHelper.class }));
+					}
+				} catch (NumberFormatException exception) {
+					Activator.log.error(NLS.bind(Messages.HyperLinkHelpersRegistrationUtil_TheHelperWillBeIgnored, helper), exception);
+				} catch (CoreException ex) {
+					Activator.log.error(Messages.HyperLinkHelpersRegistrationUtil_ICantCreateTheClassForAnHelper, ex);
+				}
+			}
+		}
+
+		return map;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkLabelProvider.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkLabelProvider.java
index eada2c57b8c..61b280efd1e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkLabelProvider.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkLabelProvider.java
@@ -1,6 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
+ * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,6 +8,7 @@
  *
  * Contributors:
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
  *
  *****************************************************************************/
 package org.eclipse.papyrus.infra.hyperlink.util;
@@ -33,11 +33,9 @@ import javax.swing.filechooser.FileSystemView;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
 import org.eclipse.papyrus.infra.hyperlink.Activator;
 import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkDocument;
-import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkEditor;
 import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;
 import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkSpecificObject;
 import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkWeb;
@@ -84,11 +82,11 @@ public class HyperLinkLabelProvider extends LabelProvider {
 					}
 				}
 			}
-			
+
 			return org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage(Activator.PLUGIN_ID, HYPERLINK_DOCUMENT_ICON_PATH);
 		}
 
-		if (element instanceof HyperLinkWeb) {			
+		if (element instanceof HyperLinkWeb) {
 			try {
 				InputStream stream = getRawStreamFromURL(new URL("http://www.google.com/s2/favicons?domain=" + ((HyperLinkWeb) element).getHyperLinkWeb()));
 				if (stream != null) {
@@ -103,24 +101,13 @@ public class HyperLinkLabelProvider extends LabelProvider {
 						e.printStackTrace();
 					}
 				}
-				
+
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
-			
-			return org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage(Activator.PLUGIN_ID, HYPERLINK_WEB_ICON_PATH);
-		}
 
-		if (element instanceof HyperLinkEditor) {
-			EObject editorContext = EMFHelper.getEObject(((HyperLinkEditor) element).getObject());
-			if (editorContext != null) {
-				try {
-					return ServiceUtilsForEObject.getInstance().getService(LabelProviderService.class, editorContext).getLabelProvider().getImage(editorContext);
-				} catch (ServiceException ex) {
-					Activator.log.error(ex);
-				}
-			}
+			return org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage(Activator.PLUGIN_ID, HYPERLINK_WEB_ICON_PATH);
 		}
 
 		if (element instanceof HyperLinkSpecificObject) {
@@ -152,15 +139,6 @@ public class HyperLinkLabelProvider extends LabelProvider {
 			out = ((HyperLinkDocument) element).getHyperlinkDocument();
 		} else if (element instanceof HyperLinkWeb) {
 			out = ((HyperLinkWeb) element).getHyperLinkWeb();
-		} else if (element instanceof HyperLinkEditor) {
-			EObject editorContext = EMFHelper.getEObject(((HyperLinkEditor) element).getObject());
-			if (editorContext != null) {
-				try {
-					return ServiceUtilsForEObject.getInstance().getService(LabelProviderService.class, editorContext).getLabelProvider().getText(editorContext);
-				} catch (ServiceException ex) {
-					Activator.log.error(ex);
-				}
-			}
 		} else if (element instanceof HyperLinkSpecificObject) {
 			EObject targetElement = ((HyperLinkSpecificObject) element).getTargetElement();
 			if (targetElement != null) {
@@ -177,86 +155,84 @@ public class HyperLinkLabelProvider extends LabelProvider {
 		out = ((HyperLinkObject) element).getTooltipText() + SEP + out;
 		return out;
 	}
-	
-    public static ImageData convertAWTImageToSWT(java.awt.Image image) {
-        if (image == null) {
-            throw new IllegalArgumentException("Null 'image' argument.");
-        }
-        int w = image.getWidth(null);
-        int h = image.getHeight(null);
-        if (w == -1 || h == -1) {
-            return null;
-        }
-        BufferedImage bi = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
-        Graphics g = bi.getGraphics();
-        g.drawImage(image, 0, 0, null);
-        g.dispose();
-        return convertToSWT(bi);
-    }
-    
-    public static ImageData convertToSWT(BufferedImage bufferedImage) {
-        if (bufferedImage.getColorModel() instanceof DirectColorModel) {
-            DirectColorModel colorModel
-                    = (DirectColorModel) bufferedImage.getColorModel();
-            PaletteData palette = new PaletteData(colorModel.getRedMask(),
-                    colorModel.getGreenMask(), colorModel.getBlueMask());
-            ImageData data = new ImageData(bufferedImage.getWidth(),
-                    bufferedImage.getHeight(), colorModel.getPixelSize(),
-                    palette);
-            WritableRaster raster = bufferedImage.getRaster();
-            int[] pixelArray = new int[3];
-            for (int y = 0; y < data.height; y++) {
-                for (int x = 0; x < data.width; x++) {
-                    raster.getPixel(x, y, pixelArray);
-                    int pixel = palette.getPixel(new RGB(pixelArray[0],
-                            pixelArray[1], pixelArray[2]));
-                    data.setPixel(x, y, pixel);
-                }
-            }
-            return data;
-        } else if (bufferedImage.getColorModel() instanceof IndexColorModel) {
-            IndexColorModel colorModel = (IndexColorModel)
-                    bufferedImage.getColorModel();
-            int size = colorModel.getMapSize();
-            byte[] reds = new byte[size];
-            byte[] greens = new byte[size];
-            byte[] blues = new byte[size];
-            colorModel.getReds(reds);
-            colorModel.getGreens(greens);
-            colorModel.getBlues(blues);
-            RGB[] rgbs = new RGB[size];
-            for (int i = 0; i < rgbs.length; i++) {
-                rgbs[i] = new RGB(reds[i] & 0xFF, greens[i] & 0xFF,
-                        blues[i] & 0xFF);
-            }
-            PaletteData palette = new PaletteData(rgbs);
-            ImageData data = new ImageData(bufferedImage.getWidth(),
-                    bufferedImage.getHeight(), colorModel.getPixelSize(),
-                    palette);
-            data.transparentPixel = colorModel.getTransparentPixel();
-            WritableRaster raster = bufferedImage.getRaster();
-            int[] pixelArray = new int[1];
-            for (int y = 0; y < data.height; y++) {
-                for (int x = 0; x < data.width; x++) {
-                    raster.getPixel(x, y, pixelArray);
-                    data.setPixel(x, y, pixelArray[0]);
-                }
-            }
-            return data;
-        }
-        return null;
-    }
-    
-    protected InputStream getRawStreamFromURL(URL url) {
-    	try {
-    		HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-    		connection.setDoInput(true);
-    		connection.connect();
-    		InputStream input = connection.getInputStream();
-    		return input;
-    	} catch (IOException e) {
-    		e.printStackTrace();
-    		return null;
-    	}
-    }
+
+	public static ImageData convertAWTImageToSWT(java.awt.Image image) {
+		if (image == null) {
+			throw new IllegalArgumentException("Null 'image' argument.");
+		}
+		int w = image.getWidth(null);
+		int h = image.getHeight(null);
+		if (w == -1 || h == -1) {
+			return null;
+		}
+		BufferedImage bi = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
+		Graphics g = bi.getGraphics();
+		g.drawImage(image, 0, 0, null);
+		g.dispose();
+		return convertToSWT(bi);
+	}
+
+	public static ImageData convertToSWT(BufferedImage bufferedImage) {
+		if (bufferedImage.getColorModel() instanceof DirectColorModel) {
+			DirectColorModel colorModel = (DirectColorModel) bufferedImage.getColorModel();
+			PaletteData palette = new PaletteData(colorModel.getRedMask(),
+					colorModel.getGreenMask(), colorModel.getBlueMask());
+			ImageData data = new ImageData(bufferedImage.getWidth(),
+					bufferedImage.getHeight(), colorModel.getPixelSize(),
+					palette);
+			WritableRaster raster = bufferedImage.getRaster();
+			int[] pixelArray = new int[3];
+			for (int y = 0; y < data.height; y++) {
+				for (int x = 0; x < data.width; x++) {
+					raster.getPixel(x, y, pixelArray);
+					int pixel = palette.getPixel(new RGB(pixelArray[0],
+							pixelArray[1], pixelArray[2]));
+					data.setPixel(x, y, pixel);
+				}
+			}
+			return data;
+		} else if (bufferedImage.getColorModel() instanceof IndexColorModel) {
+			IndexColorModel colorModel = (IndexColorModel) bufferedImage.getColorModel();
+			int size = colorModel.getMapSize();
+			byte[] reds = new byte[size];
+			byte[] greens = new byte[size];
+			byte[] blues = new byte[size];
+			colorModel.getReds(reds);
+			colorModel.getGreens(greens);
+			colorModel.getBlues(blues);
+			RGB[] rgbs = new RGB[size];
+			for (int i = 0; i < rgbs.length; i++) {
+				rgbs[i] = new RGB(reds[i] & 0xFF, greens[i] & 0xFF,
+						blues[i] & 0xFF);
+			}
+			PaletteData palette = new PaletteData(rgbs);
+			ImageData data = new ImageData(bufferedImage.getWidth(),
+					bufferedImage.getHeight(), colorModel.getPixelSize(),
+					palette);
+			data.transparentPixel = colorModel.getTransparentPixel();
+			WritableRaster raster = bufferedImage.getRaster();
+			int[] pixelArray = new int[1];
+			for (int y = 0; y < data.height; y++) {
+				for (int x = 0; x < data.width; x++) {
+					raster.getPixel(x, y, pixelArray);
+					data.setPixel(x, y, pixelArray[0]);
+				}
+			}
+			return data;
+		}
+		return null;
+	}
+
+	protected InputStream getRawStreamFromURL(URL url) {
+		try {
+			HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+			connection.setDoInput(true);
+			connection.connect();
+			InputStream input = connection.getInputStream();
+			return input;
+		} catch (IOException e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkTabsRegistrationUtil.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkTabsRegistrationUtil.java
index 5888e4bc36b..ed9d0d47259 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkTabsRegistrationUtil.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/HyperLinkTabsRegistrationUtil.java
@@ -1,107 +1,107 @@
-/*****************************************************************************

- * Copyright (c) 2011, 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA LIST) - Consolidate all hyperlink helper contributions into one tab

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.hyperlink.util;

-

-import java.util.Collection;

-import java.util.Map;

-import java.util.TreeMap;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.hyperlink.Activator;

-import org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper;

-import org.eclipse.papyrus.infra.hyperlink.messages.Messages;

-import org.eclipse.papyrus.infra.hyperlink.ui.AbstractHyperLinkTab;

-import org.eclipse.papyrus.infra.hyperlink.ui.HyperLinkTab;

-

-/**

- *

- * This class creates all the tabs for the HyperLink Shell

- *

- */

-public class HyperLinkTabsRegistrationUtil {

-

-	/**

-	 * The id to get the registered hyperlink tab

-	 */

-	public static final String HYPERLINK_TAB_REGISTRATION_ID = "org.eclipse.papyrus.infra.hyperlink.tab.registration"; //$NON-NLS-1$

-

-	/**

-	 * The 3 parameters for of the tab extension point

-	 */

-	public static final String TAB = "tab"; //$NON-NLS-1$

-

-	public static final String POSITION = "position"; //$NON-NLS-1$

-

-	public static final String TAB_ID = "tabId"; //$NON-NLS-1$

-

-	/** The ID of the tab that shows helper-based contributions. */

-	private static final String GENERIC_TAB_ID = "org.eclipse.papyrus.infra.hyperlink.helpers"; //$NON-NLS-1$

-

-	/** the instance of HyperLinkTabsRegistrationUtil */

-	public static final HyperLinkTabsRegistrationUtil INSTANCE = new HyperLinkTabsRegistrationUtil();

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	private HyperLinkTabsRegistrationUtil() {

-		// nothing to do

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the tabs for the HyperLink Shell, sorted by position

-	 */

-	public Collection<AbstractHyperLinkTab> getAllHyperLinkTab() {

-		// should not be a global variable, because we should create the tabs each time!

-		final Map<Integer, AbstractHyperLinkTab> allTabs;

-		allTabs = new TreeMap<Integer, AbstractHyperLinkTab>();

-		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(HYPERLINK_TAB_REGISTRATION_ID);

-		for (IConfigurationElement e : config) {

-			AbstractHyperLinkTab tab = null;

-			try {

-				final Object h = e.createExecutableExtension(TAB);

-				if (h instanceof AbstractHyperLinkTab) {

-					tab = (AbstractHyperLinkTab) h;

-					final String o = e.getAttribute(POSITION);

-					final Integer position = Integer.valueOf(o);

-					final String tabId = e.getAttribute(TAB_ID);

-					tab.setTabId(tabId);

-					allTabs.put(position, tab);

-				} else {

-					Activator.log.info(NLS.bind(Messages.HyperLinkTabRegistrationUtil_NotAnInstanceOf, new Object[] { h, AbstractHyperLinkTab.class }));

-				}

-			} catch (NumberFormatException ex) {

-				Activator.log.error(NLS.bind(Messages.HyperLinkTabRegistrationUtil_tabWillBeIgnored, tab), ex);

-			} catch (CoreException ex) {

-				Activator.log.error(Messages.HyperLinkTabRegistrationUtil_ICantCreateTheTab, ex);

-			}

-		}

-

-		// we create the tab for the helpers

-		Map<Integer, AbstractHyperLinkHelper> helpers = HyperLinkHelpersRegistrationUtil.INSTANCE.getHelperWithPosition();

-		if (!helpers.isEmpty()) {

-			// use the least position requested by the helpers as the tab position

-			allTabs.put(helpers.keySet().iterator().next(), new HyperLinkTab(GENERIC_TAB_ID, helpers.values()));

-		}

-

-		return allTabs.values();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA LIST) - Consolidate all hyperlink helper contributions into one tab
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.hyperlink.util;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.hyperlink.Activator;
+import org.eclipse.papyrus.infra.hyperlink.helper.AbstractHyperLinkHelper;
+import org.eclipse.papyrus.infra.hyperlink.messages.Messages;
+import org.eclipse.papyrus.infra.hyperlink.ui.AbstractHyperLinkTab;
+import org.eclipse.papyrus.infra.hyperlink.ui.HyperLinkTab;
+
+/**
+ *
+ * This class creates all the tabs for the HyperLink Shell
+ *
+ */
+public class HyperLinkTabsRegistrationUtil {
+
+	/**
+	 * The id to get the registered hyperlink tab
+	 */
+	public static final String HYPERLINK_TAB_REGISTRATION_ID = "org.eclipse.papyrus.infra.hyperlink.tab.registration"; //$NON-NLS-1$
+
+	/**
+	 * The 3 parameters for of the tab extension point
+	 */
+	public static final String TAB = "tab"; //$NON-NLS-1$
+
+	public static final String POSITION = "position"; //$NON-NLS-1$
+
+	public static final String TAB_ID = "tabId"; //$NON-NLS-1$
+
+	/** The ID of the tab that shows helper-based contributions. */
+	private static final String GENERIC_TAB_ID = "org.eclipse.papyrus.infra.hyperlink.helpers"; //$NON-NLS-1$
+
+	/** the instance of HyperLinkTabsRegistrationUtil */
+	public static final HyperLinkTabsRegistrationUtil INSTANCE = new HyperLinkTabsRegistrationUtil();
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	private HyperLinkTabsRegistrationUtil() {
+		// nothing to do
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the tabs for the HyperLink Shell, sorted by position
+	 */
+	public Collection<AbstractHyperLinkTab> getAllHyperLinkTab() {
+		// should not be a global variable, because we should create the tabs each time!
+		final Map<Integer, AbstractHyperLinkTab> allTabs;
+		allTabs = new TreeMap<Integer, AbstractHyperLinkTab>();
+		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(HYPERLINK_TAB_REGISTRATION_ID);
+		for (IConfigurationElement e : config) {
+			AbstractHyperLinkTab tab = null;
+			try {
+				final Object h = e.createExecutableExtension(TAB);
+				if (h instanceof AbstractHyperLinkTab) {
+					tab = (AbstractHyperLinkTab) h;
+					final String o = e.getAttribute(POSITION);
+					final Integer position = Integer.valueOf(o);
+					final String tabId = e.getAttribute(TAB_ID);
+					tab.setTabId(tabId);
+					allTabs.put(position, tab);
+				} else {
+					Activator.log.info(NLS.bind(Messages.HyperLinkTabRegistrationUtil_NotAnInstanceOf, new Object[] { h, AbstractHyperLinkTab.class }));
+				}
+			} catch (NumberFormatException ex) {
+				Activator.log.error(NLS.bind(Messages.HyperLinkTabRegistrationUtil_tabWillBeIgnored, tab), ex);
+			} catch (CoreException ex) {
+				Activator.log.error(Messages.HyperLinkTabRegistrationUtil_ICantCreateTheTab, ex);
+			}
+		}
+
+		// we create the tab for the helpers
+		Map<Integer, AbstractHyperLinkHelper> helpers = HyperLinkHelpersRegistrationUtil.INSTANCE.getHelperWithPosition();
+		if (!helpers.isEmpty()) {
+			// use the least position requested by the helpers as the tab position
+			allTabs.put(helpers.keySet().iterator().next(), new HyperLinkTab(GENERIC_TAB_ID, helpers.values()));
+		}
+
+		return allTabs.values();
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/TreeViewContentProvider.java b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/TreeViewContentProvider.java
index fd52a6222bf..fd52a6222bf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/TreeViewContentProvider.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/TreeViewContentProvider.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.classpath b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.classpath
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/.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/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.psf/.project b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/.project
index 845cdabcdc4..230921e2566 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.psf/.project
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.psf</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>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.psf</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/org.eclipse.papyrus.infra.onefile.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/.settings/org.eclipse.jdt.core.prefs
index c585cc455ae..c585cc455ae 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.psf/META-INF/MANIFEST.MF b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/META-INF/MANIFEST.MF
index 6cf3efe9ce4..ecd28c81214 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.psf/META-INF/MANIFEST.MF
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.team.core;bundle-version="3.7.0",

- org.eclipse.core.resources;bundle-version="3.8.100",

- org.eclipse.team.ui;bundle-version="3.7.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.ui.ide;bundle-version="3.9.0"

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: Papyrus PSF support

-Bundle-Activator: org.eclipse.papyrus.infra.psf.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.psf;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.team.core;bundle-version="3.7.0",
+ org.eclipse.core.resources;bundle-version="3.8.100",
+ org.eclipse.team.ui;bundle-version="3.7.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.ui.ide;bundle-version="3.9.0"
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: Papyrus PSF support
+Bundle-Activator: org.eclipse.papyrus.infra.psf.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.psf;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/org.eclipse.papyrus.infra.psf/about.html b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/about.html
index 460233046ee..460233046ee 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.psf/about.html
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.psf/build.properties b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/build.properties
index e3693a3b66e..101ae799c1e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.psf/build.properties
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/build.properties
@@ -1,7 +1,7 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               plugin.xml

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               plugin.xml
+src.includes = about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.psf/plugin.xml b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/plugin.xml
index ad976eee2b8..4d215846f6a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.psf/plugin.xml
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/plugin.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.ui.commands">

-      <command

-            defaultHandler="org.eclipse.papyrus.infra.psf.handler.ImportPSFHandler"

-            description="Imports a Team Project Set File (Psf) in background"

-            id="org.eclipse.papyrus.infra.psf.import"

-            name="Import PSF (Background)">

-      </command>

-   </extension>

-   <extension

-         point="org.eclipse.ui.menus">

-      <menuContribution

-            allPopups="false"

-            locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu?after=additions">

-         <command

-               commandId="org.eclipse.papyrus.infra.psf.import"

-               style="push">

-               <visibleWhen

-                     checkEnabled="false">

-                  <with

-                        variable="selection">

-                     <iterate

-                           ifEmpty="false"

-                           operator="and">

-                        <adapt

-                              type="org.eclipse.core.resources.IFile">

-                           <test

-                                 property="org.eclipse.core.resources.extension"

-                                 value="psf">

-                           </test>

-                        </adapt>

-                     </iterate>

-                  </with>

-               </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            defaultHandler="org.eclipse.papyrus.infra.psf.handler.ImportPSFHandler"
+            description="Imports a Team Project Set File (Psf) in background"
+            id="org.eclipse.papyrus.infra.psf.import"
+            name="Import PSF (Background)">
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            allPopups="false"
+            locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu?after=additions">
+         <command
+               commandId="org.eclipse.papyrus.infra.psf.import"
+               style="push">
+               <visibleWhen
+                     checkEnabled="false">
+                  <with
+                        variable="selection">
+                     <iterate
+                           ifEmpty="false"
+                           operator="and">
+                        <adapt
+                              type="org.eclipse.core.resources.IFile">
+                           <test
+                                 property="org.eclipse.core.resources.extension"
+                                 value="psf">
+                           </test>
+                        </adapt>
+                     </iterate>
+                  </with>
+               </visibleWhen>
+         </command>
+      </menuContribution>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.psf/pom.xml b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/pom.xml
index c70bcc34fef..7ae0ea6c0fd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.psf/pom.xml
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-misc</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.psf</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.psf/src/org/eclipse/papyrus/infra/psf/Activator.java b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/src/org/eclipse/papyrus/infra/psf/Activator.java
index 0c32e60e054..3f81fd59f77 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.psf/src/org/eclipse/papyrus/infra/psf/Activator.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/src/org/eclipse/papyrus/infra/psf/Activator.java
@@ -1,69 +1,69 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.psf;

-

-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.infra.psf"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	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;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.psf;
+
+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.infra.psf"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	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.psf/src/org/eclipse/papyrus/infra/psf/handler/ImportPSFHandler.java b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/src/org/eclipse/papyrus/infra/psf/handler/ImportPSFHandler.java
index 2fb862eddfa..42da87958ee 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.psf/src/org/eclipse/papyrus/infra/psf/handler/ImportPSFHandler.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/src/org/eclipse/papyrus/infra/psf/handler/ImportPSFHandler.java
@@ -1,163 +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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.psf.handler;

-

-import java.lang.reflect.InvocationTargetException;

-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.operations.AbstractOperation;

-import org.eclipse.core.commands.operations.OperationHistoryFactory;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.runtime.CoreException;

-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.Platform;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.core.runtime.jobs.Job;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.psf.Activator;

-import org.eclipse.papyrus.infra.psf.runtime.ImportResult;

-import org.eclipse.papyrus.infra.psf.runtime.ProjectSetImporter;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.handlers.HandlerUtil;

-

-/**

- * Handles the ImportPSF command: org.eclipse.papyrus.infra.psf.import

- *

- * @author Camille Letavernier

- *

- */

-public class ImportPSFHandler extends AbstractHandler {

-

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		final Shell activeShell = HandlerUtil.getActiveShell(event);

-		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);

-

-		if (currentSelection instanceof IStructuredSelection) {

-			IStructuredSelection selection = (IStructuredSelection) currentSelection;

-			if (selection.isEmpty()) {

-				return null;

-			}

-

-			Iterator<?> selectionIterator = selection.iterator();

-			while (selectionIterator.hasNext()) {

-				Object selectedElement = selectionIterator.next();

-				IFile file = (IFile) Platform.getAdapterManager().getAdapter(selectedElement, IFile.class);

-				if (file != null && "psf".equals(file.getLocation().getFileExtension())) { //$NON-NLS-1$

-					final String fileName = file.getLocation().toString();

-

-					Job job = new Job(String.format("Import %s", file.getName())) {

-

-						@Override

-						protected IStatus run(IProgressMonitor monitor) {

-							AbstractOperation operation = new ImportProjectSetOperation(getName(), fileName, activeShell);

-

-							try {

-								final IStatus result = OperationHistoryFactory.getOperationHistory().execute(operation, monitor, null);

-

-								if (monitor.isCanceled() || result.getSeverity() == IStatus.CANCEL) {

-									// TODO: Abort or Undo

-								}

-

-								return result;

-							} catch (ExecutionException ex) {

-								Activator.log.error(ex);

-								return new Status(IStatus.ERROR, Activator.PLUGIN_ID, String.format("An error occurred when importing the PSF %s", fileName), ex);

-							}

-						}

-					};

-

-					job.setUser(true);

-					job.schedule();

-

-					job.setPriority(Job.LONG);

-

-				}

-			}

-		}

-

-		return null;

-	}

-

-	public static class ImportProjectSetOperation extends AbstractOperation {

-

-		private String psfFileName;

-

-		private IProject[] importedProjects;

-

-		private Shell shell;

-

-		public ImportProjectSetOperation(String name, String psfFileName, Shell shell) {

-			super(name);

-			this.psfFileName = psfFileName;

-			this.shell = shell;

-		}

-

-		@Override

-		public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-			if (importedProjects == null || importedProjects.length == 0) {

-				return Status.OK_STATUS;

-			}

-			for (IProject project : importedProjects) {

-				try {

-					project.delete(false, true, monitor);

-				} catch (CoreException e) {

-					throw new ExecutionException(e.getMessage(), e);

-				}

-			}

-			return Status.OK_STATUS;

-		}

-

-		@Override

-		public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-			return execute(monitor, info);

-		}

-

-		@Override

-		public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-			try {

-				if (ProjectSetImporter.isValidProjectSetFile(psfFileName)) {

-					ImportResult result = ProjectSetImporter.importProjectSet(psfFileName, shell, monitor);

-					importedProjects = result.getImportedProjects();

-					if (!result.getDiagnostic().isEmpty()) {

-						if (result.getDiagnostic().size() == 1) {

-							return result.getDiagnostic().get(0);

-						} else {

-							IStatus[] status = result.getDiagnostic().toArray(new IStatus[0]);

-							int code = IStatus.OK;

-							for (IStatus currentStatus : status) {

-								if (currentStatus.getSeverity() > code) {

-									code = currentStatus.getSeverity();

-								}

-							}

-

-							IStatus resultStatus = new MultiStatus(Activator.PLUGIN_ID, code, status, "The following errors occurred during import:", null);

-							return resultStatus;

-						}

-					}

-					return Status.OK_STATUS;

-				} else {

-					return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected file is not a valid Project Set File");

-				}

-			} catch (InvocationTargetException ex) {

-				return new Status(IStatus.ERROR, Activator.PLUGIN_ID, String.format("An error occurred when importing the PSF %s", psfFileName), ex);

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.psf.handler;
+
+import java.lang.reflect.InvocationTargetException;
+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.operations.AbstractOperation;
+import org.eclipse.core.commands.operations.OperationHistoryFactory;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+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.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.psf.Activator;
+import org.eclipse.papyrus.infra.psf.runtime.ImportResult;
+import org.eclipse.papyrus.infra.psf.runtime.ProjectSetImporter;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * Handles the ImportPSF command: org.eclipse.papyrus.infra.psf.import
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class ImportPSFHandler extends AbstractHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		final Shell activeShell = HandlerUtil.getActiveShell(event);
+		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);
+
+		if (currentSelection instanceof IStructuredSelection) {
+			IStructuredSelection selection = (IStructuredSelection) currentSelection;
+			if (selection.isEmpty()) {
+				return null;
+			}
+
+			Iterator<?> selectionIterator = selection.iterator();
+			while (selectionIterator.hasNext()) {
+				Object selectedElement = selectionIterator.next();
+				IFile file = (IFile) Platform.getAdapterManager().getAdapter(selectedElement, IFile.class);
+				if (file != null && "psf".equals(file.getLocation().getFileExtension())) { //$NON-NLS-1$
+					final String fileName = file.getLocation().toString();
+
+					Job job = new Job(String.format("Import %s", file.getName())) {
+
+						@Override
+						protected IStatus run(IProgressMonitor monitor) {
+							AbstractOperation operation = new ImportProjectSetOperation(getName(), fileName, activeShell);
+
+							try {
+								final IStatus result = OperationHistoryFactory.getOperationHistory().execute(operation, monitor, null);
+
+								if (monitor.isCanceled() || result.getSeverity() == IStatus.CANCEL) {
+									// TODO: Abort or Undo
+								}
+
+								return result;
+							} catch (ExecutionException ex) {
+								Activator.log.error(ex);
+								return new Status(IStatus.ERROR, Activator.PLUGIN_ID, String.format("An error occurred when importing the PSF %s", fileName), ex);
+							}
+						}
+					};
+
+					job.setUser(true);
+					job.schedule();
+
+					job.setPriority(Job.LONG);
+
+				}
+			}
+		}
+
+		return null;
+	}
+
+	public static class ImportProjectSetOperation extends AbstractOperation {
+
+		private String psfFileName;
+
+		private IProject[] importedProjects;
+
+		private Shell shell;
+
+		public ImportProjectSetOperation(String name, String psfFileName, Shell shell) {
+			super(name);
+			this.psfFileName = psfFileName;
+			this.shell = shell;
+		}
+
+		@Override
+		public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+			if (importedProjects == null || importedProjects.length == 0) {
+				return Status.OK_STATUS;
+			}
+			for (IProject project : importedProjects) {
+				try {
+					project.delete(false, true, monitor);
+				} catch (CoreException e) {
+					throw new ExecutionException(e.getMessage(), e);
+				}
+			}
+			return Status.OK_STATUS;
+		}
+
+		@Override
+		public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+			return execute(monitor, info);
+		}
+
+		@Override
+		public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+			try {
+				if (ProjectSetImporter.isValidProjectSetFile(psfFileName)) {
+					ImportResult result = ProjectSetImporter.importProjectSet(psfFileName, shell, monitor);
+					importedProjects = result.getImportedProjects();
+					if (!result.getDiagnostic().isEmpty()) {
+						if (result.getDiagnostic().size() == 1) {
+							return result.getDiagnostic().get(0);
+						} else {
+							IStatus[] status = result.getDiagnostic().toArray(new IStatus[0]);
+							int code = IStatus.OK;
+							for (IStatus currentStatus : status) {
+								if (currentStatus.getSeverity() > code) {
+									code = currentStatus.getSeverity();
+								}
+							}
+
+							IStatus resultStatus = new MultiStatus(Activator.PLUGIN_ID, code, status, "The following errors occurred during import:", null);
+							return resultStatus;
+						}
+					}
+					return Status.OK_STATUS;
+				} else {
+					return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected file is not a valid Project Set File");
+				}
+			} catch (InvocationTargetException ex) {
+				return new Status(IStatus.ERROR, Activator.PLUGIN_ID, String.format("An error occurred when importing the PSF %s", psfFileName), ex);
+			}
+		}
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.psf/src/org/eclipse/papyrus/infra/psf/runtime/ImportResult.java b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/src/org/eclipse/papyrus/infra/psf/runtime/ImportResult.java
index f7dd4c916ae..fdecd43f0fc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.psf/src/org/eclipse/papyrus/infra/psf/runtime/ImportResult.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/src/org/eclipse/papyrus/infra/psf/runtime/ImportResult.java
@@ -1,46 +1,46 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.psf.runtime;

-

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.runtime.IStatus;

-

-/**

- * Represents the result of an Import PSF action.

- * Contains the set of sucessfully imported projects,

- * and a list of diagnostics

- *

- * @author Camille Letavernier

- *

- */

-public class ImportResult {

-

-	private IProject[] importedProjects;

-

-	private final List<IStatus> diagnostic = new LinkedList<IStatus>();

-

-	public IProject[] getImportedProjects() {

-		return importedProjects;

-	}

-

-	public void setImportedProjects(IProject[] importedProjects) {

-		this.importedProjects = importedProjects;

-	}

-

-	public List<IStatus> getDiagnostic() {

-		return diagnostic;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.psf.runtime;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IStatus;
+
+/**
+ * Represents the result of an Import PSF action.
+ * Contains the set of sucessfully imported projects,
+ * and a list of diagnostics
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class ImportResult {
+
+	private IProject[] importedProjects;
+
+	private final List<IStatus> diagnostic = new LinkedList<IStatus>();
+
+	public IProject[] getImportedProjects() {
+		return importedProjects;
+	}
+
+	public void setImportedProjects(IProject[] importedProjects) {
+		this.importedProjects = importedProjects;
+	}
+
+	public List<IStatus> getDiagnostic() {
+		return diagnostic;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.psf/src/org/eclipse/papyrus/infra/psf/runtime/ProjectSetImporter.java b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/src/org/eclipse/papyrus/infra/psf/runtime/ProjectSetImporter.java
index 885830178ba..885830178ba 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.psf/src/org/eclipse/papyrus/infra/psf/runtime/ProjectSetImporter.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/src/org/eclipse/papyrus/infra/psf/runtime/ProjectSetImporter.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.psf/src/org/eclipse/papyrus/infra/psf/ui/FilterProjectsDialog.java b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/src/org/eclipse/papyrus/infra/psf/ui/FilterProjectsDialog.java
index 54e46274cdb..017404957e7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.psf/src/org/eclipse/papyrus/infra/psf/ui/FilterProjectsDialog.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/src/org/eclipse/papyrus/infra/psf/ui/FilterProjectsDialog.java
@@ -1,270 +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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.psf.ui;

-

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.jface.viewers.CheckStateChangedEvent;

-import org.eclipse.jface.viewers.CheckboxTreeViewer;

-import org.eclipse.jface.viewers.ICheckStateListener;

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.layout.FillLayout;

-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.Control;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.dialogs.SelectionDialog;

-

-/**

- * A Checkbox Dialog to filter the projects to be imported.

- *

- * Note: the projects are represented by their PSF Reference, which is specific for each

- * team provider. The reference does not necessarily represent a single project

- * (Although it is the most common case)

- *

- * @author Camille Letavernier

- */

-public class FilterProjectsDialog extends SelectionDialog {

-

-

-

-	public class PSFLabelProvider extends LabelProvider {

-

-		@Override

-		public String getText(Object element) {

-			if (element instanceof String) {

-				String ref = (String) element;

-

-				char[] splitStrings = new char[] { '/', ',', '\\' };

-

-				int lastIndex = -1;

-				for (char split : splitStrings) {

-					lastIndex = Math.max(lastIndex, ref.lastIndexOf(split));

-				}

-

-				if (lastIndex == -1) {

-					return ref;

-				}

-				return ref.substring(lastIndex + 1);

-			}

-

-			return super.getText(element);

-		}

-	}

-

-	public class MapContentProvider implements ITreeContentProvider {

-

-		public void dispose() {

-			// Nothing

-		}

-

-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-			// Nothing

-		}

-

-		public Object[] getElements(Object inputElement) {

-			if (inputElement instanceof Map<?, ?>) {

-				return ((Map<?, ?>) inputElement).keySet().toArray();

-			}

-			return new Object[0];

-		}

-

-		public Object[] getChildren(Object parentElement) {

-			if (parentElement instanceof String && providersToProjects.containsKey(parentElement)) {

-				return providersToProjects.get(parentElement).toArray();

-			}

-			return new Object[0];

-		}

-

-		public Object getParent(Object element) {

-			return null;

-		}

-

-		public boolean hasChildren(Object element) {

-			return providersToProjects.containsKey(element);

-		}

-

-	}

-

-	private final Map<String, List<String>> providersToProjects;

-

-	private CheckboxTreeViewer treeViewer;

-

-	public FilterProjectsDialog(Shell parentShell, Map<String, List<String>> providersToProjects) {

-		super(parentShell);

-

-		this.providersToProjects = providersToProjects;

-	}

-

-	@Override

-	public void create() {

-		setTitle("Select the projects to import");

-		super.create();

-

-		getShell().setMinimumSize(400, 450);

-		getShell().pack();

-	}

-

-	@Override

-	protected Control createDialogArea(Composite parent) {

-		Composite dialogArea = (Composite) super.createDialogArea(parent);

-		Composite self = new Composite(dialogArea, SWT.CHECK);

-

-		self.setLayout(new GridLayout(1, true));

-		self.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-

-		Label description = new Label(self, SWT.WRAP);

-		description.setText("Select the projects to import");

-		Label warning = new Label(self, SWT.WRAP);

-		warning.setText("Note: Depending on the provider, project names may not be accurate");

-

-		Composite buttonsBar = new Composite(self, SWT.NONE);

-		buttonsBar.setLayoutData(new GridData(SWT.END, SWT.BEGINNING, true, false));

-		buttonsBar.setLayout(new FillLayout());

-

-		Button selectAll = new Button(buttonsBar, SWT.PUSH);

-		selectAll.setText("Select all");

-

-

-		Button unselectAll = new Button(buttonsBar, SWT.PUSH);

-		unselectAll.setText("Unselect all");

-

-

-

-		treeViewer = new CheckboxTreeViewer(self);

-

-		treeViewer.getTree().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-		treeViewer.setContentProvider(new MapContentProvider());

-		treeViewer.setLabelProvider(new PSFLabelProvider());

-		treeViewer.setInput(providersToProjects);

-

-		for (String key : providersToProjects.keySet()) {

-			treeViewer.setSubtreeChecked(key, true);

-		}

-

-		// Propagate check to children

-		treeViewer.addCheckStateListener(new ICheckStateListener() {

-

-			public void checkStateChanged(CheckStateChangedEvent event) {

-				treeViewer.setSubtreeChecked(event.getElement(), event.getChecked());

-				computeGrayedRoots();

-			}

-

-		});

-

-		selectAll.addSelectionListener(new SelectionListener() {

-

-			public void widgetSelected(SelectionEvent e) {

-				for (String provider : providersToProjects.keySet()) {

-					treeViewer.setSubtreeChecked(provider, true);

-					computeGrayedRoots();

-				}

-			}

-

-			public void widgetDefaultSelected(SelectionEvent e) {

-				// Nothing

-			}

-		});

-

-		unselectAll.addSelectionListener(new SelectionListener() {

-

-			public void widgetSelected(SelectionEvent e) {

-				for (String provider : providersToProjects.keySet()) {

-					treeViewer.setSubtreeChecked(provider, false);

-					computeGrayedRoots();

-				}

-			}

-

-			public void widgetDefaultSelected(SelectionEvent e) {

-				// Nothing

-			}

-		});

-

-		return dialogArea;

-	}

-

-	private void computeGrayedRoots() {

-		provider: for (String provider : providersToProjects.keySet()) {

-

-			boolean oneChecked = false;

-

-			boolean oneUnchecked = false;

-

-			for (String project : providersToProjects.get(provider)) {

-				if (treeViewer.getChecked(project)) {

-					oneChecked = true;

-				} else {

-					oneUnchecked = true;

-				}

-

-				if (oneChecked && oneUnchecked) {

-					treeViewer.setGrayChecked(provider, true);

-					continue provider; // Go to the next provider

-				}

-			}

-

-			// We get here only when all projects under this provider have the same state (either checked or unchecked)

-			treeViewer.setChecked(provider, oneChecked);

-			treeViewer.setGrayed(provider, false);

-		}

-	}

-

-	@Override

-	protected void okPressed() {

-		// Remove the unchecked projects/providers

-		Iterator<String> providerIterator = providersToProjects.keySet().iterator();

-		while (providerIterator.hasNext()) {

-			String provider = providerIterator.next();

-			if (!treeViewer.getChecked(provider)) { // Unchecked

-				providerIterator.remove();

-			} else { // Grayed or checked

-				if (treeViewer.getGrayed(provider)) { // Grayed

-					Iterator<String> projectIterator = providersToProjects.get(provider).iterator();

-					while (projectIterator.hasNext()) {

-						String project = projectIterator.next();

-						if (!treeViewer.getChecked(project)) {

-							projectIterator.remove();

-						}

-					}

-				}

-				// Else: checked, do nothing

-			}

-		}

-

-		super.okPressed();

-	}

-

-	@Override

-	protected boolean isResizable() {

-		return true;

-	}

-

-	@Override

-	public boolean isHelpAvailable() {

-		return false;

-	}

-

-	public Map<String, List<String>> getFilteredProjects() {

-		return providersToProjects;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.psf.ui;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.jface.viewers.CheckStateChangedEvent;
+import org.eclipse.jface.viewers.CheckboxTreeViewer;
+import org.eclipse.jface.viewers.ICheckStateListener;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.FillLayout;
+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.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.dialogs.SelectionDialog;
+
+/**
+ * A Checkbox Dialog to filter the projects to be imported.
+ *
+ * Note: the projects are represented by their PSF Reference, which is specific for each
+ * team provider. The reference does not necessarily represent a single project
+ * (Although it is the most common case)
+ *
+ * @author Camille Letavernier
+ */
+public class FilterProjectsDialog extends SelectionDialog {
+
+
+
+	public class PSFLabelProvider extends LabelProvider {
+
+		@Override
+		public String getText(Object element) {
+			if (element instanceof String) {
+				String ref = (String) element;
+
+				char[] splitStrings = new char[] { '/', ',', '\\' };
+
+				int lastIndex = -1;
+				for (char split : splitStrings) {
+					lastIndex = Math.max(lastIndex, ref.lastIndexOf(split));
+				}
+
+				if (lastIndex == -1) {
+					return ref;
+				}
+				return ref.substring(lastIndex + 1);
+			}
+
+			return super.getText(element);
+		}
+	}
+
+	public class MapContentProvider implements ITreeContentProvider {
+
+		public void dispose() {
+			// Nothing
+		}
+
+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+			// Nothing
+		}
+
+		public Object[] getElements(Object inputElement) {
+			if (inputElement instanceof Map<?, ?>) {
+				return ((Map<?, ?>) inputElement).keySet().toArray();
+			}
+			return new Object[0];
+		}
+
+		public Object[] getChildren(Object parentElement) {
+			if (parentElement instanceof String && providersToProjects.containsKey(parentElement)) {
+				return providersToProjects.get(parentElement).toArray();
+			}
+			return new Object[0];
+		}
+
+		public Object getParent(Object element) {
+			return null;
+		}
+
+		public boolean hasChildren(Object element) {
+			return providersToProjects.containsKey(element);
+		}
+
+	}
+
+	private final Map<String, List<String>> providersToProjects;
+
+	private CheckboxTreeViewer treeViewer;
+
+	public FilterProjectsDialog(Shell parentShell, Map<String, List<String>> providersToProjects) {
+		super(parentShell);
+
+		this.providersToProjects = providersToProjects;
+	}
+
+	@Override
+	public void create() {
+		setTitle("Select the projects to import");
+		super.create();
+
+		getShell().setMinimumSize(400, 450);
+		getShell().pack();
+	}
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite dialogArea = (Composite) super.createDialogArea(parent);
+		Composite self = new Composite(dialogArea, SWT.CHECK);
+
+		self.setLayout(new GridLayout(1, true));
+		self.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+		Label description = new Label(self, SWT.WRAP);
+		description.setText("Select the projects to import");
+		Label warning = new Label(self, SWT.WRAP);
+		warning.setText("Note: Depending on the provider, project names may not be accurate");
+
+		Composite buttonsBar = new Composite(self, SWT.NONE);
+		buttonsBar.setLayoutData(new GridData(SWT.END, SWT.BEGINNING, true, false));
+		buttonsBar.setLayout(new FillLayout());
+
+		Button selectAll = new Button(buttonsBar, SWT.PUSH);
+		selectAll.setText("Select all");
+
+
+		Button unselectAll = new Button(buttonsBar, SWT.PUSH);
+		unselectAll.setText("Unselect all");
+
+
+
+		treeViewer = new CheckboxTreeViewer(self);
+
+		treeViewer.getTree().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		treeViewer.setContentProvider(new MapContentProvider());
+		treeViewer.setLabelProvider(new PSFLabelProvider());
+		treeViewer.setInput(providersToProjects);
+
+		for (String key : providersToProjects.keySet()) {
+			treeViewer.setSubtreeChecked(key, true);
+		}
+
+		// Propagate check to children
+		treeViewer.addCheckStateListener(new ICheckStateListener() {
+
+			public void checkStateChanged(CheckStateChangedEvent event) {
+				treeViewer.setSubtreeChecked(event.getElement(), event.getChecked());
+				computeGrayedRoots();
+			}
+
+		});
+
+		selectAll.addSelectionListener(new SelectionListener() {
+
+			public void widgetSelected(SelectionEvent e) {
+				for (String provider : providersToProjects.keySet()) {
+					treeViewer.setSubtreeChecked(provider, true);
+					computeGrayedRoots();
+				}
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// Nothing
+			}
+		});
+
+		unselectAll.addSelectionListener(new SelectionListener() {
+
+			public void widgetSelected(SelectionEvent e) {
+				for (String provider : providersToProjects.keySet()) {
+					treeViewer.setSubtreeChecked(provider, false);
+					computeGrayedRoots();
+				}
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// Nothing
+			}
+		});
+
+		return dialogArea;
+	}
+
+	private void computeGrayedRoots() {
+		provider: for (String provider : providersToProjects.keySet()) {
+
+			boolean oneChecked = false;
+
+			boolean oneUnchecked = false;
+
+			for (String project : providersToProjects.get(provider)) {
+				if (treeViewer.getChecked(project)) {
+					oneChecked = true;
+				} else {
+					oneUnchecked = true;
+				}
+
+				if (oneChecked && oneUnchecked) {
+					treeViewer.setGrayChecked(provider, true);
+					continue provider; // Go to the next provider
+				}
+			}
+
+			// We get here only when all projects under this provider have the same state (either checked or unchecked)
+			treeViewer.setChecked(provider, oneChecked);
+			treeViewer.setGrayed(provider, false);
+		}
+	}
+
+	@Override
+	protected void okPressed() {
+		// Remove the unchecked projects/providers
+		Iterator<String> providerIterator = providersToProjects.keySet().iterator();
+		while (providerIterator.hasNext()) {
+			String provider = providerIterator.next();
+			if (!treeViewer.getChecked(provider)) { // Unchecked
+				providerIterator.remove();
+			} else { // Grayed or checked
+				if (treeViewer.getGrayed(provider)) { // Grayed
+					Iterator<String> projectIterator = providersToProjects.get(provider).iterator();
+					while (projectIterator.hasNext()) {
+						String project = projectIterator.next();
+						if (!treeViewer.getChecked(project)) {
+							projectIterator.remove();
+						}
+					}
+				}
+				// Else: checked, do nothing
+			}
+		}
+
+		super.okPressed();
+	}
+
+	@Override
+	protected boolean isResizable() {
+		return true;
+	}
+
+	@Override
+	public boolean isHelpAvailable() {
+		return false;
+	}
+
+	public Map<String, List<String>> getFilteredProjects() {
+		return providersToProjects;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/.classpath b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.classpath
index 098194ca4b7..098194ca4b7 100755
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/.classpath
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.classpath
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/.project b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.project
index d7026f45772..d7026f45772 100755
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/.project
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.project
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c4..f08be2b06c4 100755
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF
index 5f21ea11976..2ef109f8360 100755
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.emf.ecore;bundle-version="2.11.0",

- org.eclipse.emf.transaction;bundle-version="1.8.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",

- org.eclipse.core.expressions;bundle-version="3.4.600"

-Export-Package: org.eclipse.papyrus.infra.sync,

- org.eclipse.papyrus.infra.sync.internal;x-internal:=true,

- org.eclipse.papyrus.infra.sync.policy,

- org.eclipse.papyrus.infra.sync.service

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.sync.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.sync;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;bundle-version="2.11.0",
+ org.eclipse.emf.transaction;bundle-version="1.8.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
+ org.eclipse.core.expressions;bundle-version="3.4.600"
+Export-Package: org.eclipse.papyrus.infra.sync,
+ org.eclipse.papyrus.infra.sync.internal;x-internal:=true,
+ org.eclipse.papyrus.infra.sync.policy,
+ org.eclipse.papyrus.infra.sync.service
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.sync.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.sync;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/about.html b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/about.html
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/build.properties b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/build.properties
index be0cad9dd5e..be0cad9dd5e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/build.properties
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/build.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/DeveloperDoc.html b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/DeveloperDoc.html
index b3d8a436264..b3d8a436264 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/DeveloperDoc.html
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/DeveloperDoc.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/default.css b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/default.css
index df978c5d914..df978c5d914 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/default.css
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/default.css
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/design.di b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/design.di
index bf9abab340f..bf9abab340f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/design.di
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/design.di
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/design.notation b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/design.notation
index b5fc421544a..b5fc421544a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/design.notation
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/design.notation
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/design.uml b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/design.uml
index 72e6bbd71c9..72e6bbd71c9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/design.uml
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/design.uml
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Exclude_Views_from_Synchronization.png b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Exclude_Views_from_Synchronization.png
index 80030133ecb..80030133ecb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Exclude_Views_from_Synchronization.png
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Exclude_Views_from_Synchronization.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Notation_Sync_Classes.png b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Notation_Sync_Classes.png
index a558e2841c8..a558e2841c8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Notation_Sync_Classes.png
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Notation_Sync_Classes.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Notation_Synchronization.png b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Notation_Synchronization.png
index 70e1576cc00..70e1576cc00 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Notation_Synchronization.png
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Notation_Synchronization.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Plug-ins.png b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Plug-ins.png
index f0b376c2a85..f0b376c2a85 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Plug-ins.png
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Plug-ins.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Sync_Framework_Core_Classes.png b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Sync_Framework_Core_Classes.png
index 6c18db39cb2..6c18db39cb2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Sync_Framework_Core_Classes.png
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Sync_Framework_Core_Classes.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Sync_Policy_Classes.png b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Sync_Policy_Classes.png
index 636c1cfd706..636c1cfd706 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Sync_Policy_Classes.png
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Sync_Policy_Classes.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Sync_Service_Classes.png b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Sync_Service_Classes.png
index 6a6c5d6b1d5..6a6c5d6b1d5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Sync_Service_Classes.png
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Sync_Service_Classes.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronization.png b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronization.png
index 8a21d85bb58..8a21d85bb58 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronization.png
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronization.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronization_Exclusions.png b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronization_Exclusions.png
index b9f09845954..b9f09845954 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronization_Exclusions.png
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronization_Exclusions.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronization_Overrides.png b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronization_Overrides.png
index 7ab3fd2cef9..7ab3fd2cef9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronization_Overrides.png
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronization_Overrides.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronization_Overrides_1.png b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronization_Overrides_1.png
index 4f6992aec2c..4f6992aec2c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronization_Overrides_1.png
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronization_Overrides_1.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronize_Model_Elements.png b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronize_Model_Elements.png
index 622f7b1366c..622f7b1366c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronize_Model_Elements.png
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronize_Model_Elements.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronize_Model_Elements_1.png b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronize_Model_Elements_1.png
index 90e874d8234..90e874d8234 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronize_Model_Elements_1.png
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Synchronize_Model_Elements_1.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Test_Classes.png b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Test_Classes.png
index 68f728225d4..68f728225d4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Test_Classes.png
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Test_Classes.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Test_Plug-ins.png b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Test_Plug-ins.png
index b3edbe62911..b3edbe62911 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Test_Plug-ins.png
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Test_Plug-ins.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Use_Cases.png b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Use_Cases.png
index cf91d7830d1..cf91d7830d1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/doc/imgDOC/Use_Cases.png
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/doc/imgDOC/Use_Cases.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/plugin.properties b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/plugin.properties
index 76359109316..76359109316 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/plugin.properties
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/plugin.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/plugin.xml b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/plugin.xml
index 28900bbab26..28900bbab26 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/plugin.xml
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/plugin.xml
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/pom.xml b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/pom.xml
index 51bae0ccd8d..a909d6e47d0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/pom.xml
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-misc</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.sync</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/schema/triggers.exsd b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/schema/triggers.exsd
index 3923e4c36b8..3923e4c36b8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/schema/triggers.exsd
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/schema/triggers.exsd
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/Activator.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/Activator.java
index e0bb8d38ddd..e0bb8d38ddd 100755
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/Activator.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/Activator.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EMFDispatch.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EMFDispatch.java
index e543314e2ef..e543314e2ef 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EMFDispatch.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EMFDispatch.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EMFDispatchManager.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EMFDispatchManager.java
index c1287e01f78..c1287e01f78 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EMFDispatchManager.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EMFDispatchManager.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EMFListener.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EMFListener.java
index 20d2e03288f..20d2e03288f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EMFListener.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EMFListener.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EObjectEAttributeSyncFeature.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EObjectEAttributeSyncFeature.java
index 41dea338d7d..41dea338d7d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EObjectEAttributeSyncFeature.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EObjectEAttributeSyncFeature.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EObjectEReferenceSyncFeature.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EObjectEReferenceSyncFeature.java
index eb791be64b0..eb791be64b0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EObjectEReferenceSyncFeature.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EObjectEReferenceSyncFeature.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EObjectMasterSlaveSyncBucket.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EObjectMasterSlaveSyncBucket.java
index 0b896837b19..0b896837b19 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EObjectMasterSlaveSyncBucket.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EObjectMasterSlaveSyncBucket.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EObjectSyncBucket.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EObjectSyncBucket.java
index f657bb2bb4a..f657bb2bb4a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EObjectSyncBucket.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EObjectSyncBucket.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EObjectSyncItem.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EObjectSyncItem.java
index d15eb1a3da1..d15eb1a3da1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EObjectSyncItem.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EObjectSyncItem.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EStructuralFeatureSyncDispatcher.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EStructuralFeatureSyncDispatcher.java
index 09dac6d408c..09dac6d408c 100755
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EStructuralFeatureSyncDispatcher.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EStructuralFeatureSyncDispatcher.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EStructuralFeatureSyncFeature.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EStructuralFeatureSyncFeature.java
index f47ca4a5ecc..f47ca4a5ecc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EStructuralFeatureSyncFeature.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EStructuralFeatureSyncFeature.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/ISyncObject.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/ISyncObject.java
index a7e5de27462..a7e5de27462 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/ISyncObject.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/ISyncObject.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/MasterSlaveSyncBucket.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/MasterSlaveSyncBucket.java
index 19c4efd6605..19c4efd6605 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/MasterSlaveSyncBucket.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/MasterSlaveSyncBucket.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncBucket.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncBucket.java
index adf39509494..adf39509494 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncBucket.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncBucket.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncFeature.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncFeature.java
index 8f45aaff118..8f45aaff118 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncFeature.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncFeature.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncItem.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncItem.java
index 17872f651e8..17872f651e8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncItem.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncItem.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncItemList.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncItemList.java
index ab25c28b371..ab25c28b371 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncItemList.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncItemList.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncObject.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncObject.java
index 091749e718b..091749e718b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncObject.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncObject.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncRegistry.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncRegistry.java
index 07b7209dfcc..07b7209dfcc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncRegistry.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncRegistry.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncRequest.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncRequest.java
index b513bea3ad8..b513bea3ad8 100755
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncRequest.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/SyncRequest.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/NullSyncPolicy.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/NullSyncPolicy.java
index 2f9bf7589b1..2f9bf7589b1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/NullSyncPolicy.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/NullSyncPolicy.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncPolicyDelegateRegistryImpl.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncPolicyDelegateRegistryImpl.java
index 189e6d796eb..189e6d796eb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncPolicyDelegateRegistryImpl.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncPolicyDelegateRegistryImpl.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java
index 1d461d6f1a1..1d461d6f1a1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncServiceOperation.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncServiceOperation.java
index 23a97a85cd8..23a97a85cd8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncServiceOperation.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncServiceOperation.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncTriggerRegistry.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncTriggerRegistry.java
index 9750b616d23..9750b616d23 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncTriggerRegistry.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncTriggerRegistry.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/policy/DefaultSyncPolicy.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/policy/DefaultSyncPolicy.java
index 52f80e183ca..52f80e183ca 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/policy/DefaultSyncPolicy.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/policy/DefaultSyncPolicy.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/policy/ISyncPolicy.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/policy/ISyncPolicy.java
index d74e8a3c42a..d74e8a3c42a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/policy/ISyncPolicy.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/policy/ISyncPolicy.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/policy/ISyncPolicyDelegate.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/policy/ISyncPolicyDelegate.java
index c2c3605bd20..c2c3605bd20 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/policy/ISyncPolicyDelegate.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/policy/ISyncPolicyDelegate.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/policy/SyncPolicyDelegate.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/policy/SyncPolicyDelegate.java
index 2f41f7501f1..2f41f7501f1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/policy/SyncPolicyDelegate.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/policy/SyncPolicyDelegate.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/AbstractSyncTrigger.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/AbstractSyncTrigger.java
index 804dff8e2eb..804dff8e2eb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/AbstractSyncTrigger.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/AbstractSyncTrigger.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/CascadeTriggers.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/CascadeTriggers.java
index 5a9da663c30..5a9da663c30 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/CascadeTriggers.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/CascadeTriggers.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/ISyncAction.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/ISyncAction.java
index c4c708bb950..c4c708bb950 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/ISyncAction.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/ISyncAction.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/ISyncService.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/ISyncService.java
index 1a77cc4a86c..1a77cc4a86c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/ISyncService.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/ISyncService.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/ISyncTrigger.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/ISyncTrigger.java
index 8a563eccaec..8a563eccaec 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/ISyncTrigger.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/ISyncTrigger.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/SyncServiceRunnable.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/SyncServiceRunnable.java
index 2b8a893930e..2b8a893930e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/SyncServiceRunnable.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/service/SyncServiceRunnable.java
diff --git a/plugins/infra/misc/pom.xml b/plugins/infra/misc/pom.xml
new file mode 100644
index 00000000000..70e45113a66
--- /dev/null
+++ b/plugins/infra/misc/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.infra-misc</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+	<name>Papyrus Infra Other Bundles</name>
+	<description>Various uncategorized bundles providing common APIs.</description>
+
+	<modules>
+		<module>org.eclipse.papyrus.infra.hyperlink</module>
+		<module>org.eclipse.papyrus.infra.psf</module>
+		<module>org.eclipse.papyrus.infra.sync</module>
+	</modules>
+</project>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
index 8f76e495478..dbf05f2fc98 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.edit,
  org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
  org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
  ca.odell.glazedlists;bundle-version="1.9.0",
  com.google.guava;bundle-version="15.0.0",
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml
index 6c539123260..0cb35e122ea 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.infra.nattable.main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.emf.nattable</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/AbstractSynchronizedOnEStructuralFeatureAxisManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/AbstractSynchronizedOnEStructuralFeatureAxisManager.java
index 9a0489833cc..84df1a01729 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/AbstractSynchronizedOnEStructuralFeatureAxisManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/AbstractSynchronizedOnEStructuralFeatureAxisManager.java
@@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager;
 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EObjectAxisManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EObjectAxisManager.java
index 6374f0b20f8..3f3738ce278 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EObjectAxisManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EObjectAxisManager.java
@@ -18,12 +18,11 @@ import java.util.Collection;
 import java.util.Collections;
 
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandWrapper;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/cell/EMFFeatureValueCellManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/cell/EMFFeatureValueCellManager.java
index 44723be24e3..846a78d9cbb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/cell/EMFFeatureValueCellManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/cell/EMFFeatureValueCellManager.java
@@ -24,7 +24,6 @@ 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.emf.common.command.Command;
 import org.eclipse.emf.common.command.UnexecutableCommand;
 import org.eclipse.emf.ecore.EObject;
@@ -39,7 +38,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.AbstractEditCommandRequest
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.nattable.command.ErrorTransactionalCommand;
 import org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager;
 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
index 6db293e9f4d..f2228c4aa2b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
@@ -6,7 +6,8 @@ Export-Package: org.eclipse.papyrus.infra.nattable.common,
  org.eclipse.papyrus.infra.nattable.common.handlers,
  org.eclipse.papyrus.infra.nattable.common.modelresource,
  org.eclipse.papyrus.infra.nattable.common.utils,
- org.eclipse.papyrus.infra.nattable.common.wizards
+ org.eclipse.papyrus.infra.nattable.common.wizards,
+ org.eclipse.papyrus.infra.nattable.internal.common.commands;x-friends:="org.eclipse.papyrus.infra.nattable.gmfdiag"
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
@@ -18,7 +19,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0",
  org.eclipse.e4.ui.workbench,
  org.eclipse.e4.core.contexts,
  org.eclipse.core.expressions,
@@ -26,7 +27,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
  com.google.guava;bundle-version="11.0.0",
  org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",
  org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/plugin.xml
index 80faf87c36f..516988756aa 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/plugin.xml
@@ -250,12 +250,6 @@
    </helper>
 </extension>
 <extension
-      point="org.eclipse.papyrus.infra.gmfdiag.common.pasteStrategy">
-   <strategy
-         strategy="org.eclipse.papyrus.infra.nattable.common.strategy.paste.TablePasteStrategy">
-   </strategy>
-</extension>
-<extension
       point="org.eclipse.ui.commands">
    <command
          categoryId="org.eclipse.papyrus.infra.nattable.category"
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml
index 81235c12294..d7a68a653d8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.infra.nattable.main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.common</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/api/TableEditorCreationHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/api/TableEditorCreationHelper.java
index f59dbe170cc..da467d1d38f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/api/TableEditorCreationHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/api/TableEditorCreationHelper.java
@@ -34,9 +34,9 @@ import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
 import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;
 import org.eclipse.papyrus.infra.nattable.common.Activator;
-import org.eclipse.papyrus.infra.nattable.common.commands.CreateAndOpenTableEditorCommand;
 import org.eclipse.papyrus.infra.nattable.common.helper.TableViewPrototype;
 import org.eclipse.papyrus.infra.nattable.common.modelresource.PapyrusNattableModel;
+import org.eclipse.papyrus.infra.nattable.internal.common.commands.CreateAndOpenTableEditorCommand;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
 import org.eclipse.papyrus.infra.nattable.nattableconfiguration.NattableConfigurationRegistry;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/api/TableEditorDeleteHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/api/TableEditorDeleteHelper.java
index 746532aa02d..b7bd42c741a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/api/TableEditorDeleteHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/api/TableEditorDeleteHelper.java
@@ -13,19 +13,16 @@
 
 package org.eclipse.papyrus.infra.nattable.common.api;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
 import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;
 import org.eclipse.papyrus.infra.nattable.common.Activator;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/modelresource/PapyrusNattableModel.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/modelresource/PapyrusNattableModel.java
index 14c427bebbd..c5451e99276 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/modelresource/PapyrusNattableModel.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/modelresource/PapyrusNattableModel.java
@@ -1,343 +1,339 @@
-/*****************************************************************************

- * Copyright (c) 2011 LIFL & CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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 (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.common.modelresource;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource;

-import org.eclipse.papyrus.infra.core.resource.BadArgumentExcetion;

-import org.eclipse.papyrus.infra.core.resource.IModel;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.resource.NotFoundException;

-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;

-import org.eclipse.papyrus.infra.nattable.common.helper.TableViewPrototype;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-

-

-/**

- * A model used to save data from the {@link DefaultNattableEditor}

- *

- * @author cedric dumoulin

- *

- */

-public class PapyrusNattableModel extends AbstractModelWithSharedResource<Table> implements IModel {

-

-	/**

-	 * Model ID.

-	 */

-	public static final String MODEL_ID = "org.eclipse.papyrus.infra.nattable.resource.NattableModel"; //$NON-NLS-1$

-

-	/**

-	 * the file extension where table are stored

-	 */

-	public static final String TABLE_MODEL_FILE_EXTENSION = NotationModel.NOTATION_FILE_EXTENSION;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public PapyrusNattableModel() {

-

-	}

-

-	// Initialize stuff in the model.

-	@Override

-	public void init(ModelSet modelManager) {

-		super.init(modelManager);

-		// nothing to do now

-	}

-

-	/**

-	 * Get the file extension used for this model.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()

-	 *

-	 * @return

-	 */

-	@Override

-	protected String getModelFileExtension() {

-		return TABLE_MODEL_FILE_EXTENSION;

-	}

-

-	/**

-	 * Get the identifier used to register this model.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()

-	 *

-	 * @return

-	 */

-	@Override

-	public String getIdentifier() {

-		return MODEL_ID;

-	}

-

-	/**

-	 * Add a new initialized {@link PapyrusTableInstance} to the model.

-	 *

-	 * @param tableInstance

-	 *            The tableInstance to add.

-	 */

-	public void addPapyrusTable(Table tableInstance) {

-		EObject context = tableInstance.getContext();

-		if (context != null) { // we check the resource for control mode feature

-			Resource targetResource;

-			Resource contextResource = context.eResource();

-			if (!contextResource.getURI().trimFileExtension().equals(getResource().getURI().trimFileExtension())) {

-				URI uri = contextResource.getURI();

-				uri = uri.trimFileExtension();

-				uri = uri.appendFileExtension(getModelFileExtension());

-				ResourceSet set = contextResource.getResourceSet();

-				targetResource = set.getResource(uri, true);

-			} else {

-				targetResource = getResource();

-			}

-			if (targetResource != null) {

-				targetResource.getContents().add(tableInstance);

-			}

-		}

-

-		// it doesn't work when we call this method from the Create Project/Model wizard, because the file is not yet in the workspace

-		// see bug 470299: [Table] impossible to create new table from the creation wizard https://bugs.eclipse.org/bugs/show_bug.cgi?id=470299

-		// try {

-		// TransactionalEditingDomain editingDomain = ServiceUtilsForResourceSet.getInstance().getTransactionalEditingDomain(modelSet);

-		// Resource notationResource = NotationUtils.getNotationResourceForDiagram(tableInstance.getContext(), editingDomain);

-		// if (notationResource != null) {

-		// notationResource.getContents().add(tableInstance);

-		// }

-		// } catch (ServiceException ex) {

-		// Activator.log.error(ex);

-		// }

-	}

-

-	/**

-	 * Add a new initialized {@link PapyrusTableInstance} to the model.

-	 *

-	 * @param tableInstance

-	 *            The tableInstance to add.

-	 */

-	public void removeTable(Table tableInstance) {

-		if (tableInstance.eResource() != null) {

-			tableInstance.eResource().getContents().remove(tableInstance);

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#isModelRoot(org.eclipse.emf.ecore.EObject)

-	 *

-	 * @param object

-	 * @return

-	 */

-	@Override

-	protected boolean isModelRoot(EObject object) {

-		return object instanceof Table;

-	}

-

-	/**

-	 * Get a table by its name.

-	 *

-	 * @param tableName

-	 *            Name of the table. This is the name set by the user.

-	 * @return

-	 * @throws NotFoundException

-	 * @throws BadArgumentExcetion

-	 */

-	public Table getTable(String tableName) throws NotFoundException, BadArgumentExcetion {

-

-		if (tableName == null || tableName.length() == 0) {

-			throw new BadArgumentExcetion("Table name should not be null and size should be >0."); //$NON-NLS-1$

-		}

-

-		for (Resource current : getResources()) {

-			for (EObject element : current.getContents()) {

-				if (element instanceof Table) {

-					Table table = (Table) element;

-

-					if (tableName.equals(table.getName())) {

-						// Found

-						return table;

-

-					}

-				}

-			}

-		}

-		// not found

-		throw new NotFoundException(NLS.bind("No Table named '{0}' can be found in Model.", tableName)); //$NON-NLS-1$

-	}

-

-	/**

-	 * 

-	 * @param tableName

-	 *            a table name, cannot be <code>null</code>

-	 * @return

-	 * 		the list of table with the wanted name

-	 */

-	public List<Table> getTableByName(final String tableName) {

-		Assert.isNotNull(tableName);

-		List<Table> matchingTables = new ArrayList<Table>();

-		for (Resource current : getResources()) {

-			for (EObject element : current.getContents()) {

-				if (element instanceof Table) {

-					Table table = (Table) element;

-					if (tableName.equals(table.getName())) {

-						matchingTables.add(table);

-					}

-				}

-			}

-		}

-		return matchingTables;

-	}

-

-	/**

-	 * 

-	 * @param tableType

-	 *            a table type, cannot be <code>null</code>

-	 * @return

-	 * 		the list of table with the wanted type

-	 */

-	public List<Table> getTableByType(final String tableType) {

-		Assert.isNotNull(tableType);

-		List<Table> matchingTables = new ArrayList<Table>();

-		for (Resource current : getResources()) {

-			for (EObject element : current.getContents()) {

-				if (element instanceof Table) {

-					Table table = (Table) element;

-					EObject prototype = table.getPrototype();

-					if (prototype instanceof TableViewPrototype) {

-						final String implementationID = ((TableViewPrototype) prototype).getImplementation();

-						if (tableType.equals(implementationID)) {

-							matchingTables.add(table);

-						}

-					} else {

-						if (tableType.equals(table.getTableConfiguration().getType())) {

-							matchingTables.add(table);

-						}

-					}

-				}

-			}

-		}

-		return matchingTables;

-	}

-

-	/**

-	 * 

-	 * @param tableContext

-	 *            an Eobject used a context of the table, cannot be <code>null</code>

-	 * @return

-	 * 		the list of table with the wanted context

-	 */

-	public List<Table> getTableByContext(final EObject tableContext) {

-		Assert.isNotNull(tableContext);

-		List<Table> matchingTables = new ArrayList<Table>();

-		for (Resource current : getResources()) {

-			for (EObject element : current.getContents()) {

-				if (element instanceof Table) {

-					Table table = (Table) element;

-					if (tableContext.equals(table.getContext())) {

-						matchingTables.add(table);

-					}

-				}

-			}

-		}

-		return matchingTables;

-	}

-

-	/**

-	 * 

-	 * @param tableOwner

-	 *            an EObject used a owner of the table, cannot be <code>null</code>

-	 * @return

-	 * 		the list of table with the wanted owner

-	 */

-	public List<Table> getTableByOwner(final EObject tableOwner) {

-		Assert.isNotNull(tableOwner);

-		List<Table> matchingTables = new ArrayList<Table>();

-		for (Resource current : getResources()) {

-			for (EObject element : current.getContents()) {

-				if (element instanceof Table) {

-					Table table = (Table) element;

-					if (tableOwner.equals(table.getOwner())) {

-						matchingTables.add(table);

-					}

-				}

-			}

-		}

-		return matchingTables;

-	}

-

-	/**

-	 * 

-	 * @param tableContext

-	 *            the context of the wanted table

-	 * @param tableOwner

-	 *            the owner of the wanted table

-	 * @param tableType

-	 *            the type of the wanted table

-	 * @param tableName

-	 *            the name of the wanted table

-	 * @return

-	 * the list of the tables matching the parameters. <code>null</code> parameters are ignored

-	 */

-	public List<Table> findMatchingTables(final EObject tableContext, final EObject tableOwner, final String tableType, final String tableName) {

-		final List<Table> matchingTables = new ArrayList<Table>();

-		for (Resource current : getResources()) {

-			for (EObject element : current.getContents()) {

-				if (element instanceof Table) {

-					Table table = (Table) element;

-					boolean matchName = true;

-					boolean matchType = true;

-					boolean matchOwner = true;

-					boolean matchContext = true;

-					if (tableName != null) {

-						matchName = tableName.equals(table.getName());

-					}

-					if (tableType != null) {

-						EObject prototype = table.getPrototype();

-						if (prototype instanceof TableViewPrototype) {

-							final String implementationID = ((TableViewPrototype) prototype).getImplementation();

-							matchType = tableType.equals(implementationID);

-						} else {

-							matchType = tableType.equals(table.getTableConfiguration().getType());

-						}

-					}

-					if (tableOwner != null) {

-						matchOwner = tableOwner.equals(table.getOwner());

-					}

-					if (tableContext != null) {

-						matchContext = tableContext.equals(table.getContext());

-					}

-

-					if (matchName && matchType && matchOwner && matchContext) {

-						matchingTables.add(table);

-					}

-				}

-			}

-		}

-		return matchingTables;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 LIFL, CEA LIST, Christian W. Damus, and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.common.modelresource;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource;
+import org.eclipse.papyrus.infra.core.resource.BadArgumentExcetion;
+import org.eclipse.papyrus.infra.core.resource.IModel;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.NotFoundException;
+import org.eclipse.papyrus.infra.nattable.common.helper.TableViewPrototype;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+
+
+/**
+ * A model used to save data from the {@link DefaultNattableEditor}
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class PapyrusNattableModel extends AbstractModelWithSharedResource<Table> implements IModel {
+
+	/**
+	 * Model ID.
+	 */
+	public static final String MODEL_ID = "org.eclipse.papyrus.infra.nattable.resource.NattableModel"; //$NON-NLS-1$
+
+	/**
+	 * the file extension where table are stored
+	 */
+	public static final String TABLE_MODEL_FILE_EXTENSION = "notation"; //$NON-NLS-1$
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public PapyrusNattableModel() {
+
+	}
+
+	// Initialize stuff in the model.
+	@Override
+	public void init(ModelSet modelManager) {
+		super.init(modelManager);
+		// nothing to do now
+	}
+
+	/**
+	 * Get the file extension used for this model.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()
+	 *
+	 * @return
+	 */
+	@Override
+	protected String getModelFileExtension() {
+		return TABLE_MODEL_FILE_EXTENSION;
+	}
+
+	/**
+	 * Get the identifier used to register this model.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()
+	 *
+	 * @return
+	 */
+	@Override
+	public String getIdentifier() {
+		return MODEL_ID;
+	}
+
+	/**
+	 * Add a new initialized {@link PapyrusTableInstance} to the model.
+	 *
+	 * @param tableInstance
+	 *            The tableInstance to add.
+	 */
+	public void addPapyrusTable(Table tableInstance) {
+		EObject context = tableInstance.getContext();
+		if (context != null) { // we check the resource for control mode feature
+			Resource targetResource;
+			Resource contextResource = context.eResource();
+			if (!contextResource.getURI().trimFileExtension().equals(getResource().getURI().trimFileExtension())) {
+				URI uri = contextResource.getURI();
+				uri = uri.trimFileExtension();
+				uri = uri.appendFileExtension(getModelFileExtension());
+				ResourceSet set = contextResource.getResourceSet();
+				targetResource = set.getResource(uri, true);
+			} else {
+				targetResource = getResource();
+			}
+			if (targetResource != null) {
+				targetResource.getContents().add(tableInstance);
+			}
+		}
+
+		// it doesn't work when we call this method from the Create Project/Model wizard, because the file is not yet in the workspace
+		// see bug 470299: [Table] impossible to create new table from the creation wizard https://bugs.eclipse.org/bugs/show_bug.cgi?id=470299
+		// try {
+		// TransactionalEditingDomain editingDomain = ServiceUtilsForResourceSet.getInstance().getTransactionalEditingDomain(modelSet);
+		// Resource notationResource = NotationUtils.getNotationResourceForDiagram(tableInstance.getContext(), editingDomain);
+		// if (notationResource != null) {
+		// notationResource.getContents().add(tableInstance);
+		// }
+		// } catch (ServiceException ex) {
+		// Activator.log.error(ex);
+		// }
+	}
+
+	/**
+	 * Add a new initialized {@link PapyrusTableInstance} to the model.
+	 *
+	 * @param tableInstance
+	 *            The tableInstance to add.
+	 */
+	public void removeTable(Table tableInstance) {
+		if (tableInstance.eResource() != null) {
+			tableInstance.eResource().getContents().remove(tableInstance);
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.core.resource.AbstractModelWithSharedResource#isModelRoot(org.eclipse.emf.ecore.EObject)
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	protected boolean isModelRoot(EObject object) {
+		return object instanceof Table;
+	}
+
+	/**
+	 * Get a table by its name.
+	 *
+	 * @param tableName
+	 *            Name of the table. This is the name set by the user.
+	 * @return
+	 * @throws NotFoundException
+	 * @throws BadArgumentExcetion
+	 */
+	public Table getTable(String tableName) throws NotFoundException, BadArgumentExcetion {
+
+		if (tableName == null || tableName.length() == 0) {
+			throw new BadArgumentExcetion("Table name should not be null and size should be >0."); //$NON-NLS-1$
+		}
+
+		for (Resource current : getResources()) {
+			for (EObject element : current.getContents()) {
+				if (element instanceof Table) {
+					Table table = (Table) element;
+
+					if (tableName.equals(table.getName())) {
+						// Found
+						return table;
+
+					}
+				}
+			}
+		}
+		// not found
+		throw new NotFoundException(NLS.bind("No Table named '{0}' can be found in Model.", tableName)); //$NON-NLS-1$
+	}
+
+	/**
+	 * 
+	 * @param tableName
+	 *            a table name, cannot be <code>null</code>
+	 * @return
+	 * 		the list of table with the wanted name
+	 */
+	public List<Table> getTableByName(final String tableName) {
+		Assert.isNotNull(tableName);
+		List<Table> matchingTables = new ArrayList<Table>();
+		for (Resource current : getResources()) {
+			for (EObject element : current.getContents()) {
+				if (element instanceof Table) {
+					Table table = (Table) element;
+					if (tableName.equals(table.getName())) {
+						matchingTables.add(table);
+					}
+				}
+			}
+		}
+		return matchingTables;
+	}
+
+	/**
+	 * 
+	 * @param tableType
+	 *            a table type, cannot be <code>null</code>
+	 * @return
+	 * 		the list of table with the wanted type
+	 */
+	public List<Table> getTableByType(final String tableType) {
+		Assert.isNotNull(tableType);
+		List<Table> matchingTables = new ArrayList<Table>();
+		for (Resource current : getResources()) {
+			for (EObject element : current.getContents()) {
+				if (element instanceof Table) {
+					Table table = (Table) element;
+					EObject prototype = table.getPrototype();
+					if (prototype instanceof TableViewPrototype) {
+						final String implementationID = ((TableViewPrototype) prototype).getImplementation();
+						if (tableType.equals(implementationID)) {
+							matchingTables.add(table);
+						}
+					} else {
+						if (tableType.equals(table.getTableConfiguration().getType())) {
+							matchingTables.add(table);
+						}
+					}
+				}
+			}
+		}
+		return matchingTables;
+	}
+
+	/**
+	 * 
+	 * @param tableContext
+	 *            an Eobject used a context of the table, cannot be <code>null</code>
+	 * @return
+	 * 		the list of table with the wanted context
+	 */
+	public List<Table> getTableByContext(final EObject tableContext) {
+		Assert.isNotNull(tableContext);
+		List<Table> matchingTables = new ArrayList<Table>();
+		for (Resource current : getResources()) {
+			for (EObject element : current.getContents()) {
+				if (element instanceof Table) {
+					Table table = (Table) element;
+					if (tableContext.equals(table.getContext())) {
+						matchingTables.add(table);
+					}
+				}
+			}
+		}
+		return matchingTables;
+	}
+
+	/**
+	 * 
+	 * @param tableOwner
+	 *            an EObject used a owner of the table, cannot be <code>null</code>
+	 * @return
+	 * 		the list of table with the wanted owner
+	 */
+	public List<Table> getTableByOwner(final EObject tableOwner) {
+		Assert.isNotNull(tableOwner);
+		List<Table> matchingTables = new ArrayList<Table>();
+		for (Resource current : getResources()) {
+			for (EObject element : current.getContents()) {
+				if (element instanceof Table) {
+					Table table = (Table) element;
+					if (tableOwner.equals(table.getOwner())) {
+						matchingTables.add(table);
+					}
+				}
+			}
+		}
+		return matchingTables;
+	}
+
+	/**
+	 * 
+	 * @param tableContext
+	 *            the context of the wanted table
+	 * @param tableOwner
+	 *            the owner of the wanted table
+	 * @param tableType
+	 *            the type of the wanted table
+	 * @param tableName
+	 *            the name of the wanted table
+	 * @return
+	 * 		the list of the tables matching the parameters. <code>null</code> parameters are ignored
+	 */
+	public List<Table> findMatchingTables(final EObject tableContext, final EObject tableOwner, final String tableType, final String tableName) {
+		final List<Table> matchingTables = new ArrayList<Table>();
+		for (Resource current : getResources()) {
+			for (EObject element : current.getContents()) {
+				if (element instanceof Table) {
+					Table table = (Table) element;
+					boolean matchName = true;
+					boolean matchType = true;
+					boolean matchOwner = true;
+					boolean matchContext = true;
+					if (tableName != null) {
+						matchName = tableName.equals(table.getName());
+					}
+					if (tableType != null) {
+						EObject prototype = table.getPrototype();
+						if (prototype instanceof TableViewPrototype) {
+							final String implementationID = ((TableViewPrototype) prototype).getImplementation();
+							matchType = tableType.equals(implementationID);
+						} else {
+							matchType = tableType.equals(table.getTableConfiguration().getType());
+						}
+					}
+					if (tableOwner != null) {
+						matchOwner = tableOwner.equals(table.getOwner());
+					}
+					if (tableContext != null) {
+						matchContext = tableContext.equals(table.getContext());
+					}
+
+					if (matchName && matchType && matchOwner && matchContext) {
+						matchingTables.add(table);
+					}
+				}
+			}
+		}
+		return matchingTables;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/utils/TableUtil.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/utils/TableUtil.java
index d5a4bbeee92..c99b0e60fba 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/utils/TableUtil.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/utils/TableUtil.java
@@ -11,15 +11,17 @@
  *****************************************************************************/
 package org.eclipse.papyrus.infra.nattable.common.utils;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
 
 
@@ -34,18 +36,27 @@ public class TableUtil {
 	 * @return the list of diagrams associated with the given element
 	 */
 	public static List<Table> getAssociatedTables(EObject element, ResourceSet resourceSet) {
+		List<Table> result;
+
 		if (resourceSet == null) {
-			if (element != null && element.eResource() != null) {
-				resourceSet = element.eResource().getResourceSet();
-			}
+			resourceSet = EMFHelper.getResourceSet(element);
 		}
 
-		if (resourceSet instanceof ModelSet) {
-			Resource notationResource = NotationUtils.getNotationResource((ModelSet) resourceSet);
-			return getAssociatedTablesFromNotationResource(element, notationResource);
+		if (resourceSet == null) {
+			// Deny
+			result = Collections.emptyList();
+		} else {
+			result = new ArrayList<Table>(3); // Don't anticipate many
+			for (EStructuralFeature.Setting setting : EMFHelper.getUsages(element)) {
+				if (setting.getEStructuralFeature() == NattablePackage.Literals.TABLE__OWNER) {
+					if (EMFHelper.getResourceSet(setting.getEObject()) == resourceSet) {
+						result.add((Table) setting.getEObject());
+					}
+				}
+			}
 		}
 
-		return Collections.emptyList();
+		return result;
 	}
 
 	/**
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/commands/CreateAndOpenTableEditorCommand.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/internal/common/commands/CreateAndOpenTableEditorCommand.java
index 60034cb2aab..8609b0e7575 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/commands/CreateAndOpenTableEditorCommand.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/internal/common/commands/CreateAndOpenTableEditorCommand.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.infra.nattable.common.commands;
+package org.eclipse.papyrus.infra.nattable.internal.common.commands;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/commands/InsertTableCommand.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/internal/common/commands/InsertTableCommand.java
index 3e644759c7a..19a026b2a39 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/commands/InsertTableCommand.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/internal/common/commands/InsertTableCommand.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,14 +8,17 @@
  *
  * Contributors:
  *  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
  *****************************************************************************/
-package org.eclipse.papyrus.infra.nattable.common.commands;
+package org.eclipse.papyrus.infra.nattable.internal.common.commands;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.transaction.RecordingCommand;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
+import org.eclipse.papyrus.infra.core.resource.IEMFModel;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
 
 
@@ -48,22 +51,19 @@ public class InsertTableCommand extends RecordingCommand {
 		this.table = table;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * <<<<<<< HEAD
-	 *
-	 * =======
-	 *
-	 * >>>>>>> refs/heads/master
-	 *
-	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()
-	 */
 	@Override
 	protected void doExecute() {
-		Resource targetResource = NotationUtils.getNotationResourceForDiagram(owner, transactionalEditingDomain);
+		ResourceSet rset = transactionalEditingDomain.getResourceSet();
+		IEMFModel tableModel = null;
+
+		if (rset instanceof ModelSet) {
+			ModelSet modelSet = (ModelSet) rset;
+			tableModel = modelSet.getModelToPersist(table);
+		}
+
 		table.setOwner(owner);
-		if (targetResource != null) {
-			targetResource.getContents().add(table);
+		if (tableModel != null) {
+			tableModel.persist(table);
 		}
 	}
 }
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 e1c725b2ff4..6b07b8502b4 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
@@ -1,25 +1,25 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.nattable.controlmode,

- org.eclipse.papyrus.infra.nattable.controlmode.commands,

- org.eclipse.papyrus.infra.nattable.controlmode.helpers

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.emf.commands.core,

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",

- com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.2.0"

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.controlmode.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.controlmode;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.nattable.controlmode,
+ org.eclipse.papyrus.infra.nattable.controlmode.commands,
+ org.eclipse.papyrus.infra.nattable.controlmode.helpers
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.emf.commands.core,
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.2.0"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.infra.nattable.controlmode.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.controlmode;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml
index ce59ee1b1de..d46645fb89e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.infra.nattable.main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.controlmode</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/.classpath
index eca7bdba8f0..eca7bdba8f0 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/.classpath
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/.classpath
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/.project b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/.project
new file mode 100644
index 00000000000..13a3ec18604
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.nattable.gmfdiag</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/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

-org.eclipse.jdt.core.compiler.compliance=1.8

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.8

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters.edit/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..d6e57e98e04
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF
@@ -0,0 +1,38 @@
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0",
+ org.eclipse.emf.edit,
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.emf.transaction,
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0",
+ org.eclipse.e4.ui.workbench,
+ org.eclipse.e4.core.contexts,
+ org.eclipse.core.expressions,
+ org.eclipse.emf.edit.ui,
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.2.0"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.infra.nattable.internal.gmfdiag.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.gmfdiag;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.infra.nattable.internal.gmfdiag;x-internal:=true,
+ org.eclipse.papyrus.infra.nattable.internal.gmfdiag.strategy.paste;x-internal:=true
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/OSGI-INF/l10n/bundle.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 00000000000..3ab2d7c5ded
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.papyrus.infra.nattable.common
+Bundle-Vendor = Eclipse Modeling Project
+Bundle-Name = Papyrus Nattable Editor GMF Diagram Integration
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/about.html b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/about.html
new file mode 100644
index 00000000000..598b3684879
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/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>May 12, 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/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/build.properties
index 12082314b29..e2c0717c603 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/build.properties
@@ -1,8 +1,9 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               plugin.xml,\

-               icon/

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               OSGI-INF/,\
+               about.html,\
+               icons/
+src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/icons/checked.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/icons/checked.gif
new file mode 100644
index 00000000000..e556e7df3c7
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/icons/checked.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/icons/old/tableCatalog.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/icons/old/tableCatalog.gif
new file mode 100644
index 00000000000..87984f6d530
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/icons/old/tableCatalog.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/icons/old/tableCatalog.png b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/icons/old/tableCatalog.png
new file mode 100644
index 00000000000..129fa4272c2
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/icons/old/tableCatalog.png
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/icons/table.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/icons/table.gif
new file mode 100644
index 00000000000..4c9048708b0
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/icons/table.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/icons/table.png b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/icons/table.png
new file mode 100644
index 00000000000..2a979527f4a
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/icons/table.png
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/icons/tableCatalog.png b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/icons/tableCatalog.png
new file mode 100644
index 00000000000..9ae3dd48986
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/icons/tableCatalog.png
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/icons/unchecked.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/icons/unchecked.gif
new file mode 100644
index 00000000000..342fa9de7e9
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/icons/unchecked.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/plugin.xml
new file mode 100644
index 00000000000..296c1fc8948
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/plugin.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.papyrus.infra.gmfdiag.common.pasteStrategy">
+      <strategy
+            strategy="org.eclipse.papyrus.infra.nattable.internal.gmfdiag.strategy.paste.TablePasteStrategy">
+      </strategy>
+   </extension>
+</plugin>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/pom.xml
new file mode 100644
index 00000000000..0d373a66251
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../..</relativePath>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.nattable.gmfdiag</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/Activator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/src/org/eclipse/papyrus/infra/nattable/internal/gmfdiag/Activator.java
index 17153b166a2..82c42c35e80 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/Activator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/src/org/eclipse/papyrus/infra/nattable/internal/gmfdiag/Activator.java
@@ -1,69 +1,71 @@
-/*****************************************************************************

- * 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.palette;

-

-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.infra.gmfdiag.css.palette"; //$NON-NLS-1$

-

-	public static LogHelper log;

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	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;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.internal.gmfdiag;
+
+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.infra.nattable.common"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	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/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/strategy/paste/TablePasteStrategy.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/src/org/eclipse/papyrus/infra/nattable/internal/gmfdiag/strategy/paste/TablePasteStrategy.java
index 430ede79480..377493416f5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/strategy/paste/TablePasteStrategy.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/src/org/eclipse/papyrus/infra/nattable/internal/gmfdiag/strategy/paste/TablePasteStrategy.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.infra.nattable.common.strategy.paste;
+package org.eclipse.papyrus.infra.nattable.internal.gmfdiag.strategy.paste;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -30,8 +30,8 @@ import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
 import org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste.AbstractPasteStrategy;
 import org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste.DefaultPasteStrategy;
 import org.eclipse.papyrus.infra.gmfdiag.common.strategy.paste.IPasteStrategy;
-import org.eclipse.papyrus.infra.nattable.common.commands.InsertTableCommand;
 import org.eclipse.papyrus.infra.nattable.common.utils.TableUtil;
+import org.eclipse.papyrus.infra.nattable.internal.common.commands.InsertTableCommand;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
 
 
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/pom.xml
index 237f0e96aef..f2198148dd3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.infra.nattable.main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.model.edit</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/pom.xml
index 6b5e35ae927..bee3b610d9f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.infra.nattable.main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.model.editor</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/pom.xml
index e22b771d7c4..8dd4e4fc37c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.infra.nattable.main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.model</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
index afe7fda25dd..95c26a1ab4a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
@@ -1,32 +1,31 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.nattable.modelexplorer,

- org.eclipse.papyrus.infra.nattable.modelexplorer.handlers,

- org.eclipse.papyrus.infra.nattable.modelexplorer.messages,

- org.eclipse.papyrus.infra.nattable.modelexplorer.providers,

- org.eclipse.papyrus.infra.nattable.modelexplorer.queries

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Name: %Bundle-Name

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.core.expressions,

- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",

- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0",

- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0",

- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0"

-Bundle-Vendor: %Bundle-Vendor

-Bundle-Version: 1.2.0.qualifier

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.modelexplorer.Activator

-Bundle-ManifestVersion: 2

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.modelexplorer;singleton:=true

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.nattable.modelexplorer,
+ org.eclipse.papyrus.infra.nattable.modelexplorer.handlers,
+ org.eclipse.papyrus.infra.nattable.modelexplorer.messages,
+ org.eclipse.papyrus.infra.nattable.modelexplorer.providers,
+ org.eclipse.papyrus.infra.nattable.modelexplorer.queries
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Name: %Bundle-Name
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.emf.type.core,
+ org.eclipse.core.expressions,
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
+ org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0",
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Version: 1.2.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.infra.nattable.modelexplorer.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.modelexplorer;singleton:=true
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml
index d164beaa7b5..f1fbda0b2c0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.infra.nattable.main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.modelexplorer</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/AbstractTableCommandHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/AbstractTableCommandHandler.java
index 2a60d0c9c0a..077cf0c0a7c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/AbstractTableCommandHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/AbstractTableCommandHandler.java
@@ -1,62 +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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.modelexplorer.handlers;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;

-import org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PlatformUI;

-

-public abstract class AbstractTableCommandHandler extends AbstractCommandHandler {

-

-	/**

-	 * Returns the list of selected tables

-	 *

-	 * @return the list of selected tables

-	 */

-	protected List<Table> getSelectedTables() {

-		List<Table> tables = new ArrayList<Table>();

-		ISelection selection = null;

-

-		// Get current selection

-		IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();

-		if (activeWorkbenchWindow != null) {

-			selection = activeWorkbenchWindow.getSelectionService().getSelection();

-

-			// Get first element if the selection is an IStructuredSelection

-			if (selection instanceof IStructuredSelection) {

-				IStructuredSelection structuredSelection = (IStructuredSelection) selection;

-				Iterator<?> iter = structuredSelection.iterator();

-				while (iter.hasNext()) {

-					Object current = iter.next();

-					/**

-					 * Get the table object. This getElement is used in order to

-					 * use IAdaptable mechanisme For example for Facet Elements

-					 */

-					EObject table = NavigatorUtils.getElement(current, EObject.class);

-					if (table instanceof Table) {

-						tables.add((Table) table);

-					}

-				}

-			}

-		}

-		return tables;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.modelexplorer.handlers;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.ui.command.AbstractCommandHandler;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+public abstract class AbstractTableCommandHandler extends AbstractCommandHandler {
+
+	/**
+	 * Returns the list of selected tables
+	 *
+	 * @return the list of selected tables
+	 */
+	protected List<Table> getSelectedTables() {
+		List<Table> tables = new ArrayList<Table>();
+		ISelection selection = null;
+
+		// Get current selection
+		IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		if (activeWorkbenchWindow != null) {
+			selection = activeWorkbenchWindow.getSelectionService().getSelection();
+
+			// Get first element if the selection is an IStructuredSelection
+			if (selection instanceof IStructuredSelection) {
+				IStructuredSelection structuredSelection = (IStructuredSelection) selection;
+				Iterator<?> iter = structuredSelection.iterator();
+				while (iter.hasNext()) {
+					Object current = iter.next();
+					/**
+					 * Get the table object. This getElement is used in order to
+					 * use IAdaptable mechanisme For example for Facet Elements
+					 */
+					EObject table = EMFHelper.getEObject(current);
+					if (table instanceof Table) {
+						tables.add((Table) table);
+					}
+				}
+			}
+		}
+		return tables;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/RenameTableHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/RenameTableHandler.java
index d64c66516f7..79f69725e2d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/RenameTableHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/handlers/RenameTableHandler.java
@@ -1,74 +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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.modelexplorer.handlers;

-

-import java.util.List;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.jface.dialogs.InputDialog;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.modelexplorer.messages.Messages;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * This handler provides the method to rename a Table

- *

- *

- *

- */

-public class RenameTableHandler extends AbstractTableCommandHandler {

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler#getCommand()

-	 *

-	 * @return

-	 */

-	@Override

-	protected Command getCommand() {

-		TransactionalEditingDomain editingDomain = getEditingDomain();

-		List<Table> tables = getSelectedTables();

-		if (editingDomain != null && tables.size() == 1) {

-

-			final Table table = tables.get(0);

-			final String currentName = table.getName();

-			if (currentName != null) {

-

-				AbstractTransactionalCommand cmd = new AbstractTransactionalCommand(editingDomain, "RenameTableCommand", null) { //$NON-NLS-1$

-

-					@Override

-					protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) {

-						InputDialog dialog = new InputDialog(Display.getCurrent().getActiveShell(), Messages.RenameTableHandler_RenameAnExistingTable, Messages.RenameTableHandler_NewName, currentName, null);

-						if (dialog.open() == Window.OK) {

-							final String name = dialog.getValue();

-							if (name != null && name.length() > 0) {

-								table.setName(name);

-							}

-							return CommandResult.newOKCommandResult();

-						} else {

-							return CommandResult.newCancelledCommandResult();

-						}

-					}

-				};

-				return new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(cmd);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.modelexplorer.handlers;
+
+import java.util.List;
+
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.UnexecutableCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.modelexplorer.messages.Messages;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * This handler provides the method to rename a Table
+ *
+ *
+ *
+ */
+public class RenameTableHandler extends AbstractTableCommandHandler {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler#getCommand()
+	 *
+	 * @return
+	 */
+	@Override
+	protected Command getCommand(IEvaluationContext context) {
+		TransactionalEditingDomain editingDomain = getEditingDomain(context);
+		List<Table> tables = getSelectedTables();
+		if (editingDomain != null && tables.size() == 1) {
+
+			final Table table = tables.get(0);
+			final String currentName = table.getName();
+			if (currentName != null) {
+
+				AbstractTransactionalCommand cmd = new AbstractTransactionalCommand(editingDomain, "RenameTableCommand", null) { //$NON-NLS-1$
+
+					@Override
+					protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) {
+						InputDialog dialog = new InputDialog(Display.getCurrent().getActiveShell(), Messages.RenameTableHandler_RenameAnExistingTable, Messages.RenameTableHandler_NewName, currentName, null);
+						if (dialog.open() == Window.OK) {
+							final String name = dialog.getValue();
+							if (name != null && name.length() > 0) {
+								table.setName(name);
+							}
+							return CommandResult.newOKCommandResult();
+						} else {
+							return CommandResult.newCancelledCommandResult();
+						}
+					}
+				};
+				return new GMFtoEMFCommandWrapper(cmd);
+			}
+		}
+		return UnexecutableCommand.INSTANCE;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/providers/TablePropertyTester.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/providers/TablePropertyTester.java
index 988680c5378..447f29b6149 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/providers/TablePropertyTester.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/providers/TablePropertyTester.java
@@ -1,85 +1,85 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.modelexplorer.providers;

-

-import java.util.Iterator;

-

-import org.eclipse.core.expressions.PropertyTester;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;

-

-/**

- * This class provides test called by the plugin.xml in order to know if handlers should be active or not.

- *

- * Sometimes these test can be done directly in the plugin.xml in the activeWhen (with instanceof, adapt, ...),

- * but in this case, Eclipse doesn't refresh correctly the status of the command in the menu Edit or in other menu.

- *

- *

- *

- */

-public class TablePropertyTester extends PropertyTester {

-

-

-	/** property to test if the selected elements is a table */

-	public static final String IS_TABLE = "isTable"; //$NON-NLS-1$

-

-

-	/**

-	 *

-	 * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)

-	 *

-	 * @param receiver

-	 * @param property

-	 * @param args

-	 * @param expectedValue

-	 * @return

-	 */

-	@Override

-	public boolean test(final Object receiver, final String property, final Object[] args, final Object expectedValue) {

-		if (IS_TABLE.equals(property) && receiver instanceof IStructuredSelection) {

-			boolean answer = isTable((IStructuredSelection) receiver);

-			return new Boolean(answer).equals(expectedValue);

-		}

-		return false;

-	}

-

-

-

-	/**

-	 * Tests the selection in order to know if it contains only {@link Table}

-	 *

-	 * @param selection

-	 * @return

-	 *         <code>true</code> if the selection is composed by {@link Table}

-	 *

-	 */

-	private boolean isTable(IStructuredSelection selection) {

-		if (!selection.isEmpty()) {

-			Iterator<?> iter = selection.iterator();

-			while (iter.hasNext()) {

-				/**

-				 * Set to use the IAdaptable mechanism

-				 * Used for example for facet elements

-				 */

-				final Object next = iter.next();

-				EObject object = NavigatorUtils.getElement(next, EObject.class);

-				if (!(object instanceof Table)) {

-					return false;

-				}

-			}

-			return true;

-		}

-		return false;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.modelexplorer.providers;
+
+import java.util.Iterator;
+
+import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+
+/**
+ * This class provides test called by the plugin.xml in order to know if handlers should be active or not.
+ *
+ * Sometimes these test can be done directly in the plugin.xml in the activeWhen (with instanceof, adapt, ...),
+ * but in this case, Eclipse doesn't refresh correctly the status of the command in the menu Edit or in other menu.
+ *
+ *
+ *
+ */
+public class TablePropertyTester extends PropertyTester {
+
+
+	/** property to test if the selected elements is a table */
+	public static final String IS_TABLE = "isTable"; //$NON-NLS-1$
+
+
+	/**
+	 *
+	 * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
+	 *
+	 * @param receiver
+	 * @param property
+	 * @param args
+	 * @param expectedValue
+	 * @return
+	 */
+	@Override
+	public boolean test(final Object receiver, final String property, final Object[] args, final Object expectedValue) {
+		if (IS_TABLE.equals(property) && receiver instanceof IStructuredSelection) {
+			boolean answer = isTable((IStructuredSelection) receiver);
+			return new Boolean(answer).equals(expectedValue);
+		}
+		return false;
+	}
+
+
+
+	/**
+	 * Tests the selection in order to know if it contains only {@link Table}
+	 *
+	 * @param selection
+	 * @return
+	 *         <code>true</code> if the selection is composed by {@link Table}
+	 *
+	 */
+	private boolean isTable(IStructuredSelection selection) {
+		if (!selection.isEmpty()) {
+			Iterator<?> iter = selection.iterator();
+			while (iter.hasNext()) {
+				/**
+				 * Set to use the IAdaptable mechanism
+				 * Used for example for facet elements
+				 */
+				final Object next = iter.next();
+				EObject object = EMFHelper.getEObject(next);
+				if (!(object instanceof Table)) {
+					return false;
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/DisplayTablesRef.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/DisplayTablesRef.java
index ae47f004e5c..47c4d6a66ec 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/DisplayTablesRef.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/DisplayTablesRef.java
@@ -1,59 +1,58 @@
-/**

- *  Copyright (c) 2011 Atos.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Atos - Initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.nattable.modelexplorer.queries;

-

-import java.util.Iterator;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager;

-import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException;

-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference;

-import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue;

-import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;

-import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;

-import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery;

-

-public class DisplayTablesRef extends AbstractEditorContainerQuery implements IJavaQuery2<EObject, Boolean> {

-

-	/**

-	 * Return true if the element is a Table Container and the the Ereference is diagrams

-	 */

-

-	@Override

-	public Boolean evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {

-		ParameterValue parameterValue = parameterValues.getParameterValueByName("eStructuralFeature");

-		EStructuralFeature eStructuralFeature = (EStructuralFeature) parameterValue.getValue();

-		if ((eStructuralFeature instanceof FacetReference) && ("tables".equals((eStructuralFeature).getName()))) {

-

-			Iterator<EObject> roots = NavigatorUtils.getNotationRoots(source);

-			if (roots == null) {

-				return false;

-			}

-

-			while (roots.hasNext()) {

-				EObject root = roots.next();

-				if (root instanceof Table) {

-					if (EcoreUtil.equals(((Table) root).getOwner(), source)) {

-						return true;

-					}

-				}

-			}

-			return false;

-		}

-		return true;

-	}

+/**
+ *  Copyright (c) 2011 Atos.
+ *
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Atos - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.nattable.modelexplorer.queries;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager;
+import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference;
+import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.ParameterValue;
+import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
+import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.viewpoints.policy.NotationUtils;
+
+public class DisplayTablesRef implements IJavaQuery2<EObject, Boolean> {
+
+	/**
+	 * Return true if the element is a Table Container and the the Ereference is diagrams
+	 */
+
+	@Override
+	public Boolean evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
+		ParameterValue parameterValue = parameterValues.getParameterValueByName("eStructuralFeature");
+		EStructuralFeature eStructuralFeature = (EStructuralFeature) parameterValue.getValue();
+		if ((eStructuralFeature instanceof FacetReference) && ("tables".equals((eStructuralFeature).getName()))) {
+
+			Iterator<EObject> roots = NotationUtils.getNotationRoots(source);
+			if (roots == null) {
+				return false;
+			}
+
+			while (roots.hasNext()) {
+				EObject root = roots.next();
+				if (root instanceof Table) {
+					if (EcoreUtil.equals(((Table) root).getOwner(), source)) {
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetContainedTables.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetContainedTables.java
index 208c947ddae..809e6569327 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetContainedTables.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetContainedTables.java
@@ -22,16 +22,15 @@ import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementEx
 import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
 import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
-import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;
-import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery;
+import org.eclipse.papyrus.infra.viewpoints.policy.NotationUtils;
 
 /** Get the collection of all contained tables */
-public class GetContainedTables extends AbstractEditorContainerQuery implements IJavaQuery2<EObject, Collection<Table>> {
+public class GetContainedTables implements IJavaQuery2<EObject, Collection<Table>> {
 
 	@Override
 	public Collection<Table> evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
 		List<Table> result = new ArrayList<Table>();
-		Iterator<EObject> roots = NavigatorUtils.getNotationRoots(source);
+		Iterator<EObject> roots = NotationUtils.getNotationRoots(source);
 		if (roots == null) {
 			return result;
 		}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetTableIcon.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetTableIcon.java
index 9ab4524ddbc..3341bf0d2af 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetTableIcon.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetTableIcon.java
@@ -18,9 +18,9 @@ import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementEx
 import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
 import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.ui.editorsfactory.AbstractGetEditorIconQuery;
 import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
-import org.eclipse.papyrus.views.modelexplorer.queries.AbstractGetEditorIconQuery;
 
 /** Return the path to the icon of the corresponding table */
 public class GetTableIcon extends AbstractGetEditorIconQuery implements IJavaQuery2<Table, IImage> {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/IsTableContainer.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/IsTableContainer.java
index b59c3f76682..6278794ef4d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/IsTableContainer.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/IsTableContainer.java
@@ -20,17 +20,16 @@ import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementEx
 import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
 import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
-import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;
-import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery;
+import org.eclipse.papyrus.infra.viewpoints.policy.NotationUtils;
 
-public class IsTableContainer extends AbstractEditorContainerQuery implements IJavaQuery2<EObject, Boolean> {
+public class IsTableContainer implements IJavaQuery2<EObject, Boolean> {
 
 	/**
 	 * Return true if the element is a Table Container
 	 */
 	@Override
 	public Boolean evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
-		Iterator<EObject> roots = NavigatorUtils.getNotationRoots(source);
+		Iterator<EObject> roots = NotationUtils.getNotationRoots(source);
 		if (roots == null) {
 			return false;
 		}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
index 9bbc153b245..d6fa554cc91 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.infra.nattable.properties.constraints
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
  org.eclipse.emf.ecore,
  org.eclipse.emf.edit,
  org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0",
  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",
  org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/nattable.ctx b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/nattable.ctx
index 301582b400f..1f69eca0e65 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/nattable.ctx
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/nattable.ctx
@@ -211,28 +211,28 @@
       </sections>
       <sections xmi:id="_bYfDCpLDEeWbp4A9_-WIrQ" name="ColumnFeatureLabelProviderConfiguration" sectionFile="ui/ColumnFeatureLabelProviderConfiguration.xwt">
         <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfDC5LDEeWbp4A9_-WIrQ" name="hasColumnFeatureLabelConfigurationConstraint" overrideable="false">
-          <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.4"/>
+          <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.4"/>
           <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfDDJLDEeWbp4A9_-WIrQ" name="className" value="org.eclipse.papyrus.infra.nattable.properties.constraints.HasColumnFeatureLabelConfigurationConstraint"/>
         </constraints>
         <widget href="ui/ColumnFeatureLabelProviderConfiguration.xwt#/"/>
       </sections>
       <sections xmi:id="_bYfDDZLDEeWbp4A9_-WIrQ" name="ColumnObjectLabelProviderConfiguration" sectionFile="ui/ColumnObjectLabelProviderConfiguration.xwt">
         <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfDDpLDEeWbp4A9_-WIrQ" name="hasColumnObjectLabelConfigurationConstraint" overrideable="false">
-          <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.4"/>
+          <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.4"/>
           <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfDD5LDEeWbp4A9_-WIrQ" name="className" value="org.eclipse.papyrus.infra.nattable.properties.constraints.HasColumnObjectLabelConfigurationConstraint"/>
         </constraints>
         <widget href="ui/ColumnObjectLabelProviderConfiguration.xwt#/"/>
       </sections>
       <sections xmi:id="_bYfDEJLDEeWbp4A9_-WIrQ" name="RowFeatureLabelProviderConfiguration" sectionFile="ui/RowFeatureLabelProviderConfiguration.xwt">
         <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfDEZLDEeWbp4A9_-WIrQ" name="hasRowFeatureLabelConfigurationConstraint" overrideable="false">
-          <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.4"/>
+          <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.4"/>
           <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfDEpLDEeWbp4A9_-WIrQ" name="className" value="org.eclipse.papyrus.infra.nattable.properties.constraints.HasRowFeatureLabelConfigurationConstraint"/>
         </constraints>
         <widget href="ui/RowFeatureLabelProviderConfiguration.xwt#/"/>
       </sections>
       <sections xmi:id="_bYfDE5LDEeWbp4A9_-WIrQ" name="RowObjectLabelProviderConfiguration" sectionFile="ui/RowObjectLabelProviderConfiguration.xwt">
         <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfDFJLDEeWbp4A9_-WIrQ" name="hasRowObjectLabelConfigurationConstraint" overrideable="false">
-          <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.4"/>
+          <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.4"/>
           <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfDFZLDEeWbp4A9_-WIrQ" name="className" value="org.eclipse.papyrus.infra.nattable.properties.constraints.HasRowObjectLabelConfigurationConstraint"/>
         </constraints>
         <widget href="ui/RowObjectLabelProviderConfiguration.xwt#/"/>
@@ -241,28 +241,28 @@
     <tabs xmi:id="_bYfDFpLDEeWbp4A9_-WIrQ" label="Paste" id="Paste In Table" category="default" afterTab="_bYfDCJLDEeWbp4A9_-WIrQ">
       <sections xmi:id="_bYfDF5LDEeWbp4A9_-WIrQ" name="CanPasteEObjectColumnSection" sectionFile="ui/CanPasteEObjectColumnSection.xwt">
         <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfDGJLDEeWbp4A9_-WIrQ" name="canPasteColumnEObjectConstraint">
-          <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.4"/>
+          <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.4"/>
           <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfDGZLDEeWbp4A9_-WIrQ" name="className" value="org.eclipse.papyrus.infra.nattable.properties.constraints.CanCreateColumnElementContraint"/>
         </constraints>
         <widget href="ui/CanPasteEObjectColumnSection.xwt#/"/>
       </sections>
       <sections xmi:id="_bYfDGpLDEeWbp4A9_-WIrQ" name="CantPasteEObjectColumnSection" sectionFile="ui/CantPasteEObjectColumnSection.xwt">
         <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfDG5LDEeWbp4A9_-WIrQ" name="cantPasteColumnEObjectConstraint">
-          <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.4"/>
+          <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.4"/>
           <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfDHJLDEeWbp4A9_-WIrQ" name="className" value="org.eclipse.papyrus.infra.nattable.properties.constraints.CantCreateColumnElementContraint"/>
         </constraints>
         <widget href="ui/CantPasteEObjectColumnSection.xwt#/"/>
       </sections>
       <sections xmi:id="_bYfDHZLDEeWbp4A9_-WIrQ" name="CanPasteEObjectRowSection" sectionFile="ui/CanPasteEObjectRowSection.xwt">
         <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfDHpLDEeWbp4A9_-WIrQ" name="canPasteEObjectRowConstraint">
-          <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.4"/>
+          <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.4"/>
           <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfDH5LDEeWbp4A9_-WIrQ" name="className" value="org.eclipse.papyrus.infra.nattable.properties.constraints.CanCreateRowElementContraint"/>
         </constraints>
         <widget href="ui/CanPasteEObjectRowSection.xwt#/"/>
       </sections>
       <sections xmi:id="_bYfDIJLDEeWbp4A9_-WIrQ" name="CantPasteEObjectRowSection" sectionFile="ui/CantPasteEObjectRowSection.xwt">
         <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfDIZLDEeWbp4A9_-WIrQ" name="cantPasteEObjectRowConstraint">
-          <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.4"/>
+          <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.4"/>
           <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfDIpLDEeWbp4A9_-WIrQ" name="className" value="org.eclipse.papyrus.infra.nattable.properties.constraints.CantCreateRowElementContraint"/>
         </constraints>
         <widget href="ui/CantPasteEObjectRowSection.xwt#/"/>
@@ -278,7 +278,7 @@
     <views xmi:id="_bYfDI5LDEeWbp4A9_-WIrQ" name="Single Table" sections="_bYd04pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYg4hJLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:CompositeConstraint" xmi:id="_3Ik7MJOGEeWeQ8lFehLIEQ" name="isSingleNormalTable">
         <constraints xmi:id="_bYfDJJLDEeWbp4A9_-WIrQ" name="isSingleTable">
-          <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+          <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
           <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfDJZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model"/>
           <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfDJpLDEeWbp4A9_-WIrQ" name="className" value="Table"/>
         </constraints>
@@ -304,7 +304,7 @@
     <views xmi:id="_bYfDJ5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple Table" sections="_bYd045LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYg4hJLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:CompositeConstraint" xmi:id="_BlaGcJOHEeWeQ8lFehLIEQ" name="isMultipleNormalTable">
         <constraints xmi:id="_bYfDKJLDEeWbp4A9_-WIrQ" name="isMultipleTable">
-          <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+          <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
           <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfDKZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model"/>
           <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfDKpLDEeWbp4A9_-WIrQ" name="className" value="Table"/>
         </constraints>
@@ -316,448 +316,448 @@
     </views>
     <views xmi:id="_bYfDK5LDEeWbp4A9_-WIrQ" name="Single TableConfiguration" sections="_bYd05JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfX5LDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfDLJLDEeWbp4A9_-WIrQ" name="isSingleTableConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfDLZLDEeWbp4A9_-WIrQ" name="className" value="TableConfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfDLpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYfDL5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple TableConfiguration" sections="_bYd05ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfX5LDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfDMJLDEeWbp4A9_-WIrQ" name="isMultipleTableConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfDMZLDEeWbp4A9_-WIrQ" name="className" value="TableConfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfDMpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYfDM5LDEeWbp4A9_-WIrQ" name="Single AbstractAxisProvider" sections="_bYd05pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfa5LDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfDNJLDEeWbp4A9_-WIrQ" name="isSingleAbstractAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfDNZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfDNpLDEeWbp4A9_-WIrQ" name="className" value="AbstractAxisProvider"/>
       </constraints>
     </views>
     <views xmi:id="_bYfDN5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple AbstractAxisProvider" sections="_bYd055LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfa5LDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfDOJLDEeWbp4A9_-WIrQ" name="isMultipleAbstractAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfDOZLDEeWbp4A9_-WIrQ" name="className" value="AbstractAxisProvider"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfDOpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
       </constraints>
     </views>
     <views xmi:id="_bYfDO5LDEeWbp4A9_-WIrQ" name="Single AxisProvider" sections="_bYd06JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfb5LDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfDPJLDEeWbp4A9_-WIrQ" name="isSingleAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqEJLDEeWbp4A9_-WIrQ" name="className" value="AxisProvider"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqEZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
       </constraints>
     </views>
     <views xmi:id="_bYfqEpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple AxisProvider" sections="_bYd06ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfb5LDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfqE5LDEeWbp4A9_-WIrQ" name="isMultipleAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqFJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqFZLDEeWbp4A9_-WIrQ" name="className" value="AxisProvider"/>
       </constraints>
     </views>
     <views xmi:id="_bYfqFpLDEeWbp4A9_-WIrQ" name="Single IMasterAxisProvider" sections="_bYd06pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfbJLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfqF5LDEeWbp4A9_-WIrQ" name="isSingleIMasterAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqGJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqGZLDEeWbp4A9_-WIrQ" name="className" value="IMasterAxisProvider"/>
       </constraints>
     </views>
     <views xmi:id="_bYfqGpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple IMasterAxisProvider" sections="_bYeb8JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfbJLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfqG5LDEeWbp4A9_-WIrQ" name="isMultipleIMasterAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqHJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqHZLDEeWbp4A9_-WIrQ" name="className" value="IMasterAxisProvider"/>
       </constraints>
     </views>
     <views xmi:id="_bYfqHpLDEeWbp4A9_-WIrQ" name="Single ISlaveAxisProvider" sections="_bYeb8ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfbpLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfqH5LDEeWbp4A9_-WIrQ" name="isSingleISlaveAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqIJLDEeWbp4A9_-WIrQ" name="className" value="ISlaveAxisProvider"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqIZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
       </constraints>
     </views>
     <views xmi:id="_bYfqIpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple ISlaveAxisProvider" sections="_bYeb8pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfbpLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfqI5LDEeWbp4A9_-WIrQ" name="isMultipleISlaveAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqJJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqJZLDEeWbp4A9_-WIrQ" name="className" value="ISlaveAxisProvider"/>
       </constraints>
     </views>
     <views xmi:id="_bYfqJpLDEeWbp4A9_-WIrQ" name="Single SlaveObjectAxisProvider" sections="_bYeb85LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfcZLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfqJ5LDEeWbp4A9_-WIrQ" name="isSingleSlaveObjectAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqKJLDEeWbp4A9_-WIrQ" name="className" value="SlaveObjectAxisProvider"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqKZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
       </constraints>
     </views>
     <views xmi:id="_bYfqKpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple SlaveObjectAxisProvider" sections="_bYeb9JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfcZLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfqK5LDEeWbp4A9_-WIrQ" name="isMultipleSlaveObjectAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqLJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqLZLDEeWbp4A9_-WIrQ" name="className" value="SlaveObjectAxisProvider"/>
       </constraints>
     </views>
     <views xmi:id="_bYfqLpLDEeWbp4A9_-WIrQ" name="Single MasterObjectAxisProvider" sections="_bYeb9ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfcpLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfqL5LDEeWbp4A9_-WIrQ" name="isSingleMasterObjectAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqMJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqMZLDEeWbp4A9_-WIrQ" name="className" value="MasterObjectAxisProvider"/>
       </constraints>
     </views>
     <views xmi:id="_bYfqMpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple MasterObjectAxisProvider" sections="_bYeb9pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfcpLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfqM5LDEeWbp4A9_-WIrQ" name="isMultipleMasterObjectAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqNJLDEeWbp4A9_-WIrQ" name="className" value="MasterObjectAxisProvider"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqNZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
       </constraints>
     </views>
     <views xmi:id="_bYfqNpLDEeWbp4A9_-WIrQ" name="Single ILabelProviderConfiguration" sections="_bYeb95LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfdJLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfqN5LDEeWbp4A9_-WIrQ" name="isSingleILabelProviderConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqOJLDEeWbp4A9_-WIrQ" name="className" value="ILabelProviderConfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqOZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"/>
       </constraints>
     </views>
     <views xmi:id="_bYfqOpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple ILabelProviderConfiguration" sections="_bYeb-JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfdJLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfqO5LDEeWbp4A9_-WIrQ" name="isMultipleILabelProviderConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqPJLDEeWbp4A9_-WIrQ" name="className" value="ILabelProviderConfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqPZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"/>
       </constraints>
     </views>
     <views xmi:id="_bYfqPpLDEeWbp4A9_-WIrQ" name="Single ObjectLabelProviderConfiguration" sections="_bYeb-ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfepLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfqP5LDEeWbp4A9_-WIrQ" name="isSingleObjectLabelProviderConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqQJLDEeWbp4A9_-WIrQ" name="className" value="ObjectLabelProviderConfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqQZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"/>
       </constraints>
     </views>
     <views xmi:id="_bYfqQpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple ObjectLabelProviderConfiguration" sections="_bYeb-pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfepLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfqQ5LDEeWbp4A9_-WIrQ" name="isMultipleObjectLabelProviderConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqRJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqRZLDEeWbp4A9_-WIrQ" name="className" value="ObjectLabelProviderConfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYfqRpLDEeWbp4A9_-WIrQ" name="Single FeatureLabelProviderConfiguration" sections="_bYeb-5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfdZLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfqR5LDEeWbp4A9_-WIrQ" name="isSingleFeatureLabelProviderConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqSJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqSZLDEeWbp4A9_-WIrQ" name="className" value="FeatureLabelProviderConfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYfqSpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple FeatureLabelProviderConfiguration" sections="_bYeb_JLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfdZLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfqS5LDEeWbp4A9_-WIrQ" name="isMultipleFeatureLabelProviderConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqTJLDEeWbp4A9_-WIrQ" name="className" value="FeatureLabelProviderConfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqTZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"/>
       </constraints>
     </views>
     <views xmi:id="_bYfqTpLDEeWbp4A9_-WIrQ" name="Single AbstractHeaderAxisConfiguration" sections="_bYeb_ZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhffpLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfqT5LDEeWbp4A9_-WIrQ" name="isSingleAbstractHeaderAxisConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqUJLDEeWbp4A9_-WIrQ" name="className" value="AbstractHeaderAxisConfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqUZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYfqUpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple AbstractHeaderAxisConfiguration" sections="_bYeb_pLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhffpLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfqU5LDEeWbp4A9_-WIrQ" name="isMultipleAbstractHeaderAxisConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqVJLDEeWbp4A9_-WIrQ" name="className" value="AbstractHeaderAxisConfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqVZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYfqVpLDEeWbp4A9_-WIrQ" name="Single AxisManagerRepresentation" sections="_bYeb_5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfhZLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfqV5LDEeWbp4A9_-WIrQ" name="isSingleAxisManagerRepresentation">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqWJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqWZLDEeWbp4A9_-WIrQ" name="className" value="AxisManagerRepresentation"/>
       </constraints>
     </views>
     <views xmi:id="_bYfqWpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple AxisManagerRepresentation" sections="_bYecAJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfhZLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfqW5LDEeWbp4A9_-WIrQ" name="isMultipleAxisManagerRepresentation">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqXJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqXZLDEeWbp4A9_-WIrQ" name="className" value="AxisManagerRepresentation"/>
       </constraints>
     </views>
     <views xmi:id="_bYfqXpLDEeWbp4A9_-WIrQ" name="Single AxisManagerConfiguration" sections="_bYecAZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfipLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYfqX5LDEeWbp4A9_-WIrQ" name="isSingleAxisManagerConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYfqYJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRIJLDEeWbp4A9_-WIrQ" name="className" value="AxisManagerConfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYgRIZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple AxisManagerConfiguration" sections="_bYecApLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfipLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYgRIpLDEeWbp4A9_-WIrQ" name="isMultipleAxisManagerConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRI5LDEeWbp4A9_-WIrQ" name="className" value="AxisManagerConfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRJJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYgRJZLDEeWbp4A9_-WIrQ" name="Single TableHeaderAxisConfiguration" sections="_bYecA5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfjpLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYgRJpLDEeWbp4A9_-WIrQ" name="isSingleTableHeaderAxisConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRJ5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRKJLDEeWbp4A9_-WIrQ" name="className" value="TableHeaderAxisConfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYgRKZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple TableHeaderAxisConfiguration" sections="_bYecBJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfjpLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYgRKpLDEeWbp4A9_-WIrQ" name="isMultipleTableHeaderAxisConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRK5LDEeWbp4A9_-WIrQ" name="className" value="TableHeaderAxisConfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRLJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYgRLZLDEeWbp4A9_-WIrQ" name="Single LocalTableHeaderAxisConfiguration" sections="_bYecBZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfkJLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYgRLpLDEeWbp4A9_-WIrQ" name="isSingleLocalTableHeaderAxisConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRL5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRMJLDEeWbp4A9_-WIrQ" name="className" value="LocalTableHeaderAxisConfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYgRMZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple LocalTableHeaderAxisConfiguration" sections="_bYecBpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfkJLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYgRMpLDEeWbp4A9_-WIrQ" name="isMultipleLocalTableHeaderAxisConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRM5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRNJLDEeWbp4A9_-WIrQ" name="className" value="LocalTableHeaderAxisConfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYgRNZLDEeWbp4A9_-WIrQ" name="Single IAxisConfiguration" sections="_bYecB5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfkpLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYgRNpLDEeWbp4A9_-WIrQ" name="isSingleIAxisConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRN5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgROJLDEeWbp4A9_-WIrQ" name="className" value="IAxisConfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYgROZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple IAxisConfiguration" sections="_bYecCJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfkpLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYgROpLDEeWbp4A9_-WIrQ" name="isMultipleIAxisConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRO5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRPJLDEeWbp4A9_-WIrQ" name="className" value="IAxisConfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYgRPZLDEeWbp4A9_-WIrQ" name="Single FeatureAxisConfiguration" sections="_bYecCZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfk5LDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYgRPpLDEeWbp4A9_-WIrQ" name="isSingleFeatureAxisConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRP5LDEeWbp4A9_-WIrQ" name="className" value="FeatureAxisConfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRQJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYgRQZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple FeatureAxisConfiguration" sections="_bYecCpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfk5LDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYgRQpLDEeWbp4A9_-WIrQ" name="isMultipleFeatureAxisConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRQ5LDEeWbp4A9_-WIrQ" name="className" value="FeatureAxisConfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRRJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYgRRZLDEeWbp4A9_-WIrQ" name="Single IFillingConfiguration" sections="_bYecC5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhflZLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYgRRpLDEeWbp4A9_-WIrQ" name="isSingleIFillingConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRR5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRSJLDEeWbp4A9_-WIrQ" name="className" value="IFillingConfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYgRSZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple IFillingConfiguration" sections="_bYecDJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhflZLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYgRSpLDEeWbp4A9_-WIrQ" name="isMultipleIFillingConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRS5LDEeWbp4A9_-WIrQ" name="className" value="IFillingConfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRTJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYgRTZLDEeWbp4A9_-WIrQ" name="Single EStructuralFeatureValueFillingConfiguration" sections="_bYecDZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhflpLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYgRTpLDEeWbp4A9_-WIrQ" name="isSingleEStructuralFeatureValueFillingConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRT5LDEeWbp4A9_-WIrQ" name="className" value="EStructuralFeatureValueFillingConfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRUJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYgRUZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple EStructuralFeatureValueFillingConfiguration" sections="_bYecDpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhflpLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYgRUpLDEeWbp4A9_-WIrQ" name="isMultipleEStructuralFeatureValueFillingConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRU5LDEeWbp4A9_-WIrQ" name="className" value="EStructuralFeatureValueFillingConfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRVJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYgRVZLDEeWbp4A9_-WIrQ" name="Single IPasteConfiguration" sections="_bYecD5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfmJLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYgRVpLDEeWbp4A9_-WIrQ" name="isSingleIPasteConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRV5LDEeWbp4A9_-WIrQ" name="className" value="IPasteConfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRWJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYgRWZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple IPasteConfiguration" sections="_bYecEJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfmJLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYgRWpLDEeWbp4A9_-WIrQ" name="isMultipleIPasteConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRW5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRXJLDEeWbp4A9_-WIrQ" name="className" value="IPasteConfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYgRXZLDEeWbp4A9_-WIrQ" name="Single PasteEObjectConfiguration" sections="_bYecEZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfmZLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYgRXpLDEeWbp4A9_-WIrQ" name="isSinglePasteEObjectConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRX5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRYJLDEeWbp4A9_-WIrQ" name="className" value="PasteEObjectConfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYgRYZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple PasteEObjectConfiguration" sections="_bYecEpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfmZLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYgRYpLDEeWbp4A9_-WIrQ" name="isMultiplePasteEObjectConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRY5LDEeWbp4A9_-WIrQ" name="className" value="PasteEObjectConfiguration"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRZJLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
       </constraints>
     </views>
     <views xmi:id="_bYgRZZLDEeWbp4A9_-WIrQ" name="Single AbstractTableTester" sections="_bYecE5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfnZLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYgRZpLDEeWbp4A9_-WIrQ" name="isSingleAbstractTableTester">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRZ5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYgRaJLDEeWbp4A9_-WIrQ" name="className" value="AbstractTableTester"/>
       </constraints>
     </views>
     <views xmi:id="_bYgRaZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple AbstractTableTester" sections="_bYecFJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfnZLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYg4MJLDEeWbp4A9_-WIrQ" name="isMultipleAbstractTableTester">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4MZLDEeWbp4A9_-WIrQ" name="className" value="AbstractTableTester"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4MpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"/>
       </constraints>
     </views>
     <views xmi:id="_bYg4M5LDEeWbp4A9_-WIrQ" name="Single JavaTableTester" sections="_bYecFZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfnpLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYg4NJLDEeWbp4A9_-WIrQ" name="isSingleJavaTableTester">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4NZLDEeWbp4A9_-WIrQ" name="className" value="JavaTableTester"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4NpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"/>
       </constraints>
     </views>
     <views xmi:id="_bYg4N5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple JavaTableTester" sections="_bYecFpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfnpLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYg4OJLDEeWbp4A9_-WIrQ" name="isMultipleJavaTableTester">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4OZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4OpLDEeWbp4A9_-WIrQ" name="className" value="JavaTableTester"/>
       </constraints>
     </views>
     <views xmi:id="_bYg4O5LDEeWbp4A9_-WIrQ" name="Single IAxis" sections="_bYecF5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfoZLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYg4PJLDEeWbp4A9_-WIrQ" name="isSingleIAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4PZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4PpLDEeWbp4A9_-WIrQ" name="className" value="IAxis"/>
       </constraints>
     </views>
     <views xmi:id="_bYg4P5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple IAxis" sections="_bYecGJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfoZLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYg4QJLDEeWbp4A9_-WIrQ" name="isMultipleIAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4QZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4QpLDEeWbp4A9_-WIrQ" name="className" value="IAxis"/>
       </constraints>
     </views>
     <views xmi:id="_bYg4Q5LDEeWbp4A9_-WIrQ" name="Single IdAxis" sections="_bYecGZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfpJLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYg4RJLDEeWbp4A9_-WIrQ" name="isSingleIdAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4RZLDEeWbp4A9_-WIrQ" name="className" value="IdAxis"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4RpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
       </constraints>
     </views>
     <views xmi:id="_bYg4R5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple IdAxis" sections="_bYecGpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfpJLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYg4SJLDEeWbp4A9_-WIrQ" name="isMultipleIdAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4SZLDEeWbp4A9_-WIrQ" name="className" value="IdAxis"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4SpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
       </constraints>
     </views>
     <views xmi:id="_bYg4S5LDEeWbp4A9_-WIrQ" name="Single ObjectAxis" sections="_bYecG5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfqpLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYg4TJLDEeWbp4A9_-WIrQ" name="isSingleObjectAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4TZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4TpLDEeWbp4A9_-WIrQ" name="className" value="ObjectAxis"/>
       </constraints>
     </views>
     <views xmi:id="_bYg4T5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple ObjectAxis" sections="_bYecHJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfqpLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYg4UJLDEeWbp4A9_-WIrQ" name="isMultipleObjectAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4UZLDEeWbp4A9_-WIrQ" name="className" value="ObjectAxis"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4UpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
       </constraints>
     </views>
     <views xmi:id="_bYg4U5LDEeWbp4A9_-WIrQ" name="Single EObjectAxis" sections="_bYecHZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfppLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYg4VJLDEeWbp4A9_-WIrQ" name="isSingleEObjectAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4VZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4VpLDEeWbp4A9_-WIrQ" name="className" value="EObjectAxis"/>
       </constraints>
     </views>
     <views xmi:id="_bYg4V5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple EObjectAxis" sections="_bYecHpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfppLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYg4WJLDEeWbp4A9_-WIrQ" name="isMultipleEObjectAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4WZLDEeWbp4A9_-WIrQ" name="className" value="EObjectAxis"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4WpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
       </constraints>
     </views>
     <views xmi:id="_bYg4W5LDEeWbp4A9_-WIrQ" name="Single FeatureAxis" sections="_bYfDAJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfqJLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYg4XJLDEeWbp4A9_-WIrQ" name="isSingleFeatureAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4XZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4XpLDEeWbp4A9_-WIrQ" name="className" value="FeatureAxis"/>
       </constraints>
     </views>
     <views xmi:id="_bYg4X5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple FeatureAxis" sections="_bYfDAZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfqJLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYg4YJLDEeWbp4A9_-WIrQ" name="isMultipleFeatureAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4YZLDEeWbp4A9_-WIrQ" name="className" value="FeatureAxis"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4YpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
       </constraints>
     </views>
     <views xmi:id="_bYg4Y5LDEeWbp4A9_-WIrQ" name="Single FeatureIdAxis" sections="_bYfDApLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfrJLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYg4ZJLDEeWbp4A9_-WIrQ" name="isSingleFeatureIdAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4ZZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4ZpLDEeWbp4A9_-WIrQ" name="className" value="FeatureIdAxis"/>
       </constraints>
     </views>
     <views xmi:id="_bYg4Z5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple FeatureIdAxis" sections="_bYfDA5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfrJLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYg4aJLDEeWbp4A9_-WIrQ" name="isMultipleFeatureIdAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4aZLDEeWbp4A9_-WIrQ" name="className" value="FeatureIdAxis"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4apLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
       </constraints>
     </views>
     <views xmi:id="_bYg4a5LDEeWbp4A9_-WIrQ" name="Single EStructuralFeatureAxis" sections="_bYfDBJLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfrZLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYg4bJLDEeWbp4A9_-WIrQ" name="isSingleEStructuralFeatureAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4bZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4bpLDEeWbp4A9_-WIrQ" name="className" value="EStructuralFeatureAxis"/>
       </constraints>
     </views>
     <views xmi:id="_bYg4b5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple EStructuralFeatureAxis" sections="_bYfDBZLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfrZLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYg4cJLDEeWbp4A9_-WIrQ" name="isMultipleEStructuralFeatureAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4cZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4cpLDEeWbp4A9_-WIrQ" name="className" value="EStructuralFeatureAxis"/>
       </constraints>
     </views>
     <views xmi:id="_bYg4c5LDEeWbp4A9_-WIrQ" name="Single ObjectIdAxis" sections="_bYfDBpLDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfr5LDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYg4dJLDEeWbp4A9_-WIrQ" name="isSingleObjectIdAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4dZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4dpLDEeWbp4A9_-WIrQ" name="className" value="ObjectIdAxis"/>
       </constraints>
     </views>
     <views xmi:id="_bYg4d5LDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple ObjectIdAxis" sections="_bYfDB5LDEeWbp4A9_-WIrQ" automaticContext="true" datacontexts="_bYhfr5LDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYg4eJLDEeWbp4A9_-WIrQ" name="isMultipleObjectIdAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4eZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4epLDEeWbp4A9_-WIrQ" name="className" value="ObjectIdAxis"/>
       </constraints>
     </views>
     <views xmi:id="_bYg4e5LDEeWbp4A9_-WIrQ" name="SingleTableAppearance" sections="_bYfDCZLDEeWbp4A9_-WIrQ _bYfDCpLDEeWbp4A9_-WIrQ _bYfDDZLDEeWbp4A9_-WIrQ _bYfDEJLDEeWbp4A9_-WIrQ _bYfDE5LDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYg4fJLDEeWbp4A9_-WIrQ" name="singleTable">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4fZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4fpLDEeWbp4A9_-WIrQ" name="className" value="Table"/>
       </constraints>
     </views>
     <views xmi:id="_bYg4f5LDEeWbp4A9_-WIrQ" name="SinglePasteInTable" sections="_bYfDF5LDEeWbp4A9_-WIrQ _bYfDGpLDEeWbp4A9_-WIrQ _bYfDHZLDEeWbp4A9_-WIrQ _bYfDIJLDEeWbp4A9_-WIrQ">
       <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYg4gJLDEeWbp4A9_-WIrQ" name="singleTable">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4gZLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model"/>
         <properties xsi:type="constraints:ValueProperty" xmi:id="_bYg4gpLDEeWbp4A9_-WIrQ" name="className" value="Table"/>
       </constraints>
@@ -909,14 +909,14 @@
   </contexts:Context>
   <contexts:View xmi:id="_bYhfsJLDEeWbp4A9_-WIrQ" name="Single TableNamedElement" automaticContext="true" datacontexts="_bYhfXJLDEeWbp4A9_-WIrQ">
     <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYhfsZLDEeWbp4A9_-WIrQ" name="isSingleTableNamedElement">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="constraints:ValueProperty" xmi:id="_bYhfspLDEeWbp4A9_-WIrQ" name="className" value="TableNamedElement"/>
       <properties xsi:type="constraints:ValueProperty" xmi:id="_bYhfs5LDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"/>
     </constraints>
   </contexts:View>
   <contexts:View xmi:id="_bYhftJLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Multiple TableNamedElement" automaticContext="true" datacontexts="_bYhfXJLDEeWbp4A9_-WIrQ">
     <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_bYhftZLDEeWbp4A9_-WIrQ" name="isMultipleTableNamedElement">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
       <properties xsi:type="constraints:ValueProperty" xmi:id="_bYhftpLDEeWbp4A9_-WIrQ" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"/>
       <properties xsi:type="constraints:ValueProperty" xmi:id="_bYhft5LDEeWbp4A9_-WIrQ" name="className" value="TableNamedElement"/>
     </constraints>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/CanPasteEObjectColumnSection.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/CanPasteEObjectColumnSection.xwt
index a9a0aa48ee8..27d34715a52 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/CanPasteEObjectColumnSection.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/CanPasteEObjectColumnSection.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">
 	<Composite.layout>
 		<ppel:PropertiesLayout></ppel:PropertiesLayout>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/CanPasteEObjectRowSection.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/CanPasteEObjectRowSection.xwt
index cbb0852256a..bedce374844 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/CanPasteEObjectRowSection.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/CanPasteEObjectRowSection.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
 	<Composite.layout>
 		<ppel:PropertiesLayout></ppel:PropertiesLayout>
 	</Composite.layout>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/CantPasteEObjectColumnSection.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/CantPasteEObjectColumnSection.xwt
index 4e25c5c55f0..419773c581c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/CantPasteEObjectColumnSection.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/CantPasteEObjectColumnSection.xwt
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Group text="Paste Column Axis">

-		<Group.layout>

-			<ppel:PropertiesLayout numColumns="1"

-				makeColumnsEqualWidth="true"></ppel:PropertiesLayout>

-		</Group.layout>

-		<Label></Label>

-		<Composite text="Paste Row Axis">

-			<Composite.layout>

-				<ppel:PropertiesLayout numColumns="3"

-					makeColumnsEqualWidth="true"></ppel:PropertiesLayout>

-			</Composite.layout>

-			<Label></Label>

-			<Label text="Not Available For This Table"></Label>

-			<Label></Label>

-		</Composite>

-		<Composite text="Paste Row Axis">

-			<Composite.layout>

-				<ppel:PropertiesLayout numColumns="1"

-					makeColumnsEqualWidth="false"></ppel:PropertiesLayout>

-			</Composite.layout>

-			<Label></Label>

-		</Composite>

-	</Group>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Group text="Paste Column Axis">
+		<Group.layout>
+			<ppel:PropertiesLayout numColumns="1"
+				makeColumnsEqualWidth="true"></ppel:PropertiesLayout>
+		</Group.layout>
+		<Label></Label>
+		<Composite text="Paste Row Axis">
+			<Composite.layout>
+				<ppel:PropertiesLayout numColumns="3"
+					makeColumnsEqualWidth="true"></ppel:PropertiesLayout>
+			</Composite.layout>
+			<Label></Label>
+			<Label text="Not Available For This Table"></Label>
+			<Label></Label>
+		</Composite>
+		<Composite text="Paste Row Axis">
+			<Composite.layout>
+				<ppel:PropertiesLayout numColumns="1"
+					makeColumnsEqualWidth="false"></ppel:PropertiesLayout>
+			</Composite.layout>
+			<Label></Label>
+		</Composite>
+	</Group>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/CantPasteEObjectRowSection.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/CantPasteEObjectRowSection.xwt
index 0c5cd95a4b4..8f9524abefb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/CantPasteEObjectRowSection.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/CantPasteEObjectRowSection.xwt
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Group text="Paste Row Axis">

-		<Group.layout>

-			<ppel:PropertiesLayout numColumns="1"

-				makeColumnsEqualWidth="true"></ppel:PropertiesLayout>

-		</Group.layout>

-		<Label></Label>

-		<Composite text="Paste Row Axis">

-			<Composite.layout>

-				<ppel:PropertiesLayout numColumns="3"

-					makeColumnsEqualWidth="true"></ppel:PropertiesLayout>

-			</Composite.layout>

-			<Label></Label>

-			<Label text="Not Available For This Table"></Label>

-			<Label></Label>

-		</Composite>

-		<Composite text="Paste Row Axis">

-			<Composite.layout>

-				<ppel:PropertiesLayout numColumns="1"

-					makeColumnsEqualWidth="false"></ppel:PropertiesLayout>

-			</Composite.layout>

-			<Label></Label>

-		</Composite>

-	</Group>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Group text="Paste Row Axis">
+		<Group.layout>
+			<ppel:PropertiesLayout numColumns="1"
+				makeColumnsEqualWidth="true"></ppel:PropertiesLayout>
+		</Group.layout>
+		<Label></Label>
+		<Composite text="Paste Row Axis">
+			<Composite.layout>
+				<ppel:PropertiesLayout numColumns="3"
+					makeColumnsEqualWidth="true"></ppel:PropertiesLayout>
+			</Composite.layout>
+			<Label></Label>
+			<Label text="Not Available For This Table"></Label>
+			<Label></Label>
+		</Composite>
+		<Composite text="Paste Row Axis">
+			<Composite.layout>
+				<ppel:PropertiesLayout numColumns="1"
+					makeColumnsEqualWidth="false"></ppel:PropertiesLayout>
+			</Composite.layout>
+			<Label></Label>
+		</Composite>
+	</Group>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/ColumnFeatureLabelProviderConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/ColumnFeatureLabelProviderConfiguration.xwt
index 768e4768c37..639217f5b74 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/ColumnFeatureLabelProviderConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/ColumnFeatureLabelProviderConfiguration.xwt
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	text="Column Header Label Style">

-	<Group.layout>

-		<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-			text="Column Header Label Style" xmlns:x="http://www.eclipse.org/xwt"

-			xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-			xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-			<Composite.layout>

-				<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-			</Composite.layout>

-			<ppe:BooleanRadio input="{Binding}"

-				property="nattable:Table:columnFeatureLabelProviderConfigurationDisplayIcon"

-				customLabel="Display Icon"></ppe:BooleanRadio>

-			<ppe:BooleanRadio input="{Binding}"

-				property="nattable:Table:columnFeatureLabelProviderConfigurationDisplayLabel"

-				customLabel="Display Label"></ppe:BooleanRadio>

-		</Composite>

-		<Group text="Label Feature Style">

-			<Group.layout>

-				<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-			</Group.layout>

-			<ppe:BooleanRadio input="{Binding}"

-				property="nattable:Table:columnFeatureLabelProviderConfigurationDisplayIsDerived"

-				customLabel="Display IsDerived"></ppe:BooleanRadio>

-			<ppe:BooleanRadio input="{Binding}"

-				property="nattable:Table:columnFeatureLabelProviderConfigurationDisplayType"

-				customLabel="Display Type"></ppe:BooleanRadio>

-			<ppe:BooleanRadio input="{Binding}"

-				property="nattable:Table:columnFeatureLabelProviderConfigurationDisplayName"

-				customLabel="Display Name"></ppe:BooleanRadio>

-			<ppe:BooleanRadio input="{Binding}"

-				property="nattable:Table:columnFeatureLabelProviderConfigurationDisplayMultiplicity"

-				customLabel="Display Multiplicity"></ppe:BooleanRadio>

-		</Group>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	text="Column Header Label Style">
+	<Group.layout>
+		<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+			text="Column Header Label Style" xmlns:x="http://www.eclipse.org/xwt"
+			xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+			xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+			<Composite.layout>
+				<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+			</Composite.layout>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:columnFeatureLabelProviderConfigurationDisplayIcon"
+				customLabel="Display Icon"></ppe:BooleanRadio>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:columnFeatureLabelProviderConfigurationDisplayLabel"
+				customLabel="Display Label"></ppe:BooleanRadio>
+		</Composite>
+		<Group text="Label Feature Style">
+			<Group.layout>
+				<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+			</Group.layout>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:columnFeatureLabelProviderConfigurationDisplayIsDerived"
+				customLabel="Display IsDerived"></ppe:BooleanRadio>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:columnFeatureLabelProviderConfigurationDisplayType"
+				customLabel="Display Type"></ppe:BooleanRadio>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:columnFeatureLabelProviderConfigurationDisplayName"
+				customLabel="Display Name"></ppe:BooleanRadio>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:columnFeatureLabelProviderConfigurationDisplayMultiplicity"
+				customLabel="Display Multiplicity"></ppe:BooleanRadio>
+		</Group>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/ColumnObjectLabelProviderConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/ColumnObjectLabelProviderConfiguration.xwt
index 66c61b5fecf..8384a289be4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/ColumnObjectLabelProviderConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/ColumnObjectLabelProviderConfiguration.xwt
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="Column Header Label Style">

-	<Group.layout>

-		<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<Composite>

-			<Composite.layout>

-				<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-			</Composite.layout>

-			<ppe:BooleanRadio input="{Binding}"

-				property="nattable:Table:columnObjectLabelProviderConfigurationDisplayIcon"

-				customLabel="Display Icon"></ppe:BooleanRadio>

-			<ppe:BooleanRadio input="{Binding}"

-				property="nattable:Table:columnObjectLabelProviderConfigurationDisplayLabel"

-				customLabel="Display Label"></ppe:BooleanRadio>

-		</Composite>

-		<Composite>

-			<Composite.layout>

-				<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-			</Composite.layout>

-		</Composite>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="Column Header Label Style">
+	<Group.layout>
+		<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<Composite>
+			<Composite.layout>
+				<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+			</Composite.layout>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:columnObjectLabelProviderConfigurationDisplayIcon"
+				customLabel="Display Icon"></ppe:BooleanRadio>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:columnObjectLabelProviderConfigurationDisplayLabel"
+				customLabel="Display Label"></ppe:BooleanRadio>
+		</Composite>
+		<Composite>
+			<Composite.layout>
+				<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+			</Composite.layout>
+		</Composite>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/HasTreeFillingConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/HasTreeFillingConfiguration.xwt
index e791d042ad7..b5c4c4f0b04 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/HasTreeFillingConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/HasTreeFillingConfiguration.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
 	<Composite.layout>
 		<ppel:PropertiesLayout></ppel:PropertiesLayout>
 	</Composite.layout>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAbstractAxisProvider.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAbstractAxisProvider.xwt
index 9047bd98f8e..722da6c76c4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAbstractAxisProvider.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAbstractAxisProvider.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAbstractHeaderAxisConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAbstractHeaderAxisConfiguration.xwt
index 6d13ab5f5a0..5de8fa55ea6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAbstractHeaderAxisConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAbstractHeaderAxisConfiguration.xwt
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayLabel"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayFilter"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayIndex"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:indexStyle"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayLabel"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayFilter"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayIndex"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:indexStyle"></ppe:EnumCombo>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAbstractTableTester.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAbstractTableTester.xwt
index 0972b3893fb..a780fae17ea 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAbstractTableTester.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAbstractTableTester.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAxisManagerConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAxisManagerConfiguration.xwt
index 6708b2e86b8..71e2f0b09bf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAxisManagerConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAxisManagerConfiguration.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAxisManagerRepresentation.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAxisManagerRepresentation.xwt
index fca9887d055..371ca96ceee 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAxisManagerRepresentation.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAxisManagerRepresentation.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAxisProvider.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAxisProvider.xwt
index fca9887d055..371ca96ceee 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAxisProvider.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleAxisProvider.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleEObjectAxis.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleEObjectAxis.xwt
index 6a66b760328..8ee6141e132 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleEObjectAxis.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleEObjectAxis.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleEStructuralFeatureAxis.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleEStructuralFeatureAxis.xwt
index c902f6a4fb0..4d360228f8d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleEStructuralFeatureAxis.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleEStructuralFeatureAxis.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	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>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	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>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleEStructuralFeatureValueFillingConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleEStructuralFeatureValueFillingConfiguration.xwt
index f010630797c..0bf55bd8ccd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleEStructuralFeatureValueFillingConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleEStructuralFeatureValueFillingConfiguration.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleFeatureAxis.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleFeatureAxis.xwt
index 51204c02825..8b69f2a1492 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleFeatureAxis.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleFeatureAxis.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleFeatureAxisConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleFeatureAxisConfiguration.xwt
index 374808a5605..5a684b8e584 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleFeatureAxisConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleFeatureAxisConfiguration.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="nattable:nattableaxisconfiguration:FeatureAxisConfiguration:showOnlyCommonFeature"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="nattable:nattableaxisconfiguration:FeatureAxisConfiguration:showOnlyCommonFeature"></ppe:BooleanRadio>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleFeatureIdAxis.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleFeatureIdAxis.xwt
index cfb33162bc7..826244688cc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleFeatureIdAxis.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleFeatureIdAxis.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	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">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleFeatureLabelProviderConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleFeatureLabelProviderConfiguration.xwt
index 89a86c36c29..1cac8dfb700 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleFeatureLabelProviderConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleFeatureLabelProviderConfiguration.xwt
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattablelabelprovider:ObjectLabelProviderConfiguration:displayIcon"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattablelabelprovider:ObjectLabelProviderConfiguration:displayLabel"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattablelabelprovider:FeatureLabelProviderConfiguration:displayIsDerived"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattablelabelprovider:FeatureLabelProviderConfiguration:displayType"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattablelabelprovider:FeatureLabelProviderConfiguration:displayMultiplicity"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattablelabelprovider:FeatureLabelProviderConfiguration:displayName"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattablelabelprovider:ObjectLabelProviderConfiguration:displayIcon"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattablelabelprovider:ObjectLabelProviderConfiguration:displayLabel"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattablelabelprovider:FeatureLabelProviderConfiguration:displayIsDerived"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattablelabelprovider:FeatureLabelProviderConfiguration:displayType"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattablelabelprovider:FeatureLabelProviderConfiguration:displayMultiplicity"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattablelabelprovider:FeatureLabelProviderConfiguration:displayName"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIAxis.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIAxis.xwt
index 4d0cc388e09..44f3cd02f24 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIAxis.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIAxis.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite 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="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIAxisConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIAxisConfiguration.xwt
index bdce4926e13..6f693bef761 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIAxisConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIAxisConfiguration.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIFillingConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIFillingConfiguration.xwt
index 0f03fd30c5d..78049e574ae 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIFillingConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIFillingConfiguration.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleILabelProviderConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleILabelProviderConfiguration.xwt
index e738ff2346e..0073f7b1b90 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleILabelProviderConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleILabelProviderConfiguration.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIMasterAxisProvider.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIMasterAxisProvider.xwt
index 51204c02825..8b69f2a1492 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIMasterAxisProvider.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIMasterAxisProvider.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIPasteConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIPasteConfiguration.xwt
index f852ec3e3dd..2a24fc3815c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIPasteConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIPasteConfiguration.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	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>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	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>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleISlaveAxisProvider.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleISlaveAxisProvider.xwt
index c902f6a4fb0..4d360228f8d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleISlaveAxisProvider.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleISlaveAxisProvider.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	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>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	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>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIdAxis.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIdAxis.xwt
index 0f03fd30c5d..78049e574ae 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIdAxis.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleIdAxis.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleJavaTableTester.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleJavaTableTester.xwt
index d69369c20ec..2d251a2192c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleJavaTableTester.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleJavaTableTester.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<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">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleLocalTableHeaderAxisConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleLocalTableHeaderAxisConfiguration.xwt
index 058c71a9fc9..81452a4c9d3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleLocalTableHeaderAxisConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleLocalTableHeaderAxisConfiguration.xwt
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	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:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayLabel"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayFilter"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayIndex"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:indexStyle"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayLabel"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayFilter"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayIndex"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:indexStyle"></ppe:EnumCombo>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleMasterObjectAxisProvider.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleMasterObjectAxisProvider.xwt
index 51204c02825..8b69f2a1492 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleMasterObjectAxisProvider.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleMasterObjectAxisProvider.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleObjectAxis.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleObjectAxis.xwt
index 0972b3893fb..a780fae17ea 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleObjectAxis.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleObjectAxis.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleObjectIdAxis.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleObjectIdAxis.xwt
index c902f6a4fb0..4d360228f8d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleObjectIdAxis.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleObjectIdAxis.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	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>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	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>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleObjectLabelProviderConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleObjectLabelProviderConfiguration.xwt
index 9e1f715c9f9..f8fd0f82280 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleObjectLabelProviderConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleObjectLabelProviderConfiguration.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite 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:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattablelabelprovider:ObjectLabelProviderConfiguration:displayIcon"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattablelabelprovider:ObjectLabelProviderConfiguration:displayLabel"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattablelabelprovider:ObjectLabelProviderConfiguration:displayIcon"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattablelabelprovider:ObjectLabelProviderConfiguration:displayLabel"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultiplePasteEObjectConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultiplePasteEObjectConfiguration.xwt
index 89517d2ad16..3b396a9929b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultiplePasteEObjectConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultiplePasteEObjectConfiguration.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	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">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleSlaveObjectAxisProvider.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleSlaveObjectAxisProvider.xwt
index 8fd1b2ad08e..58a47121f26 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleSlaveObjectAxisProvider.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleSlaveObjectAxisProvider.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleTable.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleTable.xwt
index 63688bbbb2e..0cbea81a782 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleTable.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleTable.xwt
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}" property="nattable:Table:invertAxis"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}" property="nattable:Table:invertAxis"></ppe:BooleanRadio>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleTableConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleTableConfiguration.xwt
index 65458a528a4..fabcde75443 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleTableConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleTableConfiguration.xwt
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="nattable:nattableconfiguration:TableConfiguration:cellEditorDeclaration"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="nattable:nattableconfiguration:TableConfiguration:cellEditorDeclaration"></ppe:EnumCombo>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleTableHeaderAxisConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleTableHeaderAxisConfiguration.xwt
index a0954ff9c79..515a0a9c071 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleTableHeaderAxisConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/MultipleTableHeaderAxisConfiguration.xwt
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayLabel"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayFilter"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayIndex"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:indexStyle"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayLabel"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayFilter"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayIndex"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:indexStyle"></ppe:EnumCombo>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/PasteEObjectRowSection.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/PasteEObjectRowSection.xwt
index ef79beb3166..2ea03be9bde 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/PasteEObjectRowSection.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/PasteEObjectRowSection.xwt
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Group text="Paste Column Axis">

-		<Group.layout>

-			<ppel:PropertiesLayout numColumns="2"

-				makeColumnsEqualWidth="true"></ppel:PropertiesLayout>

-		</Group.layout>

-		<ppe:StringCombo input="{Binding}"

-			property="nattable:Table:localColumnHeaderAxisConfiguration.pastedEObjectId"

-			customLabel="Pasted Element Id"></ppe:StringCombo>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:Table:localColumnHeaderAxisConfiguration.pastedEObjectContainmentFeature"

-			customLabel="Containment Feature"></ppe:ReferenceDialog>

-	</Group>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Group text="Paste Column Axis">
+		<Group.layout>
+			<ppel:PropertiesLayout numColumns="2"
+				makeColumnsEqualWidth="true"></ppel:PropertiesLayout>
+		</Group.layout>
+		<ppe:StringCombo input="{Binding}"
+			property="nattable:Table:localColumnHeaderAxisConfiguration.pastedEObjectId"
+			customLabel="Pasted Element Id"></ppe:StringCombo>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:Table:localColumnHeaderAxisConfiguration.pastedEObjectContainmentFeature"
+			customLabel="Containment Feature"></ppe:ReferenceDialog>
+	</Group>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/PasteRowConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/PasteRowConfiguration.xwt
index 8cb7309eb0a..f05e6d5f266 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/PasteRowConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/PasteRowConfiguration.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/RowFeatureLabelProviderConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/RowFeatureLabelProviderConfiguration.xwt
index ef44e88878d..80c98b57dca 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/RowFeatureLabelProviderConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/RowFeatureLabelProviderConfiguration.xwt
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="Row Header Label Style">

-	<Group.layout>

-		<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<Composite text="Column Header Label Style" xmlns="http://www.eclipse.org/xwt/presentation"

-			xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-			xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-			xmlns:x="http://www.eclipse.org/xwt">

-			<Composite.layout>

-				<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-			</Composite.layout>

-			<ppe:BooleanRadio input="{Binding}"

-				property="nattable:Table:rowFeatureLabelProviderConfigurationDisplayIcon"

-				customLabel="Display Icon"></ppe:BooleanRadio>

-			<ppe:BooleanRadio input="{Binding}"

-				property="nattable:Table:rowFeatureLabelProviderConfigurationDisplayLabel"

-				customLabel="Display Label"></ppe:BooleanRadio>

-		</Composite>

-		<Group text="Label Feature Style">

-			<Group.layout>

-				<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-			</Group.layout>

-			<ppe:BooleanRadio input="{Binding}"

-				property="nattable:Table:rowFeatureLabelProviderConfigurationDisplayIsDerived"

-				customLabel="Display IsDerived"></ppe:BooleanRadio>

-			<ppe:BooleanRadio input="{Binding}"

-				property="nattable:Table:rowFeatureLabelProviderConfigurationDisplayType"

-				customLabel="Display Type"></ppe:BooleanRadio>

-			<ppe:BooleanRadio input="{Binding}"

-				property="nattable:Table:rowFeatureLabelProviderConfigurationDisplayName"

-				customLabel="Display Name"></ppe:BooleanRadio>

-			<ppe:BooleanRadio input="{Binding}"

-				property="nattable:Table:rowFeatureLabelProviderConfigurationDisplayMultiplicity"

-				customLabel="Display Multiplicity"></ppe:BooleanRadio>

-		</Group>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="Row Header Label Style">
+	<Group.layout>
+		<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<Composite text="Column Header Label Style" xmlns="http://www.eclipse.org/xwt/presentation"
+			xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+			xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+			xmlns:x="http://www.eclipse.org/xwt">
+			<Composite.layout>
+				<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+			</Composite.layout>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:rowFeatureLabelProviderConfigurationDisplayIcon"
+				customLabel="Display Icon"></ppe:BooleanRadio>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:rowFeatureLabelProviderConfigurationDisplayLabel"
+				customLabel="Display Label"></ppe:BooleanRadio>
+		</Composite>
+		<Group text="Label Feature Style">
+			<Group.layout>
+				<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+			</Group.layout>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:rowFeatureLabelProviderConfigurationDisplayIsDerived"
+				customLabel="Display IsDerived"></ppe:BooleanRadio>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:rowFeatureLabelProviderConfigurationDisplayType"
+				customLabel="Display Type"></ppe:BooleanRadio>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:rowFeatureLabelProviderConfigurationDisplayName"
+				customLabel="Display Name"></ppe:BooleanRadio>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:rowFeatureLabelProviderConfigurationDisplayMultiplicity"
+				customLabel="Display Multiplicity"></ppe:BooleanRadio>
+		</Group>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/RowObjectLabelProviderConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/RowObjectLabelProviderConfiguration.xwt
index e0d4f2302d3..a5dd169ee6d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/RowObjectLabelProviderConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/RowObjectLabelProviderConfiguration.xwt
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	text="Row Header Label Style">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<Composite>

-			<Composite.layout>

-				<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-			</Composite.layout>

-			<ppe:BooleanRadio input="{Binding}"

-				property="nattable:Table:rowObjectLabelProviderConfigurationDisplayIcon"

-				customLabel="Display Icon"></ppe:BooleanRadio>

-			<ppe:BooleanRadio input="{Binding}"

-				property="nattable:Table:rowObjectLabelProviderConfigurationDisplayLabel"

-				customLabel="Display Label"></ppe:BooleanRadio>

-		</Composite>

-		<Composite>

-			<Composite.layout>

-				<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-			</Composite.layout>

-		</Composite>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	text="Row Header Label Style">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<Composite>
+			<Composite.layout>
+				<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+			</Composite.layout>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:rowObjectLabelProviderConfigurationDisplayIcon"
+				customLabel="Display Icon"></ppe:BooleanRadio>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:rowObjectLabelProviderConfigurationDisplayLabel"
+				customLabel="Display Label"></ppe:BooleanRadio>
+		</Composite>
+		<Composite>
+			<Composite.layout>
+				<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+			</Composite.layout>
+		</Composite>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAbstractAxisProvider.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAbstractAxisProvider.xwt
index b4b832b78ea..06715782ba9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAbstractAxisProvider.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAbstractAxisProvider.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAbstractHeaderAxisConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAbstractHeaderAxisConfiguration.xwt
index cff5a7ca648..cca1b42a48a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAbstractHeaderAxisConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAbstractHeaderAxisConfiguration.xwt
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayLabel"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayFilter"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayIndex"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:indexStyle"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayLabel"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayFilter"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayIndex"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:indexStyle"></ppe:EnumCombo>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAbstractTableTester.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAbstractTableTester.xwt
index 51204c02825..8b69f2a1492 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAbstractTableTester.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAbstractTableTester.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAxisManagerConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAxisManagerConfiguration.xwt
index 214a87868ee..301213943b6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAxisManagerConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAxisManagerConfiguration.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AxisManagerConfiguration:localHeaderLabelConfiguration"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AxisManagerConfiguration:axisManager"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AxisManagerConfiguration:localSpecificConfigurations"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AxisManagerConfiguration:localHeaderLabelConfiguration"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AxisManagerConfiguration:axisManager"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AxisManagerConfiguration:localSpecificConfigurations"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAxisManagerRepresentation.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAxisManagerRepresentation.xwt
index 08a742e3092..aa85e5e8a29 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAxisManagerRepresentation.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAxisManagerRepresentation.xwt
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AxisManagerRepresentation:axisManagerId"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AxisManagerRepresentation:labelProviderContext"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AxisManagerRepresentation:headerLabelConfiguration"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AxisManagerRepresentation:specificAxisConfigurations"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AxisManagerRepresentation:axisManagerId"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AxisManagerRepresentation:labelProviderContext"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AxisManagerRepresentation:headerLabelConfiguration"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AxisManagerRepresentation:specificAxisConfigurations"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAxisProvider.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAxisProvider.xwt
index 707b98dd921..3dfd5ec46c9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAxisProvider.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleAxisProvider.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="nattable:nattableaxisprovider:AxisProvider:axis"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="nattable:nattableaxisprovider:AxisProvider:axis"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleEObjectAxis.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleEObjectAxis.xwt
index fd9e07a7b3b..04e7e82a6ae 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleEObjectAxis.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleEObjectAxis.xwt
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<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">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxis:IAxis:alias"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableaxis:EObjectAxis:element"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableaxis:ObjectAxis:localLabelConfiguration"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableaxis:IAxis:manager"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxis:IAxis:alias"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableaxis:EObjectAxis:element"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableaxis:ObjectAxis:localLabelConfiguration"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableaxis:IAxis:manager"></ppe:ReferenceDialog>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleEStructuralFeatureAxis.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleEStructuralFeatureAxis.xwt
index 2fda1e80597..b41c8c52f48 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleEStructuralFeatureAxis.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleEStructuralFeatureAxis.xwt
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxis:IAxis:alias"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableaxis:FeatureAxis:localLabelConfiguration"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableaxis:EStructuralFeatureAxis:element"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableaxis:IAxis:manager"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxis:IAxis:alias"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableaxis:FeatureAxis:localLabelConfiguration"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableaxis:EStructuralFeatureAxis:element"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableaxis:IAxis:manager"></ppe:ReferenceDialog>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleEStructuralFeatureValueFillingConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleEStructuralFeatureValueFillingConfiguration.xwt
index a7647304bf6..29bf967eea8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleEStructuralFeatureValueFillingConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleEStructuralFeatureValueFillingConfiguration.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableaxisconfiguration:EStructuralFeatureValueFillingConfiguration:listenFeature"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableaxisconfiguration:EStructuralFeatureValueFillingConfiguration:listenFeature"></ppe:ReferenceDialog>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleFeatureAxis.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleFeatureAxis.xwt
index 832314519e4..a9b67253bdb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleFeatureAxis.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleFeatureAxis.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxis:IAxis:alias"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableaxis:FeatureAxis:localLabelConfiguration"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableaxis:IAxis:manager"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxis:IAxis:alias"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableaxis:FeatureAxis:localLabelConfiguration"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableaxis:IAxis:manager"></ppe:ReferenceDialog>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleFeatureAxisConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleFeatureAxisConfiguration.xwt
index 8677597b01a..542269ef195 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleFeatureAxisConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleFeatureAxisConfiguration.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="nattable:nattableaxisconfiguration:FeatureAxisConfiguration:showOnlyCommonFeature"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="nattable:nattableaxisconfiguration:FeatureAxisConfiguration:showOnlyCommonFeature"></ppe:BooleanRadio>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleFeatureIdAxis.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleFeatureIdAxis.xwt
index 6b20b861342..fe641dfcaec 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleFeatureIdAxis.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleFeatureIdAxis.xwt
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxis:IdAxis:element"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxis:IAxis:alias"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableaxis:FeatureAxis:localLabelConfiguration"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableaxis:IAxis:manager"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxis:IdAxis:element"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxis:IAxis:alias"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableaxis:FeatureAxis:localLabelConfiguration"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableaxis:IAxis:manager"></ppe:ReferenceDialog>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleFeatureLabelProviderConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleFeatureLabelProviderConfiguration.xwt
index 9b80a984feb..35d79211996 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleFeatureLabelProviderConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleFeatureLabelProviderConfiguration.xwt
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattablelabelprovider:ObjectLabelProviderConfiguration:displayIcon"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattablelabelprovider:ObjectLabelProviderConfiguration:displayLabel"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattablelabelprovider:FeatureLabelProviderConfiguration:displayIsDerived"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattablelabelprovider:FeatureLabelProviderConfiguration:displayType"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattablelabelprovider:FeatureLabelProviderConfiguration:displayMultiplicity"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattablelabelprovider:FeatureLabelProviderConfiguration:displayName"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattablelabelprovider:ObjectLabelProviderConfiguration:displayIcon"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattablelabelprovider:ObjectLabelProviderConfiguration:displayLabel"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattablelabelprovider:FeatureLabelProviderConfiguration:displayIsDerived"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattablelabelprovider:FeatureLabelProviderConfiguration:displayType"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattablelabelprovider:FeatureLabelProviderConfiguration:displayMultiplicity"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattablelabelprovider:FeatureLabelProviderConfiguration:displayName"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIAxis.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIAxis.xwt
index f0e5ef01bba..029d7a8361b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIAxis.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIAxis.xwt
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxis:IAxis:alias"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableaxis:IAxis:manager"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxis:IAxis:alias"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableaxis:IAxis:manager"></ppe:ReferenceDialog>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIAxisConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIAxisConfiguration.xwt
index 51204c02825..8b69f2a1492 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIAxisConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIAxisConfiguration.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIFillingConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIFillingConfiguration.xwt
index e738ff2346e..0073f7b1b90 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIFillingConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIFillingConfiguration.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleILabelProviderConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleILabelProviderConfiguration.xwt
index cfb33162bc7..826244688cc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleILabelProviderConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleILabelProviderConfiguration.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	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">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIMasterAxisProvider.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIMasterAxisProvider.xwt
index 8e619a34637..f039e2887f3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIMasterAxisProvider.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIMasterAxisProvider.xwt
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisprovider:IMasterAxisProvider:disconnectSlave"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="nattable:nattableaxisprovider:AxisProvider:axis"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisprovider:IMasterAxisProvider:disconnectSlave"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="nattable:nattableaxisprovider:AxisProvider:axis"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIPasteConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIPasteConfiguration.xwt
index 51204c02825..8b69f2a1492 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIPasteConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIPasteConfiguration.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleISlaveAxisProvider.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleISlaveAxisProvider.xwt
index 26f013c17a0..6f7d202bca1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleISlaveAxisProvider.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleISlaveAxisProvider.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="nattable:nattableaxisprovider:AxisProvider:axis"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="nattable:nattableaxisprovider:AxisProvider:axis"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIdAxis.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIdAxis.xwt
index aec49b09ef7..555eee1be38 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIdAxis.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleIdAxis.xwt
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	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>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxis:IdAxis:element"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxis:IAxis:alias"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableaxis:IAxis:manager"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	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>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxis:IdAxis:element"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxis:IAxis:alias"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableaxis:IAxis:manager"></ppe:ReferenceDialog>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleJavaTableTester.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleJavaTableTester.xwt
index 55895c07c5f..c8a761a88ce 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleJavaTableTester.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleJavaTableTester.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattabletester:JavaTableTester:tester"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattabletester:JavaTableTester:tester"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleLocalTableHeaderAxisConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleLocalTableHeaderAxisConfiguration.xwt
index 549ee1be974..596a1054a18 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleLocalTableHeaderAxisConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleLocalTableHeaderAxisConfiguration.xwt
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayLabel"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayFilter"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayIndex"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:indexStyle"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="nattable:nattableaxisconfiguration:LocalTableHeaderAxisConfiguration:axisManagerConfigurations"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayLabel"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayFilter"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayIndex"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:indexStyle"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="nattable:nattableaxisconfiguration:LocalTableHeaderAxisConfiguration:axisManagerConfigurations"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleMasterObjectAxisProvider.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleMasterObjectAxisProvider.xwt
index f181ff44fb8..f2c05fae8d2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleMasterObjectAxisProvider.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleMasterObjectAxisProvider.xwt
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	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:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisprovider:IMasterAxisProvider:disconnectSlave"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="nattable:nattableaxisprovider:AxisProvider:axis"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisprovider:IMasterAxisProvider:disconnectSlave"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="nattable:nattableaxisprovider:AxisProvider:axis"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleNormalTableAppearance.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleNormalTableAppearance.xwt
index aaac6c0bf3b..fbe9cc47396 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleNormalTableAppearance.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleNormalTableAppearance.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
 	<Composite.layout>
 		<ppel:PropertiesLayout></ppel:PropertiesLayout>
 	</Composite.layout>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleObjectAxis.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleObjectAxis.xwt
index ad73f0fcd07..6051dc0b99d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleObjectAxis.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleObjectAxis.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxis:IAxis:alias"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableaxis:ObjectAxis:localLabelConfiguration"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableaxis:IAxis:manager"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxis:IAxis:alias"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableaxis:ObjectAxis:localLabelConfiguration"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableaxis:IAxis:manager"></ppe:ReferenceDialog>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleObjectIdAxis.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleObjectIdAxis.xwt
index 2bea12fddaf..ee040c3b1c1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleObjectIdAxis.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleObjectIdAxis.xwt
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxis:IdAxis:element"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxis:IAxis:alias"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableaxis:ObjectAxis:localLabelConfiguration"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableaxis:IAxis:manager"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxis:IdAxis:element"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxis:IAxis:alias"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableaxis:ObjectAxis:localLabelConfiguration"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableaxis:IAxis:manager"></ppe:ReferenceDialog>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleObjectLabelProviderConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleObjectLabelProviderConfiguration.xwt
index 3f3aff3d82e..147dc316704 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleObjectLabelProviderConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleObjectLabelProviderConfiguration.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattablelabelprovider:ObjectLabelProviderConfiguration:displayIcon"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattablelabelprovider:ObjectLabelProviderConfiguration:displayLabel"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattablelabelprovider:ObjectLabelProviderConfiguration:displayIcon"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattablelabelprovider:ObjectLabelProviderConfiguration:displayLabel"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SinglePasteEObjectConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SinglePasteEObjectConfiguration.xwt
index b8119daf0d9..182fc3c30bd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SinglePasteEObjectConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SinglePasteEObjectConfiguration.xwt
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisconfiguration:PasteEObjectConfiguration:pastedElementId"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableaxisconfiguration:PasteEObjectConfiguration:pasteElementContainementFeature"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisconfiguration:PasteEObjectConfiguration:pastedElementId"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableaxisconfiguration:PasteEObjectConfiguration:pasteElementContainementFeature"></ppe:ReferenceDialog>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleSlaveObjectAxisProvider.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleSlaveObjectAxisProvider.xwt
index 811bf7b7b08..ac1dfc9d019 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleSlaveObjectAxisProvider.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleSlaveObjectAxisProvider.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="nattable:nattableaxisprovider:AxisProvider:axis"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="nattable:nattableaxisprovider:AxisProvider:axis"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTable.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTable.xwt
index a992fe52044..e5e2b13cd4b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTable.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTable.xwt
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableconfiguration:TableNamedElement:name"></ppe:StringEditor>

-		<ppe:ReferenceLabel input="{Binding}" property="nattable:Table:prototype" readOnly="true" customLabel="View Type"></ppe:ReferenceLabel>

-		<ppe:ReferenceLabel input="{Binding}" property="nattable:Table:owner" readOnly="true" customLabel="Owner"></ppe:ReferenceLabel>

-		<ppe:ReferenceDialog input="{Binding}" property="nattable:Table:context" customLabel="Root element"></ppe:ReferenceDialog>

-		<ppe:BooleanRadio input="{Binding}" property="nattable:Table:invertAxis"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringMultiline input="{Binding}"

-			property="nattable:nattableconfiguration:TableNamedElement:description"></ppe:StringMultiline>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableconfiguration:TableNamedElement:name"></ppe:StringEditor>
+		<ppe:ReferenceLabel input="{Binding}" property="nattable:Table:prototype" readOnly="true" customLabel="View Type"></ppe:ReferenceLabel>
+		<ppe:ReferenceLabel input="{Binding}" property="nattable:Table:owner" readOnly="true" customLabel="Owner"></ppe:ReferenceLabel>
+		<ppe:ReferenceDialog input="{Binding}" property="nattable:Table:context" customLabel="Root element"></ppe:ReferenceDialog>
+		<ppe:BooleanRadio input="{Binding}" property="nattable:Table:invertAxis"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringMultiline input="{Binding}"
+			property="nattable:nattableconfiguration:TableNamedElement:description"></ppe:StringMultiline>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTableAppearance.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTableAppearance.xwt
index 03b60119177..d76b3d1d59d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTableAppearance.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTableAppearance.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" text="Column"><Composite.layout><ppel:PropertiesLayout makeColumnsEqualWidth="true" numColumns="1"></ppel:PropertiesLayout></Composite.layout><Group text="Column"><Group.layout><ppel:PropertiesLayout numColumns="2" makeColumnsEqualWidth="true"></ppel:PropertiesLayout></Group.layout><ppe:BooleanRadio input="{Binding}" property="nattable:Table:localColumnHeaderAxisConfiguration.displayLabel" customLabel="Display Label"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="nattable:Table:localColumnHeaderAxisConfiguration.displayFilter" readOnly="true" customLabel="Display Filter"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="nattable:Table:localColumnHeaderAxisConfiguration.displayIndex" customLabel="Display Index"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="nattable:Table:localColumnHeaderAxisConfiguration.indexStyle" customLabel="Index Style"></ppe:EnumCombo></Group><Group text="Row"><Group.layout><ppel:PropertiesLayout makeColumnsEqualWidth="true" numColumns="1"></ppel:PropertiesLayout></Group.layout><Composite><Composite.layout><ppel:PropertiesLayout makeColumnsEqualWidth="true" numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="nattable:Table:localRowHeaderAxisConfiguration.displayLabel" customLabel="Display Label"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout makeColumnsEqualWidth="true" numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="nattable:Table:localRowHeaderAxisConfiguration.displayIndex" customLabel="Display Index"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="nattable:Table:localRowHeaderAxisConfiguration.indexStyle" customLabel="Index Style"></ppe:EnumCombo></Composite></Group></Composite>
\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" text="Column"><Composite.layout><ppel:PropertiesLayout makeColumnsEqualWidth="true" numColumns="1"></ppel:PropertiesLayout></Composite.layout><Group text="Column"><Group.layout><ppel:PropertiesLayout numColumns="2" makeColumnsEqualWidth="true"></ppel:PropertiesLayout></Group.layout><ppe:BooleanRadio input="{Binding}" property="nattable:Table:localColumnHeaderAxisConfiguration.displayLabel" customLabel="Display Label"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="nattable:Table:localColumnHeaderAxisConfiguration.displayFilter" readOnly="true" customLabel="Display Filter"></ppe:BooleanRadio><ppe:BooleanRadio input="{Binding}" property="nattable:Table:localColumnHeaderAxisConfiguration.displayIndex" customLabel="Display Index"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="nattable:Table:localColumnHeaderAxisConfiguration.indexStyle" customLabel="Index Style"></ppe:EnumCombo></Group><Group text="Row"><Group.layout><ppel:PropertiesLayout makeColumnsEqualWidth="true" numColumns="1"></ppel:PropertiesLayout></Group.layout><Composite><Composite.layout><ppel:PropertiesLayout makeColumnsEqualWidth="true" numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="nattable:Table:localRowHeaderAxisConfiguration.displayLabel" customLabel="Display Label"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout makeColumnsEqualWidth="true" numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="nattable:Table:localRowHeaderAxisConfiguration.displayIndex" customLabel="Display Index"></ppe:BooleanRadio><ppe:EnumCombo input="{Binding}" property="nattable:Table:localRowHeaderAxisConfiguration.indexStyle" customLabel="Index Style"></ppe:EnumCombo></Composite></Group></Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTableConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTableConfiguration.xwt
index 3bc321fd1c2..92203178a25 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTableConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTableConfiguration.xwt
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableconfiguration:TableConfiguration:type"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableconfiguration:TableConfiguration:iconPath"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableconfiguration:TableNamedElement:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableconfiguration:TableNamedElement:name"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="nattable:nattableconfiguration:TableConfiguration:cellEditorDeclaration"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableconfiguration:TableConfiguration:creationTester"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableconfiguration:TableConfiguration:rowHeaderAxisConfiguration"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableconfiguration:TableConfiguration:columnHeaderAxisConfiguration"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableconfiguration:TableConfiguration:defaultRowAxisProvider"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="nattable:nattableconfiguration:TableConfiguration:defaultColumnAxisProvider"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="nattable:nattableconfiguration:TableConfiguration:columnAxisProviders"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="nattable:nattableconfiguration:TableConfiguration:rowAxisProviders"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableconfiguration:TableConfiguration:type"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableconfiguration:TableConfiguration:iconPath"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableconfiguration:TableNamedElement:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableconfiguration:TableNamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="nattable:nattableconfiguration:TableConfiguration:cellEditorDeclaration"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableconfiguration:TableConfiguration:creationTester"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableconfiguration:TableConfiguration:rowHeaderAxisConfiguration"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableconfiguration:TableConfiguration:columnHeaderAxisConfiguration"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableconfiguration:TableConfiguration:defaultRowAxisProvider"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="nattable:nattableconfiguration:TableConfiguration:defaultColumnAxisProvider"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="nattable:nattableconfiguration:TableConfiguration:columnAxisProviders"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="nattable:nattableconfiguration:TableConfiguration:rowAxisProviders"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTableHeaderAxisConfiguration.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTableHeaderAxisConfiguration.xwt
index 8d56cb8dbe2..0dbe7e67601 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTableHeaderAxisConfiguration.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTableHeaderAxisConfiguration.xwt
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayLabel"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayFilter"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayIndex"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:indexStyle"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="nattable:nattableaxisconfiguration:TableHeaderAxisConfiguration:axisManagers"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayLabel"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayFilter"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:displayIndex"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="nattable:nattableaxisconfiguration:AbstractHeaderAxisConfiguration:indexStyle"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="nattable:nattableaxisconfiguration:TableHeaderAxisConfiguration:axisManagers"></ppe:MultiReference>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTreeTable.xwt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTreeTable.xwt
index 1c0f96eea51..1555751ae4a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTreeTable.xwt
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTreeTable.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
 	xmlns:j="clr-namespace:java.lang">
 	<Composite.layout>
 		<ppel:PropertiesLayout></ppel:PropertiesLayout>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/plugin.xml
index 7f017081cb5..a3981c95818 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/plugin.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.properties.contexts">

-      <context

-            contextModel="model/nattable.ctx"

-            isCustomizable="true">

-      </context>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.properties.environments">

-      <environment

-            environmentModel="model/Environment.xmi">

-      </environment>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.views.properties.labelprovider">

-      <labelProvider

-            labelProvider="org.eclipse.papyrus.infra.nattable.properties.labelprovider.TablePropertyLabelProvider"

-            priority="45">

-      </labelProvider>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">

-      <labelProvider

-            priority="10"

-            provider="org.eclipse.papyrus.infra.nattable.provider.TableLabelProvider">

-         <labelProviderContext

-               context="org.eclipse.papyrus.views.properties.header.labelProvider.context">

-         </labelProviderContext>

-      </labelProvider>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.papyrus.infra.properties.contexts">
+      <context
+            contextModel="model/nattable.ctx"
+            isCustomizable="true">
+      </context>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.properties.environments">
+      <environment
+            environmentModel="model/Environment.xmi">
+      </environment>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.properties.ui.labelprovider">
+      <labelProvider
+            labelProvider="org.eclipse.papyrus.infra.nattable.properties.labelprovider.TablePropertyLabelProvider"
+            priority="45">
+      </labelProvider>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">
+      <labelProvider
+            priority="10"
+            provider="org.eclipse.papyrus.infra.nattable.provider.TableLabelProvider">
+         <labelProviderContext
+               context="org.eclipse.papyrus.infra.properties.ui.header.labelProvider.context">
+         </labelProviderContext>
+      </labelProvider>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml
index 39fd515dcef..5457d027f95 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.infra.nattable.main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.properties</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/modelelement/NatTableFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/modelelement/NatTableFactory.java
index b34c9b8e3f2..85d5e08d0b3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/modelelement/NatTableFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/modelelement/NatTableFactory.java
@@ -1,43 +1,43 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 417409

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.modelelement;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.properties.Activator;

-import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement;

-import org.eclipse.papyrus.views.properties.modelelement.EMFModelElementFactory;

-

-

-public class NatTableFactory extends EMFModelElementFactory {

-

-	@Override

-	protected EMFModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {

-		EObject source = EMFHelper.getEObject(sourceElement);

-		if (source == null) {

-			Activator.log.warn("Unable to resolve the selected element to an EObject"); //$NON-NLS-1$

-			return null;

-		}

-		if (source instanceof Table) {

-			EditingDomain domain = AdapterFactoryEditingDomain.getEditingDomainFor(source);

-			return new NatTableModelElement((Table) source, domain);

-		} else {

-			return super.doCreateFromSource(sourceElement, context);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.modelelement;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.properties.Activator;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElementFactory;
+
+
+public class NatTableFactory extends EMFModelElementFactory {
+
+	@Override
+	protected EMFModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {
+		EObject source = EMFHelper.getEObject(sourceElement);
+		if (source == null) {
+			Activator.log.warn("Unable to resolve the selected element to an EObject"); //$NON-NLS-1$
+			return null;
+		}
+		if (source instanceof Table) {
+			EditingDomain domain = AdapterFactoryEditingDomain.getEditingDomainFor(source);
+			return new NatTableModelElement((Table) source, domain);
+		} else {
+			return super.doCreateFromSource(sourceElement, context);
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/modelelement/NatTableModelElement.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/modelelement/NatTableModelElement.java
index 35c728c2f00..db143b58e70 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/modelelement/NatTableModelElement.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/modelelement/NatTableModelElement.java
@@ -83,10 +83,10 @@ import org.eclipse.papyrus.infra.nattable.properties.provider.RowPostActionIdsPr
 import org.eclipse.papyrus.infra.nattable.properties.utils.Constants;
 import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
 import org.eclipse.papyrus.infra.nattable.utils.NattableModelManagerFactory;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement;
 import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
-import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
@@ -303,7 +303,7 @@ public class NatTableModelElement extends EMFModelElement {
 
 	/**
 	 *
-	 * @see org.eclipse.papyrus.views.properties.modelelement.AbstractModelElement#dispose()
+	 * @see org.eclipse.papyrus.infra.properties.ui.modelelement.AbstractModelElement#dispose()
 	 *
 	 */
 	@Override
@@ -329,7 +329,7 @@ public class NatTableModelElement extends EMFModelElement {
 
 	/**
 	 *
-	 * @see org.eclipse.papyrus.views.properties.modelelement.EMFModelElement#doGetObservable(java.lang.String)
+	 * @see org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement#doGetObservable(java.lang.String)
 	 *
 	 * @param propertyPath
 	 * @return
@@ -522,7 +522,7 @@ public class NatTableModelElement extends EMFModelElement {
 
 	/**
 	 *
-	 * @see org.eclipse.papyrus.views.properties.modelelement.EMFModelElement#getContentProvider(java.lang.String)
+	 * @see org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement#getContentProvider(java.lang.String)
 	 *
 	 * @param propertyPath
 	 * @return
@@ -558,7 +558,7 @@ public class NatTableModelElement extends EMFModelElement {
 
 	/**
 	 *
-	 * @see org.eclipse.papyrus.views.properties.modelelement.EMFModelElement#isUnique(java.lang.String)
+	 * @see org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement#isUnique(java.lang.String)
 	 *
 	 * @param propertyPath
 	 * @return
@@ -575,7 +575,7 @@ public class NatTableModelElement extends EMFModelElement {
 
 	/**
 	 *
-	 * @see org.eclipse.papyrus.views.properties.modelelement.EMFModelElement#isOrdered(java.lang.String)
+	 * @see org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement#isOrdered(java.lang.String)
 	 *
 	 * @param propertyPath
 	 * @return
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnFeatureLabelProviderConfigurationObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnFeatureLabelProviderConfigurationObservableValue.java
index cf6dee505de..243a012d912 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnFeatureLabelProviderConfigurationObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnFeatureLabelProviderConfigurationObservableValue.java
@@ -1,72 +1,72 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.properties.observable;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.command.TableCommands;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;

-

-/**

- * The Class AbstractColumnFeatureLabelProviderConfigurationObservableValue.

- *

- * @author vl222926

- */

-public abstract class AbstractColumnFeatureLabelProviderConfigurationObservableValue extends AbstractConfigurationElementObservableValue {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param table

-	 *            the table

-	 * @param managedFeature

-	 *            the managed feature

-	 */

-	public AbstractColumnFeatureLabelProviderConfigurationObservableValue(final Table table, final EStructuralFeature managedFeature) {

-		super(table, managedFeature);

-	}

-

-	/**

-	 * Gets the edited e object.

-	 *

-	 * @return the edited e object

-	 * @see org.eclipse.papyrus.infra.nattable.properties.observable.AbstractConfigurationElementObservableValue#getEditedEObject()

-	 */

-	@Override

-	protected EObject getEditedEObject() {

-		return LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration(getTable());

-	}

-

-	/**

-	 * Do set value.

-	 *

-	 * @param value

-	 *            the value

-	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)

-	 */

-	@Override

-	protected void doSetValue(Object value) {

-		final ICommand cmd = TableCommands.getSetColumnLabelConfigurationValueCommand(getTable(), (ILabelProviderConfiguration) getEditedEObject(), getManagedFeature(), value);

-		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(getTable());

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.properties.observable;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.command.TableCommands;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;
+
+/**
+ * The Class AbstractColumnFeatureLabelProviderConfigurationObservableValue.
+ *
+ * @author vl222926
+ */
+public abstract class AbstractColumnFeatureLabelProviderConfigurationObservableValue extends AbstractConfigurationElementObservableValue {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param table
+	 *            the table
+	 * @param managedFeature
+	 *            the managed feature
+	 */
+	public AbstractColumnFeatureLabelProviderConfigurationObservableValue(final Table table, final EStructuralFeature managedFeature) {
+		super(table, managedFeature);
+	}
+
+	/**
+	 * Gets the edited e object.
+	 *
+	 * @return the edited e object
+	 * @see org.eclipse.papyrus.infra.nattable.properties.observable.AbstractConfigurationElementObservableValue#getEditedEObject()
+	 */
+	@Override
+	protected EObject getEditedEObject() {
+		return LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration(getTable());
+	}
+
+	/**
+	 * Do set value.
+	 *
+	 * @param value
+	 *            the value
+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)
+	 */
+	@Override
+	protected void doSetValue(Object value) {
+		final ICommand cmd = TableCommands.getSetColumnLabelConfigurationValueCommand(getTable(), (ILabelProviderConfiguration) getEditedEObject(), getManagedFeature(), value);
+		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(getTable());
+		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnHeaderAxisConfigurationObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnHeaderAxisConfigurationObservableValue.java
index 0b03fe59c58..350d807dc58 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnHeaderAxisConfigurationObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnHeaderAxisConfigurationObservableValue.java
@@ -1,69 +1,69 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.properties.observable;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.command.TableCommands;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;

-

-/**

- * Abstract class for the columnHeaderAxisConfiguration

- *

- * @author vl222926

- *

- */

-public abstract class AbstractColumnHeaderAxisConfigurationObservableValue extends AbstractConfigurationElementObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 *            the managed table

-	 * @param managedFeature

-	 *            the managed feature

-	 */

-	public AbstractColumnHeaderAxisConfigurationObservableValue(Table table, EStructuralFeature managedFeature) {

-		super(table, managedFeature);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the header axis configuration to use to get the value

-	 */

-	@Override

-	protected final EObject getEditedEObject() {

-		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(getTable());

-	}

-

-	/**

-	 *

-	 * @param value

-	 *            the new value

-	 */

-	@Override

-	protected final void doSetValue(final Object value) {

-		final ICommand cmd = TableCommands.getSetColumnHeaderConfigurationValueCommand(getTable(), getManagedFeature(), value);

-		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(getTable());

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.properties.observable;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.command.TableCommands;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;
+
+/**
+ * Abstract class for the columnHeaderAxisConfiguration
+ *
+ * @author vl222926
+ *
+ */
+public abstract class AbstractColumnHeaderAxisConfigurationObservableValue extends AbstractConfigurationElementObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 *            the managed table
+	 * @param managedFeature
+	 *            the managed feature
+	 */
+	public AbstractColumnHeaderAxisConfigurationObservableValue(Table table, EStructuralFeature managedFeature) {
+		super(table, managedFeature);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the header axis configuration to use to get the value
+	 */
+	@Override
+	protected final EObject getEditedEObject() {
+		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(getTable());
+	}
+
+	/**
+	 *
+	 * @param value
+	 *            the new value
+	 */
+	@Override
+	protected final void doSetValue(final Object value) {
+		final ICommand cmd = TableCommands.getSetColumnHeaderConfigurationValueCommand(getTable(), getManagedFeature(), value);
+		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(getTable());
+		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnObjectLabelProviderConfigurationObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnObjectLabelProviderConfigurationObservableValue.java
index af2ceeec261..2743e5866fe 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnObjectLabelProviderConfigurationObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnObjectLabelProviderConfigurationObservableValue.java
@@ -1,70 +1,70 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.properties.observable;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.command.TableCommands;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;

-

-/**

- * The Class AbstractColumnObjectLabelProviderConfigurationObservableValue.

- *

- * @author vl222926

- */

-public abstract class AbstractColumnObjectLabelProviderConfigurationObservableValue extends AbstractConfigurationElementObservableValue {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param table

-	 *            the table

-	 * @param managedFeature

-	 *            the managed feature

-	 */

-	public AbstractColumnObjectLabelProviderConfigurationObservableValue(final Table table, final EStructuralFeature managedFeature) {

-		super(table, managedFeature);

-	}

-

-	/**

-	 * Gets the edited e object.

-	 *

-	 * @return the edited e object

-	 * @see org.eclipse.papyrus.infra.nattable.properties.observable.AbstractConfigurationElementObservableValue#getEditedEObject()

-	 */

-	@Override

-	protected EObject getEditedEObject() {

-		return LabelConfigurationManagementUtils.getUsedColumnObjectLabelConfiguration(getTable());

-	}

-

-	/**

-	 * Do set value.

-	 *

-	 * @param value

-	 *            the value

-	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)

-	 */

-	@Override

-	protected void doSetValue(Object value) {

-		final ICommand cmd = TableCommands.getSetColumnLabelConfigurationValueCommand(getTable(), (ILabelProviderConfiguration) getEditedEObject(), getManagedFeature(), value);

-		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(getTable());

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.properties.observable;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.command.TableCommands;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;
+
+/**
+ * The Class AbstractColumnObjectLabelProviderConfigurationObservableValue.
+ *
+ * @author vl222926
+ */
+public abstract class AbstractColumnObjectLabelProviderConfigurationObservableValue extends AbstractConfigurationElementObservableValue {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param table
+	 *            the table
+	 * @param managedFeature
+	 *            the managed feature
+	 */
+	public AbstractColumnObjectLabelProviderConfigurationObservableValue(final Table table, final EStructuralFeature managedFeature) {
+		super(table, managedFeature);
+	}
+
+	/**
+	 * Gets the edited e object.
+	 *
+	 * @return the edited e object
+	 * @see org.eclipse.papyrus.infra.nattable.properties.observable.AbstractConfigurationElementObservableValue#getEditedEObject()
+	 */
+	@Override
+	protected EObject getEditedEObject() {
+		return LabelConfigurationManagementUtils.getUsedColumnObjectLabelConfiguration(getTable());
+	}
+
+	/**
+	 * Do set value.
+	 *
+	 * @param value
+	 *            the value
+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)
+	 */
+	@Override
+	protected void doSetValue(Object value) {
+		final ICommand cmd = TableCommands.getSetColumnLabelConfigurationValueCommand(getTable(), (ILabelProviderConfiguration) getEditedEObject(), getManagedFeature(), value);
+		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(getTable());
+		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnPasteEObjectConfigurationObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnPasteEObjectConfigurationObservableValue.java
index de0f1a5a605..a9cbcb52fe5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnPasteEObjectConfigurationObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnPasteEObjectConfigurationObservableValue.java
@@ -1,76 +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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.command.TableCommands;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.utils.AxisConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;

-

-/**

- * Abstract class for Paste EObject on column configuration

- *

- * @author VL222926

- *

- */

-public abstract class AbstractColumnPasteEObjectConfigurationObservableValue extends AbstractConfigurationElementObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 * @param managedFeature

-	 */

-	public AbstractColumnPasteEObjectConfigurationObservableValue(final Table table, final EStructuralFeature managedFeature) {

-		super(table, managedFeature);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.properties.observable.AbstractColumnPasteEObjectConfigurationObservableValue#getEditedEObject()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EObject getEditedEObject() {

-		return AxisConfigurationUtils.getIAxisConfigurationUsedInTable(getTable(), NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration(), true);

-	}

-

-	/**

-	 * Do set value.

-	 *

-	 * @param value

-	 *            the value

-	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)

-	 */

-	@Override

-	protected void doSetValue(Object value) {

-		IAxisConfiguration editedEObject = (IAxisConfiguration) getEditedEObject();

-		if (editedEObject == null) {

-			editedEObject = NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration();

-		}

-		final ICommand cmd = TableCommands.getSetIAxisConfigurationValueCommand(getTable(), editedEObject, getManagedFeature(), value, true);

-		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(getTable());

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.properties.observable;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.command.TableCommands;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.utils.AxisConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;
+
+/**
+ * Abstract class for Paste EObject on column configuration
+ *
+ * @author VL222926
+ *
+ */
+public abstract class AbstractColumnPasteEObjectConfigurationObservableValue extends AbstractConfigurationElementObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 * @param managedFeature
+	 */
+	public AbstractColumnPasteEObjectConfigurationObservableValue(final Table table, final EStructuralFeature managedFeature) {
+		super(table, managedFeature);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.properties.observable.AbstractColumnPasteEObjectConfigurationObservableValue#getEditedEObject()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EObject getEditedEObject() {
+		return AxisConfigurationUtils.getIAxisConfigurationUsedInTable(getTable(), NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration(), true);
+	}
+
+	/**
+	 * Do set value.
+	 *
+	 * @param value
+	 *            the value
+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)
+	 */
+	@Override
+	protected void doSetValue(Object value) {
+		IAxisConfiguration editedEObject = (IAxisConfiguration) getEditedEObject();
+		if (editedEObject == null) {
+			editedEObject = NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration();
+		}
+		final ICommand cmd = TableCommands.getSetIAxisConfigurationValueCommand(getTable(), editedEObject, getManagedFeature(), value, true);
+		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(getTable());
+		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractPasteObjectPostActionsObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractPasteObjectPostActionsObservableValue.java
index 01f93bfdd62..0aacb1114cd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractPasteObjectPostActionsObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractPasteObjectPostActionsObservableValue.java
@@ -1,288 +1,288 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.properties.observable;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CompoundCommand;

-import org.eclipse.emf.common.command.IdentityCommand;

-import org.eclipse.emf.databinding.EMFProperties;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.edit.command.RemoveCommand;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.command.TableCommands;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;

-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.utils.AxisConfigurationUtils;

-import org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList;

-

-/**

- * Observable value for the element type id

- *

- * @author VL222926

- *

- */

-public abstract class AbstractPasteObjectPostActionsObservableValue extends EMFObservableList {

-

-	private Table table;

-

-	private boolean isEditingColumn;

-

-	private EObject editedObject;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 */

-	public AbstractPasteObjectPostActionsObservableValue(final EditingDomain domain, final Table table, final boolean isEditingColumn) {

-		super(Collections.EMPTY_LIST, domain, table, NattableaxisconfigurationPackage.eINSTANCE.getIPasteConfiguration_PostActions());

-		this.table = table;

-		this.isEditingColumn = isEditingColumn;

-		updateList();

-	}

-

-	/**

-	 *

-	 */

-	protected void updateList() {

-		final List<?> list = EMFProperties.list(NattableaxisconfigurationPackage.eINSTANCE.getIPasteConfiguration_PostActions()).observe(getEditedEObject());

-		this.wrappedList = new LinkedList<Object>(list);

-		this.concreteList = list;

-	}

-

-

-	/**

-	 *

-	 * @return

-	 *         the table

-	 */

-	protected Table getTable() {

-		return this.table;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.properties.observable.AbstractColumnPasteEObjectConfigurationObservableValue#getEditedEObject()

-	 *

-	 * @return

-	 */

-	protected EObject getEditedEObject() {

-		final EObject editedConfiguration = AxisConfigurationUtils.getIAxisConfigurationUsedInTable(getTable(), NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration(), isEditingColumn);

-		editedObject = editedConfiguration;

-		return this.editedObject;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#getAddAllCommand(java.util.Collection)

-	 *

-	 * @param values

-	 * @return

-	 */

-	@Override

-	public Command getAddAllCommand(Collection<?> values) {

-		PasteEObjectConfiguration editedEObject = (PasteEObjectConfiguration) getEditedEObject();

-		if (editedEObject == null) {

-			editedEObject = NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration();

-		}

-		@SuppressWarnings("unchecked")

-		final List<Object> newValues = new ArrayList<Object>(this.wrappedList);

-		newValues.addAll(values);

-

-		final ICommand cmd = TableCommands.getSetIAxisConfigurationValueCommand(getTable(), editedEObject, feature, newValues, isEditingColumn);

-		return new GMFtoEMFCommandWrapper(cmd);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#getAddAllCommand(int, java.util.Collection)

-	 *

-	 * @param index

-	 * @param values

-	 * @return

-	 */

-	@Override

-	public Command getAddAllCommand(int index, Collection<?> values) {

-		PasteEObjectConfiguration editedEObject = (PasteEObjectConfiguration) getEditedEObject();

-		if (editedEObject == null) {

-			editedEObject = NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration();

-		}

-		@SuppressWarnings("unchecked")

-		final List<Object> newValues = new ArrayList<Object>(this.wrappedList);

-		newValues.addAll(index, values);

-		;

-

-		final ICommand cmd = TableCommands.getSetIAxisConfigurationValueCommand(getTable(), editedEObject, feature, newValues, isEditingColumn);

-		return new GMFtoEMFCommandWrapper(cmd);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#getAddCommand(int, java.lang.Object)

-	 *

-	 * @param index

-	 * @param value

-	 * @return

-	 */

-	@Override

-	public Command getAddCommand(int index, Object value) {

-		PasteEObjectConfiguration editedEObject = (PasteEObjectConfiguration) getEditedEObject();

-		if (editedEObject == null) {

-			editedEObject = NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration();

-		}

-

-		@SuppressWarnings("unchecked")

-		final List<String> newValues = new ArrayList<String>(this.wrappedList);

-		newValues.add((String) value);

-		;

-

-		final ICommand cmd = TableCommands.getSetIAxisConfigurationValueCommand(getTable(), editedEObject, feature, newValues, isEditingColumn);

-		return new GMFtoEMFCommandWrapper(cmd);

-	}

-

-

-	@Override

-	public List<Command> getMoveCommands(int oldIndex, int newIndex) {

-		List<Command> commands = new LinkedList<Command>();

-		PasteEObjectConfiguration editedEObject = (PasteEObjectConfiguration) getEditedEObject();

-		if (editedEObject == null) {

-			editedEObject = NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration();

-		}

-		@SuppressWarnings("unchecked")

-		final List<String> newValues = new ArrayList<String>(this.wrappedList);

-		Object value = get(oldIndex);

-		newValues.remove(value);

-		newValues.add(newIndex, (String) value);

-

-		final ICommand cmd = TableCommands.getSetIAxisConfigurationValueCommand(getTable(), editedEObject, feature, newValues, isEditingColumn);

-		commands.add(new GMFtoEMFCommandWrapper(cmd));

-

-		return commands;

-	}

-

-	@Override

-	public Command getRetainAllCommand(Collection<?> values) {

-		return super.getRetainAllCommand(values);

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#getAddCommand(java.lang.Object)

-	 *

-	 * @param value

-	 * @return

-	 */

-	@Override

-	public Command getAddCommand(Object value) {

-		PasteEObjectConfiguration editedEObject = (PasteEObjectConfiguration) getEditedEObject();

-		if (editedEObject == null) {

-			editedEObject = NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration();

-		}

-		@SuppressWarnings("unchecked")

-		final List<String> newValues = new ArrayList<String>(this.wrappedList);

-		newValues.add((String) value);

-		final ICommand cmd = TableCommands.getSetIAxisConfigurationValueCommand(getTable(), editedEObject, feature, newValues, isEditingColumn);

-		return new GMFtoEMFCommandWrapper(cmd);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#getRemoveAllCommand(java.util.Collection)

-	 *

-	 * @param values

-	 * @return

-	 */

-	@Override

-	public Command getRemoveAllCommand(Collection<?> values) {

-		CompoundCommand cc = new CompoundCommand("Edit list"); //$NON-NLS-1$

-

-		if (feature instanceof EReference && ((EReference) feature).isContainment() && values != null) {

-			for (Object o : values) {

-				if (o instanceof EObject) {

-					addDestroyCommand(cc, (EObject) o);

-				}

-			}

-		}

-

-		PasteEObjectConfiguration editedEObject = (PasteEObjectConfiguration) getEditedEObject();

-		if (editedEObject == null) {

-			editedEObject = NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration();

-		}

-		@SuppressWarnings("unchecked")

-		final List<String> newValues = new ArrayList<String>(this.wrappedList);

-		newValues.removeAll(values);

-

-		final ICommand cmd = TableCommands.getSetIAxisConfigurationValueCommand(getTable(), editedEObject, feature, newValues, isEditingColumn);

-		return new GMFtoEMFCommandWrapper(cmd);

-	}

-

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#getSetCommand(int, java.lang.Object)

-	 *

-	 * @param index

-	 * @param value

-	 * @return

-	 */

-	@Override

-	public Command getSetCommand(int index, Object value) {

-		PasteEObjectConfiguration editedEObject = (PasteEObjectConfiguration) getEditedEObject();

-		if (editedEObject == null) {

-			editedEObject = NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration();

-		}

-		@SuppressWarnings("unchecked")

-		final List<String> newValues = new ArrayList<String>(this.wrappedList);

-		newValues.add(index, (String) value);

-

-		final ICommand cmd = TableCommands.getSetIAxisConfigurationValueCommand(getTable(), editedEObject, feature, newValues, isEditingColumn);

-		return new GMFtoEMFCommandWrapper(cmd);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#getRemoveCommand(java.lang.Object)

-	 *

-	 * @param value

-	 * @return

-	 */

-	@Override

-	public Command getRemoveCommand(Object value) {

-		PasteEObjectConfiguration editedEObject = (PasteEObjectConfiguration) getEditedEObject();

-		if (editedEObject != null && !editingDomain.isReadOnly(editedEObject.eResource())) {

-			Command cmd = RemoveCommand.create(editingDomain, editedEObject, feature, value);

-			if (value instanceof EObject && feature instanceof EReference && ((EReference) feature).isContainment()) {

-				addDestroyCommand(cmd, (EObject) value);

-			}

-			return cmd;

-		}

-		return IdentityCommand.INSTANCE;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.properties.observable;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.common.command.IdentityCommand;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.command.TableCommands;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;
+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.utils.AxisConfigurationUtils;
+import org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList;
+
+/**
+ * Observable value for the element type id
+ *
+ * @author VL222926
+ *
+ */
+public abstract class AbstractPasteObjectPostActionsObservableValue extends EMFObservableList {
+
+	private Table table;
+
+	private boolean isEditingColumn;
+
+	private EObject editedObject;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 */
+	public AbstractPasteObjectPostActionsObservableValue(final EditingDomain domain, final Table table, final boolean isEditingColumn) {
+		super(Collections.EMPTY_LIST, domain, table, NattableaxisconfigurationPackage.eINSTANCE.getIPasteConfiguration_PostActions());
+		this.table = table;
+		this.isEditingColumn = isEditingColumn;
+		updateList();
+	}
+
+	/**
+	 *
+	 */
+	protected void updateList() {
+		final List<?> list = EMFProperties.list(NattableaxisconfigurationPackage.eINSTANCE.getIPasteConfiguration_PostActions()).observe(getEditedEObject());
+		this.wrappedList = new LinkedList<Object>(list);
+		this.concreteList = list;
+	}
+
+
+	/**
+	 *
+	 * @return
+	 *         the table
+	 */
+	protected Table getTable() {
+		return this.table;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.properties.observable.AbstractColumnPasteEObjectConfigurationObservableValue#getEditedEObject()
+	 *
+	 * @return
+	 */
+	protected EObject getEditedEObject() {
+		final EObject editedConfiguration = AxisConfigurationUtils.getIAxisConfigurationUsedInTable(getTable(), NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration(), isEditingColumn);
+		editedObject = editedConfiguration;
+		return this.editedObject;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#getAddAllCommand(java.util.Collection)
+	 *
+	 * @param values
+	 * @return
+	 */
+	@Override
+	public Command getAddAllCommand(Collection<?> values) {
+		PasteEObjectConfiguration editedEObject = (PasteEObjectConfiguration) getEditedEObject();
+		if (editedEObject == null) {
+			editedEObject = NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration();
+		}
+		@SuppressWarnings("unchecked")
+		final List<Object> newValues = new ArrayList<Object>(this.wrappedList);
+		newValues.addAll(values);
+
+		final ICommand cmd = TableCommands.getSetIAxisConfigurationValueCommand(getTable(), editedEObject, feature, newValues, isEditingColumn);
+		return new GMFtoEMFCommandWrapper(cmd);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#getAddAllCommand(int, java.util.Collection)
+	 *
+	 * @param index
+	 * @param values
+	 * @return
+	 */
+	@Override
+	public Command getAddAllCommand(int index, Collection<?> values) {
+		PasteEObjectConfiguration editedEObject = (PasteEObjectConfiguration) getEditedEObject();
+		if (editedEObject == null) {
+			editedEObject = NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration();
+		}
+		@SuppressWarnings("unchecked")
+		final List<Object> newValues = new ArrayList<Object>(this.wrappedList);
+		newValues.addAll(index, values);
+		;
+
+		final ICommand cmd = TableCommands.getSetIAxisConfigurationValueCommand(getTable(), editedEObject, feature, newValues, isEditingColumn);
+		return new GMFtoEMFCommandWrapper(cmd);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#getAddCommand(int, java.lang.Object)
+	 *
+	 * @param index
+	 * @param value
+	 * @return
+	 */
+	@Override
+	public Command getAddCommand(int index, Object value) {
+		PasteEObjectConfiguration editedEObject = (PasteEObjectConfiguration) getEditedEObject();
+		if (editedEObject == null) {
+			editedEObject = NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration();
+		}
+
+		@SuppressWarnings("unchecked")
+		final List<String> newValues = new ArrayList<String>(this.wrappedList);
+		newValues.add((String) value);
+		;
+
+		final ICommand cmd = TableCommands.getSetIAxisConfigurationValueCommand(getTable(), editedEObject, feature, newValues, isEditingColumn);
+		return new GMFtoEMFCommandWrapper(cmd);
+	}
+
+
+	@Override
+	public List<Command> getMoveCommands(int oldIndex, int newIndex) {
+		List<Command> commands = new LinkedList<Command>();
+		PasteEObjectConfiguration editedEObject = (PasteEObjectConfiguration) getEditedEObject();
+		if (editedEObject == null) {
+			editedEObject = NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration();
+		}
+		@SuppressWarnings("unchecked")
+		final List<String> newValues = new ArrayList<String>(this.wrappedList);
+		Object value = get(oldIndex);
+		newValues.remove(value);
+		newValues.add(newIndex, (String) value);
+
+		final ICommand cmd = TableCommands.getSetIAxisConfigurationValueCommand(getTable(), editedEObject, feature, newValues, isEditingColumn);
+		commands.add(new GMFtoEMFCommandWrapper(cmd));
+
+		return commands;
+	}
+
+	@Override
+	public Command getRetainAllCommand(Collection<?> values) {
+		return super.getRetainAllCommand(values);
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#getAddCommand(java.lang.Object)
+	 *
+	 * @param value
+	 * @return
+	 */
+	@Override
+	public Command getAddCommand(Object value) {
+		PasteEObjectConfiguration editedEObject = (PasteEObjectConfiguration) getEditedEObject();
+		if (editedEObject == null) {
+			editedEObject = NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration();
+		}
+		@SuppressWarnings("unchecked")
+		final List<String> newValues = new ArrayList<String>(this.wrappedList);
+		newValues.add((String) value);
+		final ICommand cmd = TableCommands.getSetIAxisConfigurationValueCommand(getTable(), editedEObject, feature, newValues, isEditingColumn);
+		return new GMFtoEMFCommandWrapper(cmd);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#getRemoveAllCommand(java.util.Collection)
+	 *
+	 * @param values
+	 * @return
+	 */
+	@Override
+	public Command getRemoveAllCommand(Collection<?> values) {
+		CompoundCommand cc = new CompoundCommand("Edit list"); //$NON-NLS-1$
+
+		if (feature instanceof EReference && ((EReference) feature).isContainment() && values != null) {
+			for (Object o : values) {
+				if (o instanceof EObject) {
+					addDestroyCommand(cc, (EObject) o);
+				}
+			}
+		}
+
+		PasteEObjectConfiguration editedEObject = (PasteEObjectConfiguration) getEditedEObject();
+		if (editedEObject == null) {
+			editedEObject = NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration();
+		}
+		@SuppressWarnings("unchecked")
+		final List<String> newValues = new ArrayList<String>(this.wrappedList);
+		newValues.removeAll(values);
+
+		final ICommand cmd = TableCommands.getSetIAxisConfigurationValueCommand(getTable(), editedEObject, feature, newValues, isEditingColumn);
+		return new GMFtoEMFCommandWrapper(cmd);
+	}
+
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#getSetCommand(int, java.lang.Object)
+	 *
+	 * @param index
+	 * @param value
+	 * @return
+	 */
+	@Override
+	public Command getSetCommand(int index, Object value) {
+		PasteEObjectConfiguration editedEObject = (PasteEObjectConfiguration) getEditedEObject();
+		if (editedEObject == null) {
+			editedEObject = NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration();
+		}
+		@SuppressWarnings("unchecked")
+		final List<String> newValues = new ArrayList<String>(this.wrappedList);
+		newValues.add(index, (String) value);
+
+		final ICommand cmd = TableCommands.getSetIAxisConfigurationValueCommand(getTable(), editedEObject, feature, newValues, isEditingColumn);
+		return new GMFtoEMFCommandWrapper(cmd);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList#getRemoveCommand(java.lang.Object)
+	 *
+	 * @param value
+	 * @return
+	 */
+	@Override
+	public Command getRemoveCommand(Object value) {
+		PasteEObjectConfiguration editedEObject = (PasteEObjectConfiguration) getEditedEObject();
+		if (editedEObject != null && !editingDomain.isReadOnly(editedEObject.eResource())) {
+			Command cmd = RemoveCommand.create(editingDomain, editedEObject, feature, value);
+			if (value instanceof EObject && feature instanceof EReference && ((EReference) feature).isContainment()) {
+				addDestroyCommand(cmd, (EObject) value);
+			}
+			return cmd;
+		}
+		return IdentityCommand.INSTANCE;
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractRowFeatureLabelProviderConfigurationObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractRowFeatureLabelProviderConfigurationObservableValue.java
index 04cd960c58e..3bb8047791d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractRowFeatureLabelProviderConfigurationObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractRowFeatureLabelProviderConfigurationObservableValue.java
@@ -1,72 +1,72 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.properties.observable;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.command.TableCommands;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;

-

-/**

- * The Class AbstractRowFeatureLabelProviderConfigurationObservableValue.

- *

- * @author vl222926

- */

-public abstract class AbstractRowFeatureLabelProviderConfigurationObservableValue extends AbstractConfigurationElementObservableValue {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param table

-	 *            the table

-	 * @param managedFeature

-	 *            the managed feature

-	 */

-	public AbstractRowFeatureLabelProviderConfigurationObservableValue(final Table table, final EStructuralFeature managedFeature) {

-		super(table, managedFeature);

-	}

-

-	/**

-	 * Gets the edited e object.

-	 *

-	 * @return the edited e object

-	 * @see org.eclipse.papyrus.infra.nattable.properties.observable.AbstractConfigurationElementObservableValue#getEditedEObject()

-	 */

-	@Override

-	protected EObject getEditedEObject() {

-		return LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration(getTable());

-	}

-

-	/**

-	 * Do set value.

-	 *

-	 * @param value

-	 *            the value

-	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)

-	 */

-	@Override

-	protected void doSetValue(Object value) {

-		final ICommand cmd = TableCommands.getSetRowLabelConfigurationValueCommand(getTable(), (ILabelProviderConfiguration) getEditedEObject(), getManagedFeature(), value);

-		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(getTable());

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.properties.observable;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.command.TableCommands;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;
+
+/**
+ * The Class AbstractRowFeatureLabelProviderConfigurationObservableValue.
+ *
+ * @author vl222926
+ */
+public abstract class AbstractRowFeatureLabelProviderConfigurationObservableValue extends AbstractConfigurationElementObservableValue {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param table
+	 *            the table
+	 * @param managedFeature
+	 *            the managed feature
+	 */
+	public AbstractRowFeatureLabelProviderConfigurationObservableValue(final Table table, final EStructuralFeature managedFeature) {
+		super(table, managedFeature);
+	}
+
+	/**
+	 * Gets the edited e object.
+	 *
+	 * @return the edited e object
+	 * @see org.eclipse.papyrus.infra.nattable.properties.observable.AbstractConfigurationElementObservableValue#getEditedEObject()
+	 */
+	@Override
+	protected EObject getEditedEObject() {
+		return LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration(getTable());
+	}
+
+	/**
+	 * Do set value.
+	 *
+	 * @param value
+	 *            the value
+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)
+	 */
+	@Override
+	protected void doSetValue(Object value) {
+		final ICommand cmd = TableCommands.getSetRowLabelConfigurationValueCommand(getTable(), (ILabelProviderConfiguration) getEditedEObject(), getManagedFeature(), value);
+		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(getTable());
+		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractRowHeaderAxisConfigurationObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractRowHeaderAxisConfigurationObservableValue.java
index a6f11488b23..5aa2e492a12 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractRowHeaderAxisConfigurationObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractRowHeaderAxisConfigurationObservableValue.java
@@ -1,71 +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.nattable.properties.observable;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.command.TableCommands;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;

-

-/**

- * Abstract class for the rowHeaderAxisConfiguration

- *

- * @author vl222926

- *

- */

-public abstract class AbstractRowHeaderAxisConfigurationObservableValue extends AbstractConfigurationElementObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 *            the managed table

-	 * @param managedFeature

-	 *            the managed feature

-	 */

-	public AbstractRowHeaderAxisConfigurationObservableValue(Table table, EStructuralFeature managedFeature) {

-		super(table, managedFeature);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.properties.observable.AbstractConfigurationElementObservableValue#getEditedEObject()

-	 *

-	 * @return

-	 */

-	@Override

-	protected final EObject getEditedEObject() {

-		return HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisUsedInTable(getTable());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)

-	 *

-	 * @param value

-	 */

-	@Override

-	protected final void doSetValue(final Object value) {

-		final ICommand cmd = TableCommands.getSetRowHeaderConfigurationValueCommand(getTable(), getManagedFeature(), value);

-		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(getTable());

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.properties.observable;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.command.TableCommands;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;
+
+/**
+ * Abstract class for the rowHeaderAxisConfiguration
+ *
+ * @author vl222926
+ *
+ */
+public abstract class AbstractRowHeaderAxisConfigurationObservableValue extends AbstractConfigurationElementObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 *            the managed table
+	 * @param managedFeature
+	 *            the managed feature
+	 */
+	public AbstractRowHeaderAxisConfigurationObservableValue(Table table, EStructuralFeature managedFeature) {
+		super(table, managedFeature);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.properties.observable.AbstractConfigurationElementObservableValue#getEditedEObject()
+	 *
+	 * @return
+	 */
+	@Override
+	protected final EObject getEditedEObject() {
+		return HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisUsedInTable(getTable());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)
+	 *
+	 * @param value
+	 */
+	@Override
+	protected final void doSetValue(final Object value) {
+		final ICommand cmd = TableCommands.getSetRowHeaderConfigurationValueCommand(getTable(), getManagedFeature(), value);
+		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(getTable());
+		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractRowObjectLabelProviderConfigurationObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractRowObjectLabelProviderConfigurationObservableValue.java
index fb7bffc39a5..45acdc3e1d2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractRowObjectLabelProviderConfigurationObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractRowObjectLabelProviderConfigurationObservableValue.java
@@ -1,70 +1,70 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.properties.observable;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.command.TableCommands;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;

-

-/**

- * The Class AbstractRowObjectLabelProviderConfigurationObservableValue.

- *

- * @author vl222926

- */

-public abstract class AbstractRowObjectLabelProviderConfigurationObservableValue extends AbstractConfigurationElementObservableValue {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param table

-	 *            the table

-	 * @param managedFeature

-	 *            the managed feature

-	 */

-	public AbstractRowObjectLabelProviderConfigurationObservableValue(final Table table, final EStructuralFeature managedFeature) {

-		super(table, managedFeature);

-	}

-

-	/**

-	 * Gets the edited e object.

-	 *

-	 * @return the edited e object

-	 * @see org.eclipse.papyrus.infra.nattable.properties.observable.AbstractConfigurationElementObservableValue#getEditedEObject()

-	 */

-	@Override

-	protected EObject getEditedEObject() {

-		return LabelConfigurationManagementUtils.getUsedRowObjectLabelConfiguration(getTable());

-	}

-

-	/**

-	 * Do set value.

-	 *

-	 * @param value

-	 *            the value

-	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)

-	 */

-	@Override

-	protected void doSetValue(Object value) {

-		final ICommand cmd = TableCommands.getSetRowLabelConfigurationValueCommand(getTable(), (ILabelProviderConfiguration) getEditedEObject(), getManagedFeature(), value);

-		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(getTable());

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.properties.observable;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.command.TableCommands;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;
+
+/**
+ * The Class AbstractRowObjectLabelProviderConfigurationObservableValue.
+ *
+ * @author vl222926
+ */
+public abstract class AbstractRowObjectLabelProviderConfigurationObservableValue extends AbstractConfigurationElementObservableValue {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param table
+	 *            the table
+	 * @param managedFeature
+	 *            the managed feature
+	 */
+	public AbstractRowObjectLabelProviderConfigurationObservableValue(final Table table, final EStructuralFeature managedFeature) {
+		super(table, managedFeature);
+	}
+
+	/**
+	 * Gets the edited e object.
+	 *
+	 * @return the edited e object
+	 * @see org.eclipse.papyrus.infra.nattable.properties.observable.AbstractConfigurationElementObservableValue#getEditedEObject()
+	 */
+	@Override
+	protected EObject getEditedEObject() {
+		return LabelConfigurationManagementUtils.getUsedRowObjectLabelConfiguration(getTable());
+	}
+
+	/**
+	 * Do set value.
+	 *
+	 * @param value
+	 *            the value
+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)
+	 */
+	@Override
+	protected void doSetValue(Object value) {
+		final ICommand cmd = TableCommands.getSetRowLabelConfigurationValueCommand(getTable(), (ILabelProviderConfiguration) getEditedEObject(), getManagedFeature(), value);
+		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(getTable());
+		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractRowPasteEObjectConfigurationObservableValue.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractRowPasteEObjectConfigurationObservableValue.java
index 977f2c6f7e8..ceb2d25f9e8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractRowPasteEObjectConfigurationObservableValue.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractRowPasteEObjectConfigurationObservableValue.java
@@ -1,75 +1,75 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.properties.observable;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.command.TableCommands;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.utils.AxisConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;

-

-/**

- *

- * @author VL222926

- *

- */

-public abstract class AbstractRowPasteEObjectConfigurationObservableValue extends AbstractConfigurationElementObservableValue {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param table

-	 * @param managedFeature

-	 */

-	public AbstractRowPasteEObjectConfigurationObservableValue(final Table table, EStructuralFeature managedFeature) {

-		super(table, managedFeature);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.properties.observable.AbstractColumnPasteEObjectConfigurationObservableValue#getEditedEObject()

-	 *

-	 * @return

-	 */

-	@Override

-	protected EObject getEditedEObject() {

-		return AxisConfigurationUtils.getIAxisConfigurationUsedInTable(getTable(), NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration(), false);

-	}

-

-	/**

-	 * Do set value.

-	 *

-	 * @param value

-	 *            the value

-	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)

-	 */

-	@Override

-	protected void doSetValue(Object value) {

-		IAxisConfiguration editedEObject = (IAxisConfiguration) getEditedEObject();

-		if (editedEObject == null) {

-			editedEObject = NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration();

-		}

-		final ICommand cmd = TableCommands.getSetIAxisConfigurationValueCommand(getTable(), editedEObject, getManagedFeature(), value, false);

-		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(getTable());

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.properties.observable;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.command.TableCommands;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.utils.AxisConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;
+
+/**
+ *
+ * @author VL222926
+ *
+ */
+public abstract class AbstractRowPasteEObjectConfigurationObservableValue extends AbstractConfigurationElementObservableValue {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param table
+	 * @param managedFeature
+	 */
+	public AbstractRowPasteEObjectConfigurationObservableValue(final Table table, EStructuralFeature managedFeature) {
+		super(table, managedFeature);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.properties.observable.AbstractColumnPasteEObjectConfigurationObservableValue#getEditedEObject()
+	 *
+	 * @return
+	 */
+	@Override
+	protected EObject getEditedEObject() {
+		return AxisConfigurationUtils.getIAxisConfigurationUsedInTable(getTable(), NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration(), false);
+	}
+
+	/**
+	 * Do set value.
+	 *
+	 * @param value
+	 *            the value
+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)
+	 */
+	@Override
+	protected void doSetValue(Object value) {
+		IAxisConfiguration editedEObject = (IAxisConfiguration) getEditedEObject();
+		if (editedEObject == null) {
+			editedEObject = NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration();
+		}
+		final ICommand cmd = TableCommands.getSetIAxisConfigurationValueCommand(getTable(), editedEObject, getManagedFeature(), value, false);
+		final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(getTable());
+		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
index 95266ff4127..5ffdd080036 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.2.0",
  org.eclipse.emf.edit,
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0",
  org.eclipse.emf.transaction,
  org.eclipse.gmf.runtime.emf.type.core,
  org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/pom.xml
index b3c76157df8..9e6965baece 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.infra.nattable.main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.views.config</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/cell/ModelViewsCellManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/cell/ModelViewsCellManager.java
index 21bd0941fb1..f9d95d8d837 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/cell/ModelViewsCellManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/cell/ModelViewsCellManager.java
@@ -1,251 +1,251 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.views.config.manager.cell;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.emf.type.core.requests.AbstractEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;

-import org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.infra.nattable.views.config.utils.Utils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-

-/**

- * The Cell manager for the ModelViews table

- * TODO : should inherits from emf.nattable

- *

- * @author Vincent Lorenzo

- *

- */

-public class ModelViewsCellManager extends AbstractCellManager {

-

-

-

-	/**

-	 *

-	 * @param columnElement

-	 *            the column element

-	 * @param rowElement

-	 *            the row element

-	 * @return <code>null</code> or a list of 2 objects.

-	 *         <ul>

-	 *         <li>the first element is the edited EObject</li>

-	 *         <li>the second one is the edited feature</li>

-	 *         </ul>

-	 *

-	 */

-	protected List<Object> organizeAndResolvedObjects(final Object columnElement, final Object rowElement) {

-		final List<Object> objects = new ArrayList<Object>();

-		Object row = AxisUtils.getRepresentedElement(rowElement);

-		Object column = AxisUtils.getRepresentedElement(columnElement);

-		if (row instanceof String && ((String) row).startsWith(Utils.NATTABLE_EDITOR_PAGE_ID) && column instanceof EObject) {

-			objects.add(column);

-			objects.add(row);

-		} else if (column instanceof String && ((String) column).startsWith(Utils.NATTABLE_EDITOR_PAGE_ID) && row instanceof EObject) {

-			objects.add(row);

-			objects.add(column);

-		}

-

-		if (objects.size() == 2) {

-			final EObject first = (EObject) objects.get(0);

-			final IPageManager mngr = Utils.getIPagneManager(first);

-			if ((mngr != null && !mngr.allPages().contains(first)) || mngr == null) {

-				return null;

-			}

-		}

-

-		if (objects.size() == 2) {

-			return objects;

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#handles(java.lang.Object, java.lang.Object)

-	 *

-	 * @param rowElement

-	 * @param columnElement

-	 * @return

-	 */

-	@Override

-	public boolean handles(Object rowElement, Object columnElement) {

-		return organizeAndResolvedObjects(columnElement, rowElement) != null;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager#doGetValue(java.lang.Object, java.lang.Object, org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager)

-	 *

-	 * @param columnElement

-	 * @param rowElement

-	 * @param tableManager

-	 * @return

-	 */

-	@Override

-	protected Object doGetValue(Object columnElement, Object rowElement, INattableModelManager tableManager) {

-		final List<Object> objects = organizeAndResolvedObjects(columnElement, rowElement);

-		final String featureName = ((String) objects.get(1)).replace(Utils.NATTABLE_EDITOR_PAGE_ID, ""); //$NON-NLS-1$

-		final Object editor = objects.get(0);

-		if (Utils.VIEW_NAME.equals(featureName)) {

-			return getEditorName(editor);

-		}

-		if (Utils.VIEW_CONTEXT.equals(featureName)) {

-			return getEditorContext(editor);

-		}

-		if (Utils.VIEW_IS_OPEN.equals(featureName)) {

-			return getEditorIsOpen(editor);

-		}

-		if (Utils.VIEW_EDITOR_TYPE.equals(featureName)) {

-			return getEditorType(editor);

-		}

-		return NOT_AVALAIBLE;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#isCellEditable(java.lang.Object, java.lang.Object)

-	 *

-	 * @param rowElement

-	 * @param columnElement

-	 * @return

-	 *         <code>true</code> excepted if the edited feature is isOpen

-	 */

-	@Override

-	public boolean isCellEditable(Object rowElement, Object columnElement) {

-		final List<Object> objects = organizeAndResolvedObjects(columnElement, rowElement);

-		final String featureName = ((String) objects.get(1)).replace(Utils.NATTABLE_EDITOR_PAGE_ID, ""); //$NON-NLS-1$

-		return featureName.equals(Utils.VIEW_NAME);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager#getSetValueCommand(org.eclipse.emf.transaction.TransactionalEditingDomain, java.lang.Object, java.lang.Object, java.lang.Object,

-	 *      org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager)

-	 *

-	 * @param domain

-	 * @param columnElement

-	 * @param rowElement

-	 * @param newValue

-	 * @param manager

-	 * @return

-	 */

-	@Override

-	public Command getSetValueCommand(final TransactionalEditingDomain domain, final Object columnElement, final Object rowElement, final Object newValue, final INattableModelManager manager) {

-		final List<Object> objects = organizeAndResolvedObjects(columnElement, rowElement);

-		final EObject editor = (EObject) objects.get(0);

-		final String featureName = ((String) objects.get(1)).replace(Utils.NATTABLE_EDITOR_PAGE_ID, ""); //$NON-NLS-1$

-		if (Utils.VIEW_NAME.equals(featureName)) {

-			final EStructuralFeature feature = editor.eClass().getEStructuralFeature(Utils.VIEW_NAME);

-			if (!newValue.equals(editor.eClass().eGet(feature))) {

-				// 426731: [Table 2] Opening then closing cells editors without modifiyng values execute a command in the stack

-				// https://bugs.eclipse.org/bugs/show_bug.cgi?id=426731

-				final AbstractEditCommandRequest request = new SetRequest(domain, editor, feature, newValue);

-				final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(editor);

-				return new GMFtoEMFCommandWrapper(provider.getEditCommand(request));

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param editor

-	 *            an editor

-	 * @return

-	 * 		the type of the editor

-	 */

-	protected Object getEditorType(final Object editor) {

-		if (editor instanceof EObject) {

-			if (editor instanceof Table) {

-				return ((Table) editor).getTableConfiguration().getType();

-			} else {

-				EStructuralFeature feature = ((EObject) editor).eClass().getEStructuralFeature(Utils.VIEW_EDITOR_TYPE);

-				if (feature != null) {

-					return ((EObject) editor).eGet(feature);

-				}

-			}

-		}

-		return NOT_AVALAIBLE;

-	}

-

-	/**

-	 *

-	 * @param editor

-	 *            the editor

-	 * @return

-	 *         <code>true</code> if the current editor is open

-	 */

-	protected Object getEditorIsOpen(final Object editor) {

-		if (editor instanceof EObject) {

-			IPageManager mngr = null;

-			try {

-				mngr = ServiceUtilsForResource.getInstance().getService(IPageManager.class, ((EObject) editor).eResource());

-				return mngr.isOpen(editor);

-			} catch (ServiceException e) {

-				// Activator.log.error(e);

-			}

-		}

-

-		return NOT_AVALAIBLE;

-	}

-

-	/**

-	 *

-	 * @param editor

-	 *            an editor

-	 * @return

-	 * 		the name of the editor

-	 */

-	protected Object getEditorName(final Object editor) {

-		if (editor instanceof EObject) {

-			final EObject eobject = (EObject) editor;

-			EStructuralFeature feature = eobject.eClass().getEStructuralFeature(Utils.VIEW_NAME);

-			if (feature != null) {

-				return eobject.eGet(feature);

-			}

-		}

-		return NOT_AVALAIBLE;

-	}

-

-	/**

-	 *

-	 * @param editor

-	 *            the editor

-	 * @return

-	 * 		the context of this editor

-	 */

-	protected Object getEditorContext(final Object editor) {

-		final Object result = Utils.getEditorContext(editor);

-		if (result == null) {

-			return NOT_AVALAIBLE;

-		}

-		return result;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.views.config.manager.cell;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.emf.type.core.requests.AbstractEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;
+import org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.views.config.utils.Utils;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+
+/**
+ * The Cell manager for the ModelViews table
+ * TODO : should inherits from emf.nattable
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class ModelViewsCellManager extends AbstractCellManager {
+
+
+
+	/**
+	 *
+	 * @param columnElement
+	 *            the column element
+	 * @param rowElement
+	 *            the row element
+	 * @return <code>null</code> or a list of 2 objects.
+	 *         <ul>
+	 *         <li>the first element is the edited EObject</li>
+	 *         <li>the second one is the edited feature</li>
+	 *         </ul>
+	 *
+	 */
+	protected List<Object> organizeAndResolvedObjects(final Object columnElement, final Object rowElement) {
+		final List<Object> objects = new ArrayList<Object>();
+		Object row = AxisUtils.getRepresentedElement(rowElement);
+		Object column = AxisUtils.getRepresentedElement(columnElement);
+		if (row instanceof String && ((String) row).startsWith(Utils.NATTABLE_EDITOR_PAGE_ID) && column instanceof EObject) {
+			objects.add(column);
+			objects.add(row);
+		} else if (column instanceof String && ((String) column).startsWith(Utils.NATTABLE_EDITOR_PAGE_ID) && row instanceof EObject) {
+			objects.add(row);
+			objects.add(column);
+		}
+
+		if (objects.size() == 2) {
+			final EObject first = (EObject) objects.get(0);
+			final IPageManager mngr = Utils.getIPagneManager(first);
+			if ((mngr != null && !mngr.allPages().contains(first)) || mngr == null) {
+				return null;
+			}
+		}
+
+		if (objects.size() == 2) {
+			return objects;
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#handles(java.lang.Object, java.lang.Object)
+	 *
+	 * @param rowElement
+	 * @param columnElement
+	 * @return
+	 */
+	@Override
+	public boolean handles(Object rowElement, Object columnElement) {
+		return organizeAndResolvedObjects(columnElement, rowElement) != null;
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager#doGetValue(java.lang.Object, java.lang.Object, org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager)
+	 *
+	 * @param columnElement
+	 * @param rowElement
+	 * @param tableManager
+	 * @return
+	 */
+	@Override
+	protected Object doGetValue(Object columnElement, Object rowElement, INattableModelManager tableManager) {
+		final List<Object> objects = organizeAndResolvedObjects(columnElement, rowElement);
+		final String featureName = ((String) objects.get(1)).replace(Utils.NATTABLE_EDITOR_PAGE_ID, ""); //$NON-NLS-1$
+		final Object editor = objects.get(0);
+		if (Utils.VIEW_NAME.equals(featureName)) {
+			return getEditorName(editor);
+		}
+		if (Utils.VIEW_CONTEXT.equals(featureName)) {
+			return getEditorContext(editor);
+		}
+		if (Utils.VIEW_IS_OPEN.equals(featureName)) {
+			return getEditorIsOpen(editor);
+		}
+		if (Utils.VIEW_EDITOR_TYPE.equals(featureName)) {
+			return getEditorType(editor);
+		}
+		return NOT_AVALAIBLE;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#isCellEditable(java.lang.Object, java.lang.Object)
+	 *
+	 * @param rowElement
+	 * @param columnElement
+	 * @return
+	 *         <code>true</code> excepted if the edited feature is isOpen
+	 */
+	@Override
+	public boolean isCellEditable(Object rowElement, Object columnElement) {
+		final List<Object> objects = organizeAndResolvedObjects(columnElement, rowElement);
+		final String featureName = ((String) objects.get(1)).replace(Utils.NATTABLE_EDITOR_PAGE_ID, ""); //$NON-NLS-1$
+		return featureName.equals(Utils.VIEW_NAME);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager#getSetValueCommand(org.eclipse.emf.transaction.TransactionalEditingDomain, java.lang.Object, java.lang.Object, java.lang.Object,
+	 *      org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager)
+	 *
+	 * @param domain
+	 * @param columnElement
+	 * @param rowElement
+	 * @param newValue
+	 * @param manager
+	 * @return
+	 */
+	@Override
+	public Command getSetValueCommand(final TransactionalEditingDomain domain, final Object columnElement, final Object rowElement, final Object newValue, final INattableModelManager manager) {
+		final List<Object> objects = organizeAndResolvedObjects(columnElement, rowElement);
+		final EObject editor = (EObject) objects.get(0);
+		final String featureName = ((String) objects.get(1)).replace(Utils.NATTABLE_EDITOR_PAGE_ID, ""); //$NON-NLS-1$
+		if (Utils.VIEW_NAME.equals(featureName)) {
+			final EStructuralFeature feature = editor.eClass().getEStructuralFeature(Utils.VIEW_NAME);
+			if (!newValue.equals(editor.eClass().eGet(feature))) {
+				// 426731: [Table 2] Opening then closing cells editors without modifiyng values execute a command in the stack
+				// https://bugs.eclipse.org/bugs/show_bug.cgi?id=426731
+				final AbstractEditCommandRequest request = new SetRequest(domain, editor, feature, newValue);
+				final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(editor);
+				return new GMFtoEMFCommandWrapper(provider.getEditCommand(request));
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param editor
+	 *            an editor
+	 * @return
+	 * 		the type of the editor
+	 */
+	protected Object getEditorType(final Object editor) {
+		if (editor instanceof EObject) {
+			if (editor instanceof Table) {
+				return ((Table) editor).getTableConfiguration().getType();
+			} else {
+				EStructuralFeature feature = ((EObject) editor).eClass().getEStructuralFeature(Utils.VIEW_EDITOR_TYPE);
+				if (feature != null) {
+					return ((EObject) editor).eGet(feature);
+				}
+			}
+		}
+		return NOT_AVALAIBLE;
+	}
+
+	/**
+	 *
+	 * @param editor
+	 *            the editor
+	 * @return
+	 *         <code>true</code> if the current editor is open
+	 */
+	protected Object getEditorIsOpen(final Object editor) {
+		if (editor instanceof EObject) {
+			IPageManager mngr = null;
+			try {
+				mngr = ServiceUtilsForResource.getInstance().getService(IPageManager.class, ((EObject) editor).eResource());
+				return mngr.isOpen(editor);
+			} catch (ServiceException e) {
+				// Activator.log.error(e);
+			}
+		}
+
+		return NOT_AVALAIBLE;
+	}
+
+	/**
+	 *
+	 * @param editor
+	 *            an editor
+	 * @return
+	 * 		the name of the editor
+	 */
+	protected Object getEditorName(final Object editor) {
+		if (editor instanceof EObject) {
+			final EObject eobject = (EObject) editor;
+			EStructuralFeature feature = eobject.eClass().getEStructuralFeature(Utils.VIEW_NAME);
+			if (feature != null) {
+				return eobject.eGet(feature);
+			}
+		}
+		return NOT_AVALAIBLE;
+	}
+
+	/**
+	 *
+	 * @param editor
+	 *            the editor
+	 * @return
+	 * 		the context of this editor
+	 */
+	protected Object getEditorContext(final Object editor) {
+		final Object result = Utils.getEditorContext(editor);
+		if (result == null) {
+			return NOT_AVALAIBLE;
+		}
+		return result;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF
index 405a184891f..475a5c13e1a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
  org.eclipse.gmf.runtime.emf.type.core,
  org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.nattable.views.config;bundle-version="1.2.0"
 Bundle-Vendor: %Bundle-Vendor
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/pom.xml
index 2db75680087..c1fc4d3f199 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.infra.nattable.main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.views.editor</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
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 5dc9ea8714d..f1b46fc86bf 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
@@ -54,7 +54,7 @@ Require-Bundle: org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
  org.eclipse.swt,
  org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.nattable.model;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
  org.eclipse.emf.edit.ui,
@@ -68,7 +68,7 @@ Require-Bundle: org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
  org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
  org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.4.0,2.0.0)",
  ca.odell.glazedlists;bundle-version="1.9.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
+ org.eclipse.jface.text;bundle-version="3.11.0",
  org.eclipse.papyrus.infra.services.decoration;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0",
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml
index d41ea20f0a4..a49d4103cc6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
+		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.infra.nattable.main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeHeaderConfigurationHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeHeaderConfigurationHandler.java
index 16a66716d26..c4ac20ba58d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeHeaderConfigurationHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeHeaderConfigurationHandler.java
@@ -1,91 +1,91 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.Command;

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.ui.handlers.HandlerUtil;

-

-/**

- * Abstract class to edit the header cofniguration

- *

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractChangeHeaderConfigurationHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @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 {

-		AbstractHeaderAxisConfiguration configuration = getEditedAxisConfiguration();

-		final CompositeCommand cmd = new CompositeCommand("ChangeHeaderConfigurationCommand"); //$NON-NLS-1$

-		TransactionalEditingDomain domain = getTableEditingDomain();

-		if (configuration instanceof TableHeaderAxisConfiguration) {

-			// we can't edit it, because it's comes from the initial configuration

-			configuration = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) configuration);

-			final Table table = getCurrentNattableModelManager().getTable();

-			final IEditCommandRequest request = new SetRequest(domain, table, getLocalHeaderAxisConfigurationFeature(), configuration);

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);

-			cmd.add(provider.getEditCommand(request));

-		}

-		Command command = event.getCommand();

-		boolean oldValue = HandlerUtil.toggleCommandState(command);

-		final IEditCommandRequest request = new SetRequest(domain, configuration, getEditedFeature(), !oldValue);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(configuration);

-		cmd.add(provider.getEditCommand(request));

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-		return null;

-	}

-

-	/**

-	 *

-	 * @return

-	 *

-	 */

-	protected abstract EStructuralFeature getLocalHeaderAxisConfigurationFeature();

-

-	/**

-	 *

-	 * @return

-	 *         the edited feature

-	 */

-	protected abstract EStructuralFeature getEditedFeature();

-

-	/**

-	 *

-	 * @return

-	 *         the edited axis configuration

-	 */

-	protected abstract AbstractHeaderAxisConfiguration getEditedAxisConfiguration();

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.Command;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * Abstract class to edit the header cofniguration
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractChangeHeaderConfigurationHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @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 {
+		AbstractHeaderAxisConfiguration configuration = getEditedAxisConfiguration();
+		final CompositeCommand cmd = new CompositeCommand("ChangeHeaderConfigurationCommand"); //$NON-NLS-1$
+		TransactionalEditingDomain domain = getTableEditingDomain();
+		if (configuration instanceof TableHeaderAxisConfiguration) {
+			// we can't edit it, because it's comes from the initial configuration
+			configuration = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) configuration);
+			final Table table = getCurrentNattableModelManager().getTable();
+			final IEditCommandRequest request = new SetRequest(domain, table, getLocalHeaderAxisConfigurationFeature(), configuration);
+			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);
+			cmd.add(provider.getEditCommand(request));
+		}
+		Command command = event.getCommand();
+		boolean oldValue = HandlerUtil.toggleCommandState(command);
+		final IEditCommandRequest request = new SetRequest(domain, configuration, getEditedFeature(), !oldValue);
+		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(configuration);
+		cmd.add(provider.getEditCommand(request));
+		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));
+		return null;
+	}
+
+	/**
+	 *
+	 * @return
+	 *
+	 */
+	protected abstract EStructuralFeature getLocalHeaderAxisConfigurationFeature();
+
+	/**
+	 *
+	 * @return
+	 *         the edited feature
+	 */
+	protected abstract EStructuralFeature getEditedFeature();
+
+	/**
+	 *
+	 * @return
+	 *         the edited axis configuration
+	 */
+	protected abstract AbstractHeaderAxisConfiguration getEditedAxisConfiguration();
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeIndexStyleHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeIndexStyleHandler.java
index c69158ac5f4..8a7a6ee56eb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeIndexStyleHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeIndexStyleHandler.java
@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.nattable.Activator;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeLabelConfigurationValueHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeLabelConfigurationValueHandler.java
index a39ccc4c5cc..00e683d4f80 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeLabelConfigurationValueHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeLabelConfigurationValueHandler.java
@@ -1,178 +1,178 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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 java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.core.commands.Command;

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.ui.handlers.HandlerUtil;

-

-/**

- * Abstract class used to change label configuration

- *

- * @author Vincent Lorenzo

- *

- */

-public abstract class AbstractChangeLabelConfigurationValueHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @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 {

-		final CompositeCommand cmd = new CompositeCommand("ChangeLabelConfigurationValueCommand"); //$NON-NLS-1$

-		TransactionalEditingDomain domain = getTableEditingDomain();

-		ILabelProviderConfiguration labelConf = getLabelProviderConfiguration();

-		ILabelProviderConfiguration editedLabelConf;

-		if (labelConf.eContainer() instanceof TableHeaderAxisConfiguration) {

-			editedLabelConf = EcoreUtil.copy(labelConf);

-			cmd.add(getRegisterLocalLabelConfigurationCommand(labelConf, editedLabelConf));

-		} else {

-			editedLabelConf = labelConf;

-		}

-		Command command = event.getCommand();

-		boolean oldValue = HandlerUtil.toggleCommandState(command);

-		final IEditCommandRequest request = new SetRequest(domain, editedLabelConf, getEditedFeature(), !oldValue);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(editedLabelConf);

-		cmd.add(provider.getEditCommand(request));

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-		return null;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the edited label configuration

-	 */

-	protected abstract ILabelProviderConfiguration getLabelProviderConfiguration();

-

-	/**

-	 *

-	 * @return

-	 *         the edited feature

-	 */

-	protected abstract EStructuralFeature getEditedFeature();

-

-	/**

-	 *

-	 * @param conf

-	 *

-	 */

-	protected ICommand getRegisterLocalLabelConfigurationCommand(ILabelProviderConfiguration tableLabelConfiguration, ILabelProviderConfiguration localTableLabelConfiguration) {

-		TransactionalEditingDomain domain = getTableEditingDomain();

-		final CompositeCommand cmd = new CompositeCommand("ChangeHeaderLabelConfigurationCommand"); //$NON-NLS-1$

-		final Table table = getCurrentNattableModelManager().getTable();

-

-		// 1. we must get or create the required LocalTableHeaderAxisConfiguration

-		AbstractHeaderAxisConfiguration configuration = getHeaderAxisConfiguration();

-		LocalTableHeaderAxisConfiguration localConfig = null;

-		if (configuration instanceof LocalTableHeaderAxisConfiguration) {

-			localConfig = (LocalTableHeaderAxisConfiguration) configuration;

-		} else if (configuration instanceof TableHeaderAxisConfiguration) {

-			// we can't edit it, because it's comes from the initial configuration

-			configuration = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) configuration);

-			localConfig = (LocalTableHeaderAxisConfiguration) configuration;

-			final IEditCommandRequest request = new SetRequest(domain, table, getLocalHeaderAxisConfigurationFeature(), configuration);

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);

-			cmd.add(provider.getEditCommand(request));

-		}

-

-		// 2. this one must store the new label configuration

-		final IEditCommandRequest request = new SetRequest(domain, configuration, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations(), localTableLabelConfiguration);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(configuration);

-		cmd.add(provider.getEditCommand(request));

-

-		// 3. we must get or create the AxisManagerConfiguration(s)

-		final TableHeaderAxisConfiguration headerAxisConfig = getTableHeaderAxisConfiguration();

-

-		final List<AxisManagerConfiguration> axisManagerConfiguration = new ArrayList<AxisManagerConfiguration>();

-		for (final AxisManagerRepresentation current : headerAxisConfig.getAxisManagers()) {

-			// we look for defined axis manager which uses the labelconfiguration defined in the table config

-			if (current.getHeaderLabelConfiguration() == tableLabelConfiguration) {

-				AxisManagerConfiguration currentConf = null;

-				// we look for an axis manager configuration mapped in this axis manager representation

-				for (final AxisManagerConfiguration axisConf : localConfig.getAxisManagerConfigurations()) {

-					if (axisConf.getAxisManager() == current) {

-						currentConf = axisConf;

-					}

-				}

-				if (currentConf == null) {

-					currentConf = NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerConfiguration();

-					currentConf.setAxisManager(current);

-					final IEditCommandRequest request2 = new SetRequest(domain, localConfig, NattableaxisconfigurationPackage.eINSTANCE.getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations(), currentConf);

-					final IElementEditService provider2 = ElementEditServiceUtils.getCommandProvider(localConfig);

-					cmd.add(provider2.getEditCommand(request2));

-				}

-				axisManagerConfiguration.add(currentConf);

-			}

-		}

-

-		// 4. these one must reference the LabelConfiguration

-		for (final AxisManagerConfiguration current : axisManagerConfiguration) {

-			final IEditCommandRequest request2 = new SetRequest(domain, current, NattableaxisconfigurationPackage.eINSTANCE.getAxisManagerConfiguration_LocalHeaderLabelConfiguration(), localTableLabelConfiguration);

-			final IElementEditService provider2 = ElementEditServiceUtils.getCommandProvider(current);

-			cmd.add(provider2.getEditCommand(request2));

-		}

-		return cmd;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the feature to use to edit the local header axis configuration

-	 */

-	protected abstract EStructuralFeature getLocalHeaderAxisConfigurationFeature();

-

-	/**

-	 *

-	 * @return

-	 *         the edited axis configuration

-	 */

-	protected abstract AbstractHeaderAxisConfiguration getHeaderAxisConfiguration();

-

-	/**

-	 *

-	 * @return

-	 *         the table header axis defined in the TableConfiguration and used for edited label axis configuration

-	 */

-	protected abstract TableHeaderAxisConfiguration getTableHeaderAxisConfiguration();

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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 java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * Abstract class used to change label configuration
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public abstract class AbstractChangeLabelConfigurationValueHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @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 {
+		final CompositeCommand cmd = new CompositeCommand("ChangeLabelConfigurationValueCommand"); //$NON-NLS-1$
+		TransactionalEditingDomain domain = getTableEditingDomain();
+		ILabelProviderConfiguration labelConf = getLabelProviderConfiguration();
+		ILabelProviderConfiguration editedLabelConf;
+		if (labelConf.eContainer() instanceof TableHeaderAxisConfiguration) {
+			editedLabelConf = EcoreUtil.copy(labelConf);
+			cmd.add(getRegisterLocalLabelConfigurationCommand(labelConf, editedLabelConf));
+		} else {
+			editedLabelConf = labelConf;
+		}
+		Command command = event.getCommand();
+		boolean oldValue = HandlerUtil.toggleCommandState(command);
+		final IEditCommandRequest request = new SetRequest(domain, editedLabelConf, getEditedFeature(), !oldValue);
+		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(editedLabelConf);
+		cmd.add(provider.getEditCommand(request));
+		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));
+		return null;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the edited label configuration
+	 */
+	protected abstract ILabelProviderConfiguration getLabelProviderConfiguration();
+
+	/**
+	 *
+	 * @return
+	 *         the edited feature
+	 */
+	protected abstract EStructuralFeature getEditedFeature();
+
+	/**
+	 *
+	 * @param conf
+	 *
+	 */
+	protected ICommand getRegisterLocalLabelConfigurationCommand(ILabelProviderConfiguration tableLabelConfiguration, ILabelProviderConfiguration localTableLabelConfiguration) {
+		TransactionalEditingDomain domain = getTableEditingDomain();
+		final CompositeCommand cmd = new CompositeCommand("ChangeHeaderLabelConfigurationCommand"); //$NON-NLS-1$
+		final Table table = getCurrentNattableModelManager().getTable();
+
+		// 1. we must get or create the required LocalTableHeaderAxisConfiguration
+		AbstractHeaderAxisConfiguration configuration = getHeaderAxisConfiguration();
+		LocalTableHeaderAxisConfiguration localConfig = null;
+		if (configuration instanceof LocalTableHeaderAxisConfiguration) {
+			localConfig = (LocalTableHeaderAxisConfiguration) configuration;
+		} else if (configuration instanceof TableHeaderAxisConfiguration) {
+			// we can't edit it, because it's comes from the initial configuration
+			configuration = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) configuration);
+			localConfig = (LocalTableHeaderAxisConfiguration) configuration;
+			final IEditCommandRequest request = new SetRequest(domain, table, getLocalHeaderAxisConfigurationFeature(), configuration);
+			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);
+			cmd.add(provider.getEditCommand(request));
+		}
+
+		// 2. this one must store the new label configuration
+		final IEditCommandRequest request = new SetRequest(domain, configuration, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations(), localTableLabelConfiguration);
+		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(configuration);
+		cmd.add(provider.getEditCommand(request));
+
+		// 3. we must get or create the AxisManagerConfiguration(s)
+		final TableHeaderAxisConfiguration headerAxisConfig = getTableHeaderAxisConfiguration();
+
+		final List<AxisManagerConfiguration> axisManagerConfiguration = new ArrayList<AxisManagerConfiguration>();
+		for (final AxisManagerRepresentation current : headerAxisConfig.getAxisManagers()) {
+			// we look for defined axis manager which uses the labelconfiguration defined in the table config
+			if (current.getHeaderLabelConfiguration() == tableLabelConfiguration) {
+				AxisManagerConfiguration currentConf = null;
+				// we look for an axis manager configuration mapped in this axis manager representation
+				for (final AxisManagerConfiguration axisConf : localConfig.getAxisManagerConfigurations()) {
+					if (axisConf.getAxisManager() == current) {
+						currentConf = axisConf;
+					}
+				}
+				if (currentConf == null) {
+					currentConf = NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerConfiguration();
+					currentConf.setAxisManager(current);
+					final IEditCommandRequest request2 = new SetRequest(domain, localConfig, NattableaxisconfigurationPackage.eINSTANCE.getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations(), currentConf);
+					final IElementEditService provider2 = ElementEditServiceUtils.getCommandProvider(localConfig);
+					cmd.add(provider2.getEditCommand(request2));
+				}
+				axisManagerConfiguration.add(currentConf);
+			}
+		}
+
+		// 4. these one must reference the LabelConfiguration
+		for (final AxisManagerConfiguration current : axisManagerConfiguration) {
+			final IEditCommandRequest request2 = new SetRequest(domain, current, NattableaxisconfigurationPackage.eINSTANCE.getAxisManagerConfiguration_LocalHeaderLabelConfiguration(), localTableLabelConfiguration);
+			final IElementEditService provider2 = ElementEditServiceUtils.getCommandProvider(current);
+			cmd.add(provider2.getEditCommand(request2));
+		}
+		return cmd;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the feature to use to edit the local header axis configuration
+	 */
+	protected abstract EStructuralFeature getLocalHeaderAxisConfigurationFeature();
+
+	/**
+	 *
+	 * @return
+	 *         the edited axis configuration
+	 */
+	protected abstract AbstractHeaderAxisConfiguration getHeaderAxisConfiguration();
+
+	/**
+	 *
+	 * @return
+	 *         the table header axis defined in the TableConfiguration and used for edited label axis configuration
+	 */
+	protected abstract TableHeaderAxisConfiguration getTableHeaderAxisConfiguration();
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractDisconnectSlaveHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractDisconnectSlaveHandler.java
index e818171d417..cb05cf1a10f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractDisconnectSlaveHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractDisconnectSlaveHandler.java
@@ -1,77 +1,77 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2015 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.emf.transaction.TransactionalEditingDomain;

-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.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.ui.handlers.HandlerUtil;

-

-/**

- * Abstract handler used to change the value of the property IMasterAxisProvider#disconnectSlave

- *

- * @author vl222926

- *

- */

-public abstract class AbstractDisconnectSlaveHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * @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 {

-		final AbstractAxisProvider axisProvider = getAxisProviderToEdit();

-		if (axisProvider instanceof MasterObjectAxisProvider) {

-			boolean newState = !HandlerUtil.toggleCommandState(event.getCommand());

-			final TransactionalEditingDomain domain = getTableEditingDomain();

-			final IEditCommandRequest request = new SetRequest(domain, axisProvider, NattableaxisproviderPackage.eINSTANCE.getIMasterAxisProvider_DisconnectSlave(), newState);

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(axisProvider);

-			final ICommand cmd = provider.getEditCommand(request);

-			domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the axis provider to edit or null

-	 */

-	protected abstract AbstractAxisProvider getAxisProviderToEdit();

-

-	/**

-	 *

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		setBaseEnabled(getAxisProviderToEdit() instanceof MasterObjectAxisProvider);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2015 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.emf.transaction.TransactionalEditingDomain;
+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.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * Abstract handler used to change the value of the property IMasterAxisProvider#disconnectSlave
+ *
+ * @author vl222926
+ *
+ */
+public abstract class AbstractDisconnectSlaveHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * @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 {
+		final AbstractAxisProvider axisProvider = getAxisProviderToEdit();
+		if (axisProvider instanceof MasterObjectAxisProvider) {
+			boolean newState = !HandlerUtil.toggleCommandState(event.getCommand());
+			final TransactionalEditingDomain domain = getTableEditingDomain();
+			final IEditCommandRequest request = new SetRequest(domain, axisProvider, NattableaxisproviderPackage.eINSTANCE.getIMasterAxisProvider_DisconnectSlave(), newState);
+			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(axisProvider);
+			final ICommand cmd = provider.getEditCommand(request);
+			domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the axis provider to edit or null
+	 */
+	protected abstract AbstractAxisProvider getAxisProviderToEdit();
+
+	/**
+	 *
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		setBaseEnabled(getAxisProviderToEdit() instanceof MasterObjectAxisProvider);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractLoadAxisProvidersHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractLoadAxisProvidersHandler.java
index 20060da3aaf..e1b18c2de21 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractLoadAxisProvidersHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractLoadAxisProvidersHandler.java
@@ -1,100 +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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@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.core.runtime.IAdaptable;

-import org.eclipse.emf.common.util.EList;

-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.CompositeCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.jface.window.Window;

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.dialog.LoadCurrentAxisProvidersDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * Abstract handler to load axis providers. Contains all execution logic.

- *

- */

-public abstract class AbstractLoadAxisProvidersHandler extends AbstractTableHandler {

-

-	protected LoadCurrentAxisProvidersDialog dialog = null;

-

-	protected EList<AbstractAxisProvider> axisProvidersHistory;

-

-	protected AbstractAxisProvider currentAxisProvider;

-

-	protected EStructuralFeature currentAxisProviderEReference;

-

-	/**

-	 * This handler opens the dialog displaying the axis provides, allows to choose one of them and set it as the current axis provider

-	 *

-	 * @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 {

-		axisProvidersHistory = getAxisProvidersHistory();

-		currentAxisProvider = getCurrentAxisProvider();

-		dialog = new LoadCurrentAxisProvidersDialog(Display.getDefault().getActiveShell(), axisProvidersHistory, currentAxisProvider, getConfigRegistry());

-		currentAxisProviderEReference = getCurrentAxisProviderEFeature();

-

-		// TODO We need to provide a proper LabelProvider to display the axis' names in the dialog.

-

-		// final LabelProviderService serv = getConfigRegistry().getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		// final ILabelProvider labelProvider = serv.getLabelProvider();

-		// dialog.setLabelProvider(labelProvider);

-

-		if (dialog.open() == Window.OK) {

-			final AbstractAxisProvider selectedAxisProvider = dialog.getSelectedAxisProvider();

-			// Create the transactional command

-			final CompositeCommand cmd = new CompositeCommand("SaveCurrentAxisProvidersHandler"); //$NON-NLS-1$

-			final TransactionalEditingDomain domain = getTableEditingDomain();

-			final IEditCommandRequest request = new SetRequest(domain, this.getCurrentNattableModelManager().getTable(), currentAxisProviderEReference, selectedAxisProvider);

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(this.getCurrentNattableModelManager().getTable());

-			cmd.add(provider.getEditCommand(request));

-			domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-

-			return selectedAxisProvider;

-		}

-		return null;

-	}

-

-	/**

-	 * Obtain the registry of configurations for the opened table

-	 *

-	 * @return

-	 */

-	public IConfigRegistry getConfigRegistry() {

-		return ((NatTable) ((IAdaptable) this.getCurrentNattableModelManager()).getAdapter(NatTable.class)).getConfigRegistry();

-	}

-

-	public abstract EList<AbstractAxisProvider> getAxisProvidersHistory();

-

-	public abstract AbstractAxisProvider getCurrentAxisProvider();

-

-	public abstract EReference getCurrentAxisProviderEFeature();

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@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.core.runtime.IAdaptable;
+import org.eclipse.emf.common.util.EList;
+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.CompositeCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.jface.window.Window;
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.dialog.LoadCurrentAxisProvidersDialog;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * Abstract handler to load axis providers. Contains all execution logic.
+ *
+ */
+public abstract class AbstractLoadAxisProvidersHandler extends AbstractTableHandler {
+
+	protected LoadCurrentAxisProvidersDialog dialog = null;
+
+	protected EList<AbstractAxisProvider> axisProvidersHistory;
+
+	protected AbstractAxisProvider currentAxisProvider;
+
+	protected EStructuralFeature currentAxisProviderEReference;
+
+	/**
+	 * This handler opens the dialog displaying the axis provides, allows to choose one of them and set it as the current axis provider
+	 *
+	 * @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 {
+		axisProvidersHistory = getAxisProvidersHistory();
+		currentAxisProvider = getCurrentAxisProvider();
+		dialog = new LoadCurrentAxisProvidersDialog(Display.getDefault().getActiveShell(), axisProvidersHistory, currentAxisProvider, getConfigRegistry());
+		currentAxisProviderEReference = getCurrentAxisProviderEFeature();
+
+		// TODO We need to provide a proper LabelProvider to display the axis' names in the dialog.
+
+		// final LabelProviderService serv = getConfigRegistry().getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
+		// final ILabelProvider labelProvider = serv.getLabelProvider();
+		// dialog.setLabelProvider(labelProvider);
+
+		if (dialog.open() == Window.OK) {
+			final AbstractAxisProvider selectedAxisProvider = dialog.getSelectedAxisProvider();
+			// Create the transactional command
+			final CompositeCommand cmd = new CompositeCommand("SaveCurrentAxisProvidersHandler"); //$NON-NLS-1$
+			final TransactionalEditingDomain domain = getTableEditingDomain();
+			final IEditCommandRequest request = new SetRequest(domain, this.getCurrentNattableModelManager().getTable(), currentAxisProviderEReference, selectedAxisProvider);
+			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(this.getCurrentNattableModelManager().getTable());
+			cmd.add(provider.getEditCommand(request));
+			domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));
+
+			return selectedAxisProvider;
+		}
+		return null;
+	}
+
+	/**
+	 * Obtain the registry of configurations for the opened table
+	 *
+	 * @return
+	 */
+	public IConfigRegistry getConfigRegistry() {
+		return ((NatTable) ((IAdaptable) this.getCurrentNattableModelManager()).getAdapter(NatTable.class)).getConfigRegistry();
+	}
+
+	public abstract EList<AbstractAxisProvider> getAxisProvidersHistory();
+
+	public abstract AbstractAxisProvider getCurrentAxisProvider();
+
+	public abstract EReference getCurrentAxisProviderEFeature();
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractMergeHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractMergeHandler.java
index 441e4d5b8a3..ef6ab8f5e63 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractMergeHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractMergeHandler.java
@@ -1,123 +1,123 @@
-/*****************************************************************************

- * 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:

- *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.List;

-

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.command.CommandIds;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;

-

-/**

- * The Abstract handler used for the merge actions

- *

- * @author QL238289

- *

- */

-public abstract class AbstractMergeHandler extends AbstractTableHandler {

-

-	/**

-	 *

-	 * Apply the merge option (all rows / all columns) to the table

-	 *

-	 * @param mergeCommand

-	 * @param tableDomain

-	 *

-	 */

-	protected void executeMergeCommands(CompositeCommand mergeCommand, TransactionalEditingDomain tableDomain) {

-		if (!mergeCommand.isEmpty()) {

-			tableDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(mergeCommand));

-		}

-	}

-

-

-	/**

-	 *

-	 * Resets the Table's merge booleans if any would conflict with the selected merge options

-	 *

-	 * @param commandId

-	 * @param mergeCommand

-	 */

-	protected void updateTableSpanBooleans(String commandId, CompositeCommand mergeCommand) {

-		TransactionalEditingDomain tableDomain = getTableEditingDomain();

-		BooleanValueStyle mergeRows = (BooleanValueStyle) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(getTable())

-				.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_ROWS);

-		BooleanValueStyle mergeColumns = (BooleanValueStyle) HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(getTable())

-				.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_COLUMNS);

-

-		if (mergeRows != null && mergeRows.isBooleanValue() && !commandId.equals(CommandIds.COMMAND_MERGE_ROWS)) {

-			SetRequest mergeRowRequest = new SetRequest(tableDomain, mergeRows, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);

-			SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);

-			mergeCommand.add(mergeRowCommand);

-		}

-		if (mergeColumns != null && mergeColumns.isBooleanValue() && !commandId.equals(CommandIds.COMMAND_MERGE_COLUMNS)) {

-			SetRequest mergeColumnRequest = new SetRequest(tableDomain, mergeColumns, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);

-			SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);

-			mergeCommand.add(mergeColumnCommand);

-		}

-	}

-

-

-	/**

-	 *

-	 * Resets the Axis' merge booleans if any were not in the current selection of the merge option

-	 *

-	 * @param commandId

-	 * @param mergeCommand

-	 */

-	protected void updateAxisSpanBooleans(String commandId, CompositeCommand mergeCommand) {

-		TransactionalEditingDomain tableDomain = getTableEditingDomain();

-		List<IAxis> rowIAxisList = getTable().getCurrentRowAxisProvider().getAxis();

-		List<IAxis> columnIAxisList = getTable().getCurrentColumnAxisProvider().getAxis();

-

-		for (IAxis currentAxis : rowIAxisList) {

-			BooleanValueStyle mergeRowBoolean = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_ROWS);

-			BooleanValueStyle mergeColumnBoolean = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);

-			if (mergeRowBoolean != null && mergeRowBoolean.isBooleanValue() && !getTable().isInvertAxis()) {

-				SetRequest mergeRowBooleanRequest = new SetRequest(tableDomain, mergeRowBoolean, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);

-				SetValueCommand mergeRowBooleanCommand = new SetValueCommand(mergeRowBooleanRequest);

-				mergeCommand.add(mergeRowBooleanCommand);

-			}

-			if (mergeColumnBoolean != null && mergeColumnBoolean.isBooleanValue() && getTable().isInvertAxis()) {

-				SetRequest mergeColumnBooleanRequest = new SetRequest(tableDomain, mergeColumnBoolean, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);

-				SetValueCommand mergeColumnBooleanCommand = new SetValueCommand(mergeColumnBooleanRequest);

-				mergeCommand.add(mergeColumnBooleanCommand);

-			}

-		}

-		for (IAxis currentAxis : columnIAxisList) {

-			BooleanValueStyle mergeColumnBoolean = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);

-			BooleanValueStyle mergeRowBoolean = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_ROWS);

-			if (mergeColumnBoolean != null && mergeColumnBoolean.isBooleanValue() && !getTable().isInvertAxis()) {

-				SetRequest mergeColumnBooleanRequest = new SetRequest(tableDomain, mergeColumnBoolean, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);

-				SetValueCommand mergeColumnBooleanCommand = new SetValueCommand(mergeColumnBooleanRequest);

-				mergeCommand.add(mergeColumnBooleanCommand);

-			}

-			if (mergeRowBoolean != null && mergeRowBoolean.isBooleanValue() && getTable().isInvertAxis()) {

-				SetRequest mergeRowBooleanRequest = new SetRequest(tableDomain, mergeRowBoolean, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);

-				SetValueCommand mergeRowBooleanCommand = new SetValueCommand(mergeRowBooleanRequest);

-				mergeCommand.add(mergeRowBooleanCommand);

-			}

-		}

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import java.util.List;
+
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.command.CommandIds;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
+
+/**
+ * The Abstract handler used for the merge actions
+ *
+ * @author QL238289
+ *
+ */
+public abstract class AbstractMergeHandler extends AbstractTableHandler {
+
+	/**
+	 *
+	 * Apply the merge option (all rows / all columns) to the table
+	 *
+	 * @param mergeCommand
+	 * @param tableDomain
+	 *
+	 */
+	protected void executeMergeCommands(CompositeCommand mergeCommand, TransactionalEditingDomain tableDomain) {
+		if (!mergeCommand.isEmpty()) {
+			tableDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(mergeCommand));
+		}
+	}
+
+
+	/**
+	 *
+	 * Resets the Table's merge booleans if any would conflict with the selected merge options
+	 *
+	 * @param commandId
+	 * @param mergeCommand
+	 */
+	protected void updateTableSpanBooleans(String commandId, CompositeCommand mergeCommand) {
+		TransactionalEditingDomain tableDomain = getTableEditingDomain();
+		BooleanValueStyle mergeRows = (BooleanValueStyle) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(getTable())
+				.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_ROWS);
+		BooleanValueStyle mergeColumns = (BooleanValueStyle) HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(getTable())
+				.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_COLUMNS);
+
+		if (mergeRows != null && mergeRows.isBooleanValue() && !commandId.equals(CommandIds.COMMAND_MERGE_ROWS)) {
+			SetRequest mergeRowRequest = new SetRequest(tableDomain, mergeRows, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);
+			SetValueCommand mergeRowCommand = new SetValueCommand(mergeRowRequest);
+			mergeCommand.add(mergeRowCommand);
+		}
+		if (mergeColumns != null && mergeColumns.isBooleanValue() && !commandId.equals(CommandIds.COMMAND_MERGE_COLUMNS)) {
+			SetRequest mergeColumnRequest = new SetRequest(tableDomain, mergeColumns, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);
+			SetValueCommand mergeColumnCommand = new SetValueCommand(mergeColumnRequest);
+			mergeCommand.add(mergeColumnCommand);
+		}
+	}
+
+
+	/**
+	 *
+	 * Resets the Axis' merge booleans if any were not in the current selection of the merge option
+	 *
+	 * @param commandId
+	 * @param mergeCommand
+	 */
+	protected void updateAxisSpanBooleans(String commandId, CompositeCommand mergeCommand) {
+		TransactionalEditingDomain tableDomain = getTableEditingDomain();
+		List<IAxis> rowIAxisList = getTable().getCurrentRowAxisProvider().getAxis();
+		List<IAxis> columnIAxisList = getTable().getCurrentColumnAxisProvider().getAxis();
+
+		for (IAxis currentAxis : rowIAxisList) {
+			BooleanValueStyle mergeRowBoolean = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_ROWS);
+			BooleanValueStyle mergeColumnBoolean = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);
+			if (mergeRowBoolean != null && mergeRowBoolean.isBooleanValue() && !getTable().isInvertAxis()) {
+				SetRequest mergeRowBooleanRequest = new SetRequest(tableDomain, mergeRowBoolean, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);
+				SetValueCommand mergeRowBooleanCommand = new SetValueCommand(mergeRowBooleanRequest);
+				mergeCommand.add(mergeRowBooleanCommand);
+			}
+			if (mergeColumnBoolean != null && mergeColumnBoolean.isBooleanValue() && getTable().isInvertAxis()) {
+				SetRequest mergeColumnBooleanRequest = new SetRequest(tableDomain, mergeColumnBoolean, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);
+				SetValueCommand mergeColumnBooleanCommand = new SetValueCommand(mergeColumnBooleanRequest);
+				mergeCommand.add(mergeColumnBooleanCommand);
+			}
+		}
+		for (IAxis currentAxis : columnIAxisList) {
+			BooleanValueStyle mergeColumnBoolean = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_COLUMNS);
+			BooleanValueStyle mergeRowBoolean = (BooleanValueStyle) currentAxis.getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_IN_SELECTED_ROWS);
+			if (mergeColumnBoolean != null && mergeColumnBoolean.isBooleanValue() && !getTable().isInvertAxis()) {
+				SetRequest mergeColumnBooleanRequest = new SetRequest(tableDomain, mergeColumnBoolean, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);
+				SetValueCommand mergeColumnBooleanCommand = new SetValueCommand(mergeColumnBooleanRequest);
+				mergeCommand.add(mergeColumnBooleanCommand);
+			}
+			if (mergeRowBoolean != null && mergeRowBoolean.isBooleanValue() && getTable().isInvertAxis()) {
+				SetRequest mergeRowBooleanRequest = new SetRequest(tableDomain, mergeRowBoolean, NattablestylePackage.eINSTANCE.getBooleanValueStyle_BooleanValue(), false);
+				SetValueCommand mergeRowBooleanCommand = new SetValueCommand(mergeRowBooleanRequest);
+				mergeCommand.add(mergeRowBooleanCommand);
+			}
+		}
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractSaveCurrentAxisProvidersHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractSaveCurrentAxisProvidersHandler.java
index 7185e344629..2f3f0251e72 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractSaveCurrentAxisProvidersHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractSaveCurrentAxisProvidersHandler.java
@@ -1,139 +1,139 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-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.IInputValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-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.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.infra.widgets.editors.TwoInputDialog;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * Abstract handler to save the current axis provider into the table's historic. It asks for a name and a description.

- *

- */

-public abstract class AbstractSaveCurrentAxisProvidersHandler extends AbstractTableHandler {

-

-

-	/**

-	 * Execute the save action according to the values provided by the concrete handlers.

-	 *

-	 * @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 {

-		final AbstractAxisProvider currentAxisProvider = getAxisProvider();

-		final EList<AbstractAxisProvider> axisProvidersHistory = getAxisProviderHistory();

-		final EReference eReference = getAxisProviderHistoryEReference();

-		return saveAxisProviderConfig(this.getCurrentNattableModelManager(), currentAxisProvider, axisProvidersHistory, eReference);

-	}

-

-	/**

-	 * Given the proper references, it displays the dialog pre-filled with data from the current provider.

-	 *

-	 * @param currentNattableModelManager

-	 * @param axisProvider

-	 * @param axisProvidersHistory

-	 * @param axisProvidersHistoryEReference

-	 * @return

-	 */

-	public Object saveAxisProviderConfig(final INattableModelManager currentNattableModelManager, final AbstractAxisProvider axisProvider, EList<AbstractAxisProvider> axisProvidersHistory, EReference axisProvidersHistoryEReference) {

-		final AbstractAxisProvider copy = EcoreUtil.copy(axisProvider);

-

-		// We ask the user for a name and description

-		String name = axisProvider.getName();

-		String description = axisProvider.getDescription();

-

-

-		final List<String> existingProviderNames = new ArrayList<String>();

-		for (AbstractAxisProvider abstractAxisProvider : axisProvidersHistory) {

-			existingProviderNames.add(abstractAxisProvider.getName());

-		}

-		TwoInputDialog dialog = new TwoInputDialog(Display.getCurrent().getActiveShell(), Messages.AbstractSaveCurrentAxisProvidersHandler_0, Messages.AbstractSaveCurrentAxisProvidersHandler_1, Messages.AbstractSaveCurrentAxisProvidersHandler_2, name,

-				description, new IInputValidator() {

-

-					@Override

-					public String isValid(String newText) {

-						if (newText == null || newText.equals("")) { //$NON-NLS-1$

-							return Messages.AbstractSaveCurrentAxisProvidersHandler_4;

-						} else if (existingProviderNames.contains(newText)) {

-							return Messages.AbstractSaveCurrentAxisProvidersHandler_5;

-						}

-						return null;

-					}

-				});

-		if (dialog.open() == Window.OK) {

-			// get the name and the description for the table

-			name = dialog.getValue();

-			description = dialog.getValue_2();

-

-			copy.setName(name);

-			copy.setDescription(description);

-

-			final List<AbstractAxisProvider> historyCopy = new ArrayList<AbstractAxisProvider>(axisProvidersHistory);

-			historyCopy.add(copy);

-

-			// Create the transactional command

-			final CompositeCommand cmd = new CompositeCommand("SaveCurrentAxisProvidersHandler"); //$NON-NLS-1$

-			final IEditCommandRequest request = new SetRequest(getTableEditingDomain(), currentNattableModelManager.getTable(), axisProvidersHistoryEReference, historyCopy);

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(currentNattableModelManager.getTable());

-			cmd.add(provider.getEditCommand(request));

-			getTableEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-

-

-			return copy;

-		}

-		return null;

-	}

-

-	/**

-	 * Obtain the current axis provider.

-	 *

-	 * @return

-	 */

-	public abstract AbstractAxisProvider getAxisProvider();

-

-	/**

-	 * Obtain all the axis providers contained in this table's historic.

-	 *

-	 * @return

-	 */

-	public abstract EList<AbstractAxisProvider> getAxisProviderHistory();

-

-	/**

-	 * Get the EReference to set a new value for this table's historic of axis providers.

-	 *

-	 * @return

-	 */

-	public abstract EReference getAxisProviderHistoryEReference();

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.handler;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+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.IInputValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+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.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.widgets.editors.TwoInputDialog;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * Abstract handler to save the current axis provider into the table's historic. It asks for a name and a description.
+ *
+ */
+public abstract class AbstractSaveCurrentAxisProvidersHandler extends AbstractTableHandler {
+
+
+	/**
+	 * Execute the save action according to the values provided by the concrete handlers.
+	 *
+	 * @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 {
+		final AbstractAxisProvider currentAxisProvider = getAxisProvider();
+		final EList<AbstractAxisProvider> axisProvidersHistory = getAxisProviderHistory();
+		final EReference eReference = getAxisProviderHistoryEReference();
+		return saveAxisProviderConfig(this.getCurrentNattableModelManager(), currentAxisProvider, axisProvidersHistory, eReference);
+	}
+
+	/**
+	 * Given the proper references, it displays the dialog pre-filled with data from the current provider.
+	 *
+	 * @param currentNattableModelManager
+	 * @param axisProvider
+	 * @param axisProvidersHistory
+	 * @param axisProvidersHistoryEReference
+	 * @return
+	 */
+	public Object saveAxisProviderConfig(final INattableModelManager currentNattableModelManager, final AbstractAxisProvider axisProvider, EList<AbstractAxisProvider> axisProvidersHistory, EReference axisProvidersHistoryEReference) {
+		final AbstractAxisProvider copy = EcoreUtil.copy(axisProvider);
+
+		// We ask the user for a name and description
+		String name = axisProvider.getName();
+		String description = axisProvider.getDescription();
+
+
+		final List<String> existingProviderNames = new ArrayList<String>();
+		for (AbstractAxisProvider abstractAxisProvider : axisProvidersHistory) {
+			existingProviderNames.add(abstractAxisProvider.getName());
+		}
+		TwoInputDialog dialog = new TwoInputDialog(Display.getCurrent().getActiveShell(), Messages.AbstractSaveCurrentAxisProvidersHandler_0, Messages.AbstractSaveCurrentAxisProvidersHandler_1, Messages.AbstractSaveCurrentAxisProvidersHandler_2, name,
+				description, new IInputValidator() {
+
+					@Override
+					public String isValid(String newText) {
+						if (newText == null || newText.equals("")) { //$NON-NLS-1$
+							return Messages.AbstractSaveCurrentAxisProvidersHandler_4;
+						} else if (existingProviderNames.contains(newText)) {
+							return Messages.AbstractSaveCurrentAxisProvidersHandler_5;
+						}
+						return null;
+					}
+				});
+		if (dialog.open() == Window.OK) {
+			// get the name and the description for the table
+			name = dialog.getValue();
+			description = dialog.getValue_2();
+
+			copy.setName(name);
+			copy.setDescription(description);
+
+			final List<AbstractAxisProvider> historyCopy = new ArrayList<AbstractAxisProvider>(axisProvidersHistory);
+			historyCopy.add(copy);
+
+			// Create the transactional command
+			final CompositeCommand cmd = new CompositeCommand("SaveCurrentAxisProvidersHandler"); //$NON-NLS-1$
+			final IEditCommandRequest request = new SetRequest(getTableEditingDomain(), currentNattableModelManager.getTable(), axisProvidersHistoryEReference, historyCopy);
+			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(currentNattableModelManager.getTable());
+			cmd.add(provider.getEditCommand(request));
+			getTableEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));
+
+
+			return copy;
+		}
+		return null;
+	}
+
+	/**
+	 * Obtain the current axis provider.
+	 *
+	 * @return
+	 */
+	public abstract AbstractAxisProvider getAxisProvider();
+
+	/**
+	 * Obtain all the axis providers contained in this table's historic.
+	 *
+	 * @return
+	 */
+	public abstract EList<AbstractAxisProvider> getAxisProviderHistory();
+
+	/**
+	 * Get the EReference to set a new value for this table's historic of axis providers.
+	 *
+	 * @return
+	 */
+	public abstract EReference getAxisProviderHistoryEReference();
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ResolvedProblemHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ResolvedProblemHandler.java
index e24a7b25e31..c7d039473f1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ResolvedProblemHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ResolvedProblemHandler.java
@@ -1,158 +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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.handler;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.nebula.widgets.nattable.coordinate.PositionCoordinate;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;

-import org.eclipse.papyrus.infra.nattable.utils.TableSelectionWrapper;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-

-/**

- *

- * @author VL222926

- *

- */

-public class ResolvedProblemHandler extends AbstractTableHandler {

-

-

-

-	/**

-	 *

-	 * @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 {

-		final TransactionalEditingDomain domain = getTableEditingDomain();

-		

-		Problem problemToDestroy = getProblemToDestroy(event);

-		DestroyElementRequest request = new DestroyElementRequest(domain, problemToDestroy, false);

-		final Cell cell = (Cell) problemToDestroy.eContainer();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(cell);

-		CompositeCommand composite = new CompositeCommand("Destroy Problem Command"); //$NON-NLS-1$

-		composite.add(provider.getEditCommand(request));

-

-		// TODO : improve me and move me into an edit helper when we will have customization for the cell

-		composite.add(new AbstractTransactionalCommand(domain, "Clean Table Model : remove empty Cell", null) { //$NON-NLS-1$

-

-					@Override

-					protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-						boolean isEmpty = true;

-						if (cell.getProblems().size() == 0) {

-							Collection<EStructuralFeature> featureToIgnore = new ArrayList<EStructuralFeature>();

-							featureToIgnore.add(EcorePackage.eINSTANCE.getEModelElement_EAnnotations());

-							featureToIgnore.add(NattablecellPackage.eINSTANCE.getCell_ColumnWrapper());

-							featureToIgnore.add(NattablecellPackage.eINSTANCE.getCell_RowWrapper());

-							Collection<EStructuralFeature> allFeatures = new ArrayList<EStructuralFeature>(cell.eClass().getEAllStructuralFeatures());

-							allFeatures.removeAll(featureToIgnore);

-							for (EStructuralFeature eStructuralFeature : allFeatures) {

-								if (eStructuralFeature.isMany()) {

-									if (!((Collection<?>) cell.eGet(eStructuralFeature)).isEmpty()) {

-										isEmpty = false;

-									}

-								} else {

-									if (cell.eGet(eStructuralFeature) != eStructuralFeature.getDefaultValue()) {

-										isEmpty = false;

-									}

-								}

-

-							}

-						}

-						if (isEmpty) {

-							DestroyElementRequest request = new DestroyElementRequest(domain, cell, false);

-							// final Cell cell = (Cell)problemToDestroy.eContainer();

-							IElementEditService provider = ElementEditServiceUtils.getCommandProvider(cell.eContainer());

-							provider.getEditCommand(request).execute(null, null);

-						}

-						return null;

-					}

-				});

-		Command cmd = new GMFtoEMFCommandWrapper(composite);

-		domain.getCommandStack().execute(cmd);

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		super.setEnabled(evaluationContext);

-		if (isEnabled()) {

-			setBaseEnabled(getProblemToDestroy(evaluationContext) != null);

-		}

-	}

-

-	/**

-	 * 

-	 * @param evaluationContextOrExecutionEvent

-	 * an evaluation context (coming from setEnable(Object evaluationContext) or an ExecutionEvent (coming from execute(ExecutionEvent e)

-	 * @return

-	 */

-	private Problem getProblemToDestroy(Object evaluationContextOrExecutionEvent) {

-		TableSelectionWrapper wrapper = getTableSelectionWrapper(evaluationContextOrExecutionEvent);

-		if (isEnabled() && wrapper != null) {

-			Collection<PositionCoordinate> selectionCells = wrapper.getSelectedCells();

-			if (selectionCells.size() == 1) {

-				final PositionCoordinate positionCoordinate = selectionCells.iterator().next();

-				final INattableModelManager nattableManager = getCurrentNattableModelManager();

-				final Object rowElement;

-				final Object columnElement;

-				if (!nattableManager.getTable().isInvertAxis()) {

-					rowElement = nattableManager.getRowElement(positionCoordinate.getRowPosition());

-					columnElement = nattableManager.getColumnElement(positionCoordinate.getColumnPosition());

-				} else {

-					columnElement = nattableManager.getRowElement(positionCoordinate.getRowPosition());

-					rowElement = nattableManager.getColumnElement(positionCoordinate.getColumnPosition());

-				}

-

-				final Cell cell = nattableManager.getCell(columnElement, rowElement);

-				if (cell != null) {

-					final Collection<Problem> problems = cell.getProblems();

-					if (problems.size() == 1) {

-						return problems.iterator().next();

-					}

-				}

-			}

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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 java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.nebula.widgets.nattable.coordinate.PositionCoordinate;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;
+import org.eclipse.papyrus.infra.nattable.utils.TableSelectionWrapper;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+
+/**
+ *
+ * @author VL222926
+ *
+ */
+public class ResolvedProblemHandler extends AbstractTableHandler {
+
+
+
+	/**
+	 *
+	 * @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 {
+		final TransactionalEditingDomain domain = getTableEditingDomain();
+		
+		Problem problemToDestroy = getProblemToDestroy(event);
+		DestroyElementRequest request = new DestroyElementRequest(domain, problemToDestroy, false);
+		final Cell cell = (Cell) problemToDestroy.eContainer();
+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(cell);
+		CompositeCommand composite = new CompositeCommand("Destroy Problem Command"); //$NON-NLS-1$
+		composite.add(provider.getEditCommand(request));
+
+		// TODO : improve me and move me into an edit helper when we will have customization for the cell
+		composite.add(new AbstractTransactionalCommand(domain, "Clean Table Model : remove empty Cell", null) { //$NON-NLS-1$
+
+					@Override
+					protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+						boolean isEmpty = true;
+						if (cell.getProblems().size() == 0) {
+							Collection<EStructuralFeature> featureToIgnore = new ArrayList<EStructuralFeature>();
+							featureToIgnore.add(EcorePackage.eINSTANCE.getEModelElement_EAnnotations());
+							featureToIgnore.add(NattablecellPackage.eINSTANCE.getCell_ColumnWrapper());
+							featureToIgnore.add(NattablecellPackage.eINSTANCE.getCell_RowWrapper());
+							Collection<EStructuralFeature> allFeatures = new ArrayList<EStructuralFeature>(cell.eClass().getEAllStructuralFeatures());
+							allFeatures.removeAll(featureToIgnore);
+							for (EStructuralFeature eStructuralFeature : allFeatures) {
+								if (eStructuralFeature.isMany()) {
+									if (!((Collection<?>) cell.eGet(eStructuralFeature)).isEmpty()) {
+										isEmpty = false;
+									}
+								} else {
+									if (cell.eGet(eStructuralFeature) != eStructuralFeature.getDefaultValue()) {
+										isEmpty = false;
+									}
+								}
+
+							}
+						}
+						if (isEmpty) {
+							DestroyElementRequest request = new DestroyElementRequest(domain, cell, false);
+							// final Cell cell = (Cell)problemToDestroy.eContainer();
+							IElementEditService provider = ElementEditServiceUtils.getCommandProvider(cell.eContainer());
+							provider.getEditCommand(request).execute(null, null);
+						}
+						return null;
+					}
+				});
+		Command cmd = new GMFtoEMFCommandWrapper(composite);
+		domain.getCommandStack().execute(cmd);
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		super.setEnabled(evaluationContext);
+		if (isEnabled()) {
+			setBaseEnabled(getProblemToDestroy(evaluationContext) != null);
+		}
+	}
+
+	/**
+	 * 
+	 * @param evaluationContextOrExecutionEvent
+	 * an evaluation context (coming from setEnable(Object evaluationContext) or an ExecutionEvent (coming from execute(ExecutionEvent e)
+	 * @return
+	 */
+	private Problem getProblemToDestroy(Object evaluationContextOrExecutionEvent) {
+		TableSelectionWrapper wrapper = getTableSelectionWrapper(evaluationContextOrExecutionEvent);
+		if (isEnabled() && wrapper != null) {
+			Collection<PositionCoordinate> selectionCells = wrapper.getSelectedCells();
+			if (selectionCells.size() == 1) {
+				final PositionCoordinate positionCoordinate = selectionCells.iterator().next();
+				final INattableModelManager nattableManager = getCurrentNattableModelManager();
+				final Object rowElement;
+				final Object columnElement;
+				if (!nattableManager.getTable().isInvertAxis()) {
+					rowElement = nattableManager.getRowElement(positionCoordinate.getRowPosition());
+					columnElement = nattableManager.getColumnElement(positionCoordinate.getColumnPosition());
+				} else {
+					columnElement = nattableManager.getRowElement(positionCoordinate.getRowPosition());
+					rowElement = nattableManager.getColumnElement(positionCoordinate.getColumnPosition());
+				}
+
+				final Cell cell = nattableManager.getCell(columnElement, rowElement);
+				if (cell != null) {
+					final Collection<Problem> problems = cell.getProblems();
+					if (problems.size() == 1) {
+						return problems.iterator().next();
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManager.java
index 2329532a506..9b547a38037 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManager.java
@@ -32,9 +32,9 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
 import org.eclipse.papyrus.infra.nattable.Activator;
 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractTreeAxisManagerForEventList.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractTreeAxisManagerForEventList.java
index 472cce04620..8cb3575b947 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractTreeAxisManagerForEventList.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractTreeAxisManagerForEventList.java
@@ -38,8 +38,8 @@ import org.eclipse.nebula.widgets.nattable.hideshow.command.MultiRowShowCommand;
 import org.eclipse.nebula.widgets.nattable.layer.ILayer;
 import org.eclipse.nebula.widgets.nattable.sort.ISortModel;
 import org.eclipse.nebula.widgets.nattable.tree.TreeLayer;
-import org.eclipse.papyrus.commands.Activator;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.GMFUnsafe;
+import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;
+import org.eclipse.papyrus.infra.nattable.Activator;
 import org.eclipse.papyrus.infra.nattable.layer.PapyrusGridLayer;
 import org.eclipse.papyrus.infra.nattable.layerstack.RowHeaderHierarchicalLayerStack;
 import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManager.java
index 5b22c2adc45..40c2f61009f 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManager.java
@@ -35,7 +35,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.AbstractEditCommandRequest
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
 import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.nattable.messages.Messages;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManagerForEventList.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManagerForEventList.java
index 4f6f41c9a75..75239fddc61 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManagerForEventList.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManagerForEventList.java
@@ -36,7 +36,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.AbstractEditCommandRequest
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
 import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.nattable.listener.UpdateTableContentListener;
 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
 import org.eclipse.papyrus.infra.nattable.messages.Messages;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeTreeAxisManagerForEventList.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeTreeAxisManagerForEventList.java
index 81d74423944..48d0d873d88 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeTreeAxisManagerForEventList.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeTreeAxisManagerForEventList.java
@@ -20,8 +20,8 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.transaction.RollbackException;
 import org.eclipse.nebula.widgets.nattable.sort.ISortModel;
+import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.GMFUnsafe;
 import org.eclipse.papyrus.infra.nattable.Activator;
 import org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ITreeItemAxisComparator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ITreeItemAxisComparator.java
index a3a9dfd4185..b0fb9ec3f93 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ITreeItemAxisComparator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ITreeItemAxisComparator.java
@@ -15,12 +15,11 @@ package org.eclipse.papyrus.infra.nattable.manager.axis;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
 import org.eclipse.core.runtime.Assert;
-import org.eclipse.papyrus.commands.Activator;
+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.model.nattable.nattableaxis.IAxis;
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 4f56c197a27..438f676d556 100755
--- 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
@@ -73,9 +73,9 @@ import org.eclipse.nebula.widgets.nattable.selection.command.SelectColumnCommand
 import org.eclipse.nebula.widgets.nattable.selection.command.SelectRowsCommand;
 import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
 import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
 import org.eclipse.papyrus.infra.nattable.Activator;
 import org.eclipse.papyrus.infra.nattable.command.CommandIds;
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 cf5e121aaab..b403e41cea8 100755
--- 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
@@ -67,7 +67,7 @@ import org.eclipse.nebula.widgets.nattable.selection.command.SelectColumnCommand
 import org.eclipse.nebula.widgets.nattable.selection.command.SelectRowsCommand;
 import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
 import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.nattable.Activator;
 import org.eclipse.papyrus.infra.nattable.command.CommandIds;
 import org.eclipse.papyrus.infra.nattable.dialog.DisplayedAxisSelectorDialog;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/TreeNattableModelManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/TreeNattableModelManager.java
index acd8f13b415..dcc96b5e117 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/TreeNattableModelManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/TreeNattableModelManager.java
@@ -14,7 +14,6 @@
 package org.eclipse.papyrus.infra.nattable.manager.table;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.core.commands.Command;
@@ -24,7 +23,6 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.impl.AdapterImpl;
 import org.eclipse.emf.transaction.ResourceSetListener;
 import org.eclipse.emf.transaction.RollbackException;
-import org.eclipse.jface.action.IContributionItem;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.viewers.ISelectionProvider;
@@ -34,8 +32,8 @@ import org.eclipse.nebula.widgets.nattable.hideshow.command.MultiColumnHideComma
 import org.eclipse.nebula.widgets.nattable.hideshow.command.MultiColumnShowCommand;
 import org.eclipse.nebula.widgets.nattable.hideshow.command.ShowAllColumnsCommand;
 import org.eclipse.nebula.widgets.nattable.layer.ILayer;
-import org.eclipse.papyrus.commands.Activator;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.GMFUnsafe;
+import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;
+import org.eclipse.papyrus.infra.nattable.Activator;
 import org.eclipse.papyrus.infra.nattable.command.CommandIds;
 import org.eclipse.papyrus.infra.nattable.configuration.TreeTableClickSortConfiguration;
 import org.eclipse.papyrus.infra.nattable.configuration.TreeTablePopupMenuConfiguration;
@@ -181,6 +179,7 @@ public class TreeNattableModelManager extends NattableModelManager implements IT
 		return this.treeList;
 	}
 
+	@Override
 	public TreeList getTreeList() {
 		return this.treeList;
 	}
@@ -278,7 +277,7 @@ public class TreeNattableModelManager extends NattableModelManager implements IT
 		if (columnAxisManager) {
 			return super.createAxisManager(representations, contentProvider, columnAxisManager);
 		} else {
-			CompositeTreeAxisManagerForEventList compositeAxisManager = new CompositeTreeAxisManagerForEventList((EventList<Object>) horizontalFilterList);
+			CompositeTreeAxisManagerForEventList compositeAxisManager = new CompositeTreeAxisManagerForEventList(horizontalFilterList);
 			final List<IAxisManagerForEventList> managers = new ArrayList<IAxisManagerForEventList>();
 			for (AxisManagerRepresentation current : representations) {
 				final IAxisManager manager = AxisManagerFactory.INSTANCE.getAxisManager(current);
@@ -289,8 +288,8 @@ public class TreeNattableModelManager extends NattableModelManager implements IT
 			}
 			compositeAxisManager.init(this, null, contentProvider);
 			DatumTreeFormat treeFormat = getTreeFormat();
-			treeFormat.setTreeComparatorProvider((CompositeTreeAxisManagerForEventList) compositeAxisManager);
-			this.expansionModel.setAxisManager((CompositeTreeAxisManagerForEventList) compositeAxisManager);
+			treeFormat.setTreeComparatorProvider(compositeAxisManager);
+			this.expansionModel.setAxisManager(compositeAxisManager);
 			((CompositeAxisManagerForEventList) compositeAxisManager).setSubManagers(managers);
 			return compositeAxisManager;
 		}
@@ -435,6 +434,7 @@ public class TreeNattableModelManager extends NattableModelManager implements IT
 	 * @return
 	 * 		the row header layer stack to use
 	 */
+	@Override
 	protected RowHeaderLayerStack createRowHeaderLayerStack(BodyLayerStack bodyLayerStack) {
 		return new RowHeaderHierarchicalLayerStack(bodyLayerStack, this);
 	}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/AbstractPasteInSelectionNattableCommandProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/AbstractPasteInSelectionNattableCommandProvider.java
index 96cef2fb4c0..c9823c21887 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/AbstractPasteInSelectionNattableCommandProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/AbstractPasteInSelectionNattableCommandProvider.java
@@ -56,8 +56,8 @@ import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;
 import org.eclipse.nebula.widgets.nattable.selection.command.SelectCellCommand;
 import org.eclipse.nebula.widgets.nattable.selection.command.SelectColumnCommand;
 import org.eclipse.nebula.widgets.nattable.selection.command.SelectRowsCommand;
-import org.eclipse.papyrus.commands.CheckedOperationHistory;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.CheckedOperationHistory;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.nattable.Activator;
 import org.eclipse.papyrus.infra.nattable.command.ErrorTransactionalCommand;
 import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;
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
index f1eaf36dda2..a503c21fae0 100644
--- 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
@@ -58,7 +58,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;
 import org.eclipse.nebula.widgets.nattable.selection.command.SelectRowsCommand;
 import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.commands.CheckedOperationHistory;
+import org.eclipse.papyrus.infra.emf.gmf.command.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;
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 161d6e33903..da634840171 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
@@ -43,7 +43,7 @@ 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.emf.gmf.command.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;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectTreeAxisInNattableCommandProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectTreeAxisInNattableCommandProvider.java
index 6be70f7700d..b3b6c7042aa 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectTreeAxisInNattableCommandProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectTreeAxisInNattableCommandProvider.java
@@ -51,8 +51,8 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;
 import org.eclipse.nebula.widgets.nattable.selection.command.SelectRowsCommand;
 import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.commands.CheckedOperationHistory;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.CheckedOperationHistory;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 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;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteInSelectionNattableCommandProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteInSelectionNattableCommandProvider.java
index cf8c050fce3..e517050a77f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteInSelectionNattableCommandProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteInSelectionNattableCommandProvider.java
@@ -34,7 +34,7 @@ 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.requests.CreateElementRequest;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteInSelectionTreeNattableCommandProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteInSelectionTreeNattableCommandProvider.java
index a23a3fa660f..1f73858476b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteInSelectionTreeNattableCommandProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteInSelectionTreeNattableCommandProvider.java
@@ -35,7 +35,7 @@ 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.requests.CreateElementRequest;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
 import org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/ITreeItemAxisHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/ITreeItemAxisHelper.java
index 014f62cf0d9..b3a1405aaad 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/ITreeItemAxisHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/ITreeItemAxisHelper.java
@@ -20,7 +20,7 @@ import java.util.Set;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.transaction.RollbackException;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.GMFUnsafe;
+import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;
 import org.eclipse.papyrus.infra.nattable.Activator;
 import org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis;
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 391e72800f1..c549a514777 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,302 +1,302 @@
-/*****************************************************************************

- * 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;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CompoundCommand;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.command.RemoveCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-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.nattablecell.Cell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;

-import org.eclipse.papyrus.infra.nattable.paste.IValueSetter;

-import org.eclipse.papyrus.infra.nattable.paste.ReferenceValueSetter;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.infra.ui.converter.ConvertedValueContainer;

-import org.eclipse.papyrus.infra.ui.converter.StringValueConverterStatus;

-

-

-public class CellHelper {

-

-	private CellHelper() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * 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();

-		if (!status.isOK()) {

-			if (status.matches(IStatus.ERROR)) {

-				@SuppressWarnings("unchecked")

-				final List<IValueSetter> references = (List<IValueSetter>) sharedMap.get(Constants.REFERENCES_TO_SET_KEY);

-				if (status.matches(IStatus.ERROR)) {

-					Cell cell = tableManager.getCell(columnElement, rowElement);

-

-					if (cell == null) {

-						// we create the cell

-						cell = NattablecellFactory.eINSTANCE.createCell();

-

-						// create the columnWrapper;

-						final Object column = AxisUtils.getRepresentedElement(columnElement);

-						ICellAxisWrapper columnWrapper = null;

-						if (column instanceof String) {

-							columnWrapper = NattablecellFactory.eINSTANCE.createIdAxisWrapper();

-							((IdAxisWrapper) columnWrapper).setElement((String) column);

-						} else if (column instanceof EObject) {

-							columnWrapper = NattablecellFactory.eINSTANCE.createEObjectAxisWrapper();

-							ReferenceValueSetter structure = new ReferenceValueSetter(columnWrapper, NattablecellPackage.eINSTANCE.getEObjectAxisWrapper_Element(), column);

-							references.add(structure);

-						}

-

-						final Object row = AxisUtils.getRepresentedElement(rowElement);

-						ICellAxisWrapper rowWrapper = null;

-						if (row instanceof String) {

-							rowWrapper = NattablecellFactory.eINSTANCE.createIdAxisWrapper();

-							((IdAxisWrapper) rowWrapper).setElement((String) row);

-						} else if (row instanceof EObject) {

-							rowWrapper = NattablecellFactory.eINSTANCE.createEObjectAxisWrapper();

-							ReferenceValueSetter structure = new ReferenceValueSetter(rowWrapper, NattablecellPackage.eINSTANCE.getEObjectAxisWrapper_Element(), row);

-							references.add(structure);

-						}

-

-						if (rowWrapper == null || columnWrapper == null) {

-							throw new UnsupportedOperationException("Case not managed"); //$NON-NLS-1$

-						}

-						cell.setColumnWrapper(columnWrapper);

-						cell.setRowWrapper(rowWrapper);

-						@SuppressWarnings("unchecked")

-						final List<Cell> cells = (List<Cell>) sharedMap.get(Constants.CELLS_TO_ADD_KEY);

-						cells.add(cell);

-

-

-					}

-

-

-					final StringResolutionProblem problem = NattableproblemFactory.eINSTANCE.createStringResolutionProblem();

-					problem.setName("Set Value As Text Problem"); //$NON-NLS-1$

-					problem.setDescription(status.getMessage());

-					problem.setValueAsString(pastedText);

-

-					if (status instanceof StringValueConverterStatus) {

-						problem.getUnresolvedString().addAll(((StringValueConverterStatus) status).getUnresolvedString());

-					}

-

-					if (cell.eContainer() == null) {

-						cell.eSet(NattablecellPackage.eINSTANCE.getCell_Problems(), Collections.singleton(problem));

-					} else {

-						final ReferenceValueSetter structure = new ReferenceValueSetter(cell, NattablecellPackage.eINSTANCE.getCell_Problems(), problem);

-						references.add(structure);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @param domain

-	 *            the editing domain

-	 * @param tableManager

-	 *            the table manager

-	 * @param rowElement

-	 *            the row element

-	 * @param columnElement

-	 *            the column element

-	 * @param pastedText

-	 *            the pasted text

-	 * @param valueContainer

-	 *            the converted value

-	 * @return

-	 *         the command to create a String resolution Problem

-	 */

-	public static final Command getCreateStringResolutionProblemCommand(final TransactionalEditingDomain domain, final INattableModelManager tableManager, final Object columnElement, final Object rowElement, final String pastedText,

-			final ConvertedValueContainer<?> valueContainer) {

-		final IStatus status = valueContainer.getStatus();

-		if (!status.isOK()) {

-			if (status.matches(IStatus.ERROR)) {

-				final CompositeCommand command = new CompositeCommand("Create Cell For Error Command"); //$NON-NLS-1$

-				Cell cell = tableManager.getCell(columnElement, rowElement);

-

-				if (cell == null) {

-					// we create the cell

-					final Table table = tableManager.getTable();

-					cell = NattablecellFactory.eINSTANCE.createCell();

-

-					SetRequest request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_Cells(), cell);

-					IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);

-					command.add(provider.getEditCommand(request));

-

-					// create the columnWrapper;

-					final Object column = AxisUtils.getRepresentedElement(columnElement);

-					ICellAxisWrapper columnWrapper = null;

-					if (column instanceof String) {

-						columnWrapper = NattablecellFactory.eINSTANCE.createIdAxisWrapper();

-						provider = ElementEditServiceUtils.getCommandProvider(columnWrapper);

-						request = new SetRequest(domain, columnWrapper, NattablecellPackage.eINSTANCE.getIdAxisWrapper_Element(), column);

-						command.add(provider.getEditCommand(request));

-					} else if (column instanceof EObject) {

-						columnWrapper = NattablecellFactory.eINSTANCE.createEObjectAxisWrapper();

-						provider = ElementEditServiceUtils.getCommandProvider(columnWrapper);

-						request = new SetRequest(domain, columnWrapper, NattablecellPackage.eINSTANCE.getEObjectAxisWrapper_Element(), column);

-						command.add(provider.getEditCommand(request));

-					}

-

-					final Object row = AxisUtils.getRepresentedElement(rowElement);

-					ICellAxisWrapper rowWrapper = null;

-					if (row instanceof String) {

-						rowWrapper = NattablecellFactory.eINSTANCE.createIdAxisWrapper();

-						provider = ElementEditServiceUtils.getCommandProvider(rowWrapper);

-						request = new SetRequest(domain, rowWrapper, NattablecellPackage.eINSTANCE.getIdAxisWrapper_Element(), row);

-						command.add(provider.getEditCommand(request));

-					} else if (row instanceof EObject) {

-						rowWrapper = NattablecellFactory.eINSTANCE.createEObjectAxisWrapper();

-						provider = ElementEditServiceUtils.getCommandProvider(rowWrapper);

-						request = new SetRequest(domain, rowWrapper, NattablecellPackage.eINSTANCE.getEObjectAxisWrapper_Element(), row);

-						command.add(provider.getEditCommand(request));

-					}

-

-					if (rowWrapper == null || columnWrapper == null) {

-						throw new UnsupportedOperationException("Case not managed"); //$NON-NLS-1$

-					}

-

-

-					provider = ElementEditServiceUtils.getCommandProvider(cell);

-					request = new SetRequest(domain, cell, NattablecellPackage.eINSTANCE.getCell_ColumnWrapper(), columnWrapper);

-					command.add(provider.getEditCommand(request));

-					request = new SetRequest(domain, cell, NattablecellPackage.eINSTANCE.getCell_RowWrapper(), rowWrapper);

-					command.add(provider.getEditCommand(request));

-				}

-				final List<Problem> problems = cell.getProblems();

-				StringResolutionProblem problem = null;

-				for (final Problem current : problems) {

-					if (current instanceof StringResolutionProblem) {

-						problem = (StringResolutionProblem) current;

-						break;

-					}

-				}

-

-				// we create a new string problem

-				if (problem == null) {

-					problem = NattableproblemFactory.eINSTANCE.createStringResolutionProblem();

-					problem.setName("Set Value As Text Problem"); //$NON-NLS-1$

-					problem.setDescription(status.getMessage());

-					problem.setValueAsString(pastedText);

-

-					if (status instanceof StringValueConverterStatus) {

-						problem.getUnresolvedString().addAll(((StringValueConverterStatus) status).getUnresolvedString());

-						SetRequest setProblemRequest = new SetRequest(domain, cell, NattablecellPackage.eINSTANCE.getCell_Problems(), problem);

-						IElementEditService provider = ElementEditServiceUtils.getCommandProvider(cell);

-						command.add(provider.getEditCommand(setProblemRequest));

-					}

-				} else {// we update the string problem

-					IElementEditService provider = ElementEditServiceUtils.getCommandProvider(problem);

-					SetRequest request = new SetRequest(domain, problem, NattableproblemPackage.eINSTANCE.getStringResolutionProblem_ValueAsString(), pastedText);

-					command.add(provider.getEditCommand(request));

-					request = new SetRequest(domain, problem, NattableproblemPackage.eINSTANCE.getStringResolutionProblem_UnresolvedString(), ((StringValueConverterStatus) status).getUnresolvedString());

-					command.add(provider.getEditCommand(request));

-					request = new SetRequest(domain, problem, NattableconfigurationPackage.eINSTANCE.getTableNamedElement_Description(), status.getMessage());

-					command.add(provider.getEditCommand(request));

-				}

-

-

-				return new GMFtoEMFCommandWrapper(command);

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param domain

-	 *            the editing domain

-	 * @param columnElement

-	 *            the column element

-	 * @param rowElement

-	 *            the row element

-	 * @param newValue

-	 *            the new value

-	 * @param tableManager

-	 *            the table manager

-	 * @return

-	 *         the command to use to destroy the string problem referenced by a cell

-	 */

-	public static final Command getDestroyStringResolutionProblemCommand(final TransactionalEditingDomain domain, final Object columnElement, final Object rowElement, final Object newValue, final INattableModelManager tableManager) {

-		Cell cell = tableManager.getCell(columnElement, rowElement);

-		CompoundCommand removeProblemCommand = new CompoundCommand("Destroy string problem command"); //$NON-NLS-1$

-		// we remove the problems of this cells

-		if (cell != null && !cell.getProblems().isEmpty()) {

-			for (Problem current : cell.getProblems()) {

-				if (current instanceof StringResolutionProblem) {

-					RemoveCommand rc = new RemoveCommand(domain, cell, NattablecellPackage.eINSTANCE.getCell_Problems(), current);

-					removeProblemCommand.append(rc);

-				}

-			}

-			// now the cell has no problem

-			if (cell.getEAnnotations().isEmpty()) {

-				if (cell instanceof StyledElement) {// currenlty it is impossible, but it could change in future version of Papyrus

-					StyledElement styledElement = (StyledElement) cell;

-					if (styledElement.getStyles().isEmpty()) {

-						RemoveCommand rc = new RemoveCommand(domain, tableManager.getTable(), NattablePackage.eINSTANCE.getTable_Cells(), cell);

-						removeProblemCommand.append(rc);

-					}

-				} else {

-					RemoveCommand rc = new RemoveCommand(domain, tableManager.getTable(), NattablePackage.eINSTANCE.getTable_Cells(), cell);

-					removeProblemCommand.append(rc);

-				}

-			}

-		}

-		if (!removeProblemCommand.isEmpty()) {

-			return removeProblemCommand;

-		}

-		return null;

-	}

-

-

-}

+/*****************************************************************************
+ * 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;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+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.nattablecell.Cell;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement;
+import org.eclipse.papyrus.infra.nattable.paste.IValueSetter;
+import org.eclipse.papyrus.infra.nattable.paste.ReferenceValueSetter;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.ui.converter.ConvertedValueContainer;
+import org.eclipse.papyrus.infra.ui.converter.StringValueConverterStatus;
+
+
+public class CellHelper {
+
+	private CellHelper() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * 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();
+		if (!status.isOK()) {
+			if (status.matches(IStatus.ERROR)) {
+				@SuppressWarnings("unchecked")
+				final List<IValueSetter> references = (List<IValueSetter>) sharedMap.get(Constants.REFERENCES_TO_SET_KEY);
+				if (status.matches(IStatus.ERROR)) {
+					Cell cell = tableManager.getCell(columnElement, rowElement);
+
+					if (cell == null) {
+						// we create the cell
+						cell = NattablecellFactory.eINSTANCE.createCell();
+
+						// create the columnWrapper;
+						final Object column = AxisUtils.getRepresentedElement(columnElement);
+						ICellAxisWrapper columnWrapper = null;
+						if (column instanceof String) {
+							columnWrapper = NattablecellFactory.eINSTANCE.createIdAxisWrapper();
+							((IdAxisWrapper) columnWrapper).setElement((String) column);
+						} else if (column instanceof EObject) {
+							columnWrapper = NattablecellFactory.eINSTANCE.createEObjectAxisWrapper();
+							ReferenceValueSetter structure = new ReferenceValueSetter(columnWrapper, NattablecellPackage.eINSTANCE.getEObjectAxisWrapper_Element(), column);
+							references.add(structure);
+						}
+
+						final Object row = AxisUtils.getRepresentedElement(rowElement);
+						ICellAxisWrapper rowWrapper = null;
+						if (row instanceof String) {
+							rowWrapper = NattablecellFactory.eINSTANCE.createIdAxisWrapper();
+							((IdAxisWrapper) rowWrapper).setElement((String) row);
+						} else if (row instanceof EObject) {
+							rowWrapper = NattablecellFactory.eINSTANCE.createEObjectAxisWrapper();
+							ReferenceValueSetter structure = new ReferenceValueSetter(rowWrapper, NattablecellPackage.eINSTANCE.getEObjectAxisWrapper_Element(), row);
+							references.add(structure);
+						}
+
+						if (rowWrapper == null || columnWrapper == null) {
+							throw new UnsupportedOperationException("Case not managed"); //$NON-NLS-1$
+						}
+						cell.setColumnWrapper(columnWrapper);
+						cell.setRowWrapper(rowWrapper);
+						@SuppressWarnings("unchecked")
+						final List<Cell> cells = (List<Cell>) sharedMap.get(Constants.CELLS_TO_ADD_KEY);
+						cells.add(cell);
+
+
+					}
+
+
+					final StringResolutionProblem problem = NattableproblemFactory.eINSTANCE.createStringResolutionProblem();
+					problem.setName("Set Value As Text Problem"); //$NON-NLS-1$
+					problem.setDescription(status.getMessage());
+					problem.setValueAsString(pastedText);
+
+					if (status instanceof StringValueConverterStatus) {
+						problem.getUnresolvedString().addAll(((StringValueConverterStatus) status).getUnresolvedString());
+					}
+
+					if (cell.eContainer() == null) {
+						cell.eSet(NattablecellPackage.eINSTANCE.getCell_Problems(), Collections.singleton(problem));
+					} else {
+						final ReferenceValueSetter structure = new ReferenceValueSetter(cell, NattablecellPackage.eINSTANCE.getCell_Problems(), problem);
+						references.add(structure);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 *
+	 * @param domain
+	 *            the editing domain
+	 * @param tableManager
+	 *            the table manager
+	 * @param rowElement
+	 *            the row element
+	 * @param columnElement
+	 *            the column element
+	 * @param pastedText
+	 *            the pasted text
+	 * @param valueContainer
+	 *            the converted value
+	 * @return
+	 *         the command to create a String resolution Problem
+	 */
+	public static final Command getCreateStringResolutionProblemCommand(final TransactionalEditingDomain domain, final INattableModelManager tableManager, final Object columnElement, final Object rowElement, final String pastedText,
+			final ConvertedValueContainer<?> valueContainer) {
+		final IStatus status = valueContainer.getStatus();
+		if (!status.isOK()) {
+			if (status.matches(IStatus.ERROR)) {
+				final CompositeCommand command = new CompositeCommand("Create Cell For Error Command"); //$NON-NLS-1$
+				Cell cell = tableManager.getCell(columnElement, rowElement);
+
+				if (cell == null) {
+					// we create the cell
+					final Table table = tableManager.getTable();
+					cell = NattablecellFactory.eINSTANCE.createCell();
+
+					SetRequest request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_Cells(), cell);
+					IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);
+					command.add(provider.getEditCommand(request));
+
+					// create the columnWrapper;
+					final Object column = AxisUtils.getRepresentedElement(columnElement);
+					ICellAxisWrapper columnWrapper = null;
+					if (column instanceof String) {
+						columnWrapper = NattablecellFactory.eINSTANCE.createIdAxisWrapper();
+						provider = ElementEditServiceUtils.getCommandProvider(columnWrapper);
+						request = new SetRequest(domain, columnWrapper, NattablecellPackage.eINSTANCE.getIdAxisWrapper_Element(), column);
+						command.add(provider.getEditCommand(request));
+					} else if (column instanceof EObject) {
+						columnWrapper = NattablecellFactory.eINSTANCE.createEObjectAxisWrapper();
+						provider = ElementEditServiceUtils.getCommandProvider(columnWrapper);
+						request = new SetRequest(domain, columnWrapper, NattablecellPackage.eINSTANCE.getEObjectAxisWrapper_Element(), column);
+						command.add(provider.getEditCommand(request));
+					}
+
+					final Object row = AxisUtils.getRepresentedElement(rowElement);
+					ICellAxisWrapper rowWrapper = null;
+					if (row instanceof String) {
+						rowWrapper = NattablecellFactory.eINSTANCE.createIdAxisWrapper();
+						provider = ElementEditServiceUtils.getCommandProvider(rowWrapper);
+						request = new SetRequest(domain, rowWrapper, NattablecellPackage.eINSTANCE.getIdAxisWrapper_Element(), row);
+						command.add(provider.getEditCommand(request));
+					} else if (row instanceof EObject) {
+						rowWrapper = NattablecellFactory.eINSTANCE.createEObjectAxisWrapper();
+						provider = ElementEditServiceUtils.getCommandProvider(rowWrapper);
+						request = new SetRequest(domain, rowWrapper, NattablecellPackage.eINSTANCE.getEObjectAxisWrapper_Element(), row);
+						command.add(provider.getEditCommand(request));
+					}
+
+					if (rowWrapper == null || columnWrapper == null) {
+						throw new UnsupportedOperationException("Case not managed"); //$NON-NLS-1$
+					}
+
+
+					provider = ElementEditServiceUtils.getCommandProvider(cell);
+					request = new SetRequest(domain, cell, NattablecellPackage.eINSTANCE.getCell_ColumnWrapper(), columnWrapper);
+					command.add(provider.getEditCommand(request));
+					request = new SetRequest(domain, cell, NattablecellPackage.eINSTANCE.getCell_RowWrapper(), rowWrapper);
+					command.add(provider.getEditCommand(request));
+				}
+				final List<Problem> problems = cell.getProblems();
+				StringResolutionProblem problem = null;
+				for (final Problem current : problems) {
+					if (current instanceof StringResolutionProblem) {
+						problem = (StringResolutionProblem) current;
+						break;
+					}
+				}
+
+				// we create a new string problem
+				if (problem == null) {
+					problem = NattableproblemFactory.eINSTANCE.createStringResolutionProblem();
+					problem.setName("Set Value As Text Problem"); //$NON-NLS-1$
+					problem.setDescription(status.getMessage());
+					problem.setValueAsString(pastedText);
+
+					if (status instanceof StringValueConverterStatus) {
+						problem.getUnresolvedString().addAll(((StringValueConverterStatus) status).getUnresolvedString());
+						SetRequest setProblemRequest = new SetRequest(domain, cell, NattablecellPackage.eINSTANCE.getCell_Problems(), problem);
+						IElementEditService provider = ElementEditServiceUtils.getCommandProvider(cell);
+						command.add(provider.getEditCommand(setProblemRequest));
+					}
+				} else {// we update the string problem
+					IElementEditService provider = ElementEditServiceUtils.getCommandProvider(problem);
+					SetRequest request = new SetRequest(domain, problem, NattableproblemPackage.eINSTANCE.getStringResolutionProblem_ValueAsString(), pastedText);
+					command.add(provider.getEditCommand(request));
+					request = new SetRequest(domain, problem, NattableproblemPackage.eINSTANCE.getStringResolutionProblem_UnresolvedString(), ((StringValueConverterStatus) status).getUnresolvedString());
+					command.add(provider.getEditCommand(request));
+					request = new SetRequest(domain, problem, NattableconfigurationPackage.eINSTANCE.getTableNamedElement_Description(), status.getMessage());
+					command.add(provider.getEditCommand(request));
+				}
+
+
+				return new GMFtoEMFCommandWrapper(command);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param domain
+	 *            the editing domain
+	 * @param columnElement
+	 *            the column element
+	 * @param rowElement
+	 *            the row element
+	 * @param newValue
+	 *            the new value
+	 * @param tableManager
+	 *            the table manager
+	 * @return
+	 *         the command to use to destroy the string problem referenced by a cell
+	 */
+	public static final Command getDestroyStringResolutionProblemCommand(final TransactionalEditingDomain domain, final Object columnElement, final Object rowElement, final Object newValue, final INattableModelManager tableManager) {
+		Cell cell = tableManager.getCell(columnElement, rowElement);
+		CompoundCommand removeProblemCommand = new CompoundCommand("Destroy string problem command"); //$NON-NLS-1$
+		// we remove the problems of this cells
+		if (cell != null && !cell.getProblems().isEmpty()) {
+			for (Problem current : cell.getProblems()) {
+				if (current instanceof StringResolutionProblem) {
+					RemoveCommand rc = new RemoveCommand(domain, cell, NattablecellPackage.eINSTANCE.getCell_Problems(), current);
+					removeProblemCommand.append(rc);
+				}
+			}
+			// now the cell has no problem
+			if (cell.getEAnnotations().isEmpty()) {
+				if (cell instanceof StyledElement) {// currenlty it is impossible, but it could change in future version of Papyrus
+					StyledElement styledElement = (StyledElement) cell;
+					if (styledElement.getStyles().isEmpty()) {
+						RemoveCommand rc = new RemoveCommand(domain, tableManager.getTable(), NattablePackage.eINSTANCE.getTable_Cells(), cell);
+						removeProblemCommand.append(rc);
+					}
+				} else {
+					RemoveCommand rc = new RemoveCommand(domain, tableManager.getTable(), NattablePackage.eINSTANCE.getTable_Cells(), cell);
+					removeProblemCommand.append(rc);
+				}
+			}
+		}
+		if (!removeProblemCommand.isEmpty()) {
+			return removeProblemCommand;
+		}
+		return null;
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ExtendedCompoundCommand.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ExtendedCompoundCommand.java
index dbae8c2d0f8..50b17539077 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ExtendedCompoundCommand.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ExtendedCompoundCommand.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.common.CommonPlugin;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.command.CompoundCommand;
 import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 
 /**
  * This allow to manage th execution of command if not already executed.
diff --git a/plugins/infra/nattable/pom.xml b/plugins/infra/nattable/pom.xml
index 4e541572c1a..1931a14bd13 100755
--- a/plugins/infra/nattable/pom.xml
+++ b/plugins/infra/nattable/pom.xml
@@ -2,14 +2,12 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>org.eclipse.papyrus</groupId>
-	<artifactId>org.eclipse.papyrus.infra.nattable.main</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Papyrus Nattable</name>
 	<description>Papyrus Nattable are a set of plugins dedicated to manage tables in relation with models.</description>
@@ -26,6 +24,9 @@
 		<module>org.eclipse.papyrus.infra.nattable.properties</module>
 		<module>org.eclipse.papyrus.infra.nattable.views.config</module>
 		<module>org.eclipse.papyrus.infra.nattable.views.editor</module>
+		
+		<!-- This one has a dependency also on Infra Diagram, so it is built outside of both modules. -->
+		<!--module>org.eclipse.papyrus.infra.nattable.gmfdiag</module-->
 	</modules>
 
 
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/.classpath b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.classpath
index c1f31893de4..c1f31893de4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/.classpath
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.classpath
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/.project b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.project
index d776efd909f..d776efd909f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/.project
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.project
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.filters/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.filters/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF
index 9cd9c5cac4d..9cd9c5cac4d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/about.html b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/about.html
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/build.properties b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/build.properties
index 48875dbc32f..48875dbc32f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/build.properties
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/build.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_CreateElementMenu.gif b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_CreateElementMenu.gif
index 8eb45613da2..8eb45613da2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_CreateElementMenu.gif
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_CreateElementMenu.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_CreateRelationshipMenu.gif b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_CreateRelationshipMenu.gif
index 517abc71fc3..517abc71fc3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_CreateRelationshipMenu.gif
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_CreateRelationshipMenu.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_CreationMenu.gif b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_CreationMenu.gif
index 3842f57e6c6..3842f57e6c6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_CreationMenu.gif
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_CreationMenu.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_Folder.gif b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_Folder.gif
index 728e46a69ee..728e46a69ee 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_Folder.gif
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateFolder_menu_Folder.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateMenu_filter_CompoundFilter.gif b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateMenu_filter_CompoundFilter.gif
index 3f3051fb1ba..3f3051fb1ba 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateMenu_filter_CompoundFilter.gif
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateMenu_filter_CompoundFilter.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateMenu_filter_Equals.gif b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateMenu_filter_Equals.gif
index a982f41fa57..a982f41fa57 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateMenu_filter_Equals.gif
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/ctool16/CreateMenu_filter_Equals.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/CreateElementMenu.gif b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/CreateElementMenu.gif
index ea58a657dc0..ea58a657dc0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/CreateElementMenu.gif
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/CreateElementMenu.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/CreateRelationshipMenu.gif b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/CreateRelationshipMenu.gif
index a17dc7d88e9..a17dc7d88e9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/CreateRelationshipMenu.gif
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/CreateRelationshipMenu.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/CreationMenu.gif b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/CreationMenu.gif
index 3842f57e6c6..3842f57e6c6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/CreationMenu.gif
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/CreationMenu.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/Folder.gif b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/Folder.gif
index 728e46a69ee..728e46a69ee 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/Folder.gif
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/icons/full/obj16/Folder.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/plugin.properties b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/plugin.properties
index 950a4b186c5..950a4b186c5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/plugin.properties
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/plugin.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/plugin.xml b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/plugin.xml
index cd3d4be2154..cd3d4be2154 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/plugin.xml
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/plugin.xml
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/pom.xml b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/pom.xml
index bded085b8e6..bbc4a766d96 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/pom.xml
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-newchild</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.newchild.edit</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/CreateRelationshipMenuItemProvider.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/CreateRelationshipMenuItemProvider.java
index 6b6e606929c..6b6e606929c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/CreateRelationshipMenuItemProvider.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/CreateRelationshipMenuItemProvider.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/CreationMenuItemProvider.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/CreationMenuItemProvider.java
index c064092fd27..c064092fd27 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/CreationMenuItemProvider.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/CreationMenuItemProvider.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/ElementCreationMenuModelEditPlugin.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/ElementCreationMenuModelEditPlugin.java
index 1b54401f176..1b54401f176 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/ElementCreationMenuModelEditPlugin.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/ElementCreationMenuModelEditPlugin.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/ElementCreationMenuModelItemProviderAdapterFactory.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/ElementCreationMenuModelItemProviderAdapterFactory.java
index bd2e167309a..bd2e167309a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/ElementCreationMenuModelItemProviderAdapterFactory.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/ElementCreationMenuModelItemProviderAdapterFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/FolderItemProvider.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/FolderItemProvider.java
index 15c0605558a..15c0605558a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/FolderItemProvider.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/FolderItemProvider.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/MenuItemProvider.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/MenuItemProvider.java
index 09111b834b2..09111b834b2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/MenuItemProvider.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/provider/MenuItemProvider.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/.classpath b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/.classpath
index c1f31893de4..c1f31893de4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/.classpath
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/.classpath
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/.project b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/.project
index b4bef4c924e..b4bef4c924e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/.project
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/.project
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF
index 77e311201aa..0ddfc7b4246 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.presentation

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.infra.newchild.edit;bundle-version="1.2.0";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

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.presentation.ElementCreationMenuModelEditorPlugin$Implementation

-Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild.editor;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.presentation
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources;visibility:=reexport,
+ org.eclipse.papyrus.infra.newchild.edit;bundle-version="1.2.0";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
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.presentation.ElementCreationMenuModelEditorPlugin$Implementation
+Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild.editor;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/about.html b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/about.html
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/build.properties b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/build.properties
index fe4b4ef10ba..fe4b4ef10ba 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/build.properties
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/build.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/icons/full/obj16/ElementCreationMenuModelModelFile.gif b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/icons/full/obj16/ElementCreationMenuModelModelFile.gif
index 557e65ee0a5..557e65ee0a5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/icons/full/obj16/ElementCreationMenuModelModelFile.gif
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/icons/full/obj16/ElementCreationMenuModelModelFile.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/icons/full/wizban/NewElementCreationMenuModel.gif b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/icons/full/wizban/NewElementCreationMenuModel.gif
index 71581772c88..71581772c88 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/icons/full/wizban/NewElementCreationMenuModel.gif
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/icons/full/wizban/NewElementCreationMenuModel.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/plugin.properties b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.properties
index 3d516ea711c..3d516ea711c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/plugin.properties
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/plugin.xml b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.xml
index 3bab387cfaf..3bab387cfaf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/plugin.xml
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/plugin.xml
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelActionBarContributor.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelActionBarContributor.java
index bf6473cf915..bf6473cf915 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelActionBarContributor.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelActionBarContributor.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelEditor.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelEditor.java
index 7a6de090616..7a6de090616 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelEditor.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelEditor.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelEditorPlugin.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelEditorPlugin.java
index 3f8bbe5f02d..3f8bbe5f02d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelEditorPlugin.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelEditorPlugin.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelModelWizard.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelModelWizard.java
index 0fe37790ee6..0fe37790ee6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelModelWizard.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/presentation/ElementCreationMenuModelModelWizard.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/.classpath b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.classpath
index 50aae142c50..50aae142c50 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/.classpath
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.classpath
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/.project b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.project
index d8cf9d53eac..44bea73ce9b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/.project
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.project
@@ -1,28 +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>

+<?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/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..b3aa6d60f94
--- /dev/null
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF
index 967eda06145..94d0fdcbcc3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gmf.runtime.emf.type.core,
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/about.html b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/about.html
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/about.html
@@ -1,28 +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>

+<!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/newchild/org.eclipse.papyrus.infra.newchild/build.properties
index ba36fa89f8c..ba36fa89f8c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/build.properties
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/build.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/DeveloperDoc.html b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/DeveloperDoc.html
index 2637545291b..2637545291b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/DeveloperDoc.html
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/DeveloperDoc.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/DeveloperDoc.mediawiki b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/DeveloperDoc.mediawiki
index f48ec7375bf..f48ec7375bf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/DeveloperDoc.mediawiki
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/DeveloperDoc.mediawiki
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/default.css b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/default.css
index 23fe5fd5fbb..110296c38c4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/default.css
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/default.css
@@ -1,61 +1,61 @@
-/*

- * Style sheet for the CSS2 specification

- */

-

-body {

-  padding: 2em 1em 2em 70px;

-  margin: 0;

-  font-family: sans-serif;

-  color: black;

-  background: white;

-  background-position: top left;

-  background-attachment: fixed;

-  background-repeat: no-repeat;

-}

-pre{

-  font-family: sans-serif;

-}

-

-p {

-  margin-top: 0.6em;

-  margin-bottom: 0.6em;

-  margin-left: 2em;

-}

-

-h1, h2, h3, h4, h5, h6 { text-align: left }

-

-

-h1, h2, h3 { color: #005A9C; background: white }

-h1 { font: 170% sans-serif }

-h2 { font: 140% sans-serif }

-h3 { font: 120% sans-serif }

-h4 { font: bold 100% sans-serif }

-h5 { font: italic 100% sans-serif }

-h6 { font: small-caps 100% sans-serif }

-

-body{counter-reset: h1 h2 h3;}

-

-

-h2:before {

-  content: counter(h2) "  ";

-  counter-increment: h2;

-}

-h3:before {

-  content: counter(h2) "." counter(h3) "  ";

-  counter-increment: h3;

-}

-h1 {

-  counter-reset: h2;

-}

-h2 {

-  counter-reset: h3;

-}

-h1.unnumbered, h2.unnumbered {

-  counter-reset: none;

-}

-h1.unnumbered:before, 

-h2.unnumbered:before,

-h3.unnumbered:before{

-  content: none;

-  counter-increment: none;

-}

+/*
+ * Style sheet for the CSS2 specification
+ */
+
+body {
+  padding: 2em 1em 2em 70px;
+  margin: 0;
+  font-family: sans-serif;
+  color: black;
+  background: white;
+  background-position: top left;
+  background-attachment: fixed;
+  background-repeat: no-repeat;
+}
+pre{
+  font-family: sans-serif;
+}
+
+p {
+  margin-top: 0.6em;
+  margin-bottom: 0.6em;
+  margin-left: 2em;
+}
+
+h1, h2, h3, h4, h5, h6 { text-align: left }
+
+
+h1, h2, h3 { color: #005A9C; background: white }
+h1 { font: 170% sans-serif }
+h2 { font: 140% sans-serif }
+h3 { font: 120% sans-serif }
+h4 { font: bold 100% sans-serif }
+h5 { font: italic 100% sans-serif }
+h6 { font: small-caps 100% sans-serif }
+
+body{counter-reset: h1 h2 h3;}
+
+
+h2:before {
+  content: counter(h2) "  ";
+  counter-increment: h2;
+}
+h3:before {
+  content: counter(h2) "." counter(h3) "  ";
+  counter-increment: h3;
+}
+h1 {
+  counter-reset: h2;
+}
+h2 {
+  counter-reset: h3;
+}
+h1.unnumbered, h2.unnumbered {
+  counter-reset: none;
+}
+h1.unnumbered:before, 
+h2.unnumbered:before,
+h3.unnumbered:before{
+  content: none;
+  counter-increment: none;
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/AllPossibleActivities.png b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/AllPossibleActivities.png
index 93a409795ee..93a409795ee 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/AllPossibleActivities.png
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/AllPossibleActivities.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/AllPossibleActivitiesIllustration.png b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/AllPossibleActivitiesIllustration.png
index 2ead41a7865..2ead41a7865 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/AllPossibleActivitiesIllustration.png
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/AllPossibleActivitiesIllustration.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/Architecture.png b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/Architecture.png
index 9b86fcb30c2..9b86fcb30c2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/Architecture.png
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/Architecture.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/EnableCreationMenu.png b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/EnableCreationMenu.png
index 2ee0b82d010..2ee0b82d010 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/EnableCreationMenu.png
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/EnableCreationMenu.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/MenuExample.png b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/MenuExample.png
index e0996bc1801..e0996bc1801 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/MenuExample.png
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/MenuExample.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/NestedClassifier.png b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/NestedClassifier.png
index 26d8b568537..26d8b568537 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/NestedClassifier.png
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/NestedClassifier.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/NestedClassifierIllustration.png b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/NestedClassifierIllustration.png
index 40046cf4bf3..40046cf4bf3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/NestedClassifierIllustration.png
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/NestedClassifierIllustration.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/NewDiagram.png b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/NewDiagram.png
index 9f50a45041d..9f50a45041d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/NewDiagram.png
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/NewDiagram.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/PackageWithIconO.png b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/PackageWithIconO.png
index 63772d65186..63772d65186 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/PackageWithIconO.png
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/PackageWithIconO.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/PackageWithIconOIllustration.png b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/PackageWithIconOIllustration.png
index f88d08f681e..f88d08f681e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/PackageWithIconOIllustration.png
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/PackageWithIconOIllustration.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/UseCaseDiagram.png b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/UseCaseDiagram.png
index 7d475969113..7d475969113 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/UseCaseDiagram.png
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/UseCaseDiagram.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/codeXML.PNG b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/codeXML.PNG
index 94721d526ab..94721d526ab 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/codeXML.PNG
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/doc/imgDOC/codeXML.PNG
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/docs/ElementCreationMenuModel.di b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/docs/ElementCreationMenuModel.di
index 5b79c6a5609..3e82eab6e53 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/docs/ElementCreationMenuModel.di
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/docs/ElementCreationMenuModel.di
@@ -1,17 +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>

+<?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/docs/ElementCreationMenuModel.notation b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/docs/ElementCreationMenuModel.notation
index c38a6a0fb42..ba5bb020274 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/docs/ElementCreationMenuModel.notation
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/docs/ElementCreationMenuModel.notation
@@ -1,194 +1,194 @@
-<?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/5.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" bold="true" gradient="8905185, 16777215, 1" lineColor="0">

-    <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>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TUoxUPCYEeOEP-VOZrQAkw" source="PapyrusCSSForceValue">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TUu38PCYEeOEP-VOZrQAkw" key="fillColor" value="true"/>

-    </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" visible="false" 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" visible="false" 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" bold="true" gradient="8905185, 16777215, 1" lineColor="0">

-    <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>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UC8o0PCYEeOEP-VOZrQAkw" source="PapyrusCSSForceValue">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UDDWgPCYEeOEP-VOZrQAkw" key="fillColor" value="true"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_z-H0mVXPEeOhVe6k7yzS3A" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_z-H0mlXPEeOhVe6k7yzS3A" visible="false" 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" visible="false" 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" visible="false" 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" bold="true" gradient="8905185, 16777215, 1" lineColor="0">

-    <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>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O5teIPCYEeOEP-VOZrQAkw" source="PapyrusCSSForceValue">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O5uFMPCYEeOEP-VOZrQAkw" key="fillColor" value="true"/>

-    </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>

-      <children xmi:type="notation:Shape" xmi:id="_8LedYPCXEeOEP-VOZrQAkw" type="3012">

-        <element xmi:type="uml:Property" href="ElementCreationMenuModel.uml#_8LbaEPCXEeOEP-VOZrQAkw"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8LedYfCXEeOEP-VOZrQAkw"/>

-      </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" visible="false" 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" visible="false" 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" height="96"/>

-  </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>

+<?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/5.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" bold="true" gradient="8905185, 16777215, 1" lineColor="0">
+    <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>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TUoxUPCYEeOEP-VOZrQAkw" source="PapyrusCSSForceValue">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TUu38PCYEeOEP-VOZrQAkw" key="fillColor" value="true"/>
+    </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" visible="false" 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" visible="false" 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" bold="true" gradient="8905185, 16777215, 1" lineColor="0">
+    <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>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UC8o0PCYEeOEP-VOZrQAkw" source="PapyrusCSSForceValue">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UDDWgPCYEeOEP-VOZrQAkw" key="fillColor" value="true"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_z-H0mVXPEeOhVe6k7yzS3A" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_z-H0mlXPEeOhVe6k7yzS3A" visible="false" 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" visible="false" 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" visible="false" 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" bold="true" gradient="8905185, 16777215, 1" lineColor="0">
+    <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>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O5teIPCYEeOEP-VOZrQAkw" source="PapyrusCSSForceValue">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O5uFMPCYEeOEP-VOZrQAkw" key="fillColor" value="true"/>
+    </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>
+      <children xmi:type="notation:Shape" xmi:id="_8LedYPCXEeOEP-VOZrQAkw" type="3012">
+        <element xmi:type="uml:Property" href="ElementCreationMenuModel.uml#_8LbaEPCXEeOEP-VOZrQAkw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8LedYfCXEeOEP-VOZrQAkw"/>
+      </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" visible="false" 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" visible="false" 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" height="96"/>
+  </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/docs/ElementCreationMenuModel.uml b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/docs/ElementCreationMenuModel.uml
index 6fc945ecf9e..7b8f923d901 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/docs/ElementCreationMenuModel.uml
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/docs/ElementCreationMenuModel.uml
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" 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/5.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>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_8LbaEPCXEeOEP-VOZrQAkw" name="isVisible" visibility="public" isUnique="false">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__x05APCXEeOEP-VOZrQAkw" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__x38UPCXEeOEP-VOZrQAkw" 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>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" 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/5.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>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_8LbaEPCXEeOEP-VOZrQAkw" name="isVisible" visibility="public" isUnique="false">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__x05APCXEeOEP-VOZrQAkw" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__x38UPCXEeOEP-VOZrQAkw" 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/docs/NewChildDevelopperDoc.docx b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/docs/NewChildDevelopperDoc.docx
index eaad2690ef9..eaad2690ef9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/docs/NewChildDevelopperDoc.docx
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/docs/NewChildDevelopperDoc.docx
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/docs/papyrusNewChild.di b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/docs/papyrusNewChild.di
index 40cea3eec9b..8fe441c57d3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/docs/papyrusNewChild.di
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/docs/papyrusNewChild.di
@@ -1,51 +1,51 @@
-<?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/>

-    <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#_uhdN0FgPEeOKQOyOw2l5lw"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="papyrusNewChild.notation#_swsygFOIEeOuspyO4PzXCg"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="papyrusNewChild.notation#_PhuW0PCMEeOEP-VOZrQAkw"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="papyrusNewChild.notation#_y6tAIPCYEeOEP-VOZrQAkw"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="ElementCreationMenuModel.notation#_VJWf0FXPEeOhVe6k7yzS3A"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="papyrusNewChild.notation#_JdFvgPC7EeOQTc9S_J6Sug"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?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/>
+    <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#_uhdN0FgPEeOKQOyOw2l5lw"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="papyrusNewChild.notation#_swsygFOIEeOuspyO4PzXCg"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="papyrusNewChild.notation#_PhuW0PCMEeOEP-VOZrQAkw"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="papyrusNewChild.notation#_y6tAIPCYEeOEP-VOZrQAkw"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="ElementCreationMenuModel.notation#_VJWf0FXPEeOhVe6k7yzS3A"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="papyrusNewChild.notation#_JdFvgPC7EeOQTc9S_J6Sug"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/docs/papyrusNewChild.notation b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/docs/papyrusNewChild.notation
index 3e6d46565db..f50575d4435 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/docs/papyrusNewChild.notation
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/docs/papyrusNewChild.notation
@@ -1,1384 +1,1384 @@
-<?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:ADL4Eclipse="http:///schemas/ADL4Eclipse/_rk7nwOqKEeOfTcbrnCq2oQ/3" xmlns:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" 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:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/ADL4Eclipse/_rk7nwOqKEeOfTcbrnCq2oQ/3 pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml#_rlFYwOqKEeOfTcbrnCq2oQ 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="PapyrusUMLClassDiagram" name="OverView" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_BTyyIPCEEeOEP-VOZrQAkw" type="2005">

-      <children xmi:type="notation:DecorationNode" xmi:id="_BT0nUPCEEeOEP-VOZrQAkw" type="5020"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_BT0nUfCEEeOEP-VOZrQAkw" type="7009">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_BT0nUvCEEeOEP-VOZrQAkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BT0nU_CEEeOEP-VOZrQAkw"/>

-      </children>

-      <element xmi:type="uml:Model" href="papyrusNewChild.uml#_52hvUPCDEeOEP-VOZrQAkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BTyyIfCEEeOEP-VOZrQAkw" x="470" y="68"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_WG70cPCFEeOEP-VOZrQAkw" type="2005">

-      <children xmi:type="notation:DecorationNode" xmi:id="_WG8bgPCFEeOEP-VOZrQAkw" type="5020"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_WG9CkPCFEeOEP-VOZrQAkw" type="7009">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_WG9CkfCFEeOEP-VOZrQAkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WG9CkvCFEeOEP-VOZrQAkw"/>

-      </children>

-      <element xmi:type="uml:Model" href="papyrusNewChild.uml#_u8E-gPCEEeOEP-VOZrQAkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WG70cfCFEeOEP-VOZrQAkw" x="473" y="220"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_aC1pUPCFEeOEP-VOZrQAkw" type="2005">

-      <children xmi:type="notation:DecorationNode" xmi:id="_aC2QYPCFEeOEP-VOZrQAkw" type="5020"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_aC2QYfCFEeOEP-VOZrQAkw" type="7009">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_aC2QYvCFEeOEP-VOZrQAkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aC2QY_CFEeOEP-VOZrQAkw"/>

-      </children>

-      <element xmi:type="uml:Model" href="papyrusNewChild.uml#_SJaO8PCFEeOEP-VOZrQAkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aC1pUfCFEeOEP-VOZrQAkw" x="232" y="353"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_zX6JQPCHEeOEP-VOZrQAkw" type="2005">

-      <children xmi:type="notation:DecorationNode" xmi:id="_zX6wUPCHEeOEP-VOZrQAkw" type="5020"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_zX6wUfCHEeOEP-VOZrQAkw" type="7009">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_zX6wUvCHEeOEP-VOZrQAkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zX7XYPCHEeOEP-VOZrQAkw"/>

-      </children>

-      <element xmi:type="uml:Model" href="papyrusNewChild.uml#_vmIgwPCHEeOEP-VOZrQAkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zX6JQfCHEeOEP-VOZrQAkw" x="920" y="337"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_Py2DcVOFEeOuspyO4PzXCg"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_XdKJ4LXUEeOXiJT1xTrETA">

-      <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmpNxhEeOqHvRyiN87hA"/>

-    </styles>

-    <element xmi:type="uml:Model" href="papyrusNewChild.uml#_a0QCwFOCEeOE6bh9v5dYKg"/>

-    <edges xmi:type="notation:Connector" xmi:id="_XPew4PCFEeOEP-VOZrQAkw" type="4006" source="_WG70cPCFEeOEP-VOZrQAkw" target="_BTyyIPCEEeOEP-VOZrQAkw">

-      <children xmi:type="notation:DecorationNode" xmi:id="_XPfX8PCFEeOEP-VOZrQAkw" visible="false" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XPfX8fCFEeOEP-VOZrQAkw" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_XPf_APCFEeOEP-VOZrQAkw" visible="false" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XPf_AfCFEeOEP-VOZrQAkw" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_XPew4fCFEeOEP-VOZrQAkw"/>

-      <element xmi:type="uml:Abstraction" href="papyrusNewChild.uml#_XPLO4PCFEeOEP-VOZrQAkw"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XPew4vCFEeOEP-VOZrQAkw" points="[-1, -3, -2, 137]$[-66, -90, -67, 50]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XPn60PCFEeOEP-VOZrQAkw" id="(0.365,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XtPq8PCFEeOEP-VOZrQAkw" id="(0.38,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_cIo4MPCFEeOEP-VOZrQAkw" type="4006" source="_aC1pUPCFEeOEP-VOZrQAkw" target="_WG70cPCFEeOEP-VOZrQAkw">

-      <children xmi:type="notation:DecorationNode" xmi:id="_cIpfQPCFEeOEP-VOZrQAkw" visible="false" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cIpfQfCFEeOEP-VOZrQAkw" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_cIqGUPCFEeOEP-VOZrQAkw" visible="false" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cIqGUfCFEeOEP-VOZrQAkw" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_cIo4MfCFEeOEP-VOZrQAkw"/>

-      <element xmi:type="uml:Abstraction" href="papyrusNewChild.uml#_cIl04PCFEeOEP-VOZrQAkw"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cIo4MvCFEeOEP-VOZrQAkw" points="[25, -10, -273, 83]$[221, -143, -77, -50]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cIypMPCFEeOEP-VOZrQAkw" id="(0.215,0.1)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_z2-D0PCHEeOEP-VOZrQAkw" type="4006" source="_zX6JQPCHEeOEP-VOZrQAkw" target="_WG70cPCFEeOEP-VOZrQAkw">

-      <children xmi:type="notation:DecorationNode" xmi:id="_z2-q4PCHEeOEP-VOZrQAkw" visible="false" type="6014">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_z2-q4fCHEeOEP-VOZrQAkw" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_z2_R8PCHEeOEP-VOZrQAkw" visible="false" type="6015">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_z2_R8fCHEeOEP-VOZrQAkw" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_z2-D0fCHEeOEP-VOZrQAkw"/>

-      <element xmi:type="uml:Abstraction" href="papyrusNewChild.uml#_z27AgPCHEeOEP-VOZrQAkw"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_z2-D0vCHEeOEP-VOZrQAkw" points="[-43, -9, 347, 70]$[-290, -71, 100, 8]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z3Ib4PCHEeOEP-VOZrQAkw" id="(0.215,0.12)"/>

-    </edges>

-  </notation:Diagram>

-  <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="33023" 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>

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l1VVEPCHEeOEP-VOZrQAkw" source="PapyrusCSSForceValue">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l1XKQPCHEeOEP-VOZrQAkw" key="gradient" value="true"/>

-          </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="4227327" 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>

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ofuewPCHEeOEP-VOZrQAkw" source="PapyrusCSSForceValue">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ofvs4PCHEeOEP-VOZrQAkw" key="gradient" value="true"/>

-          </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"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_5OV4gPCEEeOEP-VOZrQAkw">

-      <owner xmi:type="uml:Model" href="papyrusNewChild.uml#_u8E-gPCEEeOEP-VOZrQAkw"/>

-    </styles>

-    <element xmi:type="uml:Model" href="papyrusNewChild.uml#_u8E-gPCEEeOEP-VOZrQAkw"/>

-    <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/5.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"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_2Txk0PCEEeOEP-VOZrQAkw">

-      <owner xmi:type="uml:Model" href="papyrusNewChild.uml#_u8E-gPCEEeOEP-VOZrQAkw"/>

-    </styles>

-    <element xmi:type="uml:Model" href="papyrusNewChild.uml#_u8E-gPCEEeOEP-VOZrQAkw"/>

-    <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="_YiWQULXUEeOXiJT1xTrETA" key="StereotypeWithQualifiedNameList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiW3YLXUEeOXiJT1xTrETA" key="StereotypeList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiXecLXUEeOXiJT1xTrETA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiXecbXUEeOXiJT1xTrETA" key="PropStereoDisplay" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiYFgLXUEeOXiJT1xTrETA" 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="_YieMILXUEeOXiJT1xTrETA" key="StereotypeWithQualifiedNameList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiezMLXUEeOXiJT1xTrETA" key="StereotypeList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiezMbXUEeOXiJT1xTrETA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YifaQLXUEeOXiJT1xTrETA" key="PropStereoDisplay" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YigBULXUEeOXiJT1xTrETA" 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="_Yi0xcLXUEeOXiJT1xTrETA" key="StereotypeWithQualifiedNameList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi1YgLXUEeOXiJT1xTrETA" key="StereotypeList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi1YgbXUEeOXiJT1xTrETA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi1_kLXUEeOXiJT1xTrETA" key="PropStereoDisplay" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi2moLXUEeOXiJT1xTrETA" 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="_Yilg4LXUEeOXiJT1xTrETA" key="StereotypeWithQualifiedNameList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YimH8LXUEeOXiJT1xTrETA" key="StereotypeList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YimvALXUEeOXiJT1xTrETA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YimvAbXUEeOXiJT1xTrETA" key="PropStereoDisplay" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YinWELXUEeOXiJT1xTrETA" 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="_YitcsLXUEeOXiJT1xTrETA" key="StereotypeWithQualifiedNameList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YitcsbXUEeOXiJT1xTrETA" key="StereotypeList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiuDwLXUEeOXiJT1xTrETA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiuDwbXUEeOXiJT1xTrETA" key="PropStereoDisplay" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yiuq0LXUEeOXiJT1xTrETA" 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="_Yi8GMLXUEeOXiJT1xTrETA" key="StereotypeWithQualifiedNameList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi8tQLXUEeOXiJT1xTrETA" key="StereotypeList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi8tQbXUEeOXiJT1xTrETA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi9UULXUEeOXiJT1xTrETA" key="PropStereoDisplay" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi97YLXUEeOXiJT1xTrETA" 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>

-  <css:ModelStyleSheets xmi:id="_Aod9MPCEEeOEP-VOZrQAkw"/>

-  <notation:Diagram xmi:id="_PhuW0PCMEeOEP-VOZrQAkw" type="PapyrusUMLComponentDiagram" name="Architecture" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_Qs0Q8PCMEeOEP-VOZrQAkw" type="2002" fillColor="10011046">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Qs04APCMEeOEP-VOZrQAkw" type="5004"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Qs04AfCMEeOEP-VOZrQAkw" type="7001">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Qs04AvCMEeOEP-VOZrQAkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qs04A_CMEeOEP-VOZrQAkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Qs6-oPCMEeOEP-VOZrQAkw" visible="false" type="AppliedStereotypeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Qs6-ofCMEeOEP-VOZrQAkw" showTitle="true"/>

-        <element xmi:type="ADL4Eclipse:Plugin" href="papyrusNewChild.uml#_KeKWUPCMEeOEP-VOZrQAkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qs6-ovCMEeOEP-VOZrQAkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Qs6-o_CMEeOEP-VOZrQAkw" type="compartment_shape_display">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Qs7lsPCMEeOEP-VOZrQAkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qs7lsfCMEeOEP-VOZrQAkw"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_Tdu5YPCMEeOEP-VOZrQAkw" type="3069" fillColor="10011046">

-        <children xmi:type="notation:DecorationNode" xmi:id="_TdvgcPCMEeOEP-VOZrQAkw" type="5006">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TdvgcfCMEeOEP-VOZrQAkw" x="7" y="-28"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_TdwHgPCMEeOEP-VOZrQAkw" type="5007">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TdwukPCMEeOEP-VOZrQAkw" x="25" y="-10"/>

-        </children>

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_udYyMPCWEeOEP-VOZrQAkw" name="maskLabel">

-          <stringListValue>name</stringListValue>

-        </styles>

-        <element xmi:type="uml:Port" href="papyrusNewChild.uml#_KgkKEPCMEeOEP-VOZrQAkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tdu5YfCMEeOEP-VOZrQAkw" x="-7" y="-10"/>

-      </children>

-      <element xmi:type="uml:Component" href="papyrusNewChild.uml#_KeJIMPCMEeOEP-VOZrQAkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qs0Q8fCMEeOEP-VOZrQAkw" x="860" y="240"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_Uv8IIPCMEeOEP-VOZrQAkw" type="2002" fillColor="10011046">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kbSmsPCMEeOEP-VOZrQAkw" source="Stereotype_Annotation">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nvNOgPCMEeOEP-VOZrQAkw" key="StereotypeWithQualifiedNameList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nvN1kPCMEeOEP-VOZrQAkw" key="StereotypeList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nvOcoPCMEeOEP-VOZrQAkw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nvOcofCMEeOEP-VOZrQAkw" key="PropStereoDisplay" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nvPDsPCMEeOEP-VOZrQAkw" key="StereotypePropertyLocation" value="Compartment"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Uv8vMPCMEeOEP-VOZrQAkw" type="5004"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Uv8vMfCMEeOEP-VOZrQAkw" type="7001">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Uv8vMvCMEeOEP-VOZrQAkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uv8vM_CMEeOEP-VOZrQAkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_UwC10PCMEeOEP-VOZrQAkw" visible="false" type="AppliedStereotypeCompartment">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_UwC10fCMEeOEP-VOZrQAkw" showTitle="true"/>

-        <element xmi:type="ADL4Eclipse:Plugin" href="papyrusNewChild.uml#_J2tUwPCMEeOEP-VOZrQAkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UwC10vCMEeOEP-VOZrQAkw"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_UwDc4PCMEeOEP-VOZrQAkw" type="compartment_shape_display">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_UwDc4fCMEeOEP-VOZrQAkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UwDc4vCMEeOEP-VOZrQAkw"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_cFemwPCWEeOEP-VOZrQAkw" type="3069" fillColor="10011046">

-        <children xmi:type="notation:DecorationNode" xmi:id="_cFfN0PCWEeOEP-VOZrQAkw" type="5006">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_cFfN0fCWEeOEP-VOZrQAkw" x="-258" y="2"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_cFf04PCWEeOEP-VOZrQAkw" type="5007">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_cFf04fCWEeOEP-VOZrQAkw" x="25" y="-10"/>

-        </children>

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_tXlnwPCWEeOEP-VOZrQAkw" name="maskLabel">

-          <stringListValue>name</stringListValue>

-        </styles>

-        <element xmi:type="uml:Port" href="papyrusNewChild.uml#_KeDBkPCMEeOEP-VOZrQAkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cFemwfCWEeOEP-VOZrQAkw" x="-10" y="47"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_fCvCEPCWEeOEP-VOZrQAkw" type="3069" fillColor="10011046">

-        <children xmi:type="notation:DecorationNode" xmi:id="_fCvpIPCWEeOEP-VOZrQAkw" type="5006">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_fCvpIfCWEeOEP-VOZrQAkw" x="-247" y="2"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_fCwQMPCWEeOEP-VOZrQAkw" type="5007">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_fCwQMfCWEeOEP-VOZrQAkw" x="25" y="-10"/>

-        </children>

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_p1uDgPCWEeOEP-VOZrQAkw" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <element xmi:type="uml:Port" href="papyrusNewChild.uml#_KeHTAPCMEeOEP-VOZrQAkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fCvCEfCWEeOEP-VOZrQAkw" x="-10" y="-10"/>

-      </children>

-      <element xmi:type="uml:Component" href="papyrusNewChild.uml#_J2qRcPCMEeOEP-VOZrQAkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uv8IIfCMEeOEP-VOZrQAkw" x="480" y="240"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_qr0woPCMEeOEP-VOZrQAkw" type="2002">

-      <children xmi:type="notation:DecorationNode" xmi:id="_qr1XsPCMEeOEP-VOZrQAkw" type="5004"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_qr1XsfCMEeOEP-VOZrQAkw" type="7001">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_qr1XsvCMEeOEP-VOZrQAkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qr1Xs_CMEeOEP-VOZrQAkw"/>

-      </children>

-      <element xmi:type="uml:Component" href="papyrusNewChild.uml#_KSf44PCMEeOEP-VOZrQAkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qr0wofCMEeOEP-VOZrQAkw" x="700" y="20"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_ZudFAPCWEeOEP-VOZrQAkw" type="2002">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ZudsEPCWEeOEP-VOZrQAkw" type="5004"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_ZudsEfCWEeOEP-VOZrQAkw" type="7001">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_ZudsEvCWEeOEP-VOZrQAkw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZudsE_CWEeOEP-VOZrQAkw"/>

-      </children>

-      <element xmi:type="uml:Component" href="papyrusNewChild.uml#_KbTPkfCMEeOEP-VOZrQAkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZudFAfCWEeOEP-VOZrQAkw" x="420" y="20"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_PhuW0fCMEeOEP-VOZrQAkw" name="diagram_compatibility_version" stringValue="1.0.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_PhuW0vCMEeOEP-VOZrQAkw"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_PhuW0_CMEeOEP-VOZrQAkw">

-      <owner xmi:type="uml:Model" href="papyrusNewChild.uml#_vmIgwPCHEeOEP-VOZrQAkw"/>

-    </styles>

-    <element xmi:type="uml:Model" href="papyrusNewChild.uml#_vmIgwPCHEeOEP-VOZrQAkw"/>

-    <edges xmi:type="notation:Connector" xmi:id="_qsAW0PCMEeOEP-VOZrQAkw" type="4010" source="_Uv8IIPCMEeOEP-VOZrQAkw" target="_qr0woPCMEeOEP-VOZrQAkw">

-      <children xmi:type="notation:DecorationNode" xmi:id="_qsA94PCMEeOEP-VOZrQAkw" visible="false" type="6009">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qsA94fCMEeOEP-VOZrQAkw" y="60"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_qsBk8PCMEeOEP-VOZrQAkw" visible="false" type="6023">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qsCMAPCMEeOEP-VOZrQAkw" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_qsAW0fCMEeOEP-VOZrQAkw"/>

-      <element xmi:type="uml:Dependency" href="papyrusNewChild.uml#_KTKnQPCMEeOEP-VOZrQAkw"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qsAW0vCMEeOEP-VOZrQAkw" points="[0, 0, -167, 160]$[-13, -64, -180, 96]$[167, -64, 0, 96]$[167, -150, 0, 10]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wj2vcPCWEeOEP-VOZrQAkw" id="(0.6,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wj2vcfCWEeOEP-VOZrQAkw" id="(0.5333333333333333,0.8571428571428571)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_ZundEPCWEeOEP-VOZrQAkw" type="4010" source="_Uv8IIPCMEeOEP-VOZrQAkw" target="_ZudFAPCWEeOEP-VOZrQAkw">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ZuoEIPCWEeOEP-VOZrQAkw" visible="false" type="6009">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZuoEIfCWEeOEP-VOZrQAkw" y="60"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_ZuorMPCWEeOEP-VOZrQAkw" visible="false" type="6023">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZuorMfCWEeOEP-VOZrQAkw" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_ZundEfCWEeOEP-VOZrQAkw"/>

-      <element xmi:type="uml:Dependency" href="papyrusNewChild.uml#_Kbzl4PCMEeOEP-VOZrQAkw"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZundEvCWEeOEP-VOZrQAkw" points="[-71, -35, 498, 246]$[-569, -281, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yGb8gPCWEeOEP-VOZrQAkw" id="(0.3,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yGb8gfCWEeOEP-VOZrQAkw" id="(0.5219298245614035,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_gvzA0PCWEeOEP-VOZrQAkw" type="4010" source="_Qs0Q8PCMEeOEP-VOZrQAkw" target="_Uv8IIPCMEeOEP-VOZrQAkw">

-      <children xmi:type="notation:DecorationNode" xmi:id="_gvzn4PCWEeOEP-VOZrQAkw" visible="false" type="6009">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_gvzn4fCWEeOEP-VOZrQAkw" y="60"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_gv0O8PCWEeOEP-VOZrQAkw" visible="false" type="6023">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_gv0O8fCWEeOEP-VOZrQAkw" x="-105" y="89"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_gvzA0fCWEeOEP-VOZrQAkw"/>

-      <element xmi:type="uml:Dependency" href="papyrusNewChild.uml#_KgbnMPCMEeOEP-VOZrQAkw"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gvzA0vCWEeOEP-VOZrQAkw" points="[-142, -5, 299, 8]$[-341, -11, 100, 2]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ytjm4PCWEeOEP-VOZrQAkw" id="(0.0,0.5)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ytjm4fCWEeOEP-VOZrQAkw" id="(1.0,0.5)"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_y6tAIPCYEeOEP-VOZrQAkw" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_zUhOUPCYEeOEP-VOZrQAkw" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_zUh1YPCYEeOEP-VOZrQAkw" type="5038"/>

-      <element xmi:type="uml:Comment" href="papyrusNewChild.uml#_g71cQPCXEeOEP-VOZrQAkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zUhOUfCYEeOEP-VOZrQAkw" x="132" y="10" width="799" height="242"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_O8IqkPCZEeOEP-VOZrQAkw" type="2012">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rHTJcPFBEeOsMc9uAZsKjQ" source="PapyrusHyperLink_Document">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rHTJcfFBEeOsMc9uAZsKjQ" key="tooltip_text" value="Example of obtained Menu"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rHTJcvFBEeOsMc9uAZsKjQ" key="localization" value="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\MenuExample.png"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rHTJc_FBEeOsMc9uAZsKjQ" key="is_default_navigation" value="false"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rHTwgPFBEeOsMc9uAZsKjQ" source="PapyrusHyperLink_Document">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rHTwgfFBEeOsMc9uAZsKjQ" key="tooltip_text" value="Example of xml for a creation menu"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rHTwgvFBEeOsMc9uAZsKjQ" key="localization" value="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\codeXML.PNG"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rHTwg_FBEeOsMc9uAZsKjQ" key="is_default_navigation" value="false"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_O8IqkvCZEeOEP-VOZrQAkw" type="5038"/>

-      <element xmi:type="uml:Comment" href="papyrusNewChild.uml#_O5dxEPCZEeOEP-VOZrQAkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O8IqkfCZEeOEP-VOZrQAkw" x="142" y="434" width="793"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_Wc_M4PCZEeOEP-VOZrQAkw" type="2012">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_j2qhwPCvEeOqGbIPsOYq6g" source="PapyrusHyperLink_Page">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_j2rI0PCvEeOqGbIPsOYq6g" key="tooltip_text" value="Structure of Creation Menu Metamodel"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_j2rI0fCvEeOqGbIPsOYq6g" key="pageName" value="PapyrusHyperLink_Page"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_j2rI0vCvEeOqGbIPsOYq6g" key="is_default_navigation" value="false"/>

-        <references xmi:type="notation:Diagram" href="ElementCreationMenuModel.notation#_VJWf0FXPEeOhVe6k7yzS3A"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Wc_z8fCZEeOEP-VOZrQAkw" type="5038"/>

-      <element xmi:type="uml:Comment" href="papyrusNewChild.uml#_tnuqoPCYEeOEP-VOZrQAkw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wc_z8PCZEeOEP-VOZrQAkw" x="138" y="286" width="797" height="139"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_y6tAIfCYEeOEP-VOZrQAkw" name="diagram_compatibility_version" stringValue="1.0.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_y6tAIvCYEeOEP-VOZrQAkw"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_y6tAI_CYEeOEP-VOZrQAkw">

-      <owner xmi:type="uml:Model" href="papyrusNewChild.uml#_vmIgwPCHEeOEP-VOZrQAkw"/>

-    </styles>

-    <element xmi:type="uml:Model" href="papyrusNewChild.uml#_vmIgwPCHEeOEP-VOZrQAkw"/>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_JdFvgPC7EeOQTc9S_J6Sug" type="UseCase" name="How to" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_KE59cPC7EeOQTc9S_J6Sug" type="2013">

-      <children xmi:type="notation:DecorationNode" xmi:id="_KE-O4PC7EeOQTc9S_J6Sug" type="5016"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_KE-18PC7EeOQTc9S_J6Sug" type="7009">

-        <styles xmi:type="notation:SortingStyle" xmi:id="_KE-18fC7EeOQTc9S_J6Sug"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_KE-18vC7EeOQTc9S_J6Sug"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KE-18_C7EeOQTc9S_J6Sug"/>

-      </children>

-      <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_-bickFOIEeOuspyO4PzXCg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KE59cfC7EeOQTc9S_J6Sug" x="58" y="12"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_LUGUcPC7EeOQTc9S_J6Sug" type="2018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_x_ctAPFBEeOsMc9uAZsKjQ" source="PapyrusHyperLink_Document">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_x_ctAfFBEeOsMc9uAZsKjQ" key="tooltip_text" value="EnableCreationMenu"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_x_ctAvFBEeOsMc9uAZsKjQ" key="localization" value="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\EnableCreationMenu.png"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_x_ctA_FBEeOsMc9uAZsKjQ" key="is_default_navigation" value="false"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_LUG7gPC7EeOQTc9S_J6Sug" type="5027"/>

-      <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_LUGUcfC7EeOQTc9S_J6Sug"/>

-      <element xmi:type="uml:Comment" href="papyrusNewChild.uml#_LfJYwPC5EeOVd6MoZuILbA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LUGUcvC7EeOQTc9S_J6Sug" x="426" y="13" width="958"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_GCZU0PC8EeOQTc9S_J6Sug" type="2013">

-      <children xmi:type="notation:DecorationNode" xmi:id="_GCZ74PC8EeOQTc9S_J6Sug" type="5016"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_GCai8PC8EeOQTc9S_J6Sug" type="7009">

-        <styles xmi:type="notation:SortingStyle" xmi:id="_GCai8fC8EeOQTc9S_J6Sug"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_GCai8vC8EeOQTc9S_J6Sug"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GCai8_C8EeOQTc9S_J6Sug"/>

-      </children>

-      <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_EPnUAFOJEeOuspyO4PzXCg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GCZU0fC8EeOQTc9S_J6Sug" x="12" y="228"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_G39D0PC8EeOQTc9S_J6Sug" type="2018">

-      <children xmi:type="notation:DecorationNode" xmi:id="_G39q4PC8EeOQTc9S_J6Sug" type="5027"/>

-      <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_G39D0fC8EeOQTc9S_J6Sug"/>

-      <element xmi:type="uml:Comment" href="papyrusNewChild.uml#_P_VmcPC5EeOVd6MoZuILbA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G39D0vC8EeOQTc9S_J6Sug" x="426" y="89" width="958"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_yaEwUPE9EeOsMc9uAZsKjQ" type="2018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nunoUPE_EeOsMc9uAZsKjQ" source="Stereotype_Annotation">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nuoPYPE_EeOsMc9uAZsKjQ" key="StereotypeWithQualifiedNameList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nuoPYfE_EeOsMc9uAZsKjQ" key="StereotypeList" value="DeveloperProcess::structure::UserDoc"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nuo2cPE_EeOsMc9uAZsKjQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nuo2cfE_EeOsMc9uAZsKjQ" key="PropStereoDisplay" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nuo2cvE_EeOsMc9uAZsKjQ" key="StereotypePropertyLocation" value="Compartment"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NkvOAPFCEeOsMc9uAZsKjQ" source="PapyrusHyperLink_Document">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NkvOAfFCEeOsMc9uAZsKjQ" key="tooltip_text" value="Creation menu for a package with a specific icon"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NkvOAvFCEeOsMc9uAZsKjQ" key="localization" value="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\PackageWithIconO.png"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NkvOA_FCEeOsMc9uAZsKjQ" key="is_default_navigation" value="false"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Nkv1EPFCEeOsMc9uAZsKjQ" source="PapyrusHyperLink_Document">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Nkv1EfFCEeOsMc9uAZsKjQ" key="tooltip_text" value="Result for this menu"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Nkv1EvFCEeOsMc9uAZsKjQ" key="localization" value="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\PackageWithIconOIllustration.png"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Nkv1E_FCEeOsMc9uAZsKjQ" key="is_default_navigation" value="false"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_yaJo0PE9EeOsMc9uAZsKjQ" type="5027"/>

-      <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_yaEwUfE9EeOsMc9uAZsKjQ"/>

-      <element xmi:type="uml:Comment" href="papyrusNewChild.uml#_Y6GWAPE9EeOsMc9uAZsKjQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yaEwUvE9EeOsMc9uAZsKjQ" x="426" y="299" width="958" height="42"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_yyYioPE9EeOsMc9uAZsKjQ" type="2018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_omOlwPE_EeOsMc9uAZsKjQ" source="Stereotype_Annotation">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_omOlwfE_EeOsMc9uAZsKjQ" key="StereotypeWithQualifiedNameList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_omOlwvE_EeOsMc9uAZsKjQ" key="StereotypeList" value="DeveloperProcess::structure::UserDoc"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_omPM0PE_EeOsMc9uAZsKjQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_omPM0fE_EeOsMc9uAZsKjQ" key="PropStereoDisplay" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_omPM0vE_EeOsMc9uAZsKjQ" key="StereotypePropertyLocation" value="Compartment"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CX9-IPFDEeOsMc9uAZsKjQ" source="PapyrusHyperLink_Document">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CX9-IfFDEeOsMc9uAZsKjQ" key="tooltip_text" value="Result for the menu nestedClass"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CX9-IvFDEeOsMc9uAZsKjQ" key="localization" value="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\NestedClassifierIllustration.png"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CX9-I_FDEeOsMc9uAZsKjQ" key="is_default_navigation" value="false"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CX_MQPFDEeOsMc9uAZsKjQ" source="PapyrusHyperLink_Document">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CX_MQfFDEeOsMc9uAZsKjQ" key="tooltip_text" value="Creation menu model for nested class"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CX_MQvFDEeOsMc9uAZsKjQ" key="localization" value="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\NestedClassifier.png"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CX_MQ_FDEeOsMc9uAZsKjQ" key="is_default_navigation" value="false"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_yyZJsPE9EeOsMc9uAZsKjQ" type="5027"/>

-      <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_yyYiofE9EeOsMc9uAZsKjQ"/>

-      <element xmi:type="uml:Comment" href="papyrusNewChild.uml#_Zlv7EPE9EeOsMc9uAZsKjQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yyYiovE9EeOsMc9uAZsKjQ" x="426" y="350" width="958" height="45"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_zHNjIPE9EeOsMc9uAZsKjQ" type="2018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pWJm0PE_EeOsMc9uAZsKjQ" source="Stereotype_Annotation">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pWJm0fE_EeOsMc9uAZsKjQ" key="StereotypeWithQualifiedNameList" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pWJm0vE_EeOsMc9uAZsKjQ" key="StereotypeList" value="DeveloperProcess::structure::UserDoc"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pWKN4PE_EeOsMc9uAZsKjQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pWKN4fE_EeOsMc9uAZsKjQ" key="PropStereoDisplay" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pWKN4vE_EeOsMc9uAZsKjQ" key="StereotypePropertyLocation" value="Compartment"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gDpZUPFCEeOsMc9uAZsKjQ" source="PapyrusHyperLink_Document">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gDpZUfFCEeOsMc9uAZsKjQ" key="tooltip_text" value="Creation menu model for activity"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gDpZUvFCEeOsMc9uAZsKjQ" key="localization" value="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\AllPossibleActivities.png"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gDpZU_FCEeOsMc9uAZsKjQ" key="is_default_navigation" value="false"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gDqAYPFCEeOsMc9uAZsKjQ" source="PapyrusHyperLink_Document">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gDqAYfFCEeOsMc9uAZsKjQ" key="tooltip_text" value="Result for this menu activity"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gDqAYvFCEeOsMc9uAZsKjQ" key="localization" value="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\AllPossibleActivitiesIllustration.png"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gDqAY_FCEeOsMc9uAZsKjQ" key="is_default_navigation" value="false"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_zHNjI_E9EeOsMc9uAZsKjQ" type="5027"/>

-      <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_zHNjIfE9EeOsMc9uAZsKjQ"/>

-      <element xmi:type="uml:Comment" href="papyrusNewChild.uml#_aJwAAPE9EeOsMc9uAZsKjQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zHNjIvE9EeOsMc9uAZsKjQ" x="426" y="397" width="958"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_JdFvgfC7EeOQTc9S_J6Sug" name="diagram_compatibility_version" stringValue="1.0.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_JdFvgvC7EeOQTc9S_J6Sug"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_JdFvg_C7EeOQTc9S_J6Sug">

-      <owner xmi:type="uml:Model" href="papyrusNewChild.uml#_u8E-gPCEEeOEP-VOZrQAkw"/>

-    </styles>

-    <element xmi:type="uml:Model" href="papyrusNewChild.uml#_u8E-gPCEEeOEP-VOZrQAkw"/>

-    <edges xmi:type="notation:Connector" xmi:id="_kt51UPC7EeOQTc9S_J6Sug" type="4014" source="_LUGUcPC7EeOQTc9S_J6Sug" target="_KE59cPC7EeOQTc9S_J6Sug">

-      <styles xmi:type="notation:FontStyle" xmi:id="_kt51UfC7EeOQTc9S_J6Sug"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kt51UvC7EeOQTc9S_J6Sug" points="[-37, -5, 154, 9]$[-121, -21, 70, -7]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kuENYPC7EeOQTc9S_J6Sug" id="(0.0,0.38235294117647056)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wv8JwPE9EeOsMc9uAZsKjQ" id="(0.951048951048951,0.4666666666666667)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_HeQO0PC8EeOQTc9S_J6Sug" type="4014" source="_G39D0PC8EeOQTc9S_J6Sug" target="_GCZU0PC8EeOQTc9S_J6Sug">

-      <styles xmi:type="notation:FontStyle" xmi:id="_HeQO0fC8EeOQTc9S_J6Sug"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HeQO0vC8EeOQTc9S_J6Sug" points="[0, 0, 224, -50]$[-224, 0, 0, -50]$[-224, 36, 0, -14]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HeVHUPC8EeOQTc9S_J6Sug" id="(0.0,0.5722222222222222)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HeVHUfC8EeOQTc9S_J6Sug" id="(0.581039755351682,0.23333333333333334)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_z9Bw0PE9EeOsMc9uAZsKjQ" type="4014" source="_yaEwUPE9EeOsMc9uAZsKjQ" target="_GCZU0PC8EeOQTc9S_J6Sug">

-      <styles xmi:type="notation:FontStyle" xmi:id="_z9Bw0fE9EeOsMc9uAZsKjQ"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_z9Bw0vE9EeOsMc9uAZsKjQ" points="[-1, 7, 166, 46]$[-167, 7, 0, 46]$[-167, -40, 0, -1]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z9GpUPE9EeOsMc9uAZsKjQ" id="(0.0010438413361169101,0.5714285714285714)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KJfzAPE-EeOsMc9uAZsKjQ" id="(0.7584097859327217,0.9333333333333333)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_LkxeMPE-EeOsMc9uAZsKjQ" type="4014" source="_yyYioPE9EeOsMc9uAZsKjQ" target="_GCZU0PC8EeOQTc9S_J6Sug">

-      <styles xmi:type="notation:FontStyle" xmi:id="_LkxeMfE-EeOsMc9uAZsKjQ"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LkxeMvE-EeOsMc9uAZsKjQ" points="[0, 0, 218, 73]$[-218, 0, 0, 73]$[-218, -74, 0, -1]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Lk1voPE-EeOsMc9uAZsKjQ" id="(0.0,0.24444444444444444)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_j7ua8PE-EeOsMc9uAZsKjQ" id="(0.599388379204893,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_4zFrYPE-EeOsMc9uAZsKjQ" type="4014" source="_zHNjIPE9EeOsMc9uAZsKjQ" target="_GCZU0PC8EeOQTc9S_J6Sug">

-      <styles xmi:type="notation:FontStyle" xmi:id="_4zFrYfE-EeOsMc9uAZsKjQ"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4zFrYvE-EeOsMc9uAZsKjQ" points="[-3, 6, 263, 136]$[-266, 6, 0, 136]$[-266, -129, 0, 1]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LNHZ4PFDEeOsMc9uAZsKjQ" id="(0.003131524008350731,0.31666666666666665)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LNIA8PFDEeOsMc9uAZsKjQ" id="(0.4617737003058104,0.9666666666666667)"/>

-    </edges>

-  </notation:Diagram>

-</xmi:XMI>

+<?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:ADL4Eclipse="http:///schemas/ADL4Eclipse/_rk7nwOqKEeOfTcbrnCq2oQ/3" xmlns:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" 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:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/ADL4Eclipse/_rk7nwOqKEeOfTcbrnCq2oQ/3 pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml#_rlFYwOqKEeOfTcbrnCq2oQ 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="PapyrusUMLClassDiagram" name="OverView" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_BTyyIPCEEeOEP-VOZrQAkw" type="2005">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BT0nUPCEEeOEP-VOZrQAkw" type="5020"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_BT0nUfCEEeOEP-VOZrQAkw" type="7009">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BT0nUvCEEeOEP-VOZrQAkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BT0nU_CEEeOEP-VOZrQAkw"/>
+      </children>
+      <element xmi:type="uml:Model" href="papyrusNewChild.uml#_52hvUPCDEeOEP-VOZrQAkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BTyyIfCEEeOEP-VOZrQAkw" x="470" y="68"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_WG70cPCFEeOEP-VOZrQAkw" type="2005">
+      <children xmi:type="notation:DecorationNode" xmi:id="_WG8bgPCFEeOEP-VOZrQAkw" type="5020"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_WG9CkPCFEeOEP-VOZrQAkw" type="7009">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_WG9CkfCFEeOEP-VOZrQAkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WG9CkvCFEeOEP-VOZrQAkw"/>
+      </children>
+      <element xmi:type="uml:Model" href="papyrusNewChild.uml#_u8E-gPCEEeOEP-VOZrQAkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WG70cfCFEeOEP-VOZrQAkw" x="473" y="220"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_aC1pUPCFEeOEP-VOZrQAkw" type="2005">
+      <children xmi:type="notation:DecorationNode" xmi:id="_aC2QYPCFEeOEP-VOZrQAkw" type="5020"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_aC2QYfCFEeOEP-VOZrQAkw" type="7009">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_aC2QYvCFEeOEP-VOZrQAkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aC2QY_CFEeOEP-VOZrQAkw"/>
+      </children>
+      <element xmi:type="uml:Model" href="papyrusNewChild.uml#_SJaO8PCFEeOEP-VOZrQAkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aC1pUfCFEeOEP-VOZrQAkw" x="232" y="353"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_zX6JQPCHEeOEP-VOZrQAkw" type="2005">
+      <children xmi:type="notation:DecorationNode" xmi:id="_zX6wUPCHEeOEP-VOZrQAkw" type="5020"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_zX6wUfCHEeOEP-VOZrQAkw" type="7009">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_zX6wUvCHEeOEP-VOZrQAkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zX7XYPCHEeOEP-VOZrQAkw"/>
+      </children>
+      <element xmi:type="uml:Model" href="papyrusNewChild.uml#_vmIgwPCHEeOEP-VOZrQAkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zX6JQfCHEeOEP-VOZrQAkw" x="920" y="337"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_Py2DcVOFEeOuspyO4PzXCg"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_XdKJ4LXUEeOXiJT1xTrETA">
+      <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmpNxhEeOqHvRyiN87hA"/>
+    </styles>
+    <element xmi:type="uml:Model" href="papyrusNewChild.uml#_a0QCwFOCEeOE6bh9v5dYKg"/>
+    <edges xmi:type="notation:Connector" xmi:id="_XPew4PCFEeOEP-VOZrQAkw" type="4006" source="_WG70cPCFEeOEP-VOZrQAkw" target="_BTyyIPCEEeOEP-VOZrQAkw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_XPfX8PCFEeOEP-VOZrQAkw" visible="false" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XPfX8fCFEeOEP-VOZrQAkw" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_XPf_APCFEeOEP-VOZrQAkw" visible="false" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XPf_AfCFEeOEP-VOZrQAkw" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_XPew4fCFEeOEP-VOZrQAkw"/>
+      <element xmi:type="uml:Abstraction" href="papyrusNewChild.uml#_XPLO4PCFEeOEP-VOZrQAkw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XPew4vCFEeOEP-VOZrQAkw" points="[-1, -3, -2, 137]$[-66, -90, -67, 50]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XPn60PCFEeOEP-VOZrQAkw" id="(0.365,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XtPq8PCFEeOEP-VOZrQAkw" id="(0.38,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_cIo4MPCFEeOEP-VOZrQAkw" type="4006" source="_aC1pUPCFEeOEP-VOZrQAkw" target="_WG70cPCFEeOEP-VOZrQAkw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_cIpfQPCFEeOEP-VOZrQAkw" visible="false" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cIpfQfCFEeOEP-VOZrQAkw" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_cIqGUPCFEeOEP-VOZrQAkw" visible="false" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cIqGUfCFEeOEP-VOZrQAkw" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_cIo4MfCFEeOEP-VOZrQAkw"/>
+      <element xmi:type="uml:Abstraction" href="papyrusNewChild.uml#_cIl04PCFEeOEP-VOZrQAkw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cIo4MvCFEeOEP-VOZrQAkw" points="[25, -10, -273, 83]$[221, -143, -77, -50]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cIypMPCFEeOEP-VOZrQAkw" id="(0.215,0.1)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_z2-D0PCHEeOEP-VOZrQAkw" type="4006" source="_zX6JQPCHEeOEP-VOZrQAkw" target="_WG70cPCFEeOEP-VOZrQAkw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_z2-q4PCHEeOEP-VOZrQAkw" visible="false" type="6014">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_z2-q4fCHEeOEP-VOZrQAkw" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_z2_R8PCHEeOEP-VOZrQAkw" visible="false" type="6015">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_z2_R8fCHEeOEP-VOZrQAkw" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_z2-D0fCHEeOEP-VOZrQAkw"/>
+      <element xmi:type="uml:Abstraction" href="papyrusNewChild.uml#_z27AgPCHEeOEP-VOZrQAkw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_z2-D0vCHEeOEP-VOZrQAkw" points="[-43, -9, 347, 70]$[-290, -71, 100, 8]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z3Ib4PCHEeOEP-VOZrQAkw" id="(0.215,0.12)"/>
+    </edges>
+  </notation:Diagram>
+  <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="33023" 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>
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l1VVEPCHEeOEP-VOZrQAkw" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l1XKQPCHEeOEP-VOZrQAkw" key="gradient" value="true"/>
+          </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="4227327" 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>
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ofuewPCHEeOEP-VOZrQAkw" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ofvs4PCHEeOEP-VOZrQAkw" key="gradient" value="true"/>
+          </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"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_5OV4gPCEEeOEP-VOZrQAkw">
+      <owner xmi:type="uml:Model" href="papyrusNewChild.uml#_u8E-gPCEEeOEP-VOZrQAkw"/>
+    </styles>
+    <element xmi:type="uml:Model" href="papyrusNewChild.uml#_u8E-gPCEEeOEP-VOZrQAkw"/>
+    <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/5.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"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_2Txk0PCEEeOEP-VOZrQAkw">
+      <owner xmi:type="uml:Model" href="papyrusNewChild.uml#_u8E-gPCEEeOEP-VOZrQAkw"/>
+    </styles>
+    <element xmi:type="uml:Model" href="papyrusNewChild.uml#_u8E-gPCEEeOEP-VOZrQAkw"/>
+    <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="_YiWQULXUEeOXiJT1xTrETA" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiW3YLXUEeOXiJT1xTrETA" key="StereotypeList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiXecLXUEeOXiJT1xTrETA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiXecbXUEeOXiJT1xTrETA" key="PropStereoDisplay" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiYFgLXUEeOXiJT1xTrETA" 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="_YieMILXUEeOXiJT1xTrETA" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiezMLXUEeOXiJT1xTrETA" key="StereotypeList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiezMbXUEeOXiJT1xTrETA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YifaQLXUEeOXiJT1xTrETA" key="PropStereoDisplay" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YigBULXUEeOXiJT1xTrETA" 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="_Yi0xcLXUEeOXiJT1xTrETA" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi1YgLXUEeOXiJT1xTrETA" key="StereotypeList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi1YgbXUEeOXiJT1xTrETA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi1_kLXUEeOXiJT1xTrETA" key="PropStereoDisplay" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi2moLXUEeOXiJT1xTrETA" 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="_Yilg4LXUEeOXiJT1xTrETA" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YimH8LXUEeOXiJT1xTrETA" key="StereotypeList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YimvALXUEeOXiJT1xTrETA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YimvAbXUEeOXiJT1xTrETA" key="PropStereoDisplay" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YinWELXUEeOXiJT1xTrETA" 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="_YitcsLXUEeOXiJT1xTrETA" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YitcsbXUEeOXiJT1xTrETA" key="StereotypeList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiuDwLXUEeOXiJT1xTrETA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YiuDwbXUEeOXiJT1xTrETA" key="PropStereoDisplay" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yiuq0LXUEeOXiJT1xTrETA" 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="_Yi8GMLXUEeOXiJT1xTrETA" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi8tQLXUEeOXiJT1xTrETA" key="StereotypeList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi8tQbXUEeOXiJT1xTrETA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi9UULXUEeOXiJT1xTrETA" key="PropStereoDisplay" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Yi97YLXUEeOXiJT1xTrETA" 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>
+  <css:ModelStyleSheets xmi:id="_Aod9MPCEEeOEP-VOZrQAkw"/>
+  <notation:Diagram xmi:id="_PhuW0PCMEeOEP-VOZrQAkw" type="PapyrusUMLComponentDiagram" name="Architecture" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_Qs0Q8PCMEeOEP-VOZrQAkw" type="2002" fillColor="10011046">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Qs04APCMEeOEP-VOZrQAkw" type="5004"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Qs04AfCMEeOEP-VOZrQAkw" type="7001">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Qs04AvCMEeOEP-VOZrQAkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qs04A_CMEeOEP-VOZrQAkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Qs6-oPCMEeOEP-VOZrQAkw" visible="false" type="AppliedStereotypeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Qs6-ofCMEeOEP-VOZrQAkw" showTitle="true"/>
+        <element xmi:type="ADL4Eclipse:Plugin" href="papyrusNewChild.uml#_KeKWUPCMEeOEP-VOZrQAkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qs6-ovCMEeOEP-VOZrQAkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Qs6-o_CMEeOEP-VOZrQAkw" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Qs7lsPCMEeOEP-VOZrQAkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qs7lsfCMEeOEP-VOZrQAkw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_Tdu5YPCMEeOEP-VOZrQAkw" type="3069" fillColor="10011046">
+        <children xmi:type="notation:DecorationNode" xmi:id="_TdvgcPCMEeOEP-VOZrQAkw" type="5006">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TdvgcfCMEeOEP-VOZrQAkw" x="7" y="-28"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_TdwHgPCMEeOEP-VOZrQAkw" type="5007">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TdwukPCMEeOEP-VOZrQAkw" x="25" y="-10"/>
+        </children>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_udYyMPCWEeOEP-VOZrQAkw" name="maskLabel">
+          <stringListValue>name</stringListValue>
+        </styles>
+        <element xmi:type="uml:Port" href="papyrusNewChild.uml#_KgkKEPCMEeOEP-VOZrQAkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tdu5YfCMEeOEP-VOZrQAkw" x="-7" y="-10"/>
+      </children>
+      <element xmi:type="uml:Component" href="papyrusNewChild.uml#_KeJIMPCMEeOEP-VOZrQAkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qs0Q8fCMEeOEP-VOZrQAkw" x="860" y="240"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Uv8IIPCMEeOEP-VOZrQAkw" type="2002" fillColor="10011046">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kbSmsPCMEeOEP-VOZrQAkw" source="Stereotype_Annotation">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nvNOgPCMEeOEP-VOZrQAkw" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nvN1kPCMEeOEP-VOZrQAkw" key="StereotypeList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nvOcoPCMEeOEP-VOZrQAkw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nvOcofCMEeOEP-VOZrQAkw" key="PropStereoDisplay" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nvPDsPCMEeOEP-VOZrQAkw" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Uv8vMPCMEeOEP-VOZrQAkw" type="5004"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Uv8vMfCMEeOEP-VOZrQAkw" type="7001">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Uv8vMvCMEeOEP-VOZrQAkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uv8vM_CMEeOEP-VOZrQAkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UwC10PCMEeOEP-VOZrQAkw" visible="false" type="AppliedStereotypeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UwC10fCMEeOEP-VOZrQAkw" showTitle="true"/>
+        <element xmi:type="ADL4Eclipse:Plugin" href="papyrusNewChild.uml#_J2tUwPCMEeOEP-VOZrQAkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UwC10vCMEeOEP-VOZrQAkw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UwDc4PCMEeOEP-VOZrQAkw" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UwDc4fCMEeOEP-VOZrQAkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UwDc4vCMEeOEP-VOZrQAkw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_cFemwPCWEeOEP-VOZrQAkw" type="3069" fillColor="10011046">
+        <children xmi:type="notation:DecorationNode" xmi:id="_cFfN0PCWEeOEP-VOZrQAkw" type="5006">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_cFfN0fCWEeOEP-VOZrQAkw" x="-258" y="2"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_cFf04PCWEeOEP-VOZrQAkw" type="5007">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_cFf04fCWEeOEP-VOZrQAkw" x="25" y="-10"/>
+        </children>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_tXlnwPCWEeOEP-VOZrQAkw" name="maskLabel">
+          <stringListValue>name</stringListValue>
+        </styles>
+        <element xmi:type="uml:Port" href="papyrusNewChild.uml#_KeDBkPCMEeOEP-VOZrQAkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cFemwfCWEeOEP-VOZrQAkw" x="-10" y="47"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_fCvCEPCWEeOEP-VOZrQAkw" type="3069" fillColor="10011046">
+        <children xmi:type="notation:DecorationNode" xmi:id="_fCvpIPCWEeOEP-VOZrQAkw" type="5006">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_fCvpIfCWEeOEP-VOZrQAkw" x="-247" y="2"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_fCwQMPCWEeOEP-VOZrQAkw" type="5007">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_fCwQMfCWEeOEP-VOZrQAkw" x="25" y="-10"/>
+        </children>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_p1uDgPCWEeOEP-VOZrQAkw" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <element xmi:type="uml:Port" href="papyrusNewChild.uml#_KeHTAPCMEeOEP-VOZrQAkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fCvCEfCWEeOEP-VOZrQAkw" x="-10" y="-10"/>
+      </children>
+      <element xmi:type="uml:Component" href="papyrusNewChild.uml#_J2qRcPCMEeOEP-VOZrQAkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uv8IIfCMEeOEP-VOZrQAkw" x="480" y="240"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_qr0woPCMEeOEP-VOZrQAkw" type="2002">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qr1XsPCMEeOEP-VOZrQAkw" type="5004"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qr1XsfCMEeOEP-VOZrQAkw" type="7001">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qr1XsvCMEeOEP-VOZrQAkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qr1Xs_CMEeOEP-VOZrQAkw"/>
+      </children>
+      <element xmi:type="uml:Component" href="papyrusNewChild.uml#_KSf44PCMEeOEP-VOZrQAkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qr0wofCMEeOEP-VOZrQAkw" x="700" y="20"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ZudFAPCWEeOEP-VOZrQAkw" type="2002">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZudsEPCWEeOEP-VOZrQAkw" type="5004"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ZudsEfCWEeOEP-VOZrQAkw" type="7001">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ZudsEvCWEeOEP-VOZrQAkw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZudsE_CWEeOEP-VOZrQAkw"/>
+      </children>
+      <element xmi:type="uml:Component" href="papyrusNewChild.uml#_KbTPkfCMEeOEP-VOZrQAkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZudFAfCWEeOEP-VOZrQAkw" x="420" y="20"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_PhuW0fCMEeOEP-VOZrQAkw" name="diagram_compatibility_version" stringValue="1.0.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_PhuW0vCMEeOEP-VOZrQAkw"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_PhuW0_CMEeOEP-VOZrQAkw">
+      <owner xmi:type="uml:Model" href="papyrusNewChild.uml#_vmIgwPCHEeOEP-VOZrQAkw"/>
+    </styles>
+    <element xmi:type="uml:Model" href="papyrusNewChild.uml#_vmIgwPCHEeOEP-VOZrQAkw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_qsAW0PCMEeOEP-VOZrQAkw" type="4010" source="_Uv8IIPCMEeOEP-VOZrQAkw" target="_qr0woPCMEeOEP-VOZrQAkw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qsA94PCMEeOEP-VOZrQAkw" visible="false" type="6009">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qsA94fCMEeOEP-VOZrQAkw" y="60"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qsBk8PCMEeOEP-VOZrQAkw" visible="false" type="6023">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qsCMAPCMEeOEP-VOZrQAkw" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_qsAW0fCMEeOEP-VOZrQAkw"/>
+      <element xmi:type="uml:Dependency" href="papyrusNewChild.uml#_KTKnQPCMEeOEP-VOZrQAkw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qsAW0vCMEeOEP-VOZrQAkw" points="[0, 0, -167, 160]$[-13, -64, -180, 96]$[167, -64, 0, 96]$[167, -150, 0, 10]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wj2vcPCWEeOEP-VOZrQAkw" id="(0.6,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wj2vcfCWEeOEP-VOZrQAkw" id="(0.5333333333333333,0.8571428571428571)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_ZundEPCWEeOEP-VOZrQAkw" type="4010" source="_Uv8IIPCMEeOEP-VOZrQAkw" target="_ZudFAPCWEeOEP-VOZrQAkw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZuoEIPCWEeOEP-VOZrQAkw" visible="false" type="6009">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZuoEIfCWEeOEP-VOZrQAkw" y="60"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZuorMPCWEeOEP-VOZrQAkw" visible="false" type="6023">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZuorMfCWEeOEP-VOZrQAkw" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_ZundEfCWEeOEP-VOZrQAkw"/>
+      <element xmi:type="uml:Dependency" href="papyrusNewChild.uml#_Kbzl4PCMEeOEP-VOZrQAkw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZundEvCWEeOEP-VOZrQAkw" points="[-71, -35, 498, 246]$[-569, -281, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yGb8gPCWEeOEP-VOZrQAkw" id="(0.3,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yGb8gfCWEeOEP-VOZrQAkw" id="(0.5219298245614035,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_gvzA0PCWEeOEP-VOZrQAkw" type="4010" source="_Qs0Q8PCMEeOEP-VOZrQAkw" target="_Uv8IIPCMEeOEP-VOZrQAkw">
+      <children xmi:type="notation:DecorationNode" xmi:id="_gvzn4PCWEeOEP-VOZrQAkw" visible="false" type="6009">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gvzn4fCWEeOEP-VOZrQAkw" y="60"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_gv0O8PCWEeOEP-VOZrQAkw" visible="false" type="6023">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gv0O8fCWEeOEP-VOZrQAkw" x="-105" y="89"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_gvzA0fCWEeOEP-VOZrQAkw"/>
+      <element xmi:type="uml:Dependency" href="papyrusNewChild.uml#_KgbnMPCMEeOEP-VOZrQAkw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gvzA0vCWEeOEP-VOZrQAkw" points="[-142, -5, 299, 8]$[-341, -11, 100, 2]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ytjm4PCWEeOEP-VOZrQAkw" id="(0.0,0.5)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ytjm4fCWEeOEP-VOZrQAkw" id="(1.0,0.5)"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_y6tAIPCYEeOEP-VOZrQAkw" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_zUhOUPCYEeOEP-VOZrQAkw" type="2012">
+      <children xmi:type="notation:DecorationNode" xmi:id="_zUh1YPCYEeOEP-VOZrQAkw" type="5038"/>
+      <element xmi:type="uml:Comment" href="papyrusNewChild.uml#_g71cQPCXEeOEP-VOZrQAkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zUhOUfCYEeOEP-VOZrQAkw" x="132" y="10" width="799" height="242"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_O8IqkPCZEeOEP-VOZrQAkw" type="2012">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rHTJcPFBEeOsMc9uAZsKjQ" source="PapyrusHyperLink_Document">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rHTJcfFBEeOsMc9uAZsKjQ" key="tooltip_text" value="Example of obtained Menu"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rHTJcvFBEeOsMc9uAZsKjQ" key="localization" value="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\MenuExample.png"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rHTJc_FBEeOsMc9uAZsKjQ" key="is_default_navigation" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rHTwgPFBEeOsMc9uAZsKjQ" source="PapyrusHyperLink_Document">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rHTwgfFBEeOsMc9uAZsKjQ" key="tooltip_text" value="Example of xml for a creation menu"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rHTwgvFBEeOsMc9uAZsKjQ" key="localization" value="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\codeXML.PNG"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rHTwg_FBEeOsMc9uAZsKjQ" key="is_default_navigation" value="false"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_O8IqkvCZEeOEP-VOZrQAkw" type="5038"/>
+      <element xmi:type="uml:Comment" href="papyrusNewChild.uml#_O5dxEPCZEeOEP-VOZrQAkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O8IqkfCZEeOEP-VOZrQAkw" x="142" y="434" width="793"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Wc_M4PCZEeOEP-VOZrQAkw" type="2012">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_j2qhwPCvEeOqGbIPsOYq6g" source="PapyrusHyperLink_Page">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_j2rI0PCvEeOqGbIPsOYq6g" key="tooltip_text" value="Structure of Creation Menu Metamodel"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_j2rI0fCvEeOqGbIPsOYq6g" key="pageName" value="PapyrusHyperLink_Page"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_j2rI0vCvEeOqGbIPsOYq6g" key="is_default_navigation" value="false"/>
+        <references xmi:type="notation:Diagram" href="ElementCreationMenuModel.notation#_VJWf0FXPEeOhVe6k7yzS3A"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Wc_z8fCZEeOEP-VOZrQAkw" type="5038"/>
+      <element xmi:type="uml:Comment" href="papyrusNewChild.uml#_tnuqoPCYEeOEP-VOZrQAkw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wc_z8PCZEeOEP-VOZrQAkw" x="138" y="286" width="797" height="139"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_y6tAIfCYEeOEP-VOZrQAkw" name="diagram_compatibility_version" stringValue="1.0.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_y6tAIvCYEeOEP-VOZrQAkw"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_y6tAI_CYEeOEP-VOZrQAkw">
+      <owner xmi:type="uml:Model" href="papyrusNewChild.uml#_vmIgwPCHEeOEP-VOZrQAkw"/>
+    </styles>
+    <element xmi:type="uml:Model" href="papyrusNewChild.uml#_vmIgwPCHEeOEP-VOZrQAkw"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_JdFvgPC7EeOQTc9S_J6Sug" type="UseCase" name="How to" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_KE59cPC7EeOQTc9S_J6Sug" type="2013">
+      <children xmi:type="notation:DecorationNode" xmi:id="_KE-O4PC7EeOQTc9S_J6Sug" type="5016"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_KE-18PC7EeOQTc9S_J6Sug" type="7009">
+        <styles xmi:type="notation:SortingStyle" xmi:id="_KE-18fC7EeOQTc9S_J6Sug"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_KE-18vC7EeOQTc9S_J6Sug"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KE-18_C7EeOQTc9S_J6Sug"/>
+      </children>
+      <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_-bickFOIEeOuspyO4PzXCg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KE59cfC7EeOQTc9S_J6Sug" x="58" y="12"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_LUGUcPC7EeOQTc9S_J6Sug" type="2018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_x_ctAPFBEeOsMc9uAZsKjQ" source="PapyrusHyperLink_Document">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_x_ctAfFBEeOsMc9uAZsKjQ" key="tooltip_text" value="EnableCreationMenu"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_x_ctAvFBEeOsMc9uAZsKjQ" key="localization" value="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\EnableCreationMenu.png"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_x_ctA_FBEeOsMc9uAZsKjQ" key="is_default_navigation" value="false"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_LUG7gPC7EeOQTc9S_J6Sug" type="5027"/>
+      <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_LUGUcfC7EeOQTc9S_J6Sug"/>
+      <element xmi:type="uml:Comment" href="papyrusNewChild.uml#_LfJYwPC5EeOVd6MoZuILbA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LUGUcvC7EeOQTc9S_J6Sug" x="426" y="13" width="958"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_GCZU0PC8EeOQTc9S_J6Sug" type="2013">
+      <children xmi:type="notation:DecorationNode" xmi:id="_GCZ74PC8EeOQTc9S_J6Sug" type="5016"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_GCai8PC8EeOQTc9S_J6Sug" type="7009">
+        <styles xmi:type="notation:SortingStyle" xmi:id="_GCai8fC8EeOQTc9S_J6Sug"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_GCai8vC8EeOQTc9S_J6Sug"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GCai8_C8EeOQTc9S_J6Sug"/>
+      </children>
+      <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_EPnUAFOJEeOuspyO4PzXCg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GCZU0fC8EeOQTc9S_J6Sug" x="12" y="228"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_G39D0PC8EeOQTc9S_J6Sug" type="2018">
+      <children xmi:type="notation:DecorationNode" xmi:id="_G39q4PC8EeOQTc9S_J6Sug" type="5027"/>
+      <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_G39D0fC8EeOQTc9S_J6Sug"/>
+      <element xmi:type="uml:Comment" href="papyrusNewChild.uml#_P_VmcPC5EeOVd6MoZuILbA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G39D0vC8EeOQTc9S_J6Sug" x="426" y="89" width="958"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_yaEwUPE9EeOsMc9uAZsKjQ" type="2018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nunoUPE_EeOsMc9uAZsKjQ" source="Stereotype_Annotation">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nuoPYPE_EeOsMc9uAZsKjQ" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nuoPYfE_EeOsMc9uAZsKjQ" key="StereotypeList" value="DeveloperProcess::structure::UserDoc"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nuo2cPE_EeOsMc9uAZsKjQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nuo2cfE_EeOsMc9uAZsKjQ" key="PropStereoDisplay" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nuo2cvE_EeOsMc9uAZsKjQ" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NkvOAPFCEeOsMc9uAZsKjQ" source="PapyrusHyperLink_Document">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NkvOAfFCEeOsMc9uAZsKjQ" key="tooltip_text" value="Creation menu for a package with a specific icon"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NkvOAvFCEeOsMc9uAZsKjQ" key="localization" value="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\PackageWithIconO.png"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NkvOA_FCEeOsMc9uAZsKjQ" key="is_default_navigation" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Nkv1EPFCEeOsMc9uAZsKjQ" source="PapyrusHyperLink_Document">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Nkv1EfFCEeOsMc9uAZsKjQ" key="tooltip_text" value="Result for this menu"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Nkv1EvFCEeOsMc9uAZsKjQ" key="localization" value="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\PackageWithIconOIllustration.png"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Nkv1E_FCEeOsMc9uAZsKjQ" key="is_default_navigation" value="false"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_yaJo0PE9EeOsMc9uAZsKjQ" type="5027"/>
+      <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_yaEwUfE9EeOsMc9uAZsKjQ"/>
+      <element xmi:type="uml:Comment" href="papyrusNewChild.uml#_Y6GWAPE9EeOsMc9uAZsKjQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yaEwUvE9EeOsMc9uAZsKjQ" x="426" y="299" width="958" height="42"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_yyYioPE9EeOsMc9uAZsKjQ" type="2018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_omOlwPE_EeOsMc9uAZsKjQ" source="Stereotype_Annotation">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_omOlwfE_EeOsMc9uAZsKjQ" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_omOlwvE_EeOsMc9uAZsKjQ" key="StereotypeList" value="DeveloperProcess::structure::UserDoc"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_omPM0PE_EeOsMc9uAZsKjQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_omPM0fE_EeOsMc9uAZsKjQ" key="PropStereoDisplay" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_omPM0vE_EeOsMc9uAZsKjQ" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CX9-IPFDEeOsMc9uAZsKjQ" source="PapyrusHyperLink_Document">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CX9-IfFDEeOsMc9uAZsKjQ" key="tooltip_text" value="Result for the menu nestedClass"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CX9-IvFDEeOsMc9uAZsKjQ" key="localization" value="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\NestedClassifierIllustration.png"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CX9-I_FDEeOsMc9uAZsKjQ" key="is_default_navigation" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CX_MQPFDEeOsMc9uAZsKjQ" source="PapyrusHyperLink_Document">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CX_MQfFDEeOsMc9uAZsKjQ" key="tooltip_text" value="Creation menu model for nested class"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CX_MQvFDEeOsMc9uAZsKjQ" key="localization" value="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\NestedClassifier.png"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CX_MQ_FDEeOsMc9uAZsKjQ" key="is_default_navigation" value="false"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_yyZJsPE9EeOsMc9uAZsKjQ" type="5027"/>
+      <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_yyYiofE9EeOsMc9uAZsKjQ"/>
+      <element xmi:type="uml:Comment" href="papyrusNewChild.uml#_Zlv7EPE9EeOsMc9uAZsKjQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yyYiovE9EeOsMc9uAZsKjQ" x="426" y="350" width="958" height="45"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_zHNjIPE9EeOsMc9uAZsKjQ" type="2018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pWJm0PE_EeOsMc9uAZsKjQ" source="Stereotype_Annotation">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pWJm0fE_EeOsMc9uAZsKjQ" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pWJm0vE_EeOsMc9uAZsKjQ" key="StereotypeList" value="DeveloperProcess::structure::UserDoc"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pWKN4PE_EeOsMc9uAZsKjQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pWKN4fE_EeOsMc9uAZsKjQ" key="PropStereoDisplay" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pWKN4vE_EeOsMc9uAZsKjQ" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gDpZUPFCEeOsMc9uAZsKjQ" source="PapyrusHyperLink_Document">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gDpZUfFCEeOsMc9uAZsKjQ" key="tooltip_text" value="Creation menu model for activity"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gDpZUvFCEeOsMc9uAZsKjQ" key="localization" value="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\AllPossibleActivities.png"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gDpZU_FCEeOsMc9uAZsKjQ" key="is_default_navigation" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gDqAYPFCEeOsMc9uAZsKjQ" source="PapyrusHyperLink_Document">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gDqAYfFCEeOsMc9uAZsKjQ" key="tooltip_text" value="Result for this menu activity"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gDqAYvFCEeOsMc9uAZsKjQ" key="localization" value="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\AllPossibleActivitiesIllustration.png"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gDqAY_FCEeOsMc9uAZsKjQ" key="is_default_navigation" value="false"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_zHNjI_E9EeOsMc9uAZsKjQ" type="5027"/>
+      <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_zHNjIfE9EeOsMc9uAZsKjQ"/>
+      <element xmi:type="uml:Comment" href="papyrusNewChild.uml#_aJwAAPE9EeOsMc9uAZsKjQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zHNjIvE9EeOsMc9uAZsKjQ" x="426" y="397" width="958"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_JdFvgfC7EeOQTc9S_J6Sug" name="diagram_compatibility_version" stringValue="1.0.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_JdFvgvC7EeOQTc9S_J6Sug"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_JdFvg_C7EeOQTc9S_J6Sug">
+      <owner xmi:type="uml:Model" href="papyrusNewChild.uml#_u8E-gPCEEeOEP-VOZrQAkw"/>
+    </styles>
+    <element xmi:type="uml:Model" href="papyrusNewChild.uml#_u8E-gPCEEeOEP-VOZrQAkw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_kt51UPC7EeOQTc9S_J6Sug" type="4014" source="_LUGUcPC7EeOQTc9S_J6Sug" target="_KE59cPC7EeOQTc9S_J6Sug">
+      <styles xmi:type="notation:FontStyle" xmi:id="_kt51UfC7EeOQTc9S_J6Sug"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kt51UvC7EeOQTc9S_J6Sug" points="[-37, -5, 154, 9]$[-121, -21, 70, -7]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kuENYPC7EeOQTc9S_J6Sug" id="(0.0,0.38235294117647056)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wv8JwPE9EeOsMc9uAZsKjQ" id="(0.951048951048951,0.4666666666666667)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_HeQO0PC8EeOQTc9S_J6Sug" type="4014" source="_G39D0PC8EeOQTc9S_J6Sug" target="_GCZU0PC8EeOQTc9S_J6Sug">
+      <styles xmi:type="notation:FontStyle" xmi:id="_HeQO0fC8EeOQTc9S_J6Sug"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HeQO0vC8EeOQTc9S_J6Sug" points="[0, 0, 224, -50]$[-224, 0, 0, -50]$[-224, 36, 0, -14]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HeVHUPC8EeOQTc9S_J6Sug" id="(0.0,0.5722222222222222)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HeVHUfC8EeOQTc9S_J6Sug" id="(0.581039755351682,0.23333333333333334)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_z9Bw0PE9EeOsMc9uAZsKjQ" type="4014" source="_yaEwUPE9EeOsMc9uAZsKjQ" target="_GCZU0PC8EeOQTc9S_J6Sug">
+      <styles xmi:type="notation:FontStyle" xmi:id="_z9Bw0fE9EeOsMc9uAZsKjQ"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_z9Bw0vE9EeOsMc9uAZsKjQ" points="[-1, 7, 166, 46]$[-167, 7, 0, 46]$[-167, -40, 0, -1]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z9GpUPE9EeOsMc9uAZsKjQ" id="(0.0010438413361169101,0.5714285714285714)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KJfzAPE-EeOsMc9uAZsKjQ" id="(0.7584097859327217,0.9333333333333333)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_LkxeMPE-EeOsMc9uAZsKjQ" type="4014" source="_yyYioPE9EeOsMc9uAZsKjQ" target="_GCZU0PC8EeOQTc9S_J6Sug">
+      <styles xmi:type="notation:FontStyle" xmi:id="_LkxeMfE-EeOsMc9uAZsKjQ"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LkxeMvE-EeOsMc9uAZsKjQ" points="[0, 0, 218, 73]$[-218, 0, 0, 73]$[-218, -74, 0, -1]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Lk1voPE-EeOsMc9uAZsKjQ" id="(0.0,0.24444444444444444)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_j7ua8PE-EeOsMc9uAZsKjQ" id="(0.599388379204893,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_4zFrYPE-EeOsMc9uAZsKjQ" type="4014" source="_zHNjIPE9EeOsMc9uAZsKjQ" target="_GCZU0PC8EeOQTc9S_J6Sug">
+      <styles xmi:type="notation:FontStyle" xmi:id="_4zFrYfE-EeOsMc9uAZsKjQ"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4zFrYvE-EeOsMc9uAZsKjQ" points="[-3, 6, 263, 136]$[-266, 6, 0, 136]$[-266, -129, 0, 1]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LNHZ4PFDEeOsMc9uAZsKjQ" id="(0.003131524008350731,0.31666666666666665)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LNIA8PFDEeOsMc9uAZsKjQ" id="(0.4617737003058104,0.9666666666666667)"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/docs/papyrusNewChild.uml b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/docs/papyrusNewChild.uml
index d7a05cf99fc..653c3ab625d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/docs/papyrusNewChild.uml
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/docs/papyrusNewChild.uml
@@ -1,1327 +1,1327 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ADL4Eclipse="http:///schemas/ADL4Eclipse/_rk7nwOqKEeOfTcbrnCq2oQ/3" xmlns:Document="http:///schemas/Document/_qR4REMn0EeO9CYUoXDRplw/0" xmlns:ModuleLayer="http://OSGI/schemas/ModuleLayer/_0xHxU4DEEeKQG4TlBAn6bg/3" xmlns:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:structure="http://DeveloperProcess/schemas/structure/_VA9p4McPEeO9CYUoXDRplw/1" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/ADL4Eclipse/_rk7nwOqKEeOfTcbrnCq2oQ/3 pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml#_rlFYwOqKEeOfTcbrnCq2oQ http:///schemas/Document/_qR4REMn0EeO9CYUoXDRplw/0 pathmap://DEVELOPER_PROFILES/Document.profile.uml#_qR44IMn0EeO9CYUoXDRplw http://OSGI/schemas/ModuleLayer/_0xHxU4DEEeKQG4TlBAn6bg/3 pathmap://OSGI_PROFILES/osgi.profile.uml#_0xRiUIDEEeKQG4TlBAn6bg http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements http://DeveloperProcess/schemas/structure/_VA9p4McPEeO9CYUoXDRplw/1 pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_VA-4AMcPEeO9CYUoXDRplw">

-  <uml:Model xmi:id="_a0QCwFOCEeOE6bh9v5dYKg" name="PapyrusNewChild">

-    <packagedElement xmi:type="uml:Model" xmi:id="_52hvUPCDEeOEP-VOZrQAkw" 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:Model" xmi:id="_u8E-gPCEEeOEP-VOZrQAkw" name="UseCases">

-      <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 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: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:Component" xmi:id="_uxF88FOIEeOuspyO4PzXCg" name="NewChildMenu" useCase="_-bickFOIEeOuspyO4PzXCg _EPnUAFOJEeOuspyO4PzXCg _WZ_ZwFOJEeOuspyO4PzXCg _uSMlAFOJEeOuspyO4PzXCg _cXBM8FW6EeOhVe6k7yzS3A">

-        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_-bickFOIEeOuspyO4PzXCg" name="UseCreateMenu" subject="_uxF88FOIEeOuspyO4PzXCg">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Cu5MQPCGEeOEP-VOZrQAkw">

-            <body>The Papyrus User shall use this functionality from the model explorer in order to create elements in the model. It can decide to display or not this element creation</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_LfJYwPC5EeOVd6MoZuILbA" annotatedElement="_-bickFOIEeOuspyO4PzXCg">

-            <body>A user can create an element by  select element in the model explorer, click on it ant then click on the diagram.&#xD;

-In order to not display a menu,  a user can edit the model that represents the creation menu and set the attribute visibility to false. </body>

-          </ownedComment>

-        </ownedUseCase>

-        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_EPnUAFOJEeOuspyO4PzXCg" name="Create or modify ElementCreationModel" subject="_uxF88FOIEeOuspyO4PzXCg">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_O0nn8PCGEeOEP-VOZrQAkw">

-            <body>An advanced User is able to create of modify creation menu. This menu is a model that can be edited </body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_P_VmcPC5EeOVd6MoZuILbA" annotatedElement="_EPnUAFOJEeOuspyO4PzXCg">

-            <body>An advanced user can contribuate to the menu by adding a new plugin that contains:&#xD;

-	-a xmi file that represents a creation menu. The model must be an instance of org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.ecore. It contains&#xD;

-		•	CreationMenu&#xD;

-			o	It corresponds to a menu&#xD;

-			o	The ElemenTypeIDRef corresponds a reference to the element Type.&#xD;

-			o	The role can be filled in order to specify the role play by the element.&#xD;

-			o	If displayAllRole is set to true, it displays all roles played by the element if the number of roles is greater than 1. By default this property is true;&#xD;

-		•	Folder&#xD;

-			o	It is possible to add owns label and icon.&#xD;

-			o  Visibilty to specify if the folder is visible.&#xD;

-	-a reference to an extension point, to specify that papyrus must take in account this file to display the menu&#xD;

-&lt;code>&#xD;

-&lt;extension&#xD;

-         point=&quot;org.eclipse.papyrus.infra.newchild&quot;>&#xD;

-      &lt;menuCreationModel&#xD;

-            model=&quot;YourCreationMenu.xmi&quot;>&#xD;

-      &lt;/menuCreationModel>&#xD;

-&lt;/extension>&#xD;

-&lt;/code></body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Y6GWAPE9EeOsMc9uAZsKjQ" annotatedElement="_EPnUAFOJEeOuspyO4PzXCg">

-            <body>In the following example, a menu creation for a package is presented. This menu is contained in the folder SimpleUMLTest. We have associated an image for this menu.</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_Zlv7EPE9EeOsMc9uAZsKjQ" annotatedElement="_EPnUAFOJEeOuspyO4PzXCg">

-            <body>In this following example, a creation menu will be specified  to allow creation of nested classifier. That 's why the role &quot;nestedClassifier&quot; is precised. The label for this creation is &quot;nestedClass&quot;</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_aJwAAPE9EeOsMc9uAZsKjQ" annotatedElement="_EPnUAFOJEeOuspyO4PzXCg">

-            <body>In the followin examplen a creation menu is created for activities. In this case, all roles are displayed. Thanks to this, when we want to associate an activity to a state, 3 roles are proposed. </body>

-          </ownedComment>

-          <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" name="Generate &quot;ElementCreationModel&quot; from a profile" subject="_uxF88FOIEeOuspyO4PzXCg">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_j8ojgPCGEeOEP-VOZrQAkw">

-            <body>From a stereotyped profile, a model of new child menu can be generated.&#xD;

-For example a user after designing a profile, want to have a dedicated menu  from this profile/&#xD;

-For the moment this function is not implemented.</body>

-          </ownedComment>

-        </ownedUseCase>

-        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_uSMlAFOJEeOuspyO4PzXCg" name="Hide, change order or add submenus" subject="_uxF88FOIEeOuspyO4PzXCg">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_4N0kwPCGEeOEP-VOZrQAkw">

-            <body>The User can modify the creation menu by adding submenus: order about new child menu, precise if the role must be displayed.</body>

-          </ownedComment>

-          <ownedComment xmi:type="uml:Comment" xmi:id="_QuekYPC5EeOVd6MoZuILbA">

-            <body>test</body>

-          </ownedComment>

-        </ownedUseCase>

-        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_cXBM8FW6EeOhVe6k7yzS3A" name="Create or modify ElementCreationModel at runtime thanks to a GUI" subject="_uxF88FOIEeOuspyO4PzXCg">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_-6tTgPCGEeOEP-VOZrQAkw">

-            <body>A user  can edit a the model that represent the creation menu  at runtime for papyrus thanks to a dedicated UI.</body>

-          </ownedComment>

-          <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:Abstraction" xmi:id="_XPLO4PCFEeOEP-VOZrQAkw" name="Abstraction1" client="_u8E-gPCEEeOEP-VOZrQAkw" supplier="_52hvUPCDEeOEP-VOZrQAkw"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Model" xmi:id="_vmIgwPCHEeOEP-VOZrQAkw" name="Design">

-      <ownedComment xmi:type="uml:Comment" xmi:id="_g71cQPCXEeOEP-VOZrQAkw">

-        <body>The system is done by two plugins:&#xD;

-	•	org.eclipse.papyrus.infra.newchild&#xD;

-	It has in charge to provide and construct swt.Menu from the ecore model. To do that the developer has to:&#xD;

-		o	instantiate a CreationMenuFactory, &#xD;

-		o	ask to get all Root model and populate it&#xD;

-	&lt;code>&#xD;

-		CreationMenuFactory creationMenuFactory= new CreationMenuFactory(editingDomain);&#xD;

-		ArrayList&lt;Folder> folders= creationMenuRegistry.getRootFolder();&#xD;

-		Iterator&lt;Folder> iterFolder= folders.iterator();&#xD;

-		while (iterFolder.hasNext()) {&#xD;

-			Folder currentFolder= iterFolder.next();&#xD;

-			creationMenuFactory.populateMenu(menu, currentFolder,eObject);&#xD;

-		}&#xD;

-&lt;/code>&#xD;

-	•	org.eclipse.papyrus.views.modelexplorer.newchild&#xD;

-	It has in charge to add menu in the model explorer of papyrus.&#xD;

-</body>

-      </ownedComment>

-      <ownedComment xmi:type="uml:Comment" xmi:id="_tnuqoPCYEeOEP-VOZrQAkw">

-        <body>This the structure of EMF model for model&#xD;

-	•	CreationMenu&#xD;

-		o	It correspond to a menu&#xD;

-		o	The ElemenTypeIDRef correspond a reference to the element Type.&#xD;

-		o	The role can be filled in order to specify the role play by the element.&#xD;

-		o	If displayAllRole is set to true, it displays all roles played by the element if the number of roles is greater than 1. By default this property is true;&#xD;

-	•	Folder&#xD;

-		o	It is possible to add owns label an icon.&#xD;

-</body>

-      </ownedComment>

-      <ownedComment xmi:type="uml:Comment" xmi:id="_O5dxEPCZEeOEP-VOZrQAkw">

-        <body>Here an example of xml of creation menu.</body>

-      </ownedComment>

-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_z27AgPCHEeOEP-VOZrQAkw" name="Abstraction1" client="_vmIgwPCHEeOEP-VOZrQAkw" supplier="_u8E-gPCEEeOEP-VOZrQAkw"/>

-      <packagedElement xmi:type="uml:Component" xmi:id="_J2qRcPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.newchild">

-        <ownedAttribute xmi:type="uml:Port" xmi:id="_KeDBkPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.generated_package"/>

-        <ownedAttribute xmi:type="uml:Port" xmi:id="_KeGE4PCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.generated_package"/>

-        <ownedAttribute xmi:type="uml:Port" xmi:id="_KeHTAPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.extension_parser"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KR-7gPCMEeOEP-VOZrQAkw" name="org.eclipse.ui" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KRyHMPCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KSSdgPCMEeOEP-VOZrQAkw" name="org.eclipse.core.runtime" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KSCl4PCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KSc1kPCMEeOEP-VOZrQAkw" name="org.eclipse.emf" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KSWH4PCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KTKnQPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KSf44PCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KbD_APCMEeOEP-VOZrQAkw" name="org.eclipse.osgi" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KTNqkPCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KbRaYPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xmi" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KbF0MPCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_Kbzl4PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KbTPkfCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KcC2cPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.resourceloading" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_Kb1bEfCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KcTVIPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.transaction" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KcEroPCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KcpTYPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KcVKUfCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KdAfwPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KcrIkfCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KdN7IPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.gmfdiag.commands" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KdCU8fCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KdXFEPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.log" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KdPwUPCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KdwtsPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KdZhUPCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kd5QkPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.newchild"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kd7s0PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.newchild.elementcreationmenumodel"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kd9iAPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.impl"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kd_XMPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.util"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KeE2wPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.generated_package" client="_KeDBkPCMEeOEP-VOZrQAkw" supplier="_KeEPsPCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KeGr8PCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.generated_package" client="_KeGE4PCMEeOEP-VOZrQAkw" supplier="_KeEPsPCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KeIhIPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.extension_parser" client="_KeHTAPCMEeOEP-VOZrQAkw" supplier="_KeH6EPCMEeOEP-VOZrQAkw"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Component" xmi:id="_KRyHMPCMEeOEP-VOZrQAkw" name="org.eclipse.ui">

-        <ownedAttribute xmi:type="uml:Port" xmi:id="_KgkxIPCMEeOEP-VOZrQAkw" name="org.eclipse.ui.menus"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KR6qEPCMEeOEP-VOZrQAkw" name="org.eclipse.ui.internal"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Component" xmi:id="_KSCl4PCMEeOEP-VOZrQAkw" name="org.eclipse.core.runtime">

-        <packagedElement xmi:type="uml:Package" xmi:id="_KSJTkPCMEeOEP-VOZrQAkw" name="org.eclipse.core.internal.preferences.legacy"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KSMW4PCMEeOEP-VOZrQAkw" name="org.eclipse.core.internal.runtime"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KSPaMPCMEeOEP-VOZrQAkw" name="org.eclipse.core.runtime"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Component" xmi:id="_KSWH4PCMEeOEP-VOZrQAkw" name="org.eclipse.emf"/>

-      <packagedElement xmi:type="uml:Component" xmi:id="_KSf44PCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore">

-        <ownedAttribute xmi:type="uml:Port" xmi:id="_KeEPsPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.generated_package"/>

-        <ownedAttribute xmi:type="uml:Port" xmi:id="_KeH6EPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.extension_parser"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KSmmkPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KSpp4PCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.impl"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KSstMPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.plugin"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KSvJcfCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.resource"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KSyMwPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.resource.impl"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KS0pAfCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.util"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KS3sUPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xml.namespace"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KS6IkPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xml.namespace.impl"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KS8k0fCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xml.namespace.util"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KS_oIPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xml.type"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KTCEYPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xml.type.impl"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KTFHsPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xml.type.internal"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KTHj8PCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xml.type.util"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Component" xmi:id="_KTNqkPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi">

-        <packagedElement xmi:type="uml:Package" xmi:id="_KTU_UPCMEeOEP-VOZrQAkw" name="org.eclipse.core.runtime.adaptor"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KTYCoPCMEeOEP-VOZrQAkw" name="org.eclipse.core.runtime.internal.adaptor"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KTae4PCMEeOEP-VOZrQAkw" name="org.eclipse.equinox.log"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KTdiMPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.container"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KTglgPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.container.builders"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KTjBwPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.container.namespaces"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KTmFEPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.framework.console"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KTohUfCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.framework.eventmgr"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KTrkoPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.framework.internal.reliablefile"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KTun8PCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.framework.log"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KTxEMPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.framework.util"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KT0HgPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.debug"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KT2jwPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.framework"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KT5nEPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.hookregistry"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KT8DUfCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.loader"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KT_GoPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.loader.buddy"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KUCJ8PCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.loader.classpath"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KUEmMPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.loader.sources"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KUHpgPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.location"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KUKFwPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.messages"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KUNJEPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.provisional.service.security"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KUQMYPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.provisional.verifier"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KUSooPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.service.security"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KUVE4fCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.serviceregistry"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KUYIMPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.signedcontent"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KUakcPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.url"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KUdnwPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.launch"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KUgrEPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.report.resolution"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KUk8gPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.service.datalocation"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KUn_0PCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.service.debug"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KUrDIPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.service.environment"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KUtfYPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.service.localization"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KUwisPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.service.pluginconversion"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KUy-8PCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.service.resolver"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KU2CQPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.service.runnable"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KU4egPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.service.security"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KU7h0PCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.service.urlconversion"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KU_MMPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.signedcontent"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KVBocPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.storage"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KVEEsfCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.storage.bundlefile"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KVHIAPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.storage.url.reference"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KVJkQPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.storagemanager"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KVMnkPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.util"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KVPD0PCMEeOEP-VOZrQAkw" name="org.osgi.dto"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KVRgEPCMEeOEP-VOZrQAkw" name="org.osgi.framework"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KVUjYPCMEeOEP-VOZrQAkw" name="org.osgi.framework.dto"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KVW_oPCMEeOEP-VOZrQAkw" name="org.osgi.framework.hooks.bundle"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KVaC8PCMEeOEP-VOZrQAkw" name="org.osgi.framework.hooks.resolver"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KVcfMPCMEeOEP-VOZrQAkw" name="org.osgi.framework.hooks.service"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KVe7cPCMEeOEP-VOZrQAkw" name="org.osgi.framework.hooks.weaving"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KVh-wPCMEeOEP-VOZrQAkw" name="org.osgi.framework.launch"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KVkbAPCMEeOEP-VOZrQAkw" name="org.osgi.framework.namespace"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KVm3QPCMEeOEP-VOZrQAkw" name="org.osgi.framework.startlevel"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KVp6kPCMEeOEP-VOZrQAkw" name="org.osgi.framework.startlevel.dto"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KVsW0PCMEeOEP-VOZrQAkw" name="org.osgi.framework.wiring"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KVvaIPCMEeOEP-VOZrQAkw" name="org.osgi.framework.wiring.dto"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KVx2YPCMEeOEP-VOZrQAkw" name="org.osgi.resource"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KV0SoPCMEeOEP-VOZrQAkw" name="org.osgi.resource.dto"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KV3V8PCMEeOEP-VOZrQAkw" name="org.osgi.service.condpermadmin"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KV5yMPCMEeOEP-VOZrQAkw" name="org.osgi.service.log"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KV8OcPCMEeOEP-VOZrQAkw" name="org.osgi.service.packageadmin"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KV_RwPCMEeOEP-VOZrQAkw" name="org.osgi.service.permissionadmin"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWBuAPCMEeOEP-VOZrQAkw" name="org.osgi.service.resolver"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWEKQPCMEeOEP-VOZrQAkw" name="org.osgi.service.startlevel"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWHNkPCMEeOEP-VOZrQAkw" name="org.osgi.service.url"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWJp0PCMEeOEP-VOZrQAkw" name="org.osgi.util.tracker"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWMGEPCMEeOEP-VOZrQAkw" name="javax.accessibility"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWOiUPCMEeOEP-VOZrQAkw" name="javax.activation"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWQ-kPCMEeOEP-VOZrQAkw" name="javax.activity"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWSzwfCMEeOEP-VOZrQAkw" name="javax.annotation"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWVQAfCMEeOEP-VOZrQAkw" name="javax.annotation.processing"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWXsQPCMEeOEP-VOZrQAkw" name="javax.crypto"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWaIgPCMEeOEP-VOZrQAkw" name="javax.crypto.interfaces"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWckwPCMEeOEP-VOZrQAkw" name="javax.crypto.spec"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWeZ8fCMEeOEP-VOZrQAkw" name="javax.imageio"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWg2MfCMEeOEP-VOZrQAkw" name="javax.imageio.event"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWjScPCMEeOEP-VOZrQAkw" name="javax.imageio.metadata"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWlusPCMEeOEP-VOZrQAkw" name="javax.imageio.plugins.bmp"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWoK8PCMEeOEP-VOZrQAkw" name="javax.imageio.plugins.jpeg"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWqnMPCMEeOEP-VOZrQAkw" name="javax.imageio.spi"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWscYfCMEeOEP-VOZrQAkw" name="javax.imageio.stream"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWu4oPCMEeOEP-VOZrQAkw" name="javax.jws"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWxU4PCMEeOEP-VOZrQAkw" name="javax.jws.soap"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KWzKEPCMEeOEP-VOZrQAkw" name="javax.lang.model"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KW1mUPCMEeOEP-VOZrQAkw" name="javax.lang.model.element"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KW3bgPCMEeOEP-VOZrQAkw" name="javax.lang.model.type"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KW53wPCMEeOEP-VOZrQAkw" name="javax.lang.model.util"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KW7s8PCMEeOEP-VOZrQAkw" name="javax.management"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KW-JMPCMEeOEP-VOZrQAkw" name="javax.management.loading"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KW_-YfCMEeOEP-VOZrQAkw" name="javax.management.modelmbean"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXCaoPCMEeOEP-VOZrQAkw" name="javax.management.monitor"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXEP0fCMEeOEP-VOZrQAkw" name="javax.management.openmbean"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXGsEPCMEeOEP-VOZrQAkw" name="javax.management.relation"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXIhQPCMEeOEP-VOZrQAkw" name="javax.management.remote"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXK9gPCMEeOEP-VOZrQAkw" name="javax.management.remote.rmi"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXMysPCMEeOEP-VOZrQAkw" name="javax.management.timer"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXOn4fCMEeOEP-VOZrQAkw" name="javax.naming"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXREIPCMEeOEP-VOZrQAkw" name="javax.naming.directory"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXS5UPCMEeOEP-VOZrQAkw" name="javax.naming.event"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXVVkPCMEeOEP-VOZrQAkw" name="javax.naming.ldap"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXXKwPCMEeOEP-VOZrQAkw" name="javax.naming.spi"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXY_8PCMEeOEP-VOZrQAkw" name="javax.net"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXa1IfCMEeOEP-VOZrQAkw" name="javax.net.ssl"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXdRYPCMEeOEP-VOZrQAkw" name="javax.print"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXfGkPCMEeOEP-VOZrQAkw" name="javax.print.attribute"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXg7wPCMEeOEP-VOZrQAkw" name="javax.print.attribute.standard"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXiw8PCMEeOEP-VOZrQAkw" name="javax.print.event"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXkmIfCMEeOEP-VOZrQAkw" name="javax.rmi"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXnCYPCMEeOEP-VOZrQAkw" name="javax.rmi.CORBA"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXo3kPCMEeOEP-VOZrQAkw" name="javax.rmi.ssl"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXqswPCMEeOEP-VOZrQAkw" name="javax.script"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXsh8fCMEeOEP-VOZrQAkw" name="javax.security.auth"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXu-MPCMEeOEP-VOZrQAkw" name="javax.security.auth.callback"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXwzYPCMEeOEP-VOZrQAkw" name="javax.security.auth.kerberos"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KXyokPCMEeOEP-VOZrQAkw" name="javax.security.auth.login"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KX0dwfCMEeOEP-VOZrQAkw" name="javax.security.auth.spi"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KX26APCMEeOEP-VOZrQAkw" name="javax.security.auth.x500"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KX4vMPCMEeOEP-VOZrQAkw" name="javax.security.cert"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KX6kYfCMEeOEP-VOZrQAkw" name="javax.security.sasl"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KX9AoPCMEeOEP-VOZrQAkw" name="javax.sound.midi"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KX-10PCMEeOEP-VOZrQAkw" name="javax.sound.midi.spi"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYBSEPCMEeOEP-VOZrQAkw" name="javax.sound.sampled"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYDHQPCMEeOEP-VOZrQAkw" name="javax.sound.sampled.spi"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYE8cPCMEeOEP-VOZrQAkw" name="javax.sql"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYGxofCMEeOEP-VOZrQAkw" name="javax.sql.rowset"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYIm0fCMEeOEP-VOZrQAkw" name="javax.sql.rowset.serial"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYLDEPCMEeOEP-VOZrQAkw" name="javax.sql.rowset.spi"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYM4QPCMEeOEP-VOZrQAkw" name="javax.swing"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYOtcPCMEeOEP-VOZrQAkw" name="javax.swing.border"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYQiofCMEeOEP-VOZrQAkw" name="javax.swing.colorchooser"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYSX0fCMEeOEP-VOZrQAkw" name="javax.swing.event"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYU0EPCMEeOEP-VOZrQAkw" name="javax.swing.filechooser"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYWpQPCMEeOEP-VOZrQAkw" name="javax.swing.plaf"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYYecPCMEeOEP-VOZrQAkw" name="javax.swing.plaf.basic"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYaTofCMEeOEP-VOZrQAkw" name="javax.swing.plaf.metal"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYcI0fCMEeOEP-VOZrQAkw" name="javax.swing.plaf.multi"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYelEPCMEeOEP-VOZrQAkw" name="javax.swing.plaf.nimbus"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYgaQPCMEeOEP-VOZrQAkw" name="javax.swing.plaf.synth"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYiPcfCMEeOEP-VOZrQAkw" name="javax.swing.table"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYkEofCMEeOEP-VOZrQAkw" name="javax.swing.text"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYmg4PCMEeOEP-VOZrQAkw" name="javax.swing.text.html"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYoWEPCMEeOEP-VOZrQAkw" name="javax.swing.text.html.parser"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYqLQPCMEeOEP-VOZrQAkw" name="javax.swing.text.rtf"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYsAcfCMEeOEP-VOZrQAkw" name="javax.swing.tree"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYucsPCMEeOEP-VOZrQAkw" name="javax.swing.undo"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYwR4PCMEeOEP-VOZrQAkw" name="javax.tools"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYyHEPCMEeOEP-VOZrQAkw" name="javax.transaction"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KYz8QPCMEeOEP-VOZrQAkw" name="javax.transaction.xa"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KY1xcPCMEeOEP-VOZrQAkw" name="javax.xml"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KY3moPCMEeOEP-VOZrQAkw" name="javax.xml.bind"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KY5b0PCMEeOEP-VOZrQAkw" name="javax.xml.bind.annotation"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KY7RAPCMEeOEP-VOZrQAkw" name="javax.xml.bind.annotation.adapters"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KY9GMPCMEeOEP-VOZrQAkw" name="javax.xml.bind.attachment"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KY-7YPCMEeOEP-VOZrQAkw" name="javax.xml.bind.helpers"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZAwkfCMEeOEP-VOZrQAkw" name="javax.xml.bind.util"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZClwfCMEeOEP-VOZrQAkw" name="javax.xml.crypto"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZEa8fCMEeOEP-VOZrQAkw" name="javax.xml.crypto.dom"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZGQIfCMEeOEP-VOZrQAkw" name="javax.xml.crypto.dsig"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZIFUfCMEeOEP-VOZrQAkw" name="javax.xml.crypto.dsig.dom"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZJ6gfCMEeOEP-VOZrQAkw" name="javax.xml.crypto.dsig.keyinfo"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZMWwPCMEeOEP-VOZrQAkw" name="javax.xml.crypto.dsig.spec"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZOL8PCMEeOEP-VOZrQAkw" name="javax.xml.datatype"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZQBIPCMEeOEP-VOZrQAkw" name="javax.xml.namespace"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZR2UPCMEeOEP-VOZrQAkw" name="javax.xml.parsers"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZTrgPCMEeOEP-VOZrQAkw" name="javax.xml.soap"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZVgsPCMEeOEP-VOZrQAkw" name="javax.xml.stream"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZXV4PCMEeOEP-VOZrQAkw" name="javax.xml.stream.events"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZZLEPCMEeOEP-VOZrQAkw" name="javax.xml.stream.util"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZbAQPCMEeOEP-VOZrQAkw" name="javax.xml.transform"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZc1cPCMEeOEP-VOZrQAkw" name="javax.xml.transform.dom"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZeqoPCMEeOEP-VOZrQAkw" name="javax.xml.transform.sax"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZgf0PCMEeOEP-VOZrQAkw" name="javax.xml.transform.stax"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZiVAPCMEeOEP-VOZrQAkw" name="javax.xml.transform.stream"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZkKMPCMEeOEP-VOZrQAkw" name="javax.xml.validation"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZl_YPCMEeOEP-VOZrQAkw" name="javax.xml.ws"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZn0kPCMEeOEP-VOZrQAkw" name="javax.xml.ws.handler"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZpCsfCMEeOEP-VOZrQAkw" name="javax.xml.ws.handler.soap"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZq34fCMEeOEP-VOZrQAkw" name="javax.xml.ws.http"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZstEfCMEeOEP-VOZrQAkw" name="javax.xml.ws.soap"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZuiQfCMEeOEP-VOZrQAkw" name="javax.xml.ws.spi"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZwXcfCMEeOEP-VOZrQAkw" name="javax.xml.ws.spi.http"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZyMofCMEeOEP-VOZrQAkw" name="javax.xml.ws.wsaddressing"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZ0B0fCMEeOEP-VOZrQAkw" name="javax.xml.xpath"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZ13APCMEeOEP-VOZrQAkw" name="org.ietf.jgss"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZ3sMPCMEeOEP-VOZrQAkw" name="org.omg.CORBA"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZ5hYPCMEeOEP-VOZrQAkw" name="org.omg.CORBA_2_3"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZ7WkPCMEeOEP-VOZrQAkw" name="org.omg.CORBA_2_3.portable"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZ9LwPCMEeOEP-VOZrQAkw" name="org.omg.CORBA.DynAnyPackage"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KZ_A8PCMEeOEP-VOZrQAkw" name="org.omg.CORBA.ORBPackage"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KaA2IPCMEeOEP-VOZrQAkw" name="org.omg.CORBA.portable"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KaCrUPCMEeOEP-VOZrQAkw" name="org.omg.CORBA.TypeCodePackage"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KaEggPCMEeOEP-VOZrQAkw" name="org.omg.CosNaming"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KaGVsPCMEeOEP-VOZrQAkw" name="org.omg.CosNaming.NamingContextExtPackage"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KaIK4PCMEeOEP-VOZrQAkw" name="org.omg.CosNaming.NamingContextPackage"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KaKAEPCMEeOEP-VOZrQAkw" name="org.omg.Dynamic"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KaL1QPCMEeOEP-VOZrQAkw" name="org.omg.DynamicAny"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KaNqcPCMEeOEP-VOZrQAkw" name="org.omg.DynamicAny.DynAnyFactoryPackage"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KaPfoPCMEeOEP-VOZrQAkw" name="org.omg.DynamicAny.DynAnyPackage"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KaRU0PCMEeOEP-VOZrQAkw" name="org.omg.IOP"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KaTKAPCMEeOEP-VOZrQAkw" name="org.omg.IOP.CodecFactoryPackage"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KaU_MPCMEeOEP-VOZrQAkw" name="org.omg.IOP.CodecPackage"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KaW0YPCMEeOEP-VOZrQAkw" name="org.omg.Messaging"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KaYCgfCMEeOEP-VOZrQAkw" name="org.omg.PortableInterceptor"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KaZ3sfCMEeOEP-VOZrQAkw" name="org.omg.PortableInterceptor.ORBInitInfoPackage"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kabs4fCMEeOEP-VOZrQAkw" name="org.omg.PortableServer"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KadiEPCMEeOEP-VOZrQAkw" name="org.omg.PortableServer.CurrentPackage"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KafXQPCMEeOEP-VOZrQAkw" name="org.omg.PortableServer.POAManagerPackage"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KahMcPCMEeOEP-VOZrQAkw" name="org.omg.PortableServer.POAPackage"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KajBoPCMEeOEP-VOZrQAkw" name="org.omg.PortableServer.portable"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kak20PCMEeOEP-VOZrQAkw" name="org.omg.PortableServer.ServantLocatorPackage"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KamE8fCMEeOEP-VOZrQAkw" name="org.omg.SendingContext"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kan6IfCMEeOEP-VOZrQAkw" name="org.omg.stub.java.rmi"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KapvUfCMEeOEP-VOZrQAkw" name="org.w3c.dom"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KarkgPCMEeOEP-VOZrQAkw" name="org.w3c.dom.bootstrap"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KatZsPCMEeOEP-VOZrQAkw" name="org.w3c.dom.css"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KavO4PCMEeOEP-VOZrQAkw" name="org.w3c.dom.events"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KaxEEPCMEeOEP-VOZrQAkw" name="org.w3c.dom.html"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kay5QPCMEeOEP-VOZrQAkw" name="org.w3c.dom.ls"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Ka0HYfCMEeOEP-VOZrQAkw" name="org.w3c.dom.ranges"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Ka18kfCMEeOEP-VOZrQAkw" name="org.w3c.dom.stylesheets"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Ka3xwPCMEeOEP-VOZrQAkw" name="org.w3c.dom.traversal"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Ka5m8PCMEeOEP-VOZrQAkw" name="org.w3c.dom.views"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Ka7cIPCMEeOEP-VOZrQAkw" name="org.w3c.dom.xpath"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Ka9RUPCMEeOEP-VOZrQAkw" name="org.xml.sax"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Ka_GgPCMEeOEP-VOZrQAkw" name="org.xml.sax.ext"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KbA7sPCMEeOEP-VOZrQAkw" name="org.xml.sax.helpers"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Component" xmi:id="_KbF0MPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xmi">

-        <packagedElement xmi:type="uml:Package" xmi:id="_KbLTwPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xmi"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KbNI8fCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xmi.impl"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KbO-IPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xmi.util"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Component" xmi:id="_KbTPkfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes">

-        <packagedElement xmi:type="uml:Package" xmi:id="_KbYvIPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KbakUfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.advices"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KbcZgPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.handler"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KbeOsPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.impl"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KbgD4PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kbh5EPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KbjHMfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.util"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kbk8YfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KbmxkfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KbomwPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.util"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kbqb8PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.preferences"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KbsRIPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.providers"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KbuGUPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.semantic"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kbv7gPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.types"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KbxJofCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.util"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Component" xmi:id="_Kb1bEfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.resourceloading">

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kb7hsPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.resourceloading"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kb8v0fCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.resourceloading.impl"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kb-lAfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.resourceloading.strategies"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KcAaMPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.resourceloading.util"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Component" xmi:id="_KcEroPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.transaction">

-        <packagedElement xmi:type="uml:Package" xmi:id="_KcKLMPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.transaction"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KcMAYPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.transaction.impl"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KcN1kPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.transaction.internal"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KcPqwPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.transaction.internal.l10n"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KcQ44fCMEeOEP-VOZrQAkw" name="org.eclipse.emf.transaction.util"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Component" xmi:id="_KcVKUfCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core">

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kcap4PCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KccfEfCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core.commands"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KceUQPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core.edithelper"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KcgJcPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core.internal"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kch-oPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core.internal.descriptors"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kcjz0PCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core.internal.impl"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KclpAPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core.internal.l10n"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kcm3IfCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core.requests"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Component" xmi:id="_KcrIkfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit">

-        <packagedElement xmi:type="uml:Package" xmi:id="_KcwoIPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KcydUfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit.commands"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kc0SgPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit.internal"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kc2HsPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit.internal.context"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kc5LAPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit.internal.matcher"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kc7AMPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit.messages"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kc81YPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit.service"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kc-DgfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit.utils"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Component" xmi:id="_KdCU8fCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.gmfdiag.commands">

-        <packagedElement xmi:type="uml:Package" xmi:id="_KdH0gPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.commands"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KdJpsfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.commands.util"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KdLe4PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.commands.wrappers"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Component" xmi:id="_KdPwUPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.log">

-        <packagedElement xmi:type="uml:Package" xmi:id="_KdVP4PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.log"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Component" xmi:id="_KdZhUPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets">

-        <ownedBehavior xmi:type="uml:StateMachine" xmi:id="_TQ0ZwPDDEeOQTc9S_J6Sug" name="StateMachine">

-          <region xmi:type="uml:Region" xmi:id="_VyTfEPDDEeOQTc9S_J6Sug" name="Region">

-            <subvertex xmi:type="uml:State" xmi:id="_WsrcoPDDEeOQTc9S_J6Sug" name="State"/>

-          </region>

-        </ownedBehavior>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KdfA4PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kdg2EPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets.creation"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KdirQPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets.databinding"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kdj5YfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets.editors"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KdlukfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets.messages"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KdnjwfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets.providers"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KdpY8PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets.selectors"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KdrOIPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets.strategy"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KdtDUPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets.util"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kdu4gPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets.validator"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Component" xmi:id="_KeJIMPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.views.modelexplorer.newchild">

-        <ownedAttribute xmi:type="uml:Port" xmi:id="_KgkKEPCMEeOEP-VOZrQAkw" name="org.eclipse.ui.menus"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KeK9YPCMEeOEP-VOZrQAkw" name="org.eclipse.ui" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KRyHMPCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KeMykPCMEeOEP-VOZrQAkw" name="org.eclipse.core.runtime" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KSCl4PCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KeOnwfCMEeOEP-VOZrQAkw" name="org.eclipse.emf.transaction" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KcEroPCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_Ke4IAPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KeREAPCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KfSXsPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_Ke59MPCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KfqLIPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KfUM4PCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KfsAUfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.log" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KdPwUPCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KgAwcPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.common.core" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KfuckPCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KgClofCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KcVKUfCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KgFB4PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KcrIkfCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KgXVwPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.tools" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KgG3EPCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KgZK8fCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.gmfdiag.commands" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KdCU8fCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KgbnMPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.newchild" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_J2qRcPCMEeOEP-VOZrQAkw"/>

-        <packagedElement xmi:type="uml:Dependency" xmi:id="_KgkxIfCMEeOEP-VOZrQAkw" name="org.eclipse.ui.menus" client="_KgkKEPCMEeOEP-VOZrQAkw" supplier="_KgkxIPCMEeOEP-VOZrQAkw"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Component" xmi:id="_KeREAPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core">

-        <packagedElement xmi:type="uml:Package" xmi:id="_KeWjkPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KeYYwPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.clipboard"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KeZm4fCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.contentoutline"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KebcEfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.editor"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KedRQPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.editorsfactory"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KefGcPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.extension"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Keg7oPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.extension.commands"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Keiw0PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.extension.diagrameditor"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KekmAPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.lifecycleevents"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kel0IfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.listenerservice"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KenpUfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.markers"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KepegPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.modelsetquery"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KerTsPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.modelsetquery.impl"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KetI4PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.multidiagram.actionbarcontributor"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Keu-EPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.resource"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KewMMfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.resource.additional"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KeyBYfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.resource.sasheditor"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kez2kPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.services"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Ke1rwPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.utils"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Component" xmi:id="_Ke59MPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf">

-        <packagedElement xmi:type="uml:Package" xmi:id="_Ke_cwPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KfBR8PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf.adapters"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KfDHIPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf.advice"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KfE8UPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf.commands"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KfGxgPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf.databinding"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KfImsPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf.dialog"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KfKb4PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf.providers"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KfLqAfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf.providers.strategy"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KfOGQfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf.resource"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KfP7cfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf.utils"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Component" xmi:id="_KfUM4PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types">

-        <packagedElement xmi:type="uml:Package" xmi:id="_KfZscPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KfbhoPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types.command"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KfdW0PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types.element"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KffMAPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types.filter"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KfhBMPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types.handlers"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kfi2YPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types.helper"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KfkrkPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types.helper.advice"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KfmgwPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types.menu"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KfoV8PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types.utils"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Component" xmi:id="_KfuckPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.common.core">

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kfz8IPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.common.core.command"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kf1xUPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.common.core.internal"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kf3mgPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.common.core.internal.command"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kf5bsPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.common.core.internal.l10n"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kf7Q4PCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.common.core.resources"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kf9GEPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.common.core.service"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_Kf-UMfCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.common.core.util"/>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Component" xmi:id="_KgG3EPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.tools">

-        <packagedElement xmi:type="uml:Package" xmi:id="_KgMWoPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.tools.comparator"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KgOL0PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.tools.converter"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KgQBAPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.tools.databinding"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KgRPIfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.tools.preferences"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KgTEUfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.tools.preferences.ui.dialog"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_KgU5gPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.tools.util"/>

-      </packagedElement>

-      <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_J07zIPCMEeOEP-VOZrQAkw">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_J2ocQPCMEeOEP-VOZrQAkw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-          <references xmi:type="ecore:EPackage" href="pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml#_rlFYwOqKEeOfTcbrnCq2oQ"/>

-        </eAnnotations>

-        <appliedProfile xmi:type="uml:Profile" href="pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml#_nE1m0Hz7EeKfO4elN3J5Fw"/>

-      </profileApplication>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Model" xmi:id="_SJaO8PCFEeOEP-VOZrQAkw" name="Tests">

-      <packagedElement xmi:type="uml:Package" xmi:id="_fMeMwFXeEeOW-JPqZK_EZg" name="Test AboutCreateModifyElementCreationModel">

-        <packagedElement xmi:type="uml:UseCase" xmi:id="_HTgzkFXeEeOW-JPqZK_EZg" name="Create a model without nothing"/>

-        <packagedElement xmi:type="uml:UseCase" xmi:id="_KdZ8sFXeEeOW-JPqZK_EZg" name="createa model with only a root"/>

-        <packagedElement xmi:type="uml:UseCase" xmi:id="_M6gRQFXeEeOW-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" 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" name="Use a menu with elementType model"/>

-        <packagedElement xmi:type="uml:UseCase" xmi:id="_4nRBkFXdEeOW-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 xmi:type="uml:Abstraction" xmi:id="_cIl04PCFEeOEP-VOZrQAkw" name="Abstraction1" client="_SJaO8PCFEeOEP-VOZrQAkw" supplier="_u8E-gPCEEeOEP-VOZrQAkw"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Model" xmi:id="_C04U4PFJEeOieZKVW9xRxg" name="New Child Menu into the model explorer">

-      <packagedElement xmi:type="uml:Package" xmi:id="_C090cPFJEeOieZKVW9xRxg" name="Requirements">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_C1D7EPFJEeOieZKVW9xRxg">

-          <body>- AddNewChild (id=newChild001): 

- Papyrus shall add in the menu new child for new customized elements by using extended type</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_C1JaoPFJEeOieZKVW9xRxg">

-          <body>- HideElement (id=newChild002): 

- Papyrus shall not display all UML or SysML element creation</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_C1OTIPFJEeOieZKVW9xRxg">

-          <body>- newChildFromProfile (id=newChild003): 

- Papyrus shall add the creation of new element from a subset of profile</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_C1SkkPFJEeOieZKVW9xRxg">

-          <body>- newChildMenuDisplay (id=newChild004): 

- Papyrus shall be able to associated icons to folder or creation menu</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_C1W2APFJEeOieZKVW9xRxg">

-          <body>- RoleAndElementCreation (id=newChild005): 

- 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.</body>

-        </ownedComment>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_C1bHcPFJEeOieZKVW9xRxg" name="Use Cases">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_C3wCsPFJEeOieZKVW9xRxg">

-          <body>UseCaseDiagram</body>

-        </ownedComment>

-        <packagedElement xmi:type="uml:Package" xmi:id="_C3zGAPFJEeOieZKVW9xRxg" name="UseCreateMenu">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_C32JUPFJEeOieZKVW9xRxg">

-            <body>The Papyrus User shall use this functionality from the model explorer in order to create elements in the model. It can decide to display or not this element creation</body>

-          </ownedComment>

-          <packagedElement xmi:type="uml:Package" xmi:id="_C33-gPFJEeOieZKVW9xRxg" name="How to">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C36awPFJEeOieZKVW9xRxg">

-              <body>A user can create an element by  select element in the model explorer, click on it ant then click on the diagram.&#xD;

-In order to not display a menu,  a user can edit the model that represent the creation menu and set the attribute visibility to false. </body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C383APFJEeOieZKVW9xRxg">

-              <body>EnableCreationMenu</body>

-            </ownedComment>

-          </packagedElement>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_C3_TQPFJEeOieZKVW9xRxg" name="Create or modify ElementCreationModel">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_C4BvgPFJEeOieZKVW9xRxg">

-            <body>An advanced User is able to create of modify creation menu. This menu is a model that can be edited </body>

-          </ownedComment>

-          <packagedElement xmi:type="uml:Package" xmi:id="_C4ELwPFJEeOieZKVW9xRxg" name="How to">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C4GoAPFJEeOieZKVW9xRxg">

-              <body>An advanced user can contribuate to the menu by adding a new plugin that contains:&#xD;

-	-a xmi file that represents a creation menu. The model must be a instance of org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.ecore. It contains&#xD;

-		•	CreationMenu&#xD;

-			o	It correspond to a menu&#xD;

-			o	The ElemenTypeIDRef correspond a reference to the element Type.&#xD;

-			o	The role can be filled in order to specify the role play by the element.&#xD;

-			o	If displayAllRole is set to true, it displays all roles played by the element if the number of roles is greater than 1. By default this property is true;&#xD;

-		•	Folder&#xD;

-			o	It is possible to add owns label an icon.&#xD;

-			o  Visibilty to specify if the folder is visible.&#xD;

-	-a reference to an extension point, to specify that papyrus must take in account this file display the menu&#xD;

-&lt;code>&#xD;

-&lt;extension&#xD;

-         point=&quot;org.eclipse.papyrus.infra.newchild&quot;>&#xD;

-      &lt;menuCreationModel&#xD;

-            model=&quot;YourCreationMenu.xmi&quot;>&#xD;

-      &lt;/menuCreationModel>&#xD;

-&lt;/extension>&#xD;

-&lt;/code></body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C4IdMPFJEeOieZKVW9xRxg">

-              <body>In the following example, a menu creation for a package is presented. This menu is contained in the folder SimpleUMLTest. We have associated a image for this menu.</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C4K5cPFJEeOieZKVW9xRxg">

-              <body>Creation menu for a package with a specific icon</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C4NVsPFJEeOieZKVW9xRxg">

-              <body>Result for this menu</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C4Px8PFJEeOieZKVW9xRxg">

-              <body>In this following example, a creation menu will be specify  to allow creation of nested classifier. That 's why the role &quot;nestedClassifier&quot; is precised. The label for this creation is &quot;nestedClass&quot;</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C4SOMPFJEeOieZKVW9xRxg">

-              <body>Result for the menu nestedClass</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C4UqcPFJEeOieZKVW9xRxg">

-              <body>Creation menu model for nested class</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C4XtwPFJEeOieZKVW9xRxg">

-              <body>In the followin examplen a creation menu is created for activities. In this case, all roles are displayed. Thanks to this, when we want to associate an activity to a state, 3 roles are proposed. </body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C4aKAPFJEeOieZKVW9xRxg">

-              <body>Creation menu model for activity</body>

-            </ownedComment>

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C4cmQPFJEeOieZKVW9xRxg">

-              <body>Result for this menu activity</body>

-            </ownedComment>

-          </packagedElement>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_C4fCgPFJEeOieZKVW9xRxg" name="Generate &quot;ElementCreationModel&quot; from a profile">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_C4hewPFJEeOieZKVW9xRxg">

-            <body>From a stereotyped profile, a model of new child menu can be generated.&#xD;

-For example a user after designing a profile, want to have a dedicated menu  from this profile/&#xD;

-For the moment this function is not implemented.</body>

-          </ownedComment>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_C4j7APFJEeOieZKVW9xRxg" name="Hide, change order or add submenus">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_C4mXQPFJEeOieZKVW9xRxg">

-            <body>The User can modify the creation menu by adding submenus: order about new child menu, precise if the role must be displayed.</body>

-          </ownedComment>

-          <packagedElement xmi:type="uml:Package" xmi:id="_C4oMcPFJEeOieZKVW9xRxg" name="How to">

-            <ownedComment xmi:type="uml:Comment" xmi:id="_C4qosPFJEeOieZKVW9xRxg">

-              <body>test</body>

-            </ownedComment>

-          </packagedElement>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Package" xmi:id="_C4tE8PFJEeOieZKVW9xRxg" name="Create or modify ElementCreationModel at runtime thanks to a GUI">

-          <ownedComment xmi:type="uml:Comment" xmi:id="_C4u6IPFJEeOieZKVW9xRxg">

-            <body>A user  can edit a the model that represent the creation menu  at runtime for papyrus thanks to a dedicated UI.</body>

-          </ownedComment>

-        </packagedElement>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_C4xWYPFJEeOieZKVW9xRxg" name="Design">

-        <ownedComment xmi:type="uml:Comment" xmi:id="_C6RyQPFJEeOieZKVW9xRxg">

-          <body>Architecture</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_C6U1kPFJEeOieZKVW9xRxg">

-          <body>The system is done by two plugins:&#xD;

-	•	org.eclipse.papyrus.infra.newchild&#xD;

-	It has in charge to provide and construct swt.Menu from the ecore model. To do that the developer has to:&#xD;

-		o	instantiate a CreationMenuFactory, &#xD;

-		o	ask to get all Root model and populate it&#xD;

-	&lt;code>&#xD;

-		CreationMenuFactory creationMenuFactory= new CreationMenuFactory(editingDomain);&#xD;

-		ArrayList&lt;Folder> folders= creationMenuRegistry.getRootFolder();&#xD;

-		Iterator&lt;Folder> iterFolder= folders.iterator();&#xD;

-		while (iterFolder.hasNext()) {&#xD;

-			Folder currentFolder= iterFolder.next();&#xD;

-			creationMenuFactory.populateMenu(menu, currentFolder,eObject);&#xD;

-		}&#xD;

-&lt;/code>&#xD;

-	•	org.eclipse.papyrus.views.modelexplorer.newchild&#xD;

-	It has in charge to add menu in the model explorer of papyrus.&#xD;

-</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_C7WwUPFJEeOieZKVW9xRxg">

-          <body>NewDiagram</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_C7ZzoPFJEeOieZKVW9xRxg">

-          <body>This the structure of EMF model for model&#xD;

-	•	CreationMenu&#xD;

-		o	It correspond to a menu&#xD;

-		o	The ElemenTypeIDRef correspond a reference to the element Type.&#xD;

-		o	The role can be filled in order to specify the role play by the element.&#xD;

-		o	If displayAllRole is set to true, it displays all roles played by the element if the number of roles is greater than 1. By default this property is true;&#xD;

-	•	Folder&#xD;

-		o	It is possible to add owns label an icon.&#xD;

-</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_C7cP4PFJEeOieZKVW9xRxg">

-          <body>Example of obtained Menu</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_C7esIPFJEeOieZKVW9xRxg">

-          <body>Example of xml for a creation menu</body>

-        </ownedComment>

-        <ownedComment xmi:type="uml:Comment" xmi:id="_C7hIYPFJEeOieZKVW9xRxg">

-          <body>Here an example of xml of creation menu.</body>

-        </ownedComment>

-      </packagedElement>

-      <packagedElement xmi:type="uml:Package" xmi:id="_C7i9kPFJEeOieZKVW9xRxg" name="Tests">

-        <packagedElement xmi:type="uml:Package" xmi:id="_C7lZ0PFJEeOieZKVW9xRxg" name="Create a model without nothing"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_C7n2EPFJEeOieZKVW9xRxg" name="createa model with only a root"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_C7qSUPFJEeOieZKVW9xRxg" name="create a model with elementType as String"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_C7tVoPFJEeOieZKVW9xRxg" name="Use a menu from a model without ElementType model"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_C7vx4PFJEeOieZKVW9xRxg" name="Use a menu with elementType model"/>

-        <packagedElement xmi:type="uml:Package" xmi:id="_C7yOIPFJEeOieZKVW9xRxg" name="Use a menu with stereotyped element"/>

-      </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/5.0.0/UML/Profile/Standard#/"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/StandardL2.profile.uml#_0"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_L-OWgLXWEeOnr8r0UtVlaQ">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_L_ycwLXWEeOnr8r0UtVlaQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml#_rlFYwOqKEeOfTcbrnCq2oQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml#_nE1m0Hz7EeKfO4elN3J5Fw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_L_5xgLXWEeOnr8r0UtVlaQ">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MBnBsLXWEeOnr8r0UtVlaQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_0xHxUYDEEeKQG4TlBAn6bg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_OKU8EHtxEeKcL-wrhM9ICg"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_MBshQLXWEeOnr8r0UtVlaQ">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MDc0wLXWEeOnr8r0UtVlaQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_0xRiUIDEEeKQG4TlBAn6bg"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_YbhfEHtxEeKcL-wrhM9ICg"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_y9UYoPB_EeOcJLERJuPllg">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_y_6ZoPB_EeOcJLERJuPllg" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_VA6mkMcPEeO9CYUoXDRplw"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_kWqjAMbXEeO09JBvNFZRNw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_VwyQMPCDEeOEP-VOZrQAkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Vwy3QPCDEeOEP-VOZrQAkw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_VA-4AMcPEeO9CYUoXDRplw"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_qCT3MMbXEeO09JBvNFZRNw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Vw6zEPCDEeOEP-VOZrQAkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Vw7aIPCDEeOEP-VOZrQAkw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_VBAtMccPEeO9CYUoXDRplw"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_2LNtQMbYEeO09JBvNFZRNw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_XL0DwPCDEeOEP-VOZrQAkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_XL0DwfCDEeOEP-VOZrQAkw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/Document.profile.uml#_qR44IMn0EeO9CYUoXDRplw"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/Document.profile.uml#_D0JcUMnzEeO9CYUoXDRplw"/>

-    </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 elements 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="An element can be 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 roles." id="newChild005" base_Class="_Dm5BYFgOEeOKQOyOw2l5lw"/>

-  <standard:Refine xmi:id="_ME1MIFgQEeOKQOyOw2l5lw" base_Abstraction="_MEYgMFgQEeOKQOyOw2l5lw"/>

-  <standard:Refine xmi:id="_NKArgFgQEeOKQOyOw2l5lw" base_Abstraction="_NJtwkFgQEeOKQOyOw2l5lw"/>

-  <standard:Refine xmi:id="_OCi2AFgQEeOKQOyOw2l5lw" base_Abstraction="_OCZsEFgQEeOKQOyOw2l5lw"/>

-  <standard:Refine xmi:id="_PEv54lgQEeOKQOyOw2l5lw" base_Abstraction="_PEmv8FgQEeOKQOyOw2l5lw"/>

-  <standard:Refine xmi:id="_RA1MEFgQEeOKQOyOw2l5lw" base_Abstraction="_RAhqEFgQEeOKQOyOw2l5lw"/>

-  <standard:Refine xmi:id="_VQMIcVgQEeOKQOyOw2l5lw" base_Abstraction="_VQC-gFgQEeOKQOyOw2l5lw"/>

-  <structure:Project xmi:id="_ZInHoPCDEeOEP-VOZrQAkw" author="CEA LIST" version="0.2" base_Model="_a0QCwFOCEeOE6bh9v5dYKg" title="New Child Menu into the model explorer"/>

-  <structure:Requirements xmi:id="_9hHxwPCDEeOEP-VOZrQAkw" base_Model="_52hvUPCDEeOEP-VOZrQAkw"/>

-  <structure:UseCases xmi:id="_xxynYPCEEeOEP-VOZrQAkw" base_Model="_u8E-gPCEEeOEP-VOZrQAkw"/>

-  <structure:Tests xmi:id="_ikJjEPCFEeOEP-VOZrQAkw" base_Model="_SJaO8PCFEeOEP-VOZrQAkw"/>

-  <Document:Content xmi:id="_EAjBYPCGEeOEP-VOZrQAkw" base_Comment="_Cu5MQPCGEeOEP-VOZrQAkw"/>

-  <structure:Design xmi:id="_xTidwPCHEeOEP-VOZrQAkw" base_Model="_vmIgwPCHEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:Plugin xmi:id="_J2tUwPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.newchild.Activator" classPath="." description="The purpose of this plugin is to offer the model and means to create new menu in the model explorer. More documentation (models and file.doc) has been store in the docs directory. The plugin in charge to do the connection with the model explorer is org.eclipse.papyrus.view.modelexplorer.newchild" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.newchild" vendor="Eclipse Modeling Project" version="1.0.0.qualifier" exportPackage="_Kd6esPCMEeOEP-VOZrQAkw _Kd868PCMEeOEP-VOZrQAkw _Kd-wIPCMEeOEP-VOZrQAkw _KeAlUPCMEeOEP-VOZrQAkw" base_Component="_J2qRcPCMEeOEP-VOZrQAkw" name="Papyrus infra new child"/>

-  <ADL4Eclipse:Plugin xmi:id="_KR1KgPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.ui.internal.UIPlugin" classPath="." localization="plugin" requiredExecutionEnvironment="J2SE-1.4" symbolicName="org.eclipse.ui" vendor="Eclipse.org" version="3.106.0.v20140519-0906" exportPackage="_KR9GUPCMEeOEP-VOZrQAkw" base_Component="_KRyHMPCMEeOEP-VOZrQAkw" name="Eclipse UI"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KR9GUPCMEeOEP-VOZrQAkw" base_Package="_KR6qEPCMEeOEP-VOZrQAkw" isInternal="true"/>

-  <ModuleLayer:BundleReference xmi:id="_KSB-0PCMEeOEP-VOZrQAkw" base_Dependency="_KR-7gPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:Plugin xmi:id="_KSFCIPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.core.internal.runtime.PlatformActivator" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.core.runtime" vendor="Eclipse.org" version="3.10.0.v20140318-2214" exportPackage="_KSLv0PCMEeOEP-VOZrQAkw _KSOzIPCMEeOEP-VOZrQAkw _KSR2cPCMEeOEP-VOZrQAkw" base_Component="_KSCl4PCMEeOEP-VOZrQAkw" name="Core Runtime"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KSLv0PCMEeOEP-VOZrQAkw" base_Package="_KSJTkPCMEeOEP-VOZrQAkw" isInternal="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KSOzIPCMEeOEP-VOZrQAkw" base_Package="_KSMW4PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KSR2cPCMEeOEP-VOZrQAkw" atleast="3.4.0" base_Package="_KSPaMPCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_KSVg0PCMEeOEP-VOZrQAkw" base_Dependency="_KSSdgPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:Plugin xmi:id="_KSYkIPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" localization="plugin" symbolicName="org.eclipse.emf" vendor="Eclipse Modeling Project" version="2.6.0.v20140519-0339" base_Component="_KSWH4PCMEeOEP-VOZrQAkw" name="EMF - Eclipse Modeling Framework Runtime and Tools" lazyStart="true"/>

-  <ModuleLayer:BundleReference xmi:id="_KSfR0PCMEeOEP-VOZrQAkw" base_Dependency="_KSc1kPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:Plugin xmi:id="_KSiVIPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.emf.ecore.plugin.EcorePlugin$Implementation$Activator" classPath="." localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.emf.ecore" vendor="Eclipse Modeling Project" version="2.10.0.v20140514-1158" exportPackage="_KSpC0PCMEeOEP-VOZrQAkw _KSsGIPCMEeOEP-VOZrQAkw _KSvJcPCMEeOEP-VOZrQAkw _KSxlsPCMEeOEP-VOZrQAkw _KS0pAPCMEeOEP-VOZrQAkw _KS3FQPCMEeOEP-VOZrQAkw _KS5hgPCMEeOEP-VOZrQAkw _KS8k0PCMEeOEP-VOZrQAkw _KS_BEPCMEeOEP-VOZrQAkw _KTBdUPCMEeOEP-VOZrQAkw _KTEgoPCMEeOEP-VOZrQAkw _KTG84PCMEeOEP-VOZrQAkw _KTKAMPCMEeOEP-VOZrQAkw" base_Component="_KSf44PCMEeOEP-VOZrQAkw" name="EMF Ecore" lazyStart="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KSpC0PCMEeOEP-VOZrQAkw" base_Package="_KSmmkPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KSsGIPCMEeOEP-VOZrQAkw" base_Package="_KSpp4PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KSvJcPCMEeOEP-VOZrQAkw" base_Package="_KSstMPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KSxlsPCMEeOEP-VOZrQAkw" base_Package="_KSvJcfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KS0pAPCMEeOEP-VOZrQAkw" base_Package="_KSyMwPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KS3FQPCMEeOEP-VOZrQAkw" base_Package="_KS0pAfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KS5hgPCMEeOEP-VOZrQAkw" base_Package="_KS3sUPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KS8k0PCMEeOEP-VOZrQAkw" base_Package="_KS6IkPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KS_BEPCMEeOEP-VOZrQAkw" base_Package="_KS8k0fCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTBdUPCMEeOEP-VOZrQAkw" base_Package="_KS_oIPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTEgoPCMEeOEP-VOZrQAkw" base_Package="_KTCEYPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTG84PCMEeOEP-VOZrQAkw" base_Package="_KTFHsPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTKAMPCMEeOEP-VOZrQAkw" base_Package="_KTHj8PCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_KTNDgPCMEeOEP-VOZrQAkw" base_Dependency="_KTKnQPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:Plugin xmi:id="_KTQG0PCMEeOEP-VOZrQAkw" activator="org.eclipse.osgi.internal.framework.SystemBundleActivator" copyright="Copyright (c) 2003, 2014 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" description="OSGi System Bundle" docURL="http://www.eclipse.org" localization="systembundle" symbolicName="org.eclipse.osgi" vendor="Eclipse.org - Equinox" version="3.10.0.v20140513-1456" exportPackage="_KTXbkPCMEeOEP-VOZrQAkw _KTZ30PCMEeOEP-VOZrQAkw _KTc7IPCMEeOEP-VOZrQAkw _KTf-cPCMEeOEP-VOZrQAkw _KTiasPCMEeOEP-VOZrQAkw _KTleAPCMEeOEP-VOZrQAkw _KTohUPCMEeOEP-VOZrQAkw _KTq9kPCMEeOEP-VOZrQAkw _KTuA4PCMEeOEP-VOZrQAkw _KTwdIPCMEeOEP-VOZrQAkw _KTzgcPCMEeOEP-VOZrQAkw _KT18sPCMEeOEP-VOZrQAkw _KT5AAPCMEeOEP-VOZrQAkw _KT8DUPCMEeOEP-VOZrQAkw _KT-fkPCMEeOEP-VOZrQAkw _KUBi4PCMEeOEP-VOZrQAkw _KUD_IPCMEeOEP-VOZrQAkw _KUHCcPCMEeOEP-VOZrQAkw _KUJesPCMEeOEP-VOZrQAkw _KUMiAPCMEeOEP-VOZrQAkw _KUPlUPCMEeOEP-VOZrQAkw _KUSBkPCMEeOEP-VOZrQAkw _KUVE4PCMEeOEP-VOZrQAkw _KUXhIPCMEeOEP-VOZrQAkw _KUZ9YPCMEeOEP-VOZrQAkw _KUdAsPCMEeOEP-VOZrQAkw _KUgEAPCMEeOEP-VOZrQAkw _KUkVcPCMEeOEP-VOZrQAkw _KUnYwPCMEeOEP-VOZrQAkw _KUqcEPCMEeOEP-VOZrQAkw _KUs4UPCMEeOEP-VOZrQAkw _KUv7oPCMEeOEP-VOZrQAkw _KUyX4PCMEeOEP-VOZrQAkw _KU1bMPCMEeOEP-VOZrQAkw _KU33cPCMEeOEP-VOZrQAkw _KU66wPCMEeOEP-VOZrQAkw _KU-lIPCMEeOEP-VOZrQAkw _KVBBYPCMEeOEP-VOZrQAkw _KVEEsPCMEeOEP-VOZrQAkw _KVGg8PCMEeOEP-VOZrQAkw _KVI9MPCMEeOEP-VOZrQAkw _KVMAgPCMEeOEP-VOZrQAkw _KVOcwPCMEeOEP-VOZrQAkw _KVQ5APCMEeOEP-VOZrQAkw _KVT8UPCMEeOEP-VOZrQAkw _KVWYkPCMEeOEP-VOZrQAkw _KVZb4PCMEeOEP-VOZrQAkw _KVb4IPCMEeOEP-VOZrQAkw _KVeUYPCMEeOEP-VOZrQAkw _KVhXsPCMEeOEP-VOZrQAkw _KVjz8PCMEeOEP-VOZrQAkw _KVmQMPCMEeOEP-VOZrQAkw _KVpTgPCMEeOEP-VOZrQAkw _KVrvwPCMEeOEP-VOZrQAkw _KVuzEPCMEeOEP-VOZrQAkw _KVxPUPCMEeOEP-VOZrQAkw _KVzrkPCMEeOEP-VOZrQAkw _KV2u4PCMEeOEP-VOZrQAkw _KV5LIPCMEeOEP-VOZrQAkw _KV7nYPCMEeOEP-VOZrQAkw _KV-qsPCMEeOEP-VOZrQAkw _KWBG8PCMEeOEP-VOZrQAkw _KWDjMPCMEeOEP-VOZrQAkw _KWGmgPCMEeOEP-VOZrQAkw _KWJCwPCMEeOEP-VOZrQAkw _KWLfAPCMEeOEP-VOZrQAkw _KWN7QPCMEeOEP-VOZrQAkw _KWQXgPCMEeOEP-VOZrQAkw _KWSzwPCMEeOEP-VOZrQAkw _KWVQAPCMEeOEP-VOZrQAkw _KWXFMPCMEeOEP-VOZrQAkw _KWZhcPCMEeOEP-VOZrQAkw _KWb9sPCMEeOEP-VOZrQAkw _KWeZ8PCMEeOEP-VOZrQAkw _KWg2MPCMEeOEP-VOZrQAkw _KWirYPCMEeOEP-VOZrQAkw _KWlHoPCMEeOEP-VOZrQAkw _KWnj4PCMEeOEP-VOZrQAkw _KWqAIPCMEeOEP-VOZrQAkw _KWscYPCMEeOEP-VOZrQAkw _KWuRkPCMEeOEP-VOZrQAkw _KWwt0PCMEeOEP-VOZrQAkw _KWyjAPCMEeOEP-VOZrQAkw _KW0_QPCMEeOEP-VOZrQAkw _KW20cPCMEeOEP-VOZrQAkw _KW5QsPCMEeOEP-VOZrQAkw _KW7F4PCMEeOEP-VOZrQAkw _KW9iIPCMEeOEP-VOZrQAkw _KW_-YPCMEeOEP-VOZrQAkw _KXBzkPCMEeOEP-VOZrQAkw _KXEP0PCMEeOEP-VOZrQAkw _KXGFAPCMEeOEP-VOZrQAkw _KXH6MPCMEeOEP-VOZrQAkw _KXKWcPCMEeOEP-VOZrQAkw _KXMLoPCMEeOEP-VOZrQAkw _KXOn4PCMEeOEP-VOZrQAkw _KXQdEPCMEeOEP-VOZrQAkw _KXSSQPCMEeOEP-VOZrQAkw _KXUugPCMEeOEP-VOZrQAkw _KXWjsPCMEeOEP-VOZrQAkw _KXYY4PCMEeOEP-VOZrQAkw _KXa1IPCMEeOEP-VOZrQAkw _KXcqUPCMEeOEP-VOZrQAkw _KXefgPCMEeOEP-VOZrQAkw _KXgUsPCMEeOEP-VOZrQAkw _KXiJ4PCMEeOEP-VOZrQAkw _KXkmIPCMEeOEP-VOZrQAkw _KXmbUPCMEeOEP-VOZrQAkw _KXoQgPCMEeOEP-VOZrQAkw _KXqFsPCMEeOEP-VOZrQAkw _KXsh8PCMEeOEP-VOZrQAkw _KXuXIPCMEeOEP-VOZrQAkw _KXwMUPCMEeOEP-VOZrQAkw _KXyBgPCMEeOEP-VOZrQAkw _KX0dwPCMEeOEP-VOZrQAkw _KX2S8PCMEeOEP-VOZrQAkw _KX4IIPCMEeOEP-VOZrQAkw _KX6kYPCMEeOEP-VOZrQAkw _KX8ZkPCMEeOEP-VOZrQAkw _KX-OwPCMEeOEP-VOZrQAkw _KYArAPCMEeOEP-VOZrQAkw _KYCgMPCMEeOEP-VOZrQAkw _KYEVYPCMEeOEP-VOZrQAkw _KYGxoPCMEeOEP-VOZrQAkw _KYIm0PCMEeOEP-VOZrQAkw _KYKcAPCMEeOEP-VOZrQAkw _KYMRMPCMEeOEP-VOZrQAkw _KYOGYPCMEeOEP-VOZrQAkw _KYQioPCMEeOEP-VOZrQAkw _KYSX0PCMEeOEP-VOZrQAkw _KYUNAPCMEeOEP-VOZrQAkw _KYWCMPCMEeOEP-VOZrQAkw _KYX3YPCMEeOEP-VOZrQAkw _KYaToPCMEeOEP-VOZrQAkw _KYcI0PCMEeOEP-VOZrQAkw _KYd-APCMEeOEP-VOZrQAkw _KYfzMPCMEeOEP-VOZrQAkw _KYiPcPCMEeOEP-VOZrQAkw _KYkEoPCMEeOEP-VOZrQAkw _KYl50PCMEeOEP-VOZrQAkw _KYnvAPCMEeOEP-VOZrQAkw _KYpkMPCMEeOEP-VOZrQAkw _KYsAcPCMEeOEP-VOZrQAkw _KYt1oPCMEeOEP-VOZrQAkw _KYvq0PCMEeOEP-VOZrQAkw _KYxgAPCMEeOEP-VOZrQAkw _KYzVMPCMEeOEP-VOZrQAkw _KY1KYPCMEeOEP-VOZrQAkw _KY2_kPCMEeOEP-VOZrQAkw _KY40wPCMEeOEP-VOZrQAkw _KY6p8PCMEeOEP-VOZrQAkw _KY8fIPCMEeOEP-VOZrQAkw _KY-UUPCMEeOEP-VOZrQAkw _KZAwkPCMEeOEP-VOZrQAkw _KZClwPCMEeOEP-VOZrQAkw _KZEa8PCMEeOEP-VOZrQAkw _KZGQIPCMEeOEP-VOZrQAkw _KZIFUPCMEeOEP-VOZrQAkw _KZJ6gPCMEeOEP-VOZrQAkw _KZLvsPCMEeOEP-VOZrQAkw _KZNk4PCMEeOEP-VOZrQAkw _KZPaEPCMEeOEP-VOZrQAkw _KZRPQPCMEeOEP-VOZrQAkw _KZTEcPCMEeOEP-VOZrQAkw _KZU5oPCMEeOEP-VOZrQAkw _KZWu0PCMEeOEP-VOZrQAkw _KZYkAPCMEeOEP-VOZrQAkw _KZaZMPCMEeOEP-VOZrQAkw _KZcOYPCMEeOEP-VOZrQAkw _KZeDkPCMEeOEP-VOZrQAkw _KZf4wPCMEeOEP-VOZrQAkw _KZht8PCMEeOEP-VOZrQAkw _KZjjIPCMEeOEP-VOZrQAkw _KZlYUPCMEeOEP-VOZrQAkw _KZnNgPCMEeOEP-VOZrQAkw _KZpCsPCMEeOEP-VOZrQAkw _KZq34PCMEeOEP-VOZrQAkw _KZstEPCMEeOEP-VOZrQAkw _KZuiQPCMEeOEP-VOZrQAkw _KZwXcPCMEeOEP-VOZrQAkw _KZyMoPCMEeOEP-VOZrQAkw _KZ0B0PCMEeOEP-VOZrQAkw _KZ1P8PCMEeOEP-VOZrQAkw _KZ3FIPCMEeOEP-VOZrQAkw _KZ46UPCMEeOEP-VOZrQAkw _KZ6vgPCMEeOEP-VOZrQAkw _KZ8ksPCMEeOEP-VOZrQAkw _KZ-Z4PCMEeOEP-VOZrQAkw _KaAPEPCMEeOEP-VOZrQAkw _KaCEQPCMEeOEP-VOZrQAkw _KaD5cPCMEeOEP-VOZrQAkw _KaFuoPCMEeOEP-VOZrQAkw _KaHj0PCMEeOEP-VOZrQAkw _KaJZAPCMEeOEP-VOZrQAkw _KaLOMPCMEeOEP-VOZrQAkw _KaNDYPCMEeOEP-VOZrQAkw _KaO4kPCMEeOEP-VOZrQAkw _KaQtwPCMEeOEP-VOZrQAkw _KaSi8PCMEeOEP-VOZrQAkw _KaUYIPCMEeOEP-VOZrQAkw _KaWNUPCMEeOEP-VOZrQAkw _KaYCgPCMEeOEP-VOZrQAkw _KaZ3sPCMEeOEP-VOZrQAkw _Kabs4PCMEeOEP-VOZrQAkw _Kac7APCMEeOEP-VOZrQAkw _KaewMPCMEeOEP-VOZrQAkw _KaglYPCMEeOEP-VOZrQAkw _KaiakPCMEeOEP-VOZrQAkw _KakPwPCMEeOEP-VOZrQAkw _KamE8PCMEeOEP-VOZrQAkw _Kan6IPCMEeOEP-VOZrQAkw _KapvUPCMEeOEP-VOZrQAkw _Kaq9cPCMEeOEP-VOZrQAkw _KasyoPCMEeOEP-VOZrQAkw _Kaun0PCMEeOEP-VOZrQAkw _KawdAPCMEeOEP-VOZrQAkw _KaySMPCMEeOEP-VOZrQAkw _Ka0HYPCMEeOEP-VOZrQAkw _Ka18kPCMEeOEP-VOZrQAkw _Ka3KsPCMEeOEP-VOZrQAkw _Ka4_4PCMEeOEP-VOZrQAkw _Ka61EPCMEeOEP-VOZrQAkw _Ka8qQPCMEeOEP-VOZrQAkw _Ka-fcPCMEeOEP-VOZrQAkw _KbAUoPCMEeOEP-VOZrQAkw _KbCJ0PCMEeOEP-VOZrQAkw" base_Component="_KTNqkPCMEeOEP-VOZrQAkw" name="OSGi System Bundle"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTXbkPCMEeOEP-VOZrQAkw" base_Package="_KTU_UPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTZ30PCMEeOEP-VOZrQAkw" base_Package="_KTYCoPCMEeOEP-VOZrQAkw" isInternal="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTc7IPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KTae4PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTf-cPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KTdiMPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTiasPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KTglgPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTleAPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KTjBwPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTohUPCMEeOEP-VOZrQAkw" atleast="1.1.0" base_Package="_KTmFEPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTq9kPCMEeOEP-VOZrQAkw" atleast="1.2.0" base_Package="_KTohUfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTuA4PCMEeOEP-VOZrQAkw" base_Package="_KTrkoPCMEeOEP-VOZrQAkw" isInternal="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTwdIPCMEeOEP-VOZrQAkw" atleast="1.1.0" base_Package="_KTun8PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTzgcPCMEeOEP-VOZrQAkw" base_Package="_KTxEMPCMEeOEP-VOZrQAkw" isInternal="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KT18sPCMEeOEP-VOZrQAkw" base_Package="_KT0HgPCMEeOEP-VOZrQAkw" isInternal="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KT5AAPCMEeOEP-VOZrQAkw" base_Package="_KT2jwPCMEeOEP-VOZrQAkw" isInternal="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KT8DUPCMEeOEP-VOZrQAkw" base_Package="_KT5nEPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KT-fkPCMEeOEP-VOZrQAkw" base_Package="_KT8DUfCMEeOEP-VOZrQAkw" isInternal="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUBi4PCMEeOEP-VOZrQAkw" base_Package="_KT_GoPCMEeOEP-VOZrQAkw" isInternal="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUD_IPCMEeOEP-VOZrQAkw" base_Package="_KUCJ8PCMEeOEP-VOZrQAkw" isInternal="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUHCcPCMEeOEP-VOZrQAkw" base_Package="_KUEmMPCMEeOEP-VOZrQAkw" isInternal="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUJesPCMEeOEP-VOZrQAkw" base_Package="_KUHpgPCMEeOEP-VOZrQAkw" isInternal="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUMiAPCMEeOEP-VOZrQAkw" base_Package="_KUKFwPCMEeOEP-VOZrQAkw" isInternal="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUPlUPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KUNJEPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUSBkPCMEeOEP-VOZrQAkw" base_Package="_KUQMYPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUVE4PCMEeOEP-VOZrQAkw" base_Package="_KUSooPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUXhIPCMEeOEP-VOZrQAkw" base_Package="_KUVE4fCMEeOEP-VOZrQAkw" isInternal="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUZ9YPCMEeOEP-VOZrQAkw" base_Package="_KUYIMPCMEeOEP-VOZrQAkw" isInternal="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUdAsPCMEeOEP-VOZrQAkw" base_Package="_KUakcPCMEeOEP-VOZrQAkw" isInternal="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUgEAPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KUdnwPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUkVcPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KUgrEPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUnYwPCMEeOEP-VOZrQAkw" atleast="1.3.0" base_Package="_KUk8gPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUqcEPCMEeOEP-VOZrQAkw" atleast="1.2.0" base_Package="_KUn_0PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUs4UPCMEeOEP-VOZrQAkw" atleast="1.3.0" base_Package="_KUrDIPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUv7oPCMEeOEP-VOZrQAkw" atleast="1.1.0" base_Package="_KUtfYPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUyX4PCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KUwisPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KU1bMPCMEeOEP-VOZrQAkw" atleast="1.6.0" base_Package="_KUy-8PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KU33cPCMEeOEP-VOZrQAkw" atleast="1.1.0" base_Package="_KU2CQPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KU66wPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KU4egPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KU-lIPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KU7h0PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVBBYPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KU_MMPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVEEsPCMEeOEP-VOZrQAkw" base_Package="_KVBocPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVGg8PCMEeOEP-VOZrQAkw" base_Package="_KVEEsfCMEeOEP-VOZrQAkw" isInternal="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVI9MPCMEeOEP-VOZrQAkw" base_Package="_KVHIAPCMEeOEP-VOZrQAkw" isInternal="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVMAgPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KVJkQPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVOcwPCMEeOEP-VOZrQAkw" atleast="1.1.0" base_Package="_KVMnkPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVQ5APCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KVPD0PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVT8UPCMEeOEP-VOZrQAkw" atleast="1.8.0" base_Package="_KVRgEPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVWYkPCMEeOEP-VOZrQAkw" atleast="1.8.0" base_Package="_KVUjYPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVZb4PCMEeOEP-VOZrQAkw" atleast="1.1.0" base_Package="_KVW_oPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVb4IPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KVaC8PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVeUYPCMEeOEP-VOZrQAkw" atleast="1.1.0" base_Package="_KVcfMPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVhXsPCMEeOEP-VOZrQAkw" atleast="1.1.0" base_Package="_KVe7cPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVjz8PCMEeOEP-VOZrQAkw" atleast="1.2.0" base_Package="_KVh-wPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVmQMPCMEeOEP-VOZrQAkw" atleast="1.1.0" base_Package="_KVkbAPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVpTgPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KVm3QPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVrvwPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KVp6kPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVuzEPCMEeOEP-VOZrQAkw" atleast="1.2.0" base_Package="_KVsW0PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVxPUPCMEeOEP-VOZrQAkw" atleast="1.2.0" base_Package="_KVvaIPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVzrkPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KVx2YPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KV2u4PCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KV0SoPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KV5LIPCMEeOEP-VOZrQAkw" atleast="1.1.1" base_Package="_KV3V8PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KV7nYPCMEeOEP-VOZrQAkw" atleast="1.3.0" base_Package="_KV5yMPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KV-qsPCMEeOEP-VOZrQAkw" atleast="1.2.0" base_Package="_KV8OcPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWBG8PCMEeOEP-VOZrQAkw" atleast="1.2.0" base_Package="_KV_RwPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWDjMPCMEeOEP-VOZrQAkw" atleast="1.0.1" base_Package="_KWBuAPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWGmgPCMEeOEP-VOZrQAkw" atleast="1.1.0" base_Package="_KWEKQPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWJCwPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KWHNkPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWLfAPCMEeOEP-VOZrQAkw" atleast="1.5.1" base_Package="_KWJp0PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWN7QPCMEeOEP-VOZrQAkw" base_Package="_KWMGEPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWQXgPCMEeOEP-VOZrQAkw" base_Package="_KWOiUPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWSzwPCMEeOEP-VOZrQAkw" base_Package="_KWQ-kPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWVQAPCMEeOEP-VOZrQAkw" base_Package="_KWSzwfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWXFMPCMEeOEP-VOZrQAkw" base_Package="_KWVQAfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWZhcPCMEeOEP-VOZrQAkw" base_Package="_KWXsQPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWb9sPCMEeOEP-VOZrQAkw" base_Package="_KWaIgPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWeZ8PCMEeOEP-VOZrQAkw" base_Package="_KWckwPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWg2MPCMEeOEP-VOZrQAkw" base_Package="_KWeZ8fCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWirYPCMEeOEP-VOZrQAkw" base_Package="_KWg2MfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWlHoPCMEeOEP-VOZrQAkw" base_Package="_KWjScPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWnj4PCMEeOEP-VOZrQAkw" base_Package="_KWlusPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWqAIPCMEeOEP-VOZrQAkw" base_Package="_KWoK8PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWscYPCMEeOEP-VOZrQAkw" base_Package="_KWqnMPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWuRkPCMEeOEP-VOZrQAkw" base_Package="_KWscYfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWwt0PCMEeOEP-VOZrQAkw" base_Package="_KWu4oPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWyjAPCMEeOEP-VOZrQAkw" base_Package="_KWxU4PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KW0_QPCMEeOEP-VOZrQAkw" base_Package="_KWzKEPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KW20cPCMEeOEP-VOZrQAkw" base_Package="_KW1mUPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KW5QsPCMEeOEP-VOZrQAkw" base_Package="_KW3bgPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KW7F4PCMEeOEP-VOZrQAkw" base_Package="_KW53wPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KW9iIPCMEeOEP-VOZrQAkw" base_Package="_KW7s8PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KW_-YPCMEeOEP-VOZrQAkw" base_Package="_KW-JMPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXBzkPCMEeOEP-VOZrQAkw" base_Package="_KW_-YfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXEP0PCMEeOEP-VOZrQAkw" base_Package="_KXCaoPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXGFAPCMEeOEP-VOZrQAkw" base_Package="_KXEP0fCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXH6MPCMEeOEP-VOZrQAkw" base_Package="_KXGsEPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXKWcPCMEeOEP-VOZrQAkw" base_Package="_KXIhQPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXMLoPCMEeOEP-VOZrQAkw" base_Package="_KXK9gPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXOn4PCMEeOEP-VOZrQAkw" base_Package="_KXMysPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXQdEPCMEeOEP-VOZrQAkw" base_Package="_KXOn4fCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXSSQPCMEeOEP-VOZrQAkw" base_Package="_KXREIPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXUugPCMEeOEP-VOZrQAkw" base_Package="_KXS5UPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXWjsPCMEeOEP-VOZrQAkw" base_Package="_KXVVkPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXYY4PCMEeOEP-VOZrQAkw" base_Package="_KXXKwPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXa1IPCMEeOEP-VOZrQAkw" base_Package="_KXY_8PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXcqUPCMEeOEP-VOZrQAkw" base_Package="_KXa1IfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXefgPCMEeOEP-VOZrQAkw" base_Package="_KXdRYPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXgUsPCMEeOEP-VOZrQAkw" base_Package="_KXfGkPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXiJ4PCMEeOEP-VOZrQAkw" base_Package="_KXg7wPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXkmIPCMEeOEP-VOZrQAkw" base_Package="_KXiw8PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXmbUPCMEeOEP-VOZrQAkw" base_Package="_KXkmIfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXoQgPCMEeOEP-VOZrQAkw" base_Package="_KXnCYPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXqFsPCMEeOEP-VOZrQAkw" base_Package="_KXo3kPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXsh8PCMEeOEP-VOZrQAkw" base_Package="_KXqswPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXuXIPCMEeOEP-VOZrQAkw" base_Package="_KXsh8fCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXwMUPCMEeOEP-VOZrQAkw" base_Package="_KXu-MPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXyBgPCMEeOEP-VOZrQAkw" base_Package="_KXwzYPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KX0dwPCMEeOEP-VOZrQAkw" base_Package="_KXyokPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KX2S8PCMEeOEP-VOZrQAkw" base_Package="_KX0dwfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KX4IIPCMEeOEP-VOZrQAkw" base_Package="_KX26APCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KX6kYPCMEeOEP-VOZrQAkw" base_Package="_KX4vMPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KX8ZkPCMEeOEP-VOZrQAkw" base_Package="_KX6kYfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KX-OwPCMEeOEP-VOZrQAkw" base_Package="_KX9AoPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYArAPCMEeOEP-VOZrQAkw" base_Package="_KX-10PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYCgMPCMEeOEP-VOZrQAkw" base_Package="_KYBSEPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYEVYPCMEeOEP-VOZrQAkw" base_Package="_KYDHQPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYGxoPCMEeOEP-VOZrQAkw" base_Package="_KYE8cPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYIm0PCMEeOEP-VOZrQAkw" base_Package="_KYGxofCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYKcAPCMEeOEP-VOZrQAkw" base_Package="_KYIm0fCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYMRMPCMEeOEP-VOZrQAkw" base_Package="_KYLDEPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYOGYPCMEeOEP-VOZrQAkw" base_Package="_KYM4QPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYQioPCMEeOEP-VOZrQAkw" base_Package="_KYOtcPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYSX0PCMEeOEP-VOZrQAkw" base_Package="_KYQiofCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYUNAPCMEeOEP-VOZrQAkw" base_Package="_KYSX0fCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYWCMPCMEeOEP-VOZrQAkw" base_Package="_KYU0EPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYX3YPCMEeOEP-VOZrQAkw" base_Package="_KYWpQPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYaToPCMEeOEP-VOZrQAkw" base_Package="_KYYecPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYcI0PCMEeOEP-VOZrQAkw" base_Package="_KYaTofCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYd-APCMEeOEP-VOZrQAkw" base_Package="_KYcI0fCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYfzMPCMEeOEP-VOZrQAkw" base_Package="_KYelEPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYiPcPCMEeOEP-VOZrQAkw" base_Package="_KYgaQPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYkEoPCMEeOEP-VOZrQAkw" base_Package="_KYiPcfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYl50PCMEeOEP-VOZrQAkw" base_Package="_KYkEofCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYnvAPCMEeOEP-VOZrQAkw" base_Package="_KYmg4PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYpkMPCMEeOEP-VOZrQAkw" base_Package="_KYoWEPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYsAcPCMEeOEP-VOZrQAkw" base_Package="_KYqLQPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYt1oPCMEeOEP-VOZrQAkw" base_Package="_KYsAcfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYvq0PCMEeOEP-VOZrQAkw" base_Package="_KYucsPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYxgAPCMEeOEP-VOZrQAkw" base_Package="_KYwR4PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYzVMPCMEeOEP-VOZrQAkw" base_Package="_KYyHEPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KY1KYPCMEeOEP-VOZrQAkw" base_Package="_KYz8QPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KY2_kPCMEeOEP-VOZrQAkw" base_Package="_KY1xcPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KY40wPCMEeOEP-VOZrQAkw" base_Package="_KY3moPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KY6p8PCMEeOEP-VOZrQAkw" base_Package="_KY5b0PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KY8fIPCMEeOEP-VOZrQAkw" base_Package="_KY7RAPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KY-UUPCMEeOEP-VOZrQAkw" base_Package="_KY9GMPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZAwkPCMEeOEP-VOZrQAkw" base_Package="_KY-7YPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZClwPCMEeOEP-VOZrQAkw" base_Package="_KZAwkfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZEa8PCMEeOEP-VOZrQAkw" base_Package="_KZClwfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZGQIPCMEeOEP-VOZrQAkw" base_Package="_KZEa8fCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZIFUPCMEeOEP-VOZrQAkw" base_Package="_KZGQIfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZJ6gPCMEeOEP-VOZrQAkw" base_Package="_KZIFUfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZLvsPCMEeOEP-VOZrQAkw" base_Package="_KZJ6gfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZNk4PCMEeOEP-VOZrQAkw" base_Package="_KZMWwPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZPaEPCMEeOEP-VOZrQAkw" base_Package="_KZOL8PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZRPQPCMEeOEP-VOZrQAkw" base_Package="_KZQBIPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZTEcPCMEeOEP-VOZrQAkw" base_Package="_KZR2UPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZU5oPCMEeOEP-VOZrQAkw" base_Package="_KZTrgPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZWu0PCMEeOEP-VOZrQAkw" base_Package="_KZVgsPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZYkAPCMEeOEP-VOZrQAkw" base_Package="_KZXV4PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZaZMPCMEeOEP-VOZrQAkw" base_Package="_KZZLEPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZcOYPCMEeOEP-VOZrQAkw" base_Package="_KZbAQPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZeDkPCMEeOEP-VOZrQAkw" base_Package="_KZc1cPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZf4wPCMEeOEP-VOZrQAkw" base_Package="_KZeqoPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZht8PCMEeOEP-VOZrQAkw" base_Package="_KZgf0PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZjjIPCMEeOEP-VOZrQAkw" base_Package="_KZiVAPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZlYUPCMEeOEP-VOZrQAkw" base_Package="_KZkKMPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZnNgPCMEeOEP-VOZrQAkw" base_Package="_KZl_YPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZpCsPCMEeOEP-VOZrQAkw" base_Package="_KZn0kPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZq34PCMEeOEP-VOZrQAkw" base_Package="_KZpCsfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZstEPCMEeOEP-VOZrQAkw" base_Package="_KZq34fCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZuiQPCMEeOEP-VOZrQAkw" base_Package="_KZstEfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZwXcPCMEeOEP-VOZrQAkw" base_Package="_KZuiQfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZyMoPCMEeOEP-VOZrQAkw" base_Package="_KZwXcfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZ0B0PCMEeOEP-VOZrQAkw" base_Package="_KZyMofCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZ1P8PCMEeOEP-VOZrQAkw" base_Package="_KZ0B0fCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZ3FIPCMEeOEP-VOZrQAkw" base_Package="_KZ13APCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZ46UPCMEeOEP-VOZrQAkw" base_Package="_KZ3sMPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZ6vgPCMEeOEP-VOZrQAkw" base_Package="_KZ5hYPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZ8ksPCMEeOEP-VOZrQAkw" base_Package="_KZ7WkPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZ-Z4PCMEeOEP-VOZrQAkw" base_Package="_KZ9LwPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaAPEPCMEeOEP-VOZrQAkw" base_Package="_KZ_A8PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaCEQPCMEeOEP-VOZrQAkw" base_Package="_KaA2IPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaD5cPCMEeOEP-VOZrQAkw" base_Package="_KaCrUPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaFuoPCMEeOEP-VOZrQAkw" base_Package="_KaEggPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaHj0PCMEeOEP-VOZrQAkw" base_Package="_KaGVsPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaJZAPCMEeOEP-VOZrQAkw" base_Package="_KaIK4PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaLOMPCMEeOEP-VOZrQAkw" base_Package="_KaKAEPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaNDYPCMEeOEP-VOZrQAkw" base_Package="_KaL1QPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaO4kPCMEeOEP-VOZrQAkw" base_Package="_KaNqcPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaQtwPCMEeOEP-VOZrQAkw" base_Package="_KaPfoPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaSi8PCMEeOEP-VOZrQAkw" base_Package="_KaRU0PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaUYIPCMEeOEP-VOZrQAkw" base_Package="_KaTKAPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaWNUPCMEeOEP-VOZrQAkw" base_Package="_KaU_MPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaYCgPCMEeOEP-VOZrQAkw" base_Package="_KaW0YPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaZ3sPCMEeOEP-VOZrQAkw" base_Package="_KaYCgfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kabs4PCMEeOEP-VOZrQAkw" base_Package="_KaZ3sfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kac7APCMEeOEP-VOZrQAkw" base_Package="_Kabs4fCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaewMPCMEeOEP-VOZrQAkw" base_Package="_KadiEPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaglYPCMEeOEP-VOZrQAkw" base_Package="_KafXQPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaiakPCMEeOEP-VOZrQAkw" base_Package="_KahMcPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KakPwPCMEeOEP-VOZrQAkw" base_Package="_KajBoPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KamE8PCMEeOEP-VOZrQAkw" base_Package="_Kak20PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kan6IPCMEeOEP-VOZrQAkw" base_Package="_KamE8fCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KapvUPCMEeOEP-VOZrQAkw" base_Package="_Kan6IfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kaq9cPCMEeOEP-VOZrQAkw" base_Package="_KapvUfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KasyoPCMEeOEP-VOZrQAkw" base_Package="_KarkgPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kaun0PCMEeOEP-VOZrQAkw" base_Package="_KatZsPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KawdAPCMEeOEP-VOZrQAkw" base_Package="_KavO4PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaySMPCMEeOEP-VOZrQAkw" base_Package="_KaxEEPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Ka0HYPCMEeOEP-VOZrQAkw" base_Package="_Kay5QPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Ka18kPCMEeOEP-VOZrQAkw" base_Package="_Ka0HYfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Ka3KsPCMEeOEP-VOZrQAkw" base_Package="_Ka18kfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Ka4_4PCMEeOEP-VOZrQAkw" base_Package="_Ka3xwPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Ka61EPCMEeOEP-VOZrQAkw" base_Package="_Ka5m8PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Ka8qQPCMEeOEP-VOZrQAkw" base_Package="_Ka7cIPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Ka-fcPCMEeOEP-VOZrQAkw" base_Package="_Ka9RUPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbAUoPCMEeOEP-VOZrQAkw" base_Package="_Ka_GgPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbCJ0PCMEeOEP-VOZrQAkw" base_Package="_KbA7sPCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_KbFNIPCMEeOEP-VOZrQAkw" base_Dependency="_KbD_APCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:Plugin xmi:id="_KbHCUPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.emf.ecore.xmi.XMIPlugin$Implementation$Activator" classPath="." localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.emf.ecore.xmi" vendor="Eclipse Modeling Project" version="2.10.0.v20140514-1158" exportPackage="_KbNI8PCMEeOEP-VOZrQAkw _KbOXEPCMEeOEP-VOZrQAkw _KbQMQPCMEeOEP-VOZrQAkw" base_Component="_KbF0MPCMEeOEP-VOZrQAkw" name="EMF XML/XMI Persistence" lazyStart="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbNI8PCMEeOEP-VOZrQAkw" base_Package="_KbLTwPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbOXEPCMEeOEP-VOZrQAkw" base_Package="_KbNI8fCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbQMQPCMEeOEP-VOZrQAkw" base_Package="_KbO-IPCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_KbTPkPCMEeOEP-VOZrQAkw" base_Dependency="_KbRaYPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:Plugin xmi:id="_KbUdsPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.extendedtypes.Activator" classPath="." localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.extendedtypes" vendor="Eclipse Modeling Project" version="1.0.0.v201406030454" exportPackage="_KbakUPCMEeOEP-VOZrQAkw _KbbycPCMEeOEP-VOZrQAkw _KbdnoPCMEeOEP-VOZrQAkw _Kbfc0PCMEeOEP-VOZrQAkw _KbhSAPCMEeOEP-VOZrQAkw _KbjHMPCMEeOEP-VOZrQAkw _Kbk8YPCMEeOEP-VOZrQAkw _KbmxkPCMEeOEP-VOZrQAkw _Kbn_sPCMEeOEP-VOZrQAkw _Kbp04PCMEeOEP-VOZrQAkw _KbrqEPCMEeOEP-VOZrQAkw _KbtfQPCMEeOEP-VOZrQAkw _KbvUcPCMEeOEP-VOZrQAkw _KbxJoPCMEeOEP-VOZrQAkw _Kby-0PCMEeOEP-VOZrQAkw" base_Component="_KbTPkfCMEeOEP-VOZrQAkw" name="Papyrus enhanced types metamodel plugin" isIncubation="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbakUPCMEeOEP-VOZrQAkw" base_Package="_KbYvIPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbbycPCMEeOEP-VOZrQAkw" base_Package="_KbakUfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbdnoPCMEeOEP-VOZrQAkw" base_Package="_KbcZgPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kbfc0PCMEeOEP-VOZrQAkw" base_Package="_KbeOsPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbhSAPCMEeOEP-VOZrQAkw" base_Package="_KbgD4PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbjHMPCMEeOEP-VOZrQAkw" base_Package="_Kbh5EPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kbk8YPCMEeOEP-VOZrQAkw" base_Package="_KbjHMfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbmxkPCMEeOEP-VOZrQAkw" base_Package="_Kbk8YfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kbn_sPCMEeOEP-VOZrQAkw" base_Package="_KbmxkfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kbp04PCMEeOEP-VOZrQAkw" base_Package="_KbomwPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbrqEPCMEeOEP-VOZrQAkw" base_Package="_Kbqb8PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbtfQPCMEeOEP-VOZrQAkw" base_Package="_KbsRIPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbvUcPCMEeOEP-VOZrQAkw" base_Package="_KbuGUPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbxJoPCMEeOEP-VOZrQAkw" base_Package="_Kbv7gPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kby-0PCMEeOEP-VOZrQAkw" base_Package="_KbxJofCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_Kb1bEPCMEeOEP-VOZrQAkw" base_Dependency="_Kbzl4PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:Plugin xmi:id="_Kb3QQPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.services.resourceloading.Activator" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.services.resourceloading" vendor="Eclipse Modeling Project" version="1.0.0.v201406030454" exportPackage="_Kb8v0PCMEeOEP-VOZrQAkw _Kb-lAPCMEeOEP-VOZrQAkw _Kb_zIPCMEeOEP-VOZrQAkw _KcBoUPCMEeOEP-VOZrQAkw" base_Component="_Kb1bEfCMEeOEP-VOZrQAkw" name="Papyrus Resource Loading" isIncubation="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kb8v0PCMEeOEP-VOZrQAkw" base_Package="_Kb7hsPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kb-lAPCMEeOEP-VOZrQAkw" base_Package="_Kb8v0fCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kb_zIPCMEeOEP-VOZrQAkw" base_Package="_Kb-lAfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcBoUPCMEeOEP-VOZrQAkw" base_Package="_KcAaMPCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_KcEEkPCMEeOEP-VOZrQAkw" base_Dependency="_KcC2cPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:Plugin xmi:id="_KcF5wPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.emf.transaction.internal.EMFTransactionPlugin$Implementation" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.emf.transaction" vendor="Eclipse Modeling Project" version="1.8.0.201405281451" exportPackage="_KcLZUPCMEeOEP-VOZrQAkw _KcNOgPCMEeOEP-VOZrQAkw _KcPDsPCMEeOEP-VOZrQAkw _KcQ44PCMEeOEP-VOZrQAkw _KcSuEPCMEeOEP-VOZrQAkw" base_Component="_KcEroPCMEeOEP-VOZrQAkw" name="EMF Model Transaction Core" lazyStart="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcLZUPCMEeOEP-VOZrQAkw" base_Package="_KcKLMPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcNOgPCMEeOEP-VOZrQAkw" base_Package="_KcMAYPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcPDsPCMEeOEP-VOZrQAkw" base_Package="_KcN1kPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcQ44PCMEeOEP-VOZrQAkw" base_Package="_KcPqwPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcSuEPCMEeOEP-VOZrQAkw" base_Package="_KcQ44fCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_KcVKUPCMEeOEP-VOZrQAkw" base_Dependency="_KcTVIPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:Plugin xmi:id="_KcW_gPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePlugin" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.gmf.runtime.emf.type.core" vendor="Eclipse Modeling Project" version="1.7.0.201405281701" exportPackage="_KccfEPCMEeOEP-VOZrQAkw _KcdtMPCMEeOEP-VOZrQAkw _KcfiYPCMEeOEP-VOZrQAkw _KchXkPCMEeOEP-VOZrQAkw _KcjMwPCMEeOEP-VOZrQAkw _KclB8PCMEeOEP-VOZrQAkw _Kcm3IPCMEeOEP-VOZrQAkw _KcosUPCMEeOEP-VOZrQAkw" base_Component="_KcVKUfCMEeOEP-VOZrQAkw" name="GMF EMF Type Core"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KccfEPCMEeOEP-VOZrQAkw" base_Package="_Kcap4PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcdtMPCMEeOEP-VOZrQAkw" base_Package="_KccfEfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcfiYPCMEeOEP-VOZrQAkw" base_Package="_KceUQPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KchXkPCMEeOEP-VOZrQAkw" base_Package="_KcgJcPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcjMwPCMEeOEP-VOZrQAkw" base_Package="_Kch-oPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KclB8PCMEeOEP-VOZrQAkw" base_Package="_Kcjz0PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kcm3IPCMEeOEP-VOZrQAkw" base_Package="_KclpAPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcosUPCMEeOEP-VOZrQAkw" base_Package="_Kcm3IfCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_KcrIkPCMEeOEP-VOZrQAkw" base_Dependency="_KcpTYPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:Plugin xmi:id="_KcsWsPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.services.edit.Activator" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.services.edit" vendor="Eclipse Modeling Project" version="1.0.0.v201406030454" exportPackage="_KcydUPCMEeOEP-VOZrQAkw _KczrcPCMEeOEP-VOZrQAkw _Kc1goPCMEeOEP-VOZrQAkw _Kc3V0PCMEeOEP-VOZrQAkw _Kc6ZIPCMEeOEP-VOZrQAkw _Kc8OUPCMEeOEP-VOZrQAkw _Kc-DgPCMEeOEP-VOZrQAkw _Kc_4sPCMEeOEP-VOZrQAkw" base_Component="_KcrIkfCMEeOEP-VOZrQAkw" name="Papyrus Edit Service" isIncubation="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcydUPCMEeOEP-VOZrQAkw" base_Package="_KcwoIPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KczrcPCMEeOEP-VOZrQAkw" base_Package="_KcydUfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kc1goPCMEeOEP-VOZrQAkw" base_Package="_Kc0SgPCMEeOEP-VOZrQAkw" isInternal="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kc3V0PCMEeOEP-VOZrQAkw" base_Package="_Kc2HsPCMEeOEP-VOZrQAkw" isInternal="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kc6ZIPCMEeOEP-VOZrQAkw" base_Package="_Kc5LAPCMEeOEP-VOZrQAkw" isInternal="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kc8OUPCMEeOEP-VOZrQAkw" base_Package="_Kc7AMPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kc-DgPCMEeOEP-VOZrQAkw" base_Package="_Kc81YPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kc_4sPCMEeOEP-VOZrQAkw" base_Package="_Kc-DgfCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_KdCU8PCMEeOEP-VOZrQAkw" base_Dependency="_KdAfwPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:Plugin xmi:id="_KdEKIPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.commands.Activator" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.gmfdiag.commands" vendor="Eclipse Modeling Project" version="1.0.0.v201406030454" exportPackage="_KdJpsPCMEeOEP-VOZrQAkw _KdK30PCMEeOEP-VOZrQAkw _KdMtAPCMEeOEP-VOZrQAkw" base_Component="_KdCU8fCMEeOEP-VOZrQAkw" name="Papyrus Commands Tools" isIncubation="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdJpsPCMEeOEP-VOZrQAkw" base_Package="_KdH0gPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdK30PCMEeOEP-VOZrQAkw" base_Package="_KdJpsfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdMtAPCMEeOEP-VOZrQAkw" base_Package="_KdLe4PCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_KdPJQPCMEeOEP-VOZrQAkw" base_Dependency="_KdN7IPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:Plugin xmi:id="_KdQ-cPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.core.log.internal.Activator" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.core.log" vendor="Eclipse Modeling Project" version="1.0.0.v201406030454" exportPackage="_KdWeAPCMEeOEP-VOZrQAkw" base_Component="_KdPwUPCMEeOEP-VOZrQAkw" name="Papyrus Logging plugin" isIncubation="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdWeAPCMEeOEP-VOZrQAkw" base_Package="_KdVP4PCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_KdY6QPCMEeOEP-VOZrQAkw" base_Dependency="_KdXFEPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:Plugin xmi:id="_KdavcPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.widgets.Activator" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.widgets" vendor="Eclipse Modeling Project" version="1.0.0.v201406030454" exportPackage="_KdgPAPCMEeOEP-VOZrQAkw _KdiEMPCMEeOEP-VOZrQAkw _Kdj5YPCMEeOEP-VOZrQAkw _KdlukPCMEeOEP-VOZrQAkw _KdnjwPCMEeOEP-VOZrQAkw _Kdox4PCMEeOEP-VOZrQAkw _KdqnEPCMEeOEP-VOZrQAkw _KdscQPCMEeOEP-VOZrQAkw _KduRcPCMEeOEP-VOZrQAkw _KdwGoPCMEeOEP-VOZrQAkw" base_Component="_KdZhUPCMEeOEP-VOZrQAkw" name="Papyrus widgets" isIncubation="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdgPAPCMEeOEP-VOZrQAkw" base_Package="_KdfA4PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdiEMPCMEeOEP-VOZrQAkw" base_Package="_Kdg2EPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kdj5YPCMEeOEP-VOZrQAkw" base_Package="_KdirQPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdlukPCMEeOEP-VOZrQAkw" base_Package="_Kdj5YfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdnjwPCMEeOEP-VOZrQAkw" base_Package="_KdlukfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kdox4PCMEeOEP-VOZrQAkw" base_Package="_KdnjwfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdqnEPCMEeOEP-VOZrQAkw" base_Package="_KdpY8PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdscQPCMEeOEP-VOZrQAkw" base_Package="_KdrOIPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KduRcPCMEeOEP-VOZrQAkw" base_Package="_KdtDUPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdwGoPCMEeOEP-VOZrQAkw" base_Package="_Kdu4gPCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_Kdyi4PCMEeOEP-VOZrQAkw" base_Dependency="_KdwtsPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kd6esPCMEeOEP-VOZrQAkw" base_Package="_Kd5QkPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kd868PCMEeOEP-VOZrQAkw" base_Package="_Kd7s0PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kd-wIPCMEeOEP-VOZrQAkw" base_Package="_Kd9iAPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KeAlUPCMEeOEP-VOZrQAkw" base_Package="_Kd_XMPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:Plugin xmi:id="_KeKWUPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.views.modelexplorer.newchild.Activator" description="The purpose of this plugin  is to do the connection with the model explorer is org.eclipse.papyrus.view.modelexplorer.newchild. More documentation (models and file.doc) has been store in the docs directory of the plugin org.eclipse.papyrus.infra.newchild" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.views.modelexplorer.newchild" vendor="Eclipse Modeling Project" version="1.0.0.qualifier" base_Component="_KeJIMPCMEeOEP-VOZrQAkw" name="Papyrus view model explorer new child"/>

-  <ModuleLayer:BundleReference xmi:id="_KeMLgPCMEeOEP-VOZrQAkw" base_Dependency="_KeK9YPCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_KeOnwPCMEeOEP-VOZrQAkw" base_Dependency="_KeMykPCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_KeQc8PCMEeOEP-VOZrQAkw" base_Dependency="_KeOnwfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:Plugin xmi:id="_KeSSIPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.core.Activator" localization="plugin" requiredExecutionEnvironment="JavaSE-1.6" symbolicName="org.eclipse.papyrus.infra.core" vendor="Eclipse Modeling Project" version="1.0.0.v201406030454" exportPackage="_KeXxsPCMEeOEP-VOZrQAkw _KeZm4PCMEeOEP-VOZrQAkw _KebcEPCMEeOEP-VOZrQAkw _KecqMPCMEeOEP-VOZrQAkw _KeefYPCMEeOEP-VOZrQAkw _KegUkPCMEeOEP-VOZrQAkw _KeiJwPCMEeOEP-VOZrQAkw _Kej-8PCMEeOEP-VOZrQAkw _Kel0IPCMEeOEP-VOZrQAkw _KenpUPCMEeOEP-VOZrQAkw _Keo3cPCMEeOEP-VOZrQAkw _KeqsoPCMEeOEP-VOZrQAkw _Kesh0PCMEeOEP-VOZrQAkw _KeuXAPCMEeOEP-VOZrQAkw _KewMMPCMEeOEP-VOZrQAkw _KeyBYPCMEeOEP-VOZrQAkw _KezPgPCMEeOEP-VOZrQAkw _Ke1EsPCMEeOEP-VOZrQAkw _Ke254PCMEeOEP-VOZrQAkw" base_Component="_KeREAPCMEeOEP-VOZrQAkw" name="Papyrus Backbone" isIncubation="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KeXxsPCMEeOEP-VOZrQAkw" base_Package="_KeWjkPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KeZm4PCMEeOEP-VOZrQAkw" base_Package="_KeYYwPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KebcEPCMEeOEP-VOZrQAkw" base_Package="_KeZm4fCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KecqMPCMEeOEP-VOZrQAkw" base_Package="_KebcEfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KeefYPCMEeOEP-VOZrQAkw" base_Package="_KedRQPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KegUkPCMEeOEP-VOZrQAkw" base_Package="_KefGcPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KeiJwPCMEeOEP-VOZrQAkw" base_Package="_Keg7oPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kej-8PCMEeOEP-VOZrQAkw" base_Package="_Keiw0PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kel0IPCMEeOEP-VOZrQAkw" base_Package="_KekmAPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KenpUPCMEeOEP-VOZrQAkw" base_Package="_Kel0IfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Keo3cPCMEeOEP-VOZrQAkw" base_Package="_KenpUfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KeqsoPCMEeOEP-VOZrQAkw" base_Package="_KepegPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kesh0PCMEeOEP-VOZrQAkw" base_Package="_KerTsPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KeuXAPCMEeOEP-VOZrQAkw" base_Package="_KetI4PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KewMMPCMEeOEP-VOZrQAkw" base_Package="_Keu-EPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KeyBYPCMEeOEP-VOZrQAkw" base_Package="_KewMMfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KezPgPCMEeOEP-VOZrQAkw" base_Package="_KeyBYfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Ke1EsPCMEeOEP-VOZrQAkw" base_Package="_Kez2kPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Ke254PCMEeOEP-VOZrQAkw" base_Package="_Ke1rwPCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_Ke5WIPCMEeOEP-VOZrQAkw" base_Dependency="_Ke4IAPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:Plugin xmi:id="_Ke7LUPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.emf.Activator" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.emf" vendor="Eclipse Modeling Project" version="1.0.0.v201406030454" exportPackage="_KfAq4PCMEeOEP-VOZrQAkw _KfCgEPCMEeOEP-VOZrQAkw _KfEVQPCMEeOEP-VOZrQAkw _KfGKcPCMEeOEP-VOZrQAkw _KfH_oPCMEeOEP-VOZrQAkw _KfJ00PCMEeOEP-VOZrQAkw _KfLqAPCMEeOEP-VOZrQAkw _KfOGQPCMEeOEP-VOZrQAkw _KfP7cPCMEeOEP-VOZrQAkw _KfRJkPCMEeOEP-VOZrQAkw" base_Component="_Ke59MPCMEeOEP-VOZrQAkw" name="EMF Tools" isIncubation="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfAq4PCMEeOEP-VOZrQAkw" base_Package="_Ke_cwPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfCgEPCMEeOEP-VOZrQAkw" base_Package="_KfBR8PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfEVQPCMEeOEP-VOZrQAkw" base_Package="_KfDHIPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfGKcPCMEeOEP-VOZrQAkw" base_Package="_KfE8UPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfH_oPCMEeOEP-VOZrQAkw" base_Package="_KfGxgPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfJ00PCMEeOEP-VOZrQAkw" base_Package="_KfImsPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfLqAPCMEeOEP-VOZrQAkw" base_Package="_KfKb4PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfOGQPCMEeOEP-VOZrQAkw" base_Package="_KfLqAfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfP7cPCMEeOEP-VOZrQAkw" base_Package="_KfOGQfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfRJkPCMEeOEP-VOZrQAkw" base_Package="_KfP7cfCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_KfTl0PCMEeOEP-VOZrQAkw" base_Dependency="_KfSXsPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:Plugin xmi:id="_KfVbAPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.uml.service.types.Activator" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.uml.service.types" vendor="Eclipse Modeling Project" version="1.0.0.v201406030454" exportPackage="_Kfa6kPCMEeOEP-VOZrQAkw _KfcvwPCMEeOEP-VOZrQAkw _Kfek8PCMEeOEP-VOZrQAkw _KfgaIPCMEeOEP-VOZrQAkw _KfiPUPCMEeOEP-VOZrQAkw _KfkEgPCMEeOEP-VOZrQAkw _Kfl5sPCMEeOEP-VOZrQAkw _Kfnu4PCMEeOEP-VOZrQAkw _KfpkEPCMEeOEP-VOZrQAkw" base_Component="_KfUM4PCMEeOEP-VOZrQAkw" name="Papyrus UML ElementType Service" isIncubation="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kfa6kPCMEeOEP-VOZrQAkw" base_Package="_KfZscPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfcvwPCMEeOEP-VOZrQAkw" base_Package="_KfbhoPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kfek8PCMEeOEP-VOZrQAkw" base_Package="_KfdW0PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfgaIPCMEeOEP-VOZrQAkw" base_Package="_KffMAPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfiPUPCMEeOEP-VOZrQAkw" base_Package="_KfhBMPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfkEgPCMEeOEP-VOZrQAkw" base_Package="_Kfi2YPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kfl5sPCMEeOEP-VOZrQAkw" base_Package="_KfkrkPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kfnu4PCMEeOEP-VOZrQAkw" base_Package="_KfmgwPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfpkEPCMEeOEP-VOZrQAkw" base_Package="_KfoV8PCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_KfsAUPCMEeOEP-VOZrQAkw" base_Dependency="_KfqLIPCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_Kft1gPCMEeOEP-VOZrQAkw" base_Dependency="_KfsAUfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:Plugin xmi:id="_KfvqsPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.gmf.runtime.common.core.internal.CommonCorePlugin" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.gmf.runtime.common.core" vendor="Eclipse Modeling Project" version="1.7.0.201405281701" exportPackage="_Kf1KQPCMEeOEP-VOZrQAkw _Kf2_cPCMEeOEP-VOZrQAkw _Kf40oPCMEeOEP-VOZrQAkw _Kf6p0PCMEeOEP-VOZrQAkw _Kf8fAPCMEeOEP-VOZrQAkw _Kf-UMPCMEeOEP-VOZrQAkw _KgAJYPCMEeOEP-VOZrQAkw" base_Component="_KfuckPCMEeOEP-VOZrQAkw" name="GMF Common Core"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kf1KQPCMEeOEP-VOZrQAkw" base_Package="_Kfz8IPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kf2_cPCMEeOEP-VOZrQAkw" base_Package="_Kf1xUPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kf40oPCMEeOEP-VOZrQAkw" base_Package="_Kf3mgPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kf6p0PCMEeOEP-VOZrQAkw" base_Package="_Kf5bsPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kf8fAPCMEeOEP-VOZrQAkw" base_Package="_Kf7Q4PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kf-UMPCMEeOEP-VOZrQAkw" base_Package="_Kf9GEPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KgAJYPCMEeOEP-VOZrQAkw" base_Package="_Kf-UMfCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_KgCloPCMEeOEP-VOZrQAkw" base_Dependency="_KgAwcPCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_KgEa0PCMEeOEP-VOZrQAkw" base_Dependency="_KgClofCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_KgGQAPCMEeOEP-VOZrQAkw" base_Dependency="_KgFB4PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:Plugin xmi:id="_KgIFMPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.tools.Activator" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.tools" vendor="Eclipse Modeling Project" version="1.0.0.v201406030454" exportPackage="_KgNkwPCMEeOEP-VOZrQAkw _KgPZ8PCMEeOEP-VOZrQAkw _KgRPIPCMEeOEP-VOZrQAkw _KgTEUPCMEeOEP-VOZrQAkw _KgUScPCMEeOEP-VOZrQAkw _KgWusPCMEeOEP-VOZrQAkw" base_Component="_KgG3EPCMEeOEP-VOZrQAkw" name="Papyrus Tools" isIncubation="true"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KgNkwPCMEeOEP-VOZrQAkw" base_Package="_KgMWoPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KgPZ8PCMEeOEP-VOZrQAkw" base_Package="_KgOL0PCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KgRPIPCMEeOEP-VOZrQAkw" base_Package="_KgQBAPCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KgTEUPCMEeOEP-VOZrQAkw" base_Package="_KgRPIfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KgUScPCMEeOEP-VOZrQAkw" base_Package="_KgTEUfCMEeOEP-VOZrQAkw"/>

-  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KgWusPCMEeOEP-VOZrQAkw" base_Package="_KgU5gPCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_KgZK8PCMEeOEP-VOZrQAkw" base_Dependency="_KgXVwPCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_KgbAIPCMEeOEP-VOZrQAkw" base_Dependency="_KgZK8fCMEeOEP-VOZrQAkw"/>

-  <ModuleLayer:BundleReference xmi:id="_Kgc1UPCMEeOEP-VOZrQAkw" base_Dependency="_KgbnMPCMEeOEP-VOZrQAkw"/>

-  <structure:UserDoc xmi:id="_OHG5gPC5EeOVd6MoZuILbA" base_Comment="_LfJYwPC5EeOVd6MoZuILbA"/>

-  <structure:UserDoc xmi:id="_uC45oPC5EeOVd6MoZuILbA" base_Comment="_P_VmcPC5EeOVd6MoZuILbA"/>

-  <structure:UserDoc xmi:id="_wAf10PC5EeOVd6MoZuILbA" base_Comment="_QuekYPC5EeOVd6MoZuILbA"/>

-  <structure:UserDoc xmi:id="_nud3UPE_EeOsMc9uAZsKjQ" base_Comment="_Y6GWAPE9EeOsMc9uAZsKjQ"/>

-  <structure:UserDoc xmi:id="_omHRAPE_EeOsMc9uAZsKjQ" base_Comment="_Zlv7EPE9EeOsMc9uAZsKjQ"/>

-  <structure:UserDoc xmi:id="_pV-nsPE_EeOsMc9uAZsKjQ" base_Comment="_aJwAAPE9EeOsMc9uAZsKjQ"/>

-  <Document:Document xmi:id="_C07_QPFJEeOieZKVW9xRxg" base_Model="_C04U4PFJEeOieZKVW9xRxg" author="CEA LIST" version="0.2"/>

-  <Document:Section xmi:id="_C1AQsPFJEeOieZKVW9xRxg" base_Package="_C090cPFJEeOieZKVW9xRxg"/>

-  <Document:Content xmi:id="_C1GXUPFJEeOieZKVW9xRxg" base_Comment="_C1D7EPFJEeOieZKVW9xRxg"/>

-  <Document:Content xmi:id="_C1L24PFJEeOieZKVW9xRxg" base_Comment="_C1JaoPFJEeOieZKVW9xRxg"/>

-  <Document:Content xmi:id="_C1QIUPFJEeOieZKVW9xRxg" base_Comment="_C1OTIPFJEeOieZKVW9xRxg"/>

-  <Document:Content xmi:id="_C1UZwPFJEeOieZKVW9xRxg" base_Comment="_C1SkkPFJEeOieZKVW9xRxg"/>

-  <Document:Content xmi:id="_C1Z5UPFJEeOieZKVW9xRxg" base_Comment="_C1W2APFJEeOieZKVW9xRxg"/>

-  <Document:Section xmi:id="_C1djsPFJEeOieZKVW9xRxg" base_Package="_C1bHcPFJEeOieZKVW9xRxg"/>

-  <Document:ImageRef xmi:id="_C3ye8PFJEeOieZKVW9xRxg" base_Comment="_C3wCsPFJEeOieZKVW9xRxg" ref="C:/git/org.eclipse.papyrus/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/UseCaseDiagram.png"/>

-  <Document:Section xmi:id="_C307MPFJEeOieZKVW9xRxg" base_Package="_C3zGAPFJEeOieZKVW9xRxg"/>

-  <Document:Content xmi:id="_C33XcPFJEeOieZKVW9xRxg" base_Comment="_C32JUPFJEeOieZKVW9xRxg"/>

-  <Document:Section xmi:id="_C35zsPFJEeOieZKVW9xRxg" base_Package="_C33-gPFJEeOieZKVW9xRxg"/>

-  <Document:Content xmi:id="_C38P8PFJEeOieZKVW9xRxg" base_Comment="_C36awPFJEeOieZKVW9xRxg"/>

-  <Document:ImageRef xmi:id="_C3-sMPFJEeOieZKVW9xRxg" base_Comment="_C383APFJEeOieZKVW9xRxg" ref="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\EnableCreationMenu.png"/>

-  <Document:Section xmi:id="_C4BIcPFJEeOieZKVW9xRxg" base_Package="_C3_TQPFJEeOieZKVW9xRxg"/>

-  <Document:Content xmi:id="_C4DksPFJEeOieZKVW9xRxg" base_Comment="_C4BvgPFJEeOieZKVW9xRxg"/>

-  <Document:Section xmi:id="_C4GA8PFJEeOieZKVW9xRxg" base_Package="_C4ELwPFJEeOieZKVW9xRxg"/>

-  <Document:Content xmi:id="_C4H2IPFJEeOieZKVW9xRxg" base_Comment="_C4GoAPFJEeOieZKVW9xRxg"/>

-  <Document:Content xmi:id="_C4KSYPFJEeOieZKVW9xRxg" base_Comment="_C4IdMPFJEeOieZKVW9xRxg"/>

-  <Document:ImageRef xmi:id="_C4MuoPFJEeOieZKVW9xRxg" base_Comment="_C4K5cPFJEeOieZKVW9xRxg" ref="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\PackageWithIconO.png"/>

-  <Document:ImageRef xmi:id="_C4PK4PFJEeOieZKVW9xRxg" base_Comment="_C4NVsPFJEeOieZKVW9xRxg" ref="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\PackageWithIconOIllustration.png"/>

-  <Document:Content xmi:id="_C4RnIPFJEeOieZKVW9xRxg" base_Comment="_C4Px8PFJEeOieZKVW9xRxg"/>

-  <Document:ImageRef xmi:id="_C4UDYPFJEeOieZKVW9xRxg" base_Comment="_C4SOMPFJEeOieZKVW9xRxg" ref="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\NestedClassifierIllustration.png"/>

-  <Document:ImageRef xmi:id="_C4XGsPFJEeOieZKVW9xRxg" base_Comment="_C4UqcPFJEeOieZKVW9xRxg" ref="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\NestedClassifier.png"/>

-  <Document:Content xmi:id="_C4Zi8PFJEeOieZKVW9xRxg" base_Comment="_C4XtwPFJEeOieZKVW9xRxg"/>

-  <Document:ImageRef xmi:id="_C4b_MPFJEeOieZKVW9xRxg" base_Comment="_C4aKAPFJEeOieZKVW9xRxg" ref="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\AllPossibleActivities.png"/>

-  <Document:ImageRef xmi:id="_C4ebcPFJEeOieZKVW9xRxg" base_Comment="_C4cmQPFJEeOieZKVW9xRxg" ref="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\AllPossibleActivitiesIllustration.png"/>

-  <Document:Section xmi:id="_C4g3sPFJEeOieZKVW9xRxg" base_Package="_C4fCgPFJEeOieZKVW9xRxg"/>

-  <Document:Content xmi:id="_C4jT8PFJEeOieZKVW9xRxg" base_Comment="_C4hewPFJEeOieZKVW9xRxg"/>

-  <Document:Section xmi:id="_C4lwMPFJEeOieZKVW9xRxg" base_Package="_C4j7APFJEeOieZKVW9xRxg"/>

-  <Document:Content xmi:id="_C4nlYPFJEeOieZKVW9xRxg" base_Comment="_C4mXQPFJEeOieZKVW9xRxg"/>

-  <Document:Section xmi:id="_C4qBoPFJEeOieZKVW9xRxg" base_Package="_C4oMcPFJEeOieZKVW9xRxg"/>

-  <Document:Content xmi:id="_C4sd4PFJEeOieZKVW9xRxg" base_Comment="_C4qosPFJEeOieZKVW9xRxg"/>

-  <Document:Section xmi:id="_C4uTEPFJEeOieZKVW9xRxg" base_Package="_C4tE8PFJEeOieZKVW9xRxg"/>

-  <Document:Content xmi:id="_C4wvUPFJEeOieZKVW9xRxg" base_Comment="_C4u6IPFJEeOieZKVW9xRxg"/>

-  <Document:Section xmi:id="_C4zLkPFJEeOieZKVW9xRxg" base_Package="_C4xWYPFJEeOieZKVW9xRxg"/>

-  <Document:ImageRef xmi:id="_C6TncPFJEeOieZKVW9xRxg" base_Comment="_C6RyQPFJEeOieZKVW9xRxg" ref="C:/git/org.eclipse.papyrus/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/Architecture.png"/>

-  <Document:Content xmi:id="_C6WDsPFJEeOieZKVW9xRxg" base_Comment="_C6U1kPFJEeOieZKVW9xRxg"/>

-  <Document:ImageRef xmi:id="_C7YlgPFJEeOieZKVW9xRxg" base_Comment="_C7WwUPFJEeOieZKVW9xRxg" ref="C:/git/org.eclipse.papyrus/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/NewDiagram.png"/>

-  <Document:Content xmi:id="_C7bBwPFJEeOieZKVW9xRxg" base_Comment="_C7ZzoPFJEeOieZKVW9xRxg"/>

-  <Document:ImageRef xmi:id="_C7deAPFJEeOieZKVW9xRxg" base_Comment="_C7cP4PFJEeOieZKVW9xRxg" ref="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\MenuExample.png"/>

-  <Document:ImageRef xmi:id="_C7f6QPFJEeOieZKVW9xRxg" base_Comment="_C7esIPFJEeOieZKVW9xRxg" ref="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\codeXML.PNG"/>

-  <Document:Content xmi:id="_C7iWgPFJEeOieZKVW9xRxg" base_Comment="_C7hIYPFJEeOieZKVW9xRxg"/>

-  <Document:Section xmi:id="_C7kywPFJEeOieZKVW9xRxg" base_Package="_C7i9kPFJEeOieZKVW9xRxg"/>

-  <Document:Section xmi:id="_C7nPAPFJEeOieZKVW9xRxg" base_Package="_C7lZ0PFJEeOieZKVW9xRxg"/>

-  <Document:Section xmi:id="_C7prQPFJEeOieZKVW9xRxg" base_Package="_C7n2EPFJEeOieZKVW9xRxg"/>

-  <Document:Section xmi:id="_C7sHgPFJEeOieZKVW9xRxg" base_Package="_C7qSUPFJEeOieZKVW9xRxg"/>

-  <Document:Section xmi:id="_C7ujwPFJEeOieZKVW9xRxg" base_Package="_C7tVoPFJEeOieZKVW9xRxg"/>

-  <Document:Section xmi:id="_C7xAAPFJEeOieZKVW9xRxg" base_Package="_C7vx4PFJEeOieZKVW9xRxg"/>

-  <Document:Section xmi:id="_C7zcQPFJEeOieZKVW9xRxg" base_Package="_C7yOIPFJEeOieZKVW9xRxg"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ADL4Eclipse="http:///schemas/ADL4Eclipse/_rk7nwOqKEeOfTcbrnCq2oQ/3" xmlns:Document="http:///schemas/Document/_qR4REMn0EeO9CYUoXDRplw/0" xmlns:ModuleLayer="http://OSGI/schemas/ModuleLayer/_0xHxU4DEEeKQG4TlBAn6bg/3" xmlns:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:structure="http://DeveloperProcess/schemas/structure/_VA9p4McPEeO9CYUoXDRplw/1" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/ADL4Eclipse/_rk7nwOqKEeOfTcbrnCq2oQ/3 pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml#_rlFYwOqKEeOfTcbrnCq2oQ http:///schemas/Document/_qR4REMn0EeO9CYUoXDRplw/0 pathmap://DEVELOPER_PROFILES/Document.profile.uml#_qR44IMn0EeO9CYUoXDRplw http://OSGI/schemas/ModuleLayer/_0xHxU4DEEeKQG4TlBAn6bg/3 pathmap://OSGI_PROFILES/osgi.profile.uml#_0xRiUIDEEeKQG4TlBAn6bg http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements http://DeveloperProcess/schemas/structure/_VA9p4McPEeO9CYUoXDRplw/1 pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_VA-4AMcPEeO9CYUoXDRplw">
+  <uml:Model xmi:id="_a0QCwFOCEeOE6bh9v5dYKg" name="PapyrusNewChild">
+    <packagedElement xmi:type="uml:Model" xmi:id="_52hvUPCDEeOEP-VOZrQAkw" 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:Model" xmi:id="_u8E-gPCEEeOEP-VOZrQAkw" name="UseCases">
+      <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 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: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:Component" xmi:id="_uxF88FOIEeOuspyO4PzXCg" name="NewChildMenu" useCase="_-bickFOIEeOuspyO4PzXCg _EPnUAFOJEeOuspyO4PzXCg _WZ_ZwFOJEeOuspyO4PzXCg _uSMlAFOJEeOuspyO4PzXCg _cXBM8FW6EeOhVe6k7yzS3A">
+        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_-bickFOIEeOuspyO4PzXCg" name="UseCreateMenu" subject="_uxF88FOIEeOuspyO4PzXCg">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Cu5MQPCGEeOEP-VOZrQAkw">
+            <body>The Papyrus User shall use this functionality from the model explorer in order to create elements in the model. It can decide to display or not this element creation</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_LfJYwPC5EeOVd6MoZuILbA" annotatedElement="_-bickFOIEeOuspyO4PzXCg">
+            <body>A user can create an element by  select element in the model explorer, click on it ant then click on the diagram.&#xD;
+In order to not display a menu,  a user can edit the model that represents the creation menu and set the attribute visibility to false. </body>
+          </ownedComment>
+        </ownedUseCase>
+        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_EPnUAFOJEeOuspyO4PzXCg" name="Create or modify ElementCreationModel" subject="_uxF88FOIEeOuspyO4PzXCg">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_O0nn8PCGEeOEP-VOZrQAkw">
+            <body>An advanced User is able to create of modify creation menu. This menu is a model that can be edited </body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_P_VmcPC5EeOVd6MoZuILbA" annotatedElement="_EPnUAFOJEeOuspyO4PzXCg">
+            <body>An advanced user can contribuate to the menu by adding a new plugin that contains:&#xD;
+	-a xmi file that represents a creation menu. The model must be an instance of org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.ecore. It contains&#xD;
+		•	CreationMenu&#xD;
+			o	It corresponds to a menu&#xD;
+			o	The ElemenTypeIDRef corresponds a reference to the element Type.&#xD;
+			o	The role can be filled in order to specify the role play by the element.&#xD;
+			o	If displayAllRole is set to true, it displays all roles played by the element if the number of roles is greater than 1. By default this property is true;&#xD;
+		•	Folder&#xD;
+			o	It is possible to add owns label and icon.&#xD;
+			o  Visibilty to specify if the folder is visible.&#xD;
+	-a reference to an extension point, to specify that papyrus must take in account this file to display the menu&#xD;
+&lt;code>&#xD;
+&lt;extension&#xD;
+         point=&quot;org.eclipse.papyrus.infra.newchild&quot;>&#xD;
+      &lt;menuCreationModel&#xD;
+            model=&quot;YourCreationMenu.xmi&quot;>&#xD;
+      &lt;/menuCreationModel>&#xD;
+&lt;/extension>&#xD;
+&lt;/code></body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Y6GWAPE9EeOsMc9uAZsKjQ" annotatedElement="_EPnUAFOJEeOuspyO4PzXCg">
+            <body>In the following example, a menu creation for a package is presented. This menu is contained in the folder SimpleUMLTest. We have associated an image for this menu.</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Zlv7EPE9EeOsMc9uAZsKjQ" annotatedElement="_EPnUAFOJEeOuspyO4PzXCg">
+            <body>In this following example, a creation menu will be specified  to allow creation of nested classifier. That 's why the role &quot;nestedClassifier&quot; is precised. The label for this creation is &quot;nestedClass&quot;</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_aJwAAPE9EeOsMc9uAZsKjQ" annotatedElement="_EPnUAFOJEeOuspyO4PzXCg">
+            <body>In the followin examplen a creation menu is created for activities. In this case, all roles are displayed. Thanks to this, when we want to associate an activity to a state, 3 roles are proposed. </body>
+          </ownedComment>
+          <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" name="Generate &quot;ElementCreationModel&quot; from a profile" subject="_uxF88FOIEeOuspyO4PzXCg">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_j8ojgPCGEeOEP-VOZrQAkw">
+            <body>From a stereotyped profile, a model of new child menu can be generated.&#xD;
+For example a user after designing a profile, want to have a dedicated menu  from this profile/&#xD;
+For the moment this function is not implemented.</body>
+          </ownedComment>
+        </ownedUseCase>
+        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_uSMlAFOJEeOuspyO4PzXCg" name="Hide, change order or add submenus" subject="_uxF88FOIEeOuspyO4PzXCg">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_4N0kwPCGEeOEP-VOZrQAkw">
+            <body>The User can modify the creation menu by adding submenus: order about new child menu, precise if the role must be displayed.</body>
+          </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_QuekYPC5EeOVd6MoZuILbA">
+            <body>test</body>
+          </ownedComment>
+        </ownedUseCase>
+        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_cXBM8FW6EeOhVe6k7yzS3A" name="Create or modify ElementCreationModel at runtime thanks to a GUI" subject="_uxF88FOIEeOuspyO4PzXCg">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_-6tTgPCGEeOEP-VOZrQAkw">
+            <body>A user  can edit a the model that represent the creation menu  at runtime for papyrus thanks to a dedicated UI.</body>
+          </ownedComment>
+          <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:Abstraction" xmi:id="_XPLO4PCFEeOEP-VOZrQAkw" name="Abstraction1" client="_u8E-gPCEEeOEP-VOZrQAkw" supplier="_52hvUPCDEeOEP-VOZrQAkw"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Model" xmi:id="_vmIgwPCHEeOEP-VOZrQAkw" name="Design">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_g71cQPCXEeOEP-VOZrQAkw">
+        <body>The system is done by two plugins:&#xD;
+	•	org.eclipse.papyrus.infra.newchild&#xD;
+	It has in charge to provide and construct swt.Menu from the ecore model. To do that the developer has to:&#xD;
+		o	instantiate a CreationMenuFactory, &#xD;
+		o	ask to get all Root model and populate it&#xD;
+	&lt;code>&#xD;
+		CreationMenuFactory creationMenuFactory= new CreationMenuFactory(editingDomain);&#xD;
+		ArrayList&lt;Folder> folders= creationMenuRegistry.getRootFolder();&#xD;
+		Iterator&lt;Folder> iterFolder= folders.iterator();&#xD;
+		while (iterFolder.hasNext()) {&#xD;
+			Folder currentFolder= iterFolder.next();&#xD;
+			creationMenuFactory.populateMenu(menu, currentFolder,eObject);&#xD;
+		}&#xD;
+&lt;/code>&#xD;
+	•	org.eclipse.papyrus.views.modelexplorer.newchild&#xD;
+	It has in charge to add menu in the model explorer of papyrus.&#xD;
+</body>
+      </ownedComment>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_tnuqoPCYEeOEP-VOZrQAkw">
+        <body>This the structure of EMF model for model&#xD;
+	•	CreationMenu&#xD;
+		o	It correspond to a menu&#xD;
+		o	The ElemenTypeIDRef correspond a reference to the element Type.&#xD;
+		o	The role can be filled in order to specify the role play by the element.&#xD;
+		o	If displayAllRole is set to true, it displays all roles played by the element if the number of roles is greater than 1. By default this property is true;&#xD;
+	•	Folder&#xD;
+		o	It is possible to add owns label an icon.&#xD;
+</body>
+      </ownedComment>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_O5dxEPCZEeOEP-VOZrQAkw">
+        <body>Here an example of xml of creation menu.</body>
+      </ownedComment>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_z27AgPCHEeOEP-VOZrQAkw" name="Abstraction1" client="_vmIgwPCHEeOEP-VOZrQAkw" supplier="_u8E-gPCEEeOEP-VOZrQAkw"/>
+      <packagedElement xmi:type="uml:Component" xmi:id="_J2qRcPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.newchild">
+        <ownedAttribute xmi:type="uml:Port" xmi:id="_KeDBkPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.generated_package"/>
+        <ownedAttribute xmi:type="uml:Port" xmi:id="_KeGE4PCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.generated_package"/>
+        <ownedAttribute xmi:type="uml:Port" xmi:id="_KeHTAPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.extension_parser"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KR-7gPCMEeOEP-VOZrQAkw" name="org.eclipse.ui" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KRyHMPCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KSSdgPCMEeOEP-VOZrQAkw" name="org.eclipse.core.runtime" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KSCl4PCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KSc1kPCMEeOEP-VOZrQAkw" name="org.eclipse.emf" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KSWH4PCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KTKnQPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KSf44PCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KbD_APCMEeOEP-VOZrQAkw" name="org.eclipse.osgi" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KTNqkPCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KbRaYPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xmi" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KbF0MPCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_Kbzl4PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KbTPkfCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KcC2cPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.resourceloading" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_Kb1bEfCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KcTVIPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.transaction" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KcEroPCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KcpTYPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KcVKUfCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KdAfwPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KcrIkfCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KdN7IPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.gmfdiag.commands" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KdCU8fCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KdXFEPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.log" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KdPwUPCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KdwtsPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets" client="_J2qRcPCMEeOEP-VOZrQAkw" supplier="_KdZhUPCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kd5QkPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.newchild"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kd7s0PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.newchild.elementcreationmenumodel"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kd9iAPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.impl"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kd_XMPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.util"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KeE2wPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.generated_package" client="_KeDBkPCMEeOEP-VOZrQAkw" supplier="_KeEPsPCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KeGr8PCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.generated_package" client="_KeGE4PCMEeOEP-VOZrQAkw" supplier="_KeEPsPCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KeIhIPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.extension_parser" client="_KeHTAPCMEeOEP-VOZrQAkw" supplier="_KeH6EPCMEeOEP-VOZrQAkw"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Component" xmi:id="_KRyHMPCMEeOEP-VOZrQAkw" name="org.eclipse.ui">
+        <ownedAttribute xmi:type="uml:Port" xmi:id="_KgkxIPCMEeOEP-VOZrQAkw" name="org.eclipse.ui.menus"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KR6qEPCMEeOEP-VOZrQAkw" name="org.eclipse.ui.internal"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Component" xmi:id="_KSCl4PCMEeOEP-VOZrQAkw" name="org.eclipse.core.runtime">
+        <packagedElement xmi:type="uml:Package" xmi:id="_KSJTkPCMEeOEP-VOZrQAkw" name="org.eclipse.core.internal.preferences.legacy"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KSMW4PCMEeOEP-VOZrQAkw" name="org.eclipse.core.internal.runtime"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KSPaMPCMEeOEP-VOZrQAkw" name="org.eclipse.core.runtime"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Component" xmi:id="_KSWH4PCMEeOEP-VOZrQAkw" name="org.eclipse.emf"/>
+      <packagedElement xmi:type="uml:Component" xmi:id="_KSf44PCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore">
+        <ownedAttribute xmi:type="uml:Port" xmi:id="_KeEPsPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.generated_package"/>
+        <ownedAttribute xmi:type="uml:Port" xmi:id="_KeH6EPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.extension_parser"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KSmmkPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KSpp4PCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.impl"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KSstMPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.plugin"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KSvJcfCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.resource"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KSyMwPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.resource.impl"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KS0pAfCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.util"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KS3sUPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xml.namespace"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KS6IkPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xml.namespace.impl"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KS8k0fCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xml.namespace.util"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KS_oIPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xml.type"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KTCEYPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xml.type.impl"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KTFHsPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xml.type.internal"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KTHj8PCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xml.type.util"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Component" xmi:id="_KTNqkPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi">
+        <packagedElement xmi:type="uml:Package" xmi:id="_KTU_UPCMEeOEP-VOZrQAkw" name="org.eclipse.core.runtime.adaptor"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KTYCoPCMEeOEP-VOZrQAkw" name="org.eclipse.core.runtime.internal.adaptor"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KTae4PCMEeOEP-VOZrQAkw" name="org.eclipse.equinox.log"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KTdiMPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.container"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KTglgPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.container.builders"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KTjBwPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.container.namespaces"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KTmFEPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.framework.console"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KTohUfCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.framework.eventmgr"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KTrkoPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.framework.internal.reliablefile"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KTun8PCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.framework.log"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KTxEMPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.framework.util"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KT0HgPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.debug"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KT2jwPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.framework"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KT5nEPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.hookregistry"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KT8DUfCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.loader"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KT_GoPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.loader.buddy"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KUCJ8PCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.loader.classpath"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KUEmMPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.loader.sources"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KUHpgPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.location"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KUKFwPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.messages"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KUNJEPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.provisional.service.security"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KUQMYPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.provisional.verifier"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KUSooPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.service.security"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KUVE4fCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.serviceregistry"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KUYIMPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.signedcontent"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KUakcPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.internal.url"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KUdnwPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.launch"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KUgrEPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.report.resolution"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KUk8gPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.service.datalocation"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KUn_0PCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.service.debug"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KUrDIPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.service.environment"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KUtfYPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.service.localization"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KUwisPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.service.pluginconversion"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KUy-8PCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.service.resolver"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KU2CQPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.service.runnable"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KU4egPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.service.security"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KU7h0PCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.service.urlconversion"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KU_MMPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.signedcontent"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KVBocPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.storage"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KVEEsfCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.storage.bundlefile"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KVHIAPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.storage.url.reference"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KVJkQPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.storagemanager"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KVMnkPCMEeOEP-VOZrQAkw" name="org.eclipse.osgi.util"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KVPD0PCMEeOEP-VOZrQAkw" name="org.osgi.dto"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KVRgEPCMEeOEP-VOZrQAkw" name="org.osgi.framework"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KVUjYPCMEeOEP-VOZrQAkw" name="org.osgi.framework.dto"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KVW_oPCMEeOEP-VOZrQAkw" name="org.osgi.framework.hooks.bundle"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KVaC8PCMEeOEP-VOZrQAkw" name="org.osgi.framework.hooks.resolver"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KVcfMPCMEeOEP-VOZrQAkw" name="org.osgi.framework.hooks.service"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KVe7cPCMEeOEP-VOZrQAkw" name="org.osgi.framework.hooks.weaving"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KVh-wPCMEeOEP-VOZrQAkw" name="org.osgi.framework.launch"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KVkbAPCMEeOEP-VOZrQAkw" name="org.osgi.framework.namespace"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KVm3QPCMEeOEP-VOZrQAkw" name="org.osgi.framework.startlevel"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KVp6kPCMEeOEP-VOZrQAkw" name="org.osgi.framework.startlevel.dto"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KVsW0PCMEeOEP-VOZrQAkw" name="org.osgi.framework.wiring"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KVvaIPCMEeOEP-VOZrQAkw" name="org.osgi.framework.wiring.dto"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KVx2YPCMEeOEP-VOZrQAkw" name="org.osgi.resource"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KV0SoPCMEeOEP-VOZrQAkw" name="org.osgi.resource.dto"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KV3V8PCMEeOEP-VOZrQAkw" name="org.osgi.service.condpermadmin"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KV5yMPCMEeOEP-VOZrQAkw" name="org.osgi.service.log"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KV8OcPCMEeOEP-VOZrQAkw" name="org.osgi.service.packageadmin"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KV_RwPCMEeOEP-VOZrQAkw" name="org.osgi.service.permissionadmin"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWBuAPCMEeOEP-VOZrQAkw" name="org.osgi.service.resolver"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWEKQPCMEeOEP-VOZrQAkw" name="org.osgi.service.startlevel"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWHNkPCMEeOEP-VOZrQAkw" name="org.osgi.service.url"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWJp0PCMEeOEP-VOZrQAkw" name="org.osgi.util.tracker"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWMGEPCMEeOEP-VOZrQAkw" name="javax.accessibility"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWOiUPCMEeOEP-VOZrQAkw" name="javax.activation"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWQ-kPCMEeOEP-VOZrQAkw" name="javax.activity"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWSzwfCMEeOEP-VOZrQAkw" name="javax.annotation"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWVQAfCMEeOEP-VOZrQAkw" name="javax.annotation.processing"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWXsQPCMEeOEP-VOZrQAkw" name="javax.crypto"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWaIgPCMEeOEP-VOZrQAkw" name="javax.crypto.interfaces"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWckwPCMEeOEP-VOZrQAkw" name="javax.crypto.spec"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWeZ8fCMEeOEP-VOZrQAkw" name="javax.imageio"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWg2MfCMEeOEP-VOZrQAkw" name="javax.imageio.event"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWjScPCMEeOEP-VOZrQAkw" name="javax.imageio.metadata"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWlusPCMEeOEP-VOZrQAkw" name="javax.imageio.plugins.bmp"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWoK8PCMEeOEP-VOZrQAkw" name="javax.imageio.plugins.jpeg"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWqnMPCMEeOEP-VOZrQAkw" name="javax.imageio.spi"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWscYfCMEeOEP-VOZrQAkw" name="javax.imageio.stream"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWu4oPCMEeOEP-VOZrQAkw" name="javax.jws"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWxU4PCMEeOEP-VOZrQAkw" name="javax.jws.soap"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KWzKEPCMEeOEP-VOZrQAkw" name="javax.lang.model"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KW1mUPCMEeOEP-VOZrQAkw" name="javax.lang.model.element"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KW3bgPCMEeOEP-VOZrQAkw" name="javax.lang.model.type"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KW53wPCMEeOEP-VOZrQAkw" name="javax.lang.model.util"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KW7s8PCMEeOEP-VOZrQAkw" name="javax.management"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KW-JMPCMEeOEP-VOZrQAkw" name="javax.management.loading"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KW_-YfCMEeOEP-VOZrQAkw" name="javax.management.modelmbean"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXCaoPCMEeOEP-VOZrQAkw" name="javax.management.monitor"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXEP0fCMEeOEP-VOZrQAkw" name="javax.management.openmbean"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXGsEPCMEeOEP-VOZrQAkw" name="javax.management.relation"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXIhQPCMEeOEP-VOZrQAkw" name="javax.management.remote"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXK9gPCMEeOEP-VOZrQAkw" name="javax.management.remote.rmi"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXMysPCMEeOEP-VOZrQAkw" name="javax.management.timer"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXOn4fCMEeOEP-VOZrQAkw" name="javax.naming"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXREIPCMEeOEP-VOZrQAkw" name="javax.naming.directory"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXS5UPCMEeOEP-VOZrQAkw" name="javax.naming.event"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXVVkPCMEeOEP-VOZrQAkw" name="javax.naming.ldap"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXXKwPCMEeOEP-VOZrQAkw" name="javax.naming.spi"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXY_8PCMEeOEP-VOZrQAkw" name="javax.net"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXa1IfCMEeOEP-VOZrQAkw" name="javax.net.ssl"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXdRYPCMEeOEP-VOZrQAkw" name="javax.print"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXfGkPCMEeOEP-VOZrQAkw" name="javax.print.attribute"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXg7wPCMEeOEP-VOZrQAkw" name="javax.print.attribute.standard"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXiw8PCMEeOEP-VOZrQAkw" name="javax.print.event"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXkmIfCMEeOEP-VOZrQAkw" name="javax.rmi"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXnCYPCMEeOEP-VOZrQAkw" name="javax.rmi.CORBA"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXo3kPCMEeOEP-VOZrQAkw" name="javax.rmi.ssl"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXqswPCMEeOEP-VOZrQAkw" name="javax.script"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXsh8fCMEeOEP-VOZrQAkw" name="javax.security.auth"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXu-MPCMEeOEP-VOZrQAkw" name="javax.security.auth.callback"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXwzYPCMEeOEP-VOZrQAkw" name="javax.security.auth.kerberos"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KXyokPCMEeOEP-VOZrQAkw" name="javax.security.auth.login"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KX0dwfCMEeOEP-VOZrQAkw" name="javax.security.auth.spi"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KX26APCMEeOEP-VOZrQAkw" name="javax.security.auth.x500"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KX4vMPCMEeOEP-VOZrQAkw" name="javax.security.cert"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KX6kYfCMEeOEP-VOZrQAkw" name="javax.security.sasl"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KX9AoPCMEeOEP-VOZrQAkw" name="javax.sound.midi"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KX-10PCMEeOEP-VOZrQAkw" name="javax.sound.midi.spi"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYBSEPCMEeOEP-VOZrQAkw" name="javax.sound.sampled"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYDHQPCMEeOEP-VOZrQAkw" name="javax.sound.sampled.spi"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYE8cPCMEeOEP-VOZrQAkw" name="javax.sql"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYGxofCMEeOEP-VOZrQAkw" name="javax.sql.rowset"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYIm0fCMEeOEP-VOZrQAkw" name="javax.sql.rowset.serial"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYLDEPCMEeOEP-VOZrQAkw" name="javax.sql.rowset.spi"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYM4QPCMEeOEP-VOZrQAkw" name="javax.swing"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYOtcPCMEeOEP-VOZrQAkw" name="javax.swing.border"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYQiofCMEeOEP-VOZrQAkw" name="javax.swing.colorchooser"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYSX0fCMEeOEP-VOZrQAkw" name="javax.swing.event"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYU0EPCMEeOEP-VOZrQAkw" name="javax.swing.filechooser"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYWpQPCMEeOEP-VOZrQAkw" name="javax.swing.plaf"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYYecPCMEeOEP-VOZrQAkw" name="javax.swing.plaf.basic"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYaTofCMEeOEP-VOZrQAkw" name="javax.swing.plaf.metal"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYcI0fCMEeOEP-VOZrQAkw" name="javax.swing.plaf.multi"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYelEPCMEeOEP-VOZrQAkw" name="javax.swing.plaf.nimbus"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYgaQPCMEeOEP-VOZrQAkw" name="javax.swing.plaf.synth"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYiPcfCMEeOEP-VOZrQAkw" name="javax.swing.table"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYkEofCMEeOEP-VOZrQAkw" name="javax.swing.text"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYmg4PCMEeOEP-VOZrQAkw" name="javax.swing.text.html"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYoWEPCMEeOEP-VOZrQAkw" name="javax.swing.text.html.parser"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYqLQPCMEeOEP-VOZrQAkw" name="javax.swing.text.rtf"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYsAcfCMEeOEP-VOZrQAkw" name="javax.swing.tree"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYucsPCMEeOEP-VOZrQAkw" name="javax.swing.undo"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYwR4PCMEeOEP-VOZrQAkw" name="javax.tools"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYyHEPCMEeOEP-VOZrQAkw" name="javax.transaction"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KYz8QPCMEeOEP-VOZrQAkw" name="javax.transaction.xa"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KY1xcPCMEeOEP-VOZrQAkw" name="javax.xml"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KY3moPCMEeOEP-VOZrQAkw" name="javax.xml.bind"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KY5b0PCMEeOEP-VOZrQAkw" name="javax.xml.bind.annotation"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KY7RAPCMEeOEP-VOZrQAkw" name="javax.xml.bind.annotation.adapters"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KY9GMPCMEeOEP-VOZrQAkw" name="javax.xml.bind.attachment"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KY-7YPCMEeOEP-VOZrQAkw" name="javax.xml.bind.helpers"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZAwkfCMEeOEP-VOZrQAkw" name="javax.xml.bind.util"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZClwfCMEeOEP-VOZrQAkw" name="javax.xml.crypto"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZEa8fCMEeOEP-VOZrQAkw" name="javax.xml.crypto.dom"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZGQIfCMEeOEP-VOZrQAkw" name="javax.xml.crypto.dsig"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZIFUfCMEeOEP-VOZrQAkw" name="javax.xml.crypto.dsig.dom"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZJ6gfCMEeOEP-VOZrQAkw" name="javax.xml.crypto.dsig.keyinfo"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZMWwPCMEeOEP-VOZrQAkw" name="javax.xml.crypto.dsig.spec"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZOL8PCMEeOEP-VOZrQAkw" name="javax.xml.datatype"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZQBIPCMEeOEP-VOZrQAkw" name="javax.xml.namespace"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZR2UPCMEeOEP-VOZrQAkw" name="javax.xml.parsers"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZTrgPCMEeOEP-VOZrQAkw" name="javax.xml.soap"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZVgsPCMEeOEP-VOZrQAkw" name="javax.xml.stream"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZXV4PCMEeOEP-VOZrQAkw" name="javax.xml.stream.events"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZZLEPCMEeOEP-VOZrQAkw" name="javax.xml.stream.util"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZbAQPCMEeOEP-VOZrQAkw" name="javax.xml.transform"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZc1cPCMEeOEP-VOZrQAkw" name="javax.xml.transform.dom"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZeqoPCMEeOEP-VOZrQAkw" name="javax.xml.transform.sax"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZgf0PCMEeOEP-VOZrQAkw" name="javax.xml.transform.stax"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZiVAPCMEeOEP-VOZrQAkw" name="javax.xml.transform.stream"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZkKMPCMEeOEP-VOZrQAkw" name="javax.xml.validation"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZl_YPCMEeOEP-VOZrQAkw" name="javax.xml.ws"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZn0kPCMEeOEP-VOZrQAkw" name="javax.xml.ws.handler"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZpCsfCMEeOEP-VOZrQAkw" name="javax.xml.ws.handler.soap"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZq34fCMEeOEP-VOZrQAkw" name="javax.xml.ws.http"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZstEfCMEeOEP-VOZrQAkw" name="javax.xml.ws.soap"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZuiQfCMEeOEP-VOZrQAkw" name="javax.xml.ws.spi"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZwXcfCMEeOEP-VOZrQAkw" name="javax.xml.ws.spi.http"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZyMofCMEeOEP-VOZrQAkw" name="javax.xml.ws.wsaddressing"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZ0B0fCMEeOEP-VOZrQAkw" name="javax.xml.xpath"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZ13APCMEeOEP-VOZrQAkw" name="org.ietf.jgss"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZ3sMPCMEeOEP-VOZrQAkw" name="org.omg.CORBA"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZ5hYPCMEeOEP-VOZrQAkw" name="org.omg.CORBA_2_3"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZ7WkPCMEeOEP-VOZrQAkw" name="org.omg.CORBA_2_3.portable"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZ9LwPCMEeOEP-VOZrQAkw" name="org.omg.CORBA.DynAnyPackage"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KZ_A8PCMEeOEP-VOZrQAkw" name="org.omg.CORBA.ORBPackage"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KaA2IPCMEeOEP-VOZrQAkw" name="org.omg.CORBA.portable"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KaCrUPCMEeOEP-VOZrQAkw" name="org.omg.CORBA.TypeCodePackage"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KaEggPCMEeOEP-VOZrQAkw" name="org.omg.CosNaming"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KaGVsPCMEeOEP-VOZrQAkw" name="org.omg.CosNaming.NamingContextExtPackage"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KaIK4PCMEeOEP-VOZrQAkw" name="org.omg.CosNaming.NamingContextPackage"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KaKAEPCMEeOEP-VOZrQAkw" name="org.omg.Dynamic"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KaL1QPCMEeOEP-VOZrQAkw" name="org.omg.DynamicAny"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KaNqcPCMEeOEP-VOZrQAkw" name="org.omg.DynamicAny.DynAnyFactoryPackage"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KaPfoPCMEeOEP-VOZrQAkw" name="org.omg.DynamicAny.DynAnyPackage"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KaRU0PCMEeOEP-VOZrQAkw" name="org.omg.IOP"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KaTKAPCMEeOEP-VOZrQAkw" name="org.omg.IOP.CodecFactoryPackage"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KaU_MPCMEeOEP-VOZrQAkw" name="org.omg.IOP.CodecPackage"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KaW0YPCMEeOEP-VOZrQAkw" name="org.omg.Messaging"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KaYCgfCMEeOEP-VOZrQAkw" name="org.omg.PortableInterceptor"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KaZ3sfCMEeOEP-VOZrQAkw" name="org.omg.PortableInterceptor.ORBInitInfoPackage"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kabs4fCMEeOEP-VOZrQAkw" name="org.omg.PortableServer"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KadiEPCMEeOEP-VOZrQAkw" name="org.omg.PortableServer.CurrentPackage"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KafXQPCMEeOEP-VOZrQAkw" name="org.omg.PortableServer.POAManagerPackage"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KahMcPCMEeOEP-VOZrQAkw" name="org.omg.PortableServer.POAPackage"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KajBoPCMEeOEP-VOZrQAkw" name="org.omg.PortableServer.portable"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kak20PCMEeOEP-VOZrQAkw" name="org.omg.PortableServer.ServantLocatorPackage"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KamE8fCMEeOEP-VOZrQAkw" name="org.omg.SendingContext"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kan6IfCMEeOEP-VOZrQAkw" name="org.omg.stub.java.rmi"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KapvUfCMEeOEP-VOZrQAkw" name="org.w3c.dom"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KarkgPCMEeOEP-VOZrQAkw" name="org.w3c.dom.bootstrap"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KatZsPCMEeOEP-VOZrQAkw" name="org.w3c.dom.css"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KavO4PCMEeOEP-VOZrQAkw" name="org.w3c.dom.events"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KaxEEPCMEeOEP-VOZrQAkw" name="org.w3c.dom.html"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kay5QPCMEeOEP-VOZrQAkw" name="org.w3c.dom.ls"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Ka0HYfCMEeOEP-VOZrQAkw" name="org.w3c.dom.ranges"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Ka18kfCMEeOEP-VOZrQAkw" name="org.w3c.dom.stylesheets"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Ka3xwPCMEeOEP-VOZrQAkw" name="org.w3c.dom.traversal"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Ka5m8PCMEeOEP-VOZrQAkw" name="org.w3c.dom.views"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Ka7cIPCMEeOEP-VOZrQAkw" name="org.w3c.dom.xpath"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Ka9RUPCMEeOEP-VOZrQAkw" name="org.xml.sax"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Ka_GgPCMEeOEP-VOZrQAkw" name="org.xml.sax.ext"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KbA7sPCMEeOEP-VOZrQAkw" name="org.xml.sax.helpers"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Component" xmi:id="_KbF0MPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xmi">
+        <packagedElement xmi:type="uml:Package" xmi:id="_KbLTwPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xmi"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KbNI8fCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xmi.impl"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KbO-IPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.ecore.xmi.util"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Component" xmi:id="_KbTPkfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes">
+        <packagedElement xmi:type="uml:Package" xmi:id="_KbYvIPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KbakUfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.advices"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KbcZgPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.handler"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KbeOsPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.impl"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KbgD4PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kbh5EPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KbjHMfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.util"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kbk8YfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KbmxkfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KbomwPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.util"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kbqb8PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.preferences"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KbsRIPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.providers"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KbuGUPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.semantic"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kbv7gPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.types"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KbxJofCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.extendedtypes.util"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Component" xmi:id="_Kb1bEfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.resourceloading">
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kb7hsPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.resourceloading"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kb8v0fCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.resourceloading.impl"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kb-lAfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.resourceloading.strategies"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KcAaMPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.resourceloading.util"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Component" xmi:id="_KcEroPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.transaction">
+        <packagedElement xmi:type="uml:Package" xmi:id="_KcKLMPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.transaction"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KcMAYPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.transaction.impl"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KcN1kPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.transaction.internal"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KcPqwPCMEeOEP-VOZrQAkw" name="org.eclipse.emf.transaction.internal.l10n"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KcQ44fCMEeOEP-VOZrQAkw" name="org.eclipse.emf.transaction.util"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Component" xmi:id="_KcVKUfCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core">
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kcap4PCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KccfEfCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core.commands"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KceUQPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core.edithelper"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KcgJcPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core.internal"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kch-oPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core.internal.descriptors"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kcjz0PCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core.internal.impl"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KclpAPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core.internal.l10n"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kcm3IfCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core.requests"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Component" xmi:id="_KcrIkfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit">
+        <packagedElement xmi:type="uml:Package" xmi:id="_KcwoIPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KcydUfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit.commands"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kc0SgPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit.internal"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kc2HsPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit.internal.context"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kc5LAPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit.internal.matcher"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kc7AMPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit.messages"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kc81YPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit.service"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kc-DgfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit.utils"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Component" xmi:id="_KdCU8fCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.gmfdiag.commands">
+        <packagedElement xmi:type="uml:Package" xmi:id="_KdH0gPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.commands"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KdJpsfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.commands.util"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KdLe4PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.commands.wrappers"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Component" xmi:id="_KdPwUPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.log">
+        <packagedElement xmi:type="uml:Package" xmi:id="_KdVP4PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.log"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Component" xmi:id="_KdZhUPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets">
+        <ownedBehavior xmi:type="uml:StateMachine" xmi:id="_TQ0ZwPDDEeOQTc9S_J6Sug" name="StateMachine">
+          <region xmi:type="uml:Region" xmi:id="_VyTfEPDDEeOQTc9S_J6Sug" name="Region">
+            <subvertex xmi:type="uml:State" xmi:id="_WsrcoPDDEeOQTc9S_J6Sug" name="State"/>
+          </region>
+        </ownedBehavior>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KdfA4PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kdg2EPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets.creation"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KdirQPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets.databinding"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kdj5YfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets.editors"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KdlukfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets.messages"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KdnjwfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets.providers"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KdpY8PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets.selectors"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KdrOIPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets.strategy"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KdtDUPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets.util"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kdu4gPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.widgets.validator"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Component" xmi:id="_KeJIMPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.views.modelexplorer.newchild">
+        <ownedAttribute xmi:type="uml:Port" xmi:id="_KgkKEPCMEeOEP-VOZrQAkw" name="org.eclipse.ui.menus"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KeK9YPCMEeOEP-VOZrQAkw" name="org.eclipse.ui" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KRyHMPCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KeMykPCMEeOEP-VOZrQAkw" name="org.eclipse.core.runtime" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KSCl4PCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KeOnwfCMEeOEP-VOZrQAkw" name="org.eclipse.emf.transaction" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KcEroPCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_Ke4IAPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KeREAPCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KfSXsPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_Ke59MPCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KfqLIPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KfUM4PCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KfsAUfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.log" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KdPwUPCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KgAwcPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.common.core" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KfuckPCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KgClofCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.emf.type.core" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KcVKUfCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KgFB4PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.services.edit" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KcrIkfCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KgXVwPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.tools" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KgG3EPCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KgZK8fCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.gmfdiag.commands" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_KdCU8fCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KgbnMPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.newchild" client="_KeJIMPCMEeOEP-VOZrQAkw" supplier="_J2qRcPCMEeOEP-VOZrQAkw"/>
+        <packagedElement xmi:type="uml:Dependency" xmi:id="_KgkxIfCMEeOEP-VOZrQAkw" name="org.eclipse.ui.menus" client="_KgkKEPCMEeOEP-VOZrQAkw" supplier="_KgkxIPCMEeOEP-VOZrQAkw"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Component" xmi:id="_KeREAPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core">
+        <packagedElement xmi:type="uml:Package" xmi:id="_KeWjkPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KeYYwPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.clipboard"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KeZm4fCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.contentoutline"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KebcEfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.editor"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KedRQPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.editorsfactory"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KefGcPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.extension"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Keg7oPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.extension.commands"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Keiw0PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.extension.diagrameditor"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KekmAPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.lifecycleevents"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kel0IfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.listenerservice"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KenpUfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.markers"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KepegPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.modelsetquery"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KerTsPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.modelsetquery.impl"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KetI4PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.multidiagram.actionbarcontributor"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Keu-EPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.resource"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KewMMfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.resource.additional"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KeyBYfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.resource.sasheditor"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kez2kPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.services"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Ke1rwPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.core.utils"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Component" xmi:id="_Ke59MPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf">
+        <packagedElement xmi:type="uml:Package" xmi:id="_Ke_cwPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KfBR8PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf.adapters"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KfDHIPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf.advice"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KfE8UPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf.commands"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KfGxgPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf.databinding"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KfImsPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf.dialog"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KfKb4PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf.providers"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KfLqAfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf.providers.strategy"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KfOGQfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf.resource"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KfP7cfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.emf.utils"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Component" xmi:id="_KfUM4PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types">
+        <packagedElement xmi:type="uml:Package" xmi:id="_KfZscPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KfbhoPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types.command"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KfdW0PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types.element"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KffMAPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types.filter"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KfhBMPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types.handlers"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kfi2YPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types.helper"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KfkrkPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types.helper.advice"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KfmgwPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types.menu"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KfoV8PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.uml.service.types.utils"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Component" xmi:id="_KfuckPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.common.core">
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kfz8IPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.common.core.command"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kf1xUPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.common.core.internal"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kf3mgPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.common.core.internal.command"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kf5bsPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.common.core.internal.l10n"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kf7Q4PCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.common.core.resources"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kf9GEPCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.common.core.service"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_Kf-UMfCMEeOEP-VOZrQAkw" name="org.eclipse.gmf.runtime.common.core.util"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Component" xmi:id="_KgG3EPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.tools">
+        <packagedElement xmi:type="uml:Package" xmi:id="_KgMWoPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.tools.comparator"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KgOL0PCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.tools.converter"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KgQBAPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.tools.databinding"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KgRPIfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.tools.preferences"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KgTEUfCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.tools.preferences.ui.dialog"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_KgU5gPCMEeOEP-VOZrQAkw" name="org.eclipse.papyrus.infra.tools.util"/>
+      </packagedElement>
+      <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_J07zIPCMEeOEP-VOZrQAkw">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_J2ocQPCMEeOEP-VOZrQAkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+          <references xmi:type="ecore:EPackage" href="pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml#_rlFYwOqKEeOfTcbrnCq2oQ"/>
+        </eAnnotations>
+        <appliedProfile xmi:type="uml:Profile" href="pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml#_nE1m0Hz7EeKfO4elN3J5Fw"/>
+      </profileApplication>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Model" xmi:id="_SJaO8PCFEeOEP-VOZrQAkw" name="Tests">
+      <packagedElement xmi:type="uml:Package" xmi:id="_fMeMwFXeEeOW-JPqZK_EZg" name="Test AboutCreateModifyElementCreationModel">
+        <packagedElement xmi:type="uml:UseCase" xmi:id="_HTgzkFXeEeOW-JPqZK_EZg" name="Create a model without nothing"/>
+        <packagedElement xmi:type="uml:UseCase" xmi:id="_KdZ8sFXeEeOW-JPqZK_EZg" name="createa model with only a root"/>
+        <packagedElement xmi:type="uml:UseCase" xmi:id="_M6gRQFXeEeOW-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" 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" name="Use a menu with elementType model"/>
+        <packagedElement xmi:type="uml:UseCase" xmi:id="_4nRBkFXdEeOW-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 xmi:type="uml:Abstraction" xmi:id="_cIl04PCFEeOEP-VOZrQAkw" name="Abstraction1" client="_SJaO8PCFEeOEP-VOZrQAkw" supplier="_u8E-gPCEEeOEP-VOZrQAkw"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Model" xmi:id="_C04U4PFJEeOieZKVW9xRxg" name="New Child Menu into the model explorer">
+      <packagedElement xmi:type="uml:Package" xmi:id="_C090cPFJEeOieZKVW9xRxg" name="Requirements">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_C1D7EPFJEeOieZKVW9xRxg">
+          <body>- AddNewChild (id=newChild001): 
+ Papyrus shall add in the menu new child for new customized elements by using extended type</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_C1JaoPFJEeOieZKVW9xRxg">
+          <body>- HideElement (id=newChild002): 
+ Papyrus shall not display all UML or SysML element creation</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_C1OTIPFJEeOieZKVW9xRxg">
+          <body>- newChildFromProfile (id=newChild003): 
+ Papyrus shall add the creation of new element from a subset of profile</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_C1SkkPFJEeOieZKVW9xRxg">
+          <body>- newChildMenuDisplay (id=newChild004): 
+ Papyrus shall be able to associated icons to folder or creation menu</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_C1W2APFJEeOieZKVW9xRxg">
+          <body>- RoleAndElementCreation (id=newChild005): 
+ 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.</body>
+        </ownedComment>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_C1bHcPFJEeOieZKVW9xRxg" name="Use Cases">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_C3wCsPFJEeOieZKVW9xRxg">
+          <body>UseCaseDiagram</body>
+        </ownedComment>
+        <packagedElement xmi:type="uml:Package" xmi:id="_C3zGAPFJEeOieZKVW9xRxg" name="UseCreateMenu">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_C32JUPFJEeOieZKVW9xRxg">
+            <body>The Papyrus User shall use this functionality from the model explorer in order to create elements in the model. It can decide to display or not this element creation</body>
+          </ownedComment>
+          <packagedElement xmi:type="uml:Package" xmi:id="_C33-gPFJEeOieZKVW9xRxg" name="How to">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C36awPFJEeOieZKVW9xRxg">
+              <body>A user can create an element by  select element in the model explorer, click on it ant then click on the diagram.&#xD;
+In order to not display a menu,  a user can edit the model that represent the creation menu and set the attribute visibility to false. </body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C383APFJEeOieZKVW9xRxg">
+              <body>EnableCreationMenu</body>
+            </ownedComment>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_C3_TQPFJEeOieZKVW9xRxg" name="Create or modify ElementCreationModel">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_C4BvgPFJEeOieZKVW9xRxg">
+            <body>An advanced User is able to create of modify creation menu. This menu is a model that can be edited </body>
+          </ownedComment>
+          <packagedElement xmi:type="uml:Package" xmi:id="_C4ELwPFJEeOieZKVW9xRxg" name="How to">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C4GoAPFJEeOieZKVW9xRxg">
+              <body>An advanced user can contribuate to the menu by adding a new plugin that contains:&#xD;
+	-a xmi file that represents a creation menu. The model must be a instance of org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.ecore. It contains&#xD;
+		•	CreationMenu&#xD;
+			o	It correspond to a menu&#xD;
+			o	The ElemenTypeIDRef correspond a reference to the element Type.&#xD;
+			o	The role can be filled in order to specify the role play by the element.&#xD;
+			o	If displayAllRole is set to true, it displays all roles played by the element if the number of roles is greater than 1. By default this property is true;&#xD;
+		•	Folder&#xD;
+			o	It is possible to add owns label an icon.&#xD;
+			o  Visibilty to specify if the folder is visible.&#xD;
+	-a reference to an extension point, to specify that papyrus must take in account this file display the menu&#xD;
+&lt;code>&#xD;
+&lt;extension&#xD;
+         point=&quot;org.eclipse.papyrus.infra.newchild&quot;>&#xD;
+      &lt;menuCreationModel&#xD;
+            model=&quot;YourCreationMenu.xmi&quot;>&#xD;
+      &lt;/menuCreationModel>&#xD;
+&lt;/extension>&#xD;
+&lt;/code></body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C4IdMPFJEeOieZKVW9xRxg">
+              <body>In the following example, a menu creation for a package is presented. This menu is contained in the folder SimpleUMLTest. We have associated a image for this menu.</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C4K5cPFJEeOieZKVW9xRxg">
+              <body>Creation menu for a package with a specific icon</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C4NVsPFJEeOieZKVW9xRxg">
+              <body>Result for this menu</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C4Px8PFJEeOieZKVW9xRxg">
+              <body>In this following example, a creation menu will be specify  to allow creation of nested classifier. That 's why the role &quot;nestedClassifier&quot; is precised. The label for this creation is &quot;nestedClass&quot;</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C4SOMPFJEeOieZKVW9xRxg">
+              <body>Result for the menu nestedClass</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C4UqcPFJEeOieZKVW9xRxg">
+              <body>Creation menu model for nested class</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C4XtwPFJEeOieZKVW9xRxg">
+              <body>In the followin examplen a creation menu is created for activities. In this case, all roles are displayed. Thanks to this, when we want to associate an activity to a state, 3 roles are proposed. </body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C4aKAPFJEeOieZKVW9xRxg">
+              <body>Creation menu model for activity</body>
+            </ownedComment>
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C4cmQPFJEeOieZKVW9xRxg">
+              <body>Result for this menu activity</body>
+            </ownedComment>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_C4fCgPFJEeOieZKVW9xRxg" name="Generate &quot;ElementCreationModel&quot; from a profile">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_C4hewPFJEeOieZKVW9xRxg">
+            <body>From a stereotyped profile, a model of new child menu can be generated.&#xD;
+For example a user after designing a profile, want to have a dedicated menu  from this profile/&#xD;
+For the moment this function is not implemented.</body>
+          </ownedComment>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_C4j7APFJEeOieZKVW9xRxg" name="Hide, change order or add submenus">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_C4mXQPFJEeOieZKVW9xRxg">
+            <body>The User can modify the creation menu by adding submenus: order about new child menu, precise if the role must be displayed.</body>
+          </ownedComment>
+          <packagedElement xmi:type="uml:Package" xmi:id="_C4oMcPFJEeOieZKVW9xRxg" name="How to">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_C4qosPFJEeOieZKVW9xRxg">
+              <body>test</body>
+            </ownedComment>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="_C4tE8PFJEeOieZKVW9xRxg" name="Create or modify ElementCreationModel at runtime thanks to a GUI">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_C4u6IPFJEeOieZKVW9xRxg">
+            <body>A user  can edit a the model that represent the creation menu  at runtime for papyrus thanks to a dedicated UI.</body>
+          </ownedComment>
+        </packagedElement>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_C4xWYPFJEeOieZKVW9xRxg" name="Design">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_C6RyQPFJEeOieZKVW9xRxg">
+          <body>Architecture</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_C6U1kPFJEeOieZKVW9xRxg">
+          <body>The system is done by two plugins:&#xD;
+	•	org.eclipse.papyrus.infra.newchild&#xD;
+	It has in charge to provide and construct swt.Menu from the ecore model. To do that the developer has to:&#xD;
+		o	instantiate a CreationMenuFactory, &#xD;
+		o	ask to get all Root model and populate it&#xD;
+	&lt;code>&#xD;
+		CreationMenuFactory creationMenuFactory= new CreationMenuFactory(editingDomain);&#xD;
+		ArrayList&lt;Folder> folders= creationMenuRegistry.getRootFolder();&#xD;
+		Iterator&lt;Folder> iterFolder= folders.iterator();&#xD;
+		while (iterFolder.hasNext()) {&#xD;
+			Folder currentFolder= iterFolder.next();&#xD;
+			creationMenuFactory.populateMenu(menu, currentFolder,eObject);&#xD;
+		}&#xD;
+&lt;/code>&#xD;
+	•	org.eclipse.papyrus.views.modelexplorer.newchild&#xD;
+	It has in charge to add menu in the model explorer of papyrus.&#xD;
+</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_C7WwUPFJEeOieZKVW9xRxg">
+          <body>NewDiagram</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_C7ZzoPFJEeOieZKVW9xRxg">
+          <body>This the structure of EMF model for model&#xD;
+	•	CreationMenu&#xD;
+		o	It correspond to a menu&#xD;
+		o	The ElemenTypeIDRef correspond a reference to the element Type.&#xD;
+		o	The role can be filled in order to specify the role play by the element.&#xD;
+		o	If displayAllRole is set to true, it displays all roles played by the element if the number of roles is greater than 1. By default this property is true;&#xD;
+	•	Folder&#xD;
+		o	It is possible to add owns label an icon.&#xD;
+</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_C7cP4PFJEeOieZKVW9xRxg">
+          <body>Example of obtained Menu</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_C7esIPFJEeOieZKVW9xRxg">
+          <body>Example of xml for a creation menu</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_C7hIYPFJEeOieZKVW9xRxg">
+          <body>Here an example of xml of creation menu.</body>
+        </ownedComment>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Package" xmi:id="_C7i9kPFJEeOieZKVW9xRxg" name="Tests">
+        <packagedElement xmi:type="uml:Package" xmi:id="_C7lZ0PFJEeOieZKVW9xRxg" name="Create a model without nothing"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_C7n2EPFJEeOieZKVW9xRxg" name="createa model with only a root"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_C7qSUPFJEeOieZKVW9xRxg" name="create a model with elementType as String"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_C7tVoPFJEeOieZKVW9xRxg" name="Use a menu from a model without ElementType model"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_C7vx4PFJEeOieZKVW9xRxg" name="Use a menu with elementType model"/>
+        <packagedElement xmi:type="uml:Package" xmi:id="_C7yOIPFJEeOieZKVW9xRxg" name="Use a menu with stereotyped element"/>
+      </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/5.0.0/UML/Profile/Standard#/"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/StandardL2.profile.uml#_0"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_L-OWgLXWEeOnr8r0UtVlaQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_L_ycwLXWEeOnr8r0UtVlaQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml#_rlFYwOqKEeOfTcbrnCq2oQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml#_nE1m0Hz7EeKfO4elN3J5Fw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_L_5xgLXWEeOnr8r0UtVlaQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MBnBsLXWEeOnr8r0UtVlaQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_0xHxUYDEEeKQG4TlBAn6bg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_OKU8EHtxEeKcL-wrhM9ICg"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_MBshQLXWEeOnr8r0UtVlaQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MDc0wLXWEeOnr8r0UtVlaQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_0xRiUIDEEeKQG4TlBAn6bg"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_YbhfEHtxEeKcL-wrhM9ICg"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_y9UYoPB_EeOcJLERJuPllg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_y_6ZoPB_EeOcJLERJuPllg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_VA6mkMcPEeO9CYUoXDRplw"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_kWqjAMbXEeO09JBvNFZRNw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_VwyQMPCDEeOEP-VOZrQAkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Vwy3QPCDEeOEP-VOZrQAkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_VA-4AMcPEeO9CYUoXDRplw"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_qCT3MMbXEeO09JBvNFZRNw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Vw6zEPCDEeOEP-VOZrQAkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Vw7aIPCDEeOEP-VOZrQAkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_VBAtMccPEeO9CYUoXDRplw"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/developerprocess.profile.uml#_2LNtQMbYEeO09JBvNFZRNw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_XL0DwPCDEeOEP-VOZrQAkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_XL0DwfCDEeOEP-VOZrQAkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://DEVELOPER_PROFILES/Document.profile.uml#_qR44IMn0EeO9CYUoXDRplw"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://DEVELOPER_PROFILES/Document.profile.uml#_D0JcUMnzEeO9CYUoXDRplw"/>
+    </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 elements 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="An element can be 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 roles." id="newChild005" base_Class="_Dm5BYFgOEeOKQOyOw2l5lw"/>
+  <standard:Refine xmi:id="_ME1MIFgQEeOKQOyOw2l5lw" base_Abstraction="_MEYgMFgQEeOKQOyOw2l5lw"/>
+  <standard:Refine xmi:id="_NKArgFgQEeOKQOyOw2l5lw" base_Abstraction="_NJtwkFgQEeOKQOyOw2l5lw"/>
+  <standard:Refine xmi:id="_OCi2AFgQEeOKQOyOw2l5lw" base_Abstraction="_OCZsEFgQEeOKQOyOw2l5lw"/>
+  <standard:Refine xmi:id="_PEv54lgQEeOKQOyOw2l5lw" base_Abstraction="_PEmv8FgQEeOKQOyOw2l5lw"/>
+  <standard:Refine xmi:id="_RA1MEFgQEeOKQOyOw2l5lw" base_Abstraction="_RAhqEFgQEeOKQOyOw2l5lw"/>
+  <standard:Refine xmi:id="_VQMIcVgQEeOKQOyOw2l5lw" base_Abstraction="_VQC-gFgQEeOKQOyOw2l5lw"/>
+  <structure:Project xmi:id="_ZInHoPCDEeOEP-VOZrQAkw" author="CEA LIST" version="0.2" base_Model="_a0QCwFOCEeOE6bh9v5dYKg" title="New Child Menu into the model explorer"/>
+  <structure:Requirements xmi:id="_9hHxwPCDEeOEP-VOZrQAkw" base_Model="_52hvUPCDEeOEP-VOZrQAkw"/>
+  <structure:UseCases xmi:id="_xxynYPCEEeOEP-VOZrQAkw" base_Model="_u8E-gPCEEeOEP-VOZrQAkw"/>
+  <structure:Tests xmi:id="_ikJjEPCFEeOEP-VOZrQAkw" base_Model="_SJaO8PCFEeOEP-VOZrQAkw"/>
+  <Document:Content xmi:id="_EAjBYPCGEeOEP-VOZrQAkw" base_Comment="_Cu5MQPCGEeOEP-VOZrQAkw"/>
+  <structure:Design xmi:id="_xTidwPCHEeOEP-VOZrQAkw" base_Model="_vmIgwPCHEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:Plugin xmi:id="_J2tUwPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.newchild.Activator" classPath="." description="The purpose of this plugin is to offer the model and means to create new menu in the model explorer. More documentation (models and file.doc) has been store in the docs directory. The plugin in charge to do the connection with the model explorer is org.eclipse.papyrus.view.modelexplorer.newchild" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.newchild" vendor="Eclipse Modeling Project" version="1.0.0.qualifier" exportPackage="_Kd6esPCMEeOEP-VOZrQAkw _Kd868PCMEeOEP-VOZrQAkw _Kd-wIPCMEeOEP-VOZrQAkw _KeAlUPCMEeOEP-VOZrQAkw" base_Component="_J2qRcPCMEeOEP-VOZrQAkw" name="Papyrus infra new child"/>
+  <ADL4Eclipse:Plugin xmi:id="_KR1KgPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.ui.internal.UIPlugin" classPath="." localization="plugin" requiredExecutionEnvironment="J2SE-1.4" symbolicName="org.eclipse.ui" vendor="Eclipse.org" version="3.106.0.v20140519-0906" exportPackage="_KR9GUPCMEeOEP-VOZrQAkw" base_Component="_KRyHMPCMEeOEP-VOZrQAkw" name="Eclipse UI"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KR9GUPCMEeOEP-VOZrQAkw" base_Package="_KR6qEPCMEeOEP-VOZrQAkw" isInternal="true"/>
+  <ModuleLayer:BundleReference xmi:id="_KSB-0PCMEeOEP-VOZrQAkw" base_Dependency="_KR-7gPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:Plugin xmi:id="_KSFCIPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.core.internal.runtime.PlatformActivator" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.core.runtime" vendor="Eclipse.org" version="3.10.0.v20140318-2214" exportPackage="_KSLv0PCMEeOEP-VOZrQAkw _KSOzIPCMEeOEP-VOZrQAkw _KSR2cPCMEeOEP-VOZrQAkw" base_Component="_KSCl4PCMEeOEP-VOZrQAkw" name="Core Runtime"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KSLv0PCMEeOEP-VOZrQAkw" base_Package="_KSJTkPCMEeOEP-VOZrQAkw" isInternal="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KSOzIPCMEeOEP-VOZrQAkw" base_Package="_KSMW4PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KSR2cPCMEeOEP-VOZrQAkw" atleast="3.4.0" base_Package="_KSPaMPCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_KSVg0PCMEeOEP-VOZrQAkw" base_Dependency="_KSSdgPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:Plugin xmi:id="_KSYkIPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" localization="plugin" symbolicName="org.eclipse.emf" vendor="Eclipse Modeling Project" version="2.6.0.v20140519-0339" base_Component="_KSWH4PCMEeOEP-VOZrQAkw" name="EMF - Eclipse Modeling Framework Runtime and Tools" lazyStart="true"/>
+  <ModuleLayer:BundleReference xmi:id="_KSfR0PCMEeOEP-VOZrQAkw" base_Dependency="_KSc1kPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:Plugin xmi:id="_KSiVIPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.emf.ecore.plugin.EcorePlugin$Implementation$Activator" classPath="." localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.emf.ecore" vendor="Eclipse Modeling Project" version="2.10.0.v20140514-1158" exportPackage="_KSpC0PCMEeOEP-VOZrQAkw _KSsGIPCMEeOEP-VOZrQAkw _KSvJcPCMEeOEP-VOZrQAkw _KSxlsPCMEeOEP-VOZrQAkw _KS0pAPCMEeOEP-VOZrQAkw _KS3FQPCMEeOEP-VOZrQAkw _KS5hgPCMEeOEP-VOZrQAkw _KS8k0PCMEeOEP-VOZrQAkw _KS_BEPCMEeOEP-VOZrQAkw _KTBdUPCMEeOEP-VOZrQAkw _KTEgoPCMEeOEP-VOZrQAkw _KTG84PCMEeOEP-VOZrQAkw _KTKAMPCMEeOEP-VOZrQAkw" base_Component="_KSf44PCMEeOEP-VOZrQAkw" name="EMF Ecore" lazyStart="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KSpC0PCMEeOEP-VOZrQAkw" base_Package="_KSmmkPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KSsGIPCMEeOEP-VOZrQAkw" base_Package="_KSpp4PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KSvJcPCMEeOEP-VOZrQAkw" base_Package="_KSstMPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KSxlsPCMEeOEP-VOZrQAkw" base_Package="_KSvJcfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KS0pAPCMEeOEP-VOZrQAkw" base_Package="_KSyMwPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KS3FQPCMEeOEP-VOZrQAkw" base_Package="_KS0pAfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KS5hgPCMEeOEP-VOZrQAkw" base_Package="_KS3sUPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KS8k0PCMEeOEP-VOZrQAkw" base_Package="_KS6IkPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KS_BEPCMEeOEP-VOZrQAkw" base_Package="_KS8k0fCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTBdUPCMEeOEP-VOZrQAkw" base_Package="_KS_oIPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTEgoPCMEeOEP-VOZrQAkw" base_Package="_KTCEYPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTG84PCMEeOEP-VOZrQAkw" base_Package="_KTFHsPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTKAMPCMEeOEP-VOZrQAkw" base_Package="_KTHj8PCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_KTNDgPCMEeOEP-VOZrQAkw" base_Dependency="_KTKnQPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:Plugin xmi:id="_KTQG0PCMEeOEP-VOZrQAkw" activator="org.eclipse.osgi.internal.framework.SystemBundleActivator" copyright="Copyright (c) 2003, 2014 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" description="OSGi System Bundle" docURL="http://www.eclipse.org" localization="systembundle" symbolicName="org.eclipse.osgi" vendor="Eclipse.org - Equinox" version="3.10.0.v20140513-1456" exportPackage="_KTXbkPCMEeOEP-VOZrQAkw _KTZ30PCMEeOEP-VOZrQAkw _KTc7IPCMEeOEP-VOZrQAkw _KTf-cPCMEeOEP-VOZrQAkw _KTiasPCMEeOEP-VOZrQAkw _KTleAPCMEeOEP-VOZrQAkw _KTohUPCMEeOEP-VOZrQAkw _KTq9kPCMEeOEP-VOZrQAkw _KTuA4PCMEeOEP-VOZrQAkw _KTwdIPCMEeOEP-VOZrQAkw _KTzgcPCMEeOEP-VOZrQAkw _KT18sPCMEeOEP-VOZrQAkw _KT5AAPCMEeOEP-VOZrQAkw _KT8DUPCMEeOEP-VOZrQAkw _KT-fkPCMEeOEP-VOZrQAkw _KUBi4PCMEeOEP-VOZrQAkw _KUD_IPCMEeOEP-VOZrQAkw _KUHCcPCMEeOEP-VOZrQAkw _KUJesPCMEeOEP-VOZrQAkw _KUMiAPCMEeOEP-VOZrQAkw _KUPlUPCMEeOEP-VOZrQAkw _KUSBkPCMEeOEP-VOZrQAkw _KUVE4PCMEeOEP-VOZrQAkw _KUXhIPCMEeOEP-VOZrQAkw _KUZ9YPCMEeOEP-VOZrQAkw _KUdAsPCMEeOEP-VOZrQAkw _KUgEAPCMEeOEP-VOZrQAkw _KUkVcPCMEeOEP-VOZrQAkw _KUnYwPCMEeOEP-VOZrQAkw _KUqcEPCMEeOEP-VOZrQAkw _KUs4UPCMEeOEP-VOZrQAkw _KUv7oPCMEeOEP-VOZrQAkw _KUyX4PCMEeOEP-VOZrQAkw _KU1bMPCMEeOEP-VOZrQAkw _KU33cPCMEeOEP-VOZrQAkw _KU66wPCMEeOEP-VOZrQAkw _KU-lIPCMEeOEP-VOZrQAkw _KVBBYPCMEeOEP-VOZrQAkw _KVEEsPCMEeOEP-VOZrQAkw _KVGg8PCMEeOEP-VOZrQAkw _KVI9MPCMEeOEP-VOZrQAkw _KVMAgPCMEeOEP-VOZrQAkw _KVOcwPCMEeOEP-VOZrQAkw _KVQ5APCMEeOEP-VOZrQAkw _KVT8UPCMEeOEP-VOZrQAkw _KVWYkPCMEeOEP-VOZrQAkw _KVZb4PCMEeOEP-VOZrQAkw _KVb4IPCMEeOEP-VOZrQAkw _KVeUYPCMEeOEP-VOZrQAkw _KVhXsPCMEeOEP-VOZrQAkw _KVjz8PCMEeOEP-VOZrQAkw _KVmQMPCMEeOEP-VOZrQAkw _KVpTgPCMEeOEP-VOZrQAkw _KVrvwPCMEeOEP-VOZrQAkw _KVuzEPCMEeOEP-VOZrQAkw _KVxPUPCMEeOEP-VOZrQAkw _KVzrkPCMEeOEP-VOZrQAkw _KV2u4PCMEeOEP-VOZrQAkw _KV5LIPCMEeOEP-VOZrQAkw _KV7nYPCMEeOEP-VOZrQAkw _KV-qsPCMEeOEP-VOZrQAkw _KWBG8PCMEeOEP-VOZrQAkw _KWDjMPCMEeOEP-VOZrQAkw _KWGmgPCMEeOEP-VOZrQAkw _KWJCwPCMEeOEP-VOZrQAkw _KWLfAPCMEeOEP-VOZrQAkw _KWN7QPCMEeOEP-VOZrQAkw _KWQXgPCMEeOEP-VOZrQAkw _KWSzwPCMEeOEP-VOZrQAkw _KWVQAPCMEeOEP-VOZrQAkw _KWXFMPCMEeOEP-VOZrQAkw _KWZhcPCMEeOEP-VOZrQAkw _KWb9sPCMEeOEP-VOZrQAkw _KWeZ8PCMEeOEP-VOZrQAkw _KWg2MPCMEeOEP-VOZrQAkw _KWirYPCMEeOEP-VOZrQAkw _KWlHoPCMEeOEP-VOZrQAkw _KWnj4PCMEeOEP-VOZrQAkw _KWqAIPCMEeOEP-VOZrQAkw _KWscYPCMEeOEP-VOZrQAkw _KWuRkPCMEeOEP-VOZrQAkw _KWwt0PCMEeOEP-VOZrQAkw _KWyjAPCMEeOEP-VOZrQAkw _KW0_QPCMEeOEP-VOZrQAkw _KW20cPCMEeOEP-VOZrQAkw _KW5QsPCMEeOEP-VOZrQAkw _KW7F4PCMEeOEP-VOZrQAkw _KW9iIPCMEeOEP-VOZrQAkw _KW_-YPCMEeOEP-VOZrQAkw _KXBzkPCMEeOEP-VOZrQAkw _KXEP0PCMEeOEP-VOZrQAkw _KXGFAPCMEeOEP-VOZrQAkw _KXH6MPCMEeOEP-VOZrQAkw _KXKWcPCMEeOEP-VOZrQAkw _KXMLoPCMEeOEP-VOZrQAkw _KXOn4PCMEeOEP-VOZrQAkw _KXQdEPCMEeOEP-VOZrQAkw _KXSSQPCMEeOEP-VOZrQAkw _KXUugPCMEeOEP-VOZrQAkw _KXWjsPCMEeOEP-VOZrQAkw _KXYY4PCMEeOEP-VOZrQAkw _KXa1IPCMEeOEP-VOZrQAkw _KXcqUPCMEeOEP-VOZrQAkw _KXefgPCMEeOEP-VOZrQAkw _KXgUsPCMEeOEP-VOZrQAkw _KXiJ4PCMEeOEP-VOZrQAkw _KXkmIPCMEeOEP-VOZrQAkw _KXmbUPCMEeOEP-VOZrQAkw _KXoQgPCMEeOEP-VOZrQAkw _KXqFsPCMEeOEP-VOZrQAkw _KXsh8PCMEeOEP-VOZrQAkw _KXuXIPCMEeOEP-VOZrQAkw _KXwMUPCMEeOEP-VOZrQAkw _KXyBgPCMEeOEP-VOZrQAkw _KX0dwPCMEeOEP-VOZrQAkw _KX2S8PCMEeOEP-VOZrQAkw _KX4IIPCMEeOEP-VOZrQAkw _KX6kYPCMEeOEP-VOZrQAkw _KX8ZkPCMEeOEP-VOZrQAkw _KX-OwPCMEeOEP-VOZrQAkw _KYArAPCMEeOEP-VOZrQAkw _KYCgMPCMEeOEP-VOZrQAkw _KYEVYPCMEeOEP-VOZrQAkw _KYGxoPCMEeOEP-VOZrQAkw _KYIm0PCMEeOEP-VOZrQAkw _KYKcAPCMEeOEP-VOZrQAkw _KYMRMPCMEeOEP-VOZrQAkw _KYOGYPCMEeOEP-VOZrQAkw _KYQioPCMEeOEP-VOZrQAkw _KYSX0PCMEeOEP-VOZrQAkw _KYUNAPCMEeOEP-VOZrQAkw _KYWCMPCMEeOEP-VOZrQAkw _KYX3YPCMEeOEP-VOZrQAkw _KYaToPCMEeOEP-VOZrQAkw _KYcI0PCMEeOEP-VOZrQAkw _KYd-APCMEeOEP-VOZrQAkw _KYfzMPCMEeOEP-VOZrQAkw _KYiPcPCMEeOEP-VOZrQAkw _KYkEoPCMEeOEP-VOZrQAkw _KYl50PCMEeOEP-VOZrQAkw _KYnvAPCMEeOEP-VOZrQAkw _KYpkMPCMEeOEP-VOZrQAkw _KYsAcPCMEeOEP-VOZrQAkw _KYt1oPCMEeOEP-VOZrQAkw _KYvq0PCMEeOEP-VOZrQAkw _KYxgAPCMEeOEP-VOZrQAkw _KYzVMPCMEeOEP-VOZrQAkw _KY1KYPCMEeOEP-VOZrQAkw _KY2_kPCMEeOEP-VOZrQAkw _KY40wPCMEeOEP-VOZrQAkw _KY6p8PCMEeOEP-VOZrQAkw _KY8fIPCMEeOEP-VOZrQAkw _KY-UUPCMEeOEP-VOZrQAkw _KZAwkPCMEeOEP-VOZrQAkw _KZClwPCMEeOEP-VOZrQAkw _KZEa8PCMEeOEP-VOZrQAkw _KZGQIPCMEeOEP-VOZrQAkw _KZIFUPCMEeOEP-VOZrQAkw _KZJ6gPCMEeOEP-VOZrQAkw _KZLvsPCMEeOEP-VOZrQAkw _KZNk4PCMEeOEP-VOZrQAkw _KZPaEPCMEeOEP-VOZrQAkw _KZRPQPCMEeOEP-VOZrQAkw _KZTEcPCMEeOEP-VOZrQAkw _KZU5oPCMEeOEP-VOZrQAkw _KZWu0PCMEeOEP-VOZrQAkw _KZYkAPCMEeOEP-VOZrQAkw _KZaZMPCMEeOEP-VOZrQAkw _KZcOYPCMEeOEP-VOZrQAkw _KZeDkPCMEeOEP-VOZrQAkw _KZf4wPCMEeOEP-VOZrQAkw _KZht8PCMEeOEP-VOZrQAkw _KZjjIPCMEeOEP-VOZrQAkw _KZlYUPCMEeOEP-VOZrQAkw _KZnNgPCMEeOEP-VOZrQAkw _KZpCsPCMEeOEP-VOZrQAkw _KZq34PCMEeOEP-VOZrQAkw _KZstEPCMEeOEP-VOZrQAkw _KZuiQPCMEeOEP-VOZrQAkw _KZwXcPCMEeOEP-VOZrQAkw _KZyMoPCMEeOEP-VOZrQAkw _KZ0B0PCMEeOEP-VOZrQAkw _KZ1P8PCMEeOEP-VOZrQAkw _KZ3FIPCMEeOEP-VOZrQAkw _KZ46UPCMEeOEP-VOZrQAkw _KZ6vgPCMEeOEP-VOZrQAkw _KZ8ksPCMEeOEP-VOZrQAkw _KZ-Z4PCMEeOEP-VOZrQAkw _KaAPEPCMEeOEP-VOZrQAkw _KaCEQPCMEeOEP-VOZrQAkw _KaD5cPCMEeOEP-VOZrQAkw _KaFuoPCMEeOEP-VOZrQAkw _KaHj0PCMEeOEP-VOZrQAkw _KaJZAPCMEeOEP-VOZrQAkw _KaLOMPCMEeOEP-VOZrQAkw _KaNDYPCMEeOEP-VOZrQAkw _KaO4kPCMEeOEP-VOZrQAkw _KaQtwPCMEeOEP-VOZrQAkw _KaSi8PCMEeOEP-VOZrQAkw _KaUYIPCMEeOEP-VOZrQAkw _KaWNUPCMEeOEP-VOZrQAkw _KaYCgPCMEeOEP-VOZrQAkw _KaZ3sPCMEeOEP-VOZrQAkw _Kabs4PCMEeOEP-VOZrQAkw _Kac7APCMEeOEP-VOZrQAkw _KaewMPCMEeOEP-VOZrQAkw _KaglYPCMEeOEP-VOZrQAkw _KaiakPCMEeOEP-VOZrQAkw _KakPwPCMEeOEP-VOZrQAkw _KamE8PCMEeOEP-VOZrQAkw _Kan6IPCMEeOEP-VOZrQAkw _KapvUPCMEeOEP-VOZrQAkw _Kaq9cPCMEeOEP-VOZrQAkw _KasyoPCMEeOEP-VOZrQAkw _Kaun0PCMEeOEP-VOZrQAkw _KawdAPCMEeOEP-VOZrQAkw _KaySMPCMEeOEP-VOZrQAkw _Ka0HYPCMEeOEP-VOZrQAkw _Ka18kPCMEeOEP-VOZrQAkw _Ka3KsPCMEeOEP-VOZrQAkw _Ka4_4PCMEeOEP-VOZrQAkw _Ka61EPCMEeOEP-VOZrQAkw _Ka8qQPCMEeOEP-VOZrQAkw _Ka-fcPCMEeOEP-VOZrQAkw _KbAUoPCMEeOEP-VOZrQAkw _KbCJ0PCMEeOEP-VOZrQAkw" base_Component="_KTNqkPCMEeOEP-VOZrQAkw" name="OSGi System Bundle"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTXbkPCMEeOEP-VOZrQAkw" base_Package="_KTU_UPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTZ30PCMEeOEP-VOZrQAkw" base_Package="_KTYCoPCMEeOEP-VOZrQAkw" isInternal="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTc7IPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KTae4PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTf-cPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KTdiMPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTiasPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KTglgPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTleAPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KTjBwPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTohUPCMEeOEP-VOZrQAkw" atleast="1.1.0" base_Package="_KTmFEPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTq9kPCMEeOEP-VOZrQAkw" atleast="1.2.0" base_Package="_KTohUfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTuA4PCMEeOEP-VOZrQAkw" base_Package="_KTrkoPCMEeOEP-VOZrQAkw" isInternal="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTwdIPCMEeOEP-VOZrQAkw" atleast="1.1.0" base_Package="_KTun8PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KTzgcPCMEeOEP-VOZrQAkw" base_Package="_KTxEMPCMEeOEP-VOZrQAkw" isInternal="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KT18sPCMEeOEP-VOZrQAkw" base_Package="_KT0HgPCMEeOEP-VOZrQAkw" isInternal="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KT5AAPCMEeOEP-VOZrQAkw" base_Package="_KT2jwPCMEeOEP-VOZrQAkw" isInternal="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KT8DUPCMEeOEP-VOZrQAkw" base_Package="_KT5nEPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KT-fkPCMEeOEP-VOZrQAkw" base_Package="_KT8DUfCMEeOEP-VOZrQAkw" isInternal="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUBi4PCMEeOEP-VOZrQAkw" base_Package="_KT_GoPCMEeOEP-VOZrQAkw" isInternal="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUD_IPCMEeOEP-VOZrQAkw" base_Package="_KUCJ8PCMEeOEP-VOZrQAkw" isInternal="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUHCcPCMEeOEP-VOZrQAkw" base_Package="_KUEmMPCMEeOEP-VOZrQAkw" isInternal="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUJesPCMEeOEP-VOZrQAkw" base_Package="_KUHpgPCMEeOEP-VOZrQAkw" isInternal="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUMiAPCMEeOEP-VOZrQAkw" base_Package="_KUKFwPCMEeOEP-VOZrQAkw" isInternal="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUPlUPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KUNJEPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUSBkPCMEeOEP-VOZrQAkw" base_Package="_KUQMYPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUVE4PCMEeOEP-VOZrQAkw" base_Package="_KUSooPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUXhIPCMEeOEP-VOZrQAkw" base_Package="_KUVE4fCMEeOEP-VOZrQAkw" isInternal="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUZ9YPCMEeOEP-VOZrQAkw" base_Package="_KUYIMPCMEeOEP-VOZrQAkw" isInternal="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUdAsPCMEeOEP-VOZrQAkw" base_Package="_KUakcPCMEeOEP-VOZrQAkw" isInternal="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUgEAPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KUdnwPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUkVcPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KUgrEPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUnYwPCMEeOEP-VOZrQAkw" atleast="1.3.0" base_Package="_KUk8gPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUqcEPCMEeOEP-VOZrQAkw" atleast="1.2.0" base_Package="_KUn_0PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUs4UPCMEeOEP-VOZrQAkw" atleast="1.3.0" base_Package="_KUrDIPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUv7oPCMEeOEP-VOZrQAkw" atleast="1.1.0" base_Package="_KUtfYPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KUyX4PCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KUwisPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KU1bMPCMEeOEP-VOZrQAkw" atleast="1.6.0" base_Package="_KUy-8PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KU33cPCMEeOEP-VOZrQAkw" atleast="1.1.0" base_Package="_KU2CQPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KU66wPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KU4egPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KU-lIPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KU7h0PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVBBYPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KU_MMPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVEEsPCMEeOEP-VOZrQAkw" base_Package="_KVBocPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVGg8PCMEeOEP-VOZrQAkw" base_Package="_KVEEsfCMEeOEP-VOZrQAkw" isInternal="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVI9MPCMEeOEP-VOZrQAkw" base_Package="_KVHIAPCMEeOEP-VOZrQAkw" isInternal="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVMAgPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KVJkQPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVOcwPCMEeOEP-VOZrQAkw" atleast="1.1.0" base_Package="_KVMnkPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVQ5APCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KVPD0PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVT8UPCMEeOEP-VOZrQAkw" atleast="1.8.0" base_Package="_KVRgEPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVWYkPCMEeOEP-VOZrQAkw" atleast="1.8.0" base_Package="_KVUjYPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVZb4PCMEeOEP-VOZrQAkw" atleast="1.1.0" base_Package="_KVW_oPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVb4IPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KVaC8PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVeUYPCMEeOEP-VOZrQAkw" atleast="1.1.0" base_Package="_KVcfMPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVhXsPCMEeOEP-VOZrQAkw" atleast="1.1.0" base_Package="_KVe7cPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVjz8PCMEeOEP-VOZrQAkw" atleast="1.2.0" base_Package="_KVh-wPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVmQMPCMEeOEP-VOZrQAkw" atleast="1.1.0" base_Package="_KVkbAPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVpTgPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KVm3QPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVrvwPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KVp6kPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVuzEPCMEeOEP-VOZrQAkw" atleast="1.2.0" base_Package="_KVsW0PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVxPUPCMEeOEP-VOZrQAkw" atleast="1.2.0" base_Package="_KVvaIPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KVzrkPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KVx2YPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KV2u4PCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KV0SoPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KV5LIPCMEeOEP-VOZrQAkw" atleast="1.1.1" base_Package="_KV3V8PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KV7nYPCMEeOEP-VOZrQAkw" atleast="1.3.0" base_Package="_KV5yMPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KV-qsPCMEeOEP-VOZrQAkw" atleast="1.2.0" base_Package="_KV8OcPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWBG8PCMEeOEP-VOZrQAkw" atleast="1.2.0" base_Package="_KV_RwPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWDjMPCMEeOEP-VOZrQAkw" atleast="1.0.1" base_Package="_KWBuAPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWGmgPCMEeOEP-VOZrQAkw" atleast="1.1.0" base_Package="_KWEKQPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWJCwPCMEeOEP-VOZrQAkw" atleast="1.0.0" base_Package="_KWHNkPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWLfAPCMEeOEP-VOZrQAkw" atleast="1.5.1" base_Package="_KWJp0PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWN7QPCMEeOEP-VOZrQAkw" base_Package="_KWMGEPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWQXgPCMEeOEP-VOZrQAkw" base_Package="_KWOiUPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWSzwPCMEeOEP-VOZrQAkw" base_Package="_KWQ-kPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWVQAPCMEeOEP-VOZrQAkw" base_Package="_KWSzwfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWXFMPCMEeOEP-VOZrQAkw" base_Package="_KWVQAfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWZhcPCMEeOEP-VOZrQAkw" base_Package="_KWXsQPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWb9sPCMEeOEP-VOZrQAkw" base_Package="_KWaIgPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWeZ8PCMEeOEP-VOZrQAkw" base_Package="_KWckwPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWg2MPCMEeOEP-VOZrQAkw" base_Package="_KWeZ8fCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWirYPCMEeOEP-VOZrQAkw" base_Package="_KWg2MfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWlHoPCMEeOEP-VOZrQAkw" base_Package="_KWjScPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWnj4PCMEeOEP-VOZrQAkw" base_Package="_KWlusPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWqAIPCMEeOEP-VOZrQAkw" base_Package="_KWoK8PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWscYPCMEeOEP-VOZrQAkw" base_Package="_KWqnMPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWuRkPCMEeOEP-VOZrQAkw" base_Package="_KWscYfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWwt0PCMEeOEP-VOZrQAkw" base_Package="_KWu4oPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KWyjAPCMEeOEP-VOZrQAkw" base_Package="_KWxU4PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KW0_QPCMEeOEP-VOZrQAkw" base_Package="_KWzKEPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KW20cPCMEeOEP-VOZrQAkw" base_Package="_KW1mUPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KW5QsPCMEeOEP-VOZrQAkw" base_Package="_KW3bgPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KW7F4PCMEeOEP-VOZrQAkw" base_Package="_KW53wPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KW9iIPCMEeOEP-VOZrQAkw" base_Package="_KW7s8PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KW_-YPCMEeOEP-VOZrQAkw" base_Package="_KW-JMPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXBzkPCMEeOEP-VOZrQAkw" base_Package="_KW_-YfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXEP0PCMEeOEP-VOZrQAkw" base_Package="_KXCaoPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXGFAPCMEeOEP-VOZrQAkw" base_Package="_KXEP0fCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXH6MPCMEeOEP-VOZrQAkw" base_Package="_KXGsEPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXKWcPCMEeOEP-VOZrQAkw" base_Package="_KXIhQPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXMLoPCMEeOEP-VOZrQAkw" base_Package="_KXK9gPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXOn4PCMEeOEP-VOZrQAkw" base_Package="_KXMysPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXQdEPCMEeOEP-VOZrQAkw" base_Package="_KXOn4fCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXSSQPCMEeOEP-VOZrQAkw" base_Package="_KXREIPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXUugPCMEeOEP-VOZrQAkw" base_Package="_KXS5UPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXWjsPCMEeOEP-VOZrQAkw" base_Package="_KXVVkPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXYY4PCMEeOEP-VOZrQAkw" base_Package="_KXXKwPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXa1IPCMEeOEP-VOZrQAkw" base_Package="_KXY_8PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXcqUPCMEeOEP-VOZrQAkw" base_Package="_KXa1IfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXefgPCMEeOEP-VOZrQAkw" base_Package="_KXdRYPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXgUsPCMEeOEP-VOZrQAkw" base_Package="_KXfGkPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXiJ4PCMEeOEP-VOZrQAkw" base_Package="_KXg7wPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXkmIPCMEeOEP-VOZrQAkw" base_Package="_KXiw8PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXmbUPCMEeOEP-VOZrQAkw" base_Package="_KXkmIfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXoQgPCMEeOEP-VOZrQAkw" base_Package="_KXnCYPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXqFsPCMEeOEP-VOZrQAkw" base_Package="_KXo3kPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXsh8PCMEeOEP-VOZrQAkw" base_Package="_KXqswPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXuXIPCMEeOEP-VOZrQAkw" base_Package="_KXsh8fCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXwMUPCMEeOEP-VOZrQAkw" base_Package="_KXu-MPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KXyBgPCMEeOEP-VOZrQAkw" base_Package="_KXwzYPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KX0dwPCMEeOEP-VOZrQAkw" base_Package="_KXyokPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KX2S8PCMEeOEP-VOZrQAkw" base_Package="_KX0dwfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KX4IIPCMEeOEP-VOZrQAkw" base_Package="_KX26APCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KX6kYPCMEeOEP-VOZrQAkw" base_Package="_KX4vMPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KX8ZkPCMEeOEP-VOZrQAkw" base_Package="_KX6kYfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KX-OwPCMEeOEP-VOZrQAkw" base_Package="_KX9AoPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYArAPCMEeOEP-VOZrQAkw" base_Package="_KX-10PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYCgMPCMEeOEP-VOZrQAkw" base_Package="_KYBSEPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYEVYPCMEeOEP-VOZrQAkw" base_Package="_KYDHQPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYGxoPCMEeOEP-VOZrQAkw" base_Package="_KYE8cPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYIm0PCMEeOEP-VOZrQAkw" base_Package="_KYGxofCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYKcAPCMEeOEP-VOZrQAkw" base_Package="_KYIm0fCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYMRMPCMEeOEP-VOZrQAkw" base_Package="_KYLDEPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYOGYPCMEeOEP-VOZrQAkw" base_Package="_KYM4QPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYQioPCMEeOEP-VOZrQAkw" base_Package="_KYOtcPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYSX0PCMEeOEP-VOZrQAkw" base_Package="_KYQiofCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYUNAPCMEeOEP-VOZrQAkw" base_Package="_KYSX0fCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYWCMPCMEeOEP-VOZrQAkw" base_Package="_KYU0EPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYX3YPCMEeOEP-VOZrQAkw" base_Package="_KYWpQPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYaToPCMEeOEP-VOZrQAkw" base_Package="_KYYecPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYcI0PCMEeOEP-VOZrQAkw" base_Package="_KYaTofCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYd-APCMEeOEP-VOZrQAkw" base_Package="_KYcI0fCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYfzMPCMEeOEP-VOZrQAkw" base_Package="_KYelEPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYiPcPCMEeOEP-VOZrQAkw" base_Package="_KYgaQPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYkEoPCMEeOEP-VOZrQAkw" base_Package="_KYiPcfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYl50PCMEeOEP-VOZrQAkw" base_Package="_KYkEofCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYnvAPCMEeOEP-VOZrQAkw" base_Package="_KYmg4PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYpkMPCMEeOEP-VOZrQAkw" base_Package="_KYoWEPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYsAcPCMEeOEP-VOZrQAkw" base_Package="_KYqLQPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYt1oPCMEeOEP-VOZrQAkw" base_Package="_KYsAcfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYvq0PCMEeOEP-VOZrQAkw" base_Package="_KYucsPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYxgAPCMEeOEP-VOZrQAkw" base_Package="_KYwR4PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KYzVMPCMEeOEP-VOZrQAkw" base_Package="_KYyHEPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KY1KYPCMEeOEP-VOZrQAkw" base_Package="_KYz8QPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KY2_kPCMEeOEP-VOZrQAkw" base_Package="_KY1xcPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KY40wPCMEeOEP-VOZrQAkw" base_Package="_KY3moPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KY6p8PCMEeOEP-VOZrQAkw" base_Package="_KY5b0PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KY8fIPCMEeOEP-VOZrQAkw" base_Package="_KY7RAPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KY-UUPCMEeOEP-VOZrQAkw" base_Package="_KY9GMPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZAwkPCMEeOEP-VOZrQAkw" base_Package="_KY-7YPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZClwPCMEeOEP-VOZrQAkw" base_Package="_KZAwkfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZEa8PCMEeOEP-VOZrQAkw" base_Package="_KZClwfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZGQIPCMEeOEP-VOZrQAkw" base_Package="_KZEa8fCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZIFUPCMEeOEP-VOZrQAkw" base_Package="_KZGQIfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZJ6gPCMEeOEP-VOZrQAkw" base_Package="_KZIFUfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZLvsPCMEeOEP-VOZrQAkw" base_Package="_KZJ6gfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZNk4PCMEeOEP-VOZrQAkw" base_Package="_KZMWwPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZPaEPCMEeOEP-VOZrQAkw" base_Package="_KZOL8PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZRPQPCMEeOEP-VOZrQAkw" base_Package="_KZQBIPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZTEcPCMEeOEP-VOZrQAkw" base_Package="_KZR2UPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZU5oPCMEeOEP-VOZrQAkw" base_Package="_KZTrgPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZWu0PCMEeOEP-VOZrQAkw" base_Package="_KZVgsPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZYkAPCMEeOEP-VOZrQAkw" base_Package="_KZXV4PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZaZMPCMEeOEP-VOZrQAkw" base_Package="_KZZLEPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZcOYPCMEeOEP-VOZrQAkw" base_Package="_KZbAQPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZeDkPCMEeOEP-VOZrQAkw" base_Package="_KZc1cPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZf4wPCMEeOEP-VOZrQAkw" base_Package="_KZeqoPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZht8PCMEeOEP-VOZrQAkw" base_Package="_KZgf0PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZjjIPCMEeOEP-VOZrQAkw" base_Package="_KZiVAPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZlYUPCMEeOEP-VOZrQAkw" base_Package="_KZkKMPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZnNgPCMEeOEP-VOZrQAkw" base_Package="_KZl_YPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZpCsPCMEeOEP-VOZrQAkw" base_Package="_KZn0kPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZq34PCMEeOEP-VOZrQAkw" base_Package="_KZpCsfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZstEPCMEeOEP-VOZrQAkw" base_Package="_KZq34fCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZuiQPCMEeOEP-VOZrQAkw" base_Package="_KZstEfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZwXcPCMEeOEP-VOZrQAkw" base_Package="_KZuiQfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZyMoPCMEeOEP-VOZrQAkw" base_Package="_KZwXcfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZ0B0PCMEeOEP-VOZrQAkw" base_Package="_KZyMofCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZ1P8PCMEeOEP-VOZrQAkw" base_Package="_KZ0B0fCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZ3FIPCMEeOEP-VOZrQAkw" base_Package="_KZ13APCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZ46UPCMEeOEP-VOZrQAkw" base_Package="_KZ3sMPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZ6vgPCMEeOEP-VOZrQAkw" base_Package="_KZ5hYPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZ8ksPCMEeOEP-VOZrQAkw" base_Package="_KZ7WkPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KZ-Z4PCMEeOEP-VOZrQAkw" base_Package="_KZ9LwPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaAPEPCMEeOEP-VOZrQAkw" base_Package="_KZ_A8PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaCEQPCMEeOEP-VOZrQAkw" base_Package="_KaA2IPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaD5cPCMEeOEP-VOZrQAkw" base_Package="_KaCrUPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaFuoPCMEeOEP-VOZrQAkw" base_Package="_KaEggPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaHj0PCMEeOEP-VOZrQAkw" base_Package="_KaGVsPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaJZAPCMEeOEP-VOZrQAkw" base_Package="_KaIK4PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaLOMPCMEeOEP-VOZrQAkw" base_Package="_KaKAEPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaNDYPCMEeOEP-VOZrQAkw" base_Package="_KaL1QPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaO4kPCMEeOEP-VOZrQAkw" base_Package="_KaNqcPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaQtwPCMEeOEP-VOZrQAkw" base_Package="_KaPfoPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaSi8PCMEeOEP-VOZrQAkw" base_Package="_KaRU0PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaUYIPCMEeOEP-VOZrQAkw" base_Package="_KaTKAPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaWNUPCMEeOEP-VOZrQAkw" base_Package="_KaU_MPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaYCgPCMEeOEP-VOZrQAkw" base_Package="_KaW0YPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaZ3sPCMEeOEP-VOZrQAkw" base_Package="_KaYCgfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kabs4PCMEeOEP-VOZrQAkw" base_Package="_KaZ3sfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kac7APCMEeOEP-VOZrQAkw" base_Package="_Kabs4fCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaewMPCMEeOEP-VOZrQAkw" base_Package="_KadiEPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaglYPCMEeOEP-VOZrQAkw" base_Package="_KafXQPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaiakPCMEeOEP-VOZrQAkw" base_Package="_KahMcPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KakPwPCMEeOEP-VOZrQAkw" base_Package="_KajBoPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KamE8PCMEeOEP-VOZrQAkw" base_Package="_Kak20PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kan6IPCMEeOEP-VOZrQAkw" base_Package="_KamE8fCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KapvUPCMEeOEP-VOZrQAkw" base_Package="_Kan6IfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kaq9cPCMEeOEP-VOZrQAkw" base_Package="_KapvUfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KasyoPCMEeOEP-VOZrQAkw" base_Package="_KarkgPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kaun0PCMEeOEP-VOZrQAkw" base_Package="_KatZsPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KawdAPCMEeOEP-VOZrQAkw" base_Package="_KavO4PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KaySMPCMEeOEP-VOZrQAkw" base_Package="_KaxEEPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Ka0HYPCMEeOEP-VOZrQAkw" base_Package="_Kay5QPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Ka18kPCMEeOEP-VOZrQAkw" base_Package="_Ka0HYfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Ka3KsPCMEeOEP-VOZrQAkw" base_Package="_Ka18kfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Ka4_4PCMEeOEP-VOZrQAkw" base_Package="_Ka3xwPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Ka61EPCMEeOEP-VOZrQAkw" base_Package="_Ka5m8PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Ka8qQPCMEeOEP-VOZrQAkw" base_Package="_Ka7cIPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Ka-fcPCMEeOEP-VOZrQAkw" base_Package="_Ka9RUPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbAUoPCMEeOEP-VOZrQAkw" base_Package="_Ka_GgPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbCJ0PCMEeOEP-VOZrQAkw" base_Package="_KbA7sPCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_KbFNIPCMEeOEP-VOZrQAkw" base_Dependency="_KbD_APCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:Plugin xmi:id="_KbHCUPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.emf.ecore.xmi.XMIPlugin$Implementation$Activator" classPath="." localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.emf.ecore.xmi" vendor="Eclipse Modeling Project" version="2.10.0.v20140514-1158" exportPackage="_KbNI8PCMEeOEP-VOZrQAkw _KbOXEPCMEeOEP-VOZrQAkw _KbQMQPCMEeOEP-VOZrQAkw" base_Component="_KbF0MPCMEeOEP-VOZrQAkw" name="EMF XML/XMI Persistence" lazyStart="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbNI8PCMEeOEP-VOZrQAkw" base_Package="_KbLTwPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbOXEPCMEeOEP-VOZrQAkw" base_Package="_KbNI8fCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbQMQPCMEeOEP-VOZrQAkw" base_Package="_KbO-IPCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_KbTPkPCMEeOEP-VOZrQAkw" base_Dependency="_KbRaYPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:Plugin xmi:id="_KbUdsPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.extendedtypes.Activator" classPath="." localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.extendedtypes" vendor="Eclipse Modeling Project" version="1.0.0.v201406030454" exportPackage="_KbakUPCMEeOEP-VOZrQAkw _KbbycPCMEeOEP-VOZrQAkw _KbdnoPCMEeOEP-VOZrQAkw _Kbfc0PCMEeOEP-VOZrQAkw _KbhSAPCMEeOEP-VOZrQAkw _KbjHMPCMEeOEP-VOZrQAkw _Kbk8YPCMEeOEP-VOZrQAkw _KbmxkPCMEeOEP-VOZrQAkw _Kbn_sPCMEeOEP-VOZrQAkw _Kbp04PCMEeOEP-VOZrQAkw _KbrqEPCMEeOEP-VOZrQAkw _KbtfQPCMEeOEP-VOZrQAkw _KbvUcPCMEeOEP-VOZrQAkw _KbxJoPCMEeOEP-VOZrQAkw _Kby-0PCMEeOEP-VOZrQAkw" base_Component="_KbTPkfCMEeOEP-VOZrQAkw" name="Papyrus enhanced types metamodel plugin" isIncubation="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbakUPCMEeOEP-VOZrQAkw" base_Package="_KbYvIPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbbycPCMEeOEP-VOZrQAkw" base_Package="_KbakUfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbdnoPCMEeOEP-VOZrQAkw" base_Package="_KbcZgPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kbfc0PCMEeOEP-VOZrQAkw" base_Package="_KbeOsPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbhSAPCMEeOEP-VOZrQAkw" base_Package="_KbgD4PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbjHMPCMEeOEP-VOZrQAkw" base_Package="_Kbh5EPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kbk8YPCMEeOEP-VOZrQAkw" base_Package="_KbjHMfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbmxkPCMEeOEP-VOZrQAkw" base_Package="_Kbk8YfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kbn_sPCMEeOEP-VOZrQAkw" base_Package="_KbmxkfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kbp04PCMEeOEP-VOZrQAkw" base_Package="_KbomwPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbrqEPCMEeOEP-VOZrQAkw" base_Package="_Kbqb8PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbtfQPCMEeOEP-VOZrQAkw" base_Package="_KbsRIPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbvUcPCMEeOEP-VOZrQAkw" base_Package="_KbuGUPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KbxJoPCMEeOEP-VOZrQAkw" base_Package="_Kbv7gPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kby-0PCMEeOEP-VOZrQAkw" base_Package="_KbxJofCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_Kb1bEPCMEeOEP-VOZrQAkw" base_Dependency="_Kbzl4PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:Plugin xmi:id="_Kb3QQPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.services.resourceloading.Activator" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.services.resourceloading" vendor="Eclipse Modeling Project" version="1.0.0.v201406030454" exportPackage="_Kb8v0PCMEeOEP-VOZrQAkw _Kb-lAPCMEeOEP-VOZrQAkw _Kb_zIPCMEeOEP-VOZrQAkw _KcBoUPCMEeOEP-VOZrQAkw" base_Component="_Kb1bEfCMEeOEP-VOZrQAkw" name="Papyrus Resource Loading" isIncubation="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kb8v0PCMEeOEP-VOZrQAkw" base_Package="_Kb7hsPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kb-lAPCMEeOEP-VOZrQAkw" base_Package="_Kb8v0fCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kb_zIPCMEeOEP-VOZrQAkw" base_Package="_Kb-lAfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcBoUPCMEeOEP-VOZrQAkw" base_Package="_KcAaMPCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_KcEEkPCMEeOEP-VOZrQAkw" base_Dependency="_KcC2cPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:Plugin xmi:id="_KcF5wPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.emf.transaction.internal.EMFTransactionPlugin$Implementation" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.emf.transaction" vendor="Eclipse Modeling Project" version="1.8.0.201405281451" exportPackage="_KcLZUPCMEeOEP-VOZrQAkw _KcNOgPCMEeOEP-VOZrQAkw _KcPDsPCMEeOEP-VOZrQAkw _KcQ44PCMEeOEP-VOZrQAkw _KcSuEPCMEeOEP-VOZrQAkw" base_Component="_KcEroPCMEeOEP-VOZrQAkw" name="EMF Model Transaction Core" lazyStart="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcLZUPCMEeOEP-VOZrQAkw" base_Package="_KcKLMPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcNOgPCMEeOEP-VOZrQAkw" base_Package="_KcMAYPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcPDsPCMEeOEP-VOZrQAkw" base_Package="_KcN1kPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcQ44PCMEeOEP-VOZrQAkw" base_Package="_KcPqwPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcSuEPCMEeOEP-VOZrQAkw" base_Package="_KcQ44fCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_KcVKUPCMEeOEP-VOZrQAkw" base_Dependency="_KcTVIPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:Plugin xmi:id="_KcW_gPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.gmf.runtime.emf.type.core.internal.EMFTypePlugin" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.gmf.runtime.emf.type.core" vendor="Eclipse Modeling Project" version="1.7.0.201405281701" exportPackage="_KccfEPCMEeOEP-VOZrQAkw _KcdtMPCMEeOEP-VOZrQAkw _KcfiYPCMEeOEP-VOZrQAkw _KchXkPCMEeOEP-VOZrQAkw _KcjMwPCMEeOEP-VOZrQAkw _KclB8PCMEeOEP-VOZrQAkw _Kcm3IPCMEeOEP-VOZrQAkw _KcosUPCMEeOEP-VOZrQAkw" base_Component="_KcVKUfCMEeOEP-VOZrQAkw" name="GMF EMF Type Core"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KccfEPCMEeOEP-VOZrQAkw" base_Package="_Kcap4PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcdtMPCMEeOEP-VOZrQAkw" base_Package="_KccfEfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcfiYPCMEeOEP-VOZrQAkw" base_Package="_KceUQPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KchXkPCMEeOEP-VOZrQAkw" base_Package="_KcgJcPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcjMwPCMEeOEP-VOZrQAkw" base_Package="_Kch-oPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KclB8PCMEeOEP-VOZrQAkw" base_Package="_Kcjz0PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kcm3IPCMEeOEP-VOZrQAkw" base_Package="_KclpAPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcosUPCMEeOEP-VOZrQAkw" base_Package="_Kcm3IfCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_KcrIkPCMEeOEP-VOZrQAkw" base_Dependency="_KcpTYPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:Plugin xmi:id="_KcsWsPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.services.edit.Activator" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.services.edit" vendor="Eclipse Modeling Project" version="1.0.0.v201406030454" exportPackage="_KcydUPCMEeOEP-VOZrQAkw _KczrcPCMEeOEP-VOZrQAkw _Kc1goPCMEeOEP-VOZrQAkw _Kc3V0PCMEeOEP-VOZrQAkw _Kc6ZIPCMEeOEP-VOZrQAkw _Kc8OUPCMEeOEP-VOZrQAkw _Kc-DgPCMEeOEP-VOZrQAkw _Kc_4sPCMEeOEP-VOZrQAkw" base_Component="_KcrIkfCMEeOEP-VOZrQAkw" name="Papyrus Edit Service" isIncubation="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KcydUPCMEeOEP-VOZrQAkw" base_Package="_KcwoIPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KczrcPCMEeOEP-VOZrQAkw" base_Package="_KcydUfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kc1goPCMEeOEP-VOZrQAkw" base_Package="_Kc0SgPCMEeOEP-VOZrQAkw" isInternal="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kc3V0PCMEeOEP-VOZrQAkw" base_Package="_Kc2HsPCMEeOEP-VOZrQAkw" isInternal="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kc6ZIPCMEeOEP-VOZrQAkw" base_Package="_Kc5LAPCMEeOEP-VOZrQAkw" isInternal="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kc8OUPCMEeOEP-VOZrQAkw" base_Package="_Kc7AMPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kc-DgPCMEeOEP-VOZrQAkw" base_Package="_Kc81YPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kc_4sPCMEeOEP-VOZrQAkw" base_Package="_Kc-DgfCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_KdCU8PCMEeOEP-VOZrQAkw" base_Dependency="_KdAfwPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:Plugin xmi:id="_KdEKIPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.commands.Activator" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.gmfdiag.commands" vendor="Eclipse Modeling Project" version="1.0.0.v201406030454" exportPackage="_KdJpsPCMEeOEP-VOZrQAkw _KdK30PCMEeOEP-VOZrQAkw _KdMtAPCMEeOEP-VOZrQAkw" base_Component="_KdCU8fCMEeOEP-VOZrQAkw" name="Papyrus Commands Tools" isIncubation="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdJpsPCMEeOEP-VOZrQAkw" base_Package="_KdH0gPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdK30PCMEeOEP-VOZrQAkw" base_Package="_KdJpsfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdMtAPCMEeOEP-VOZrQAkw" base_Package="_KdLe4PCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_KdPJQPCMEeOEP-VOZrQAkw" base_Dependency="_KdN7IPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:Plugin xmi:id="_KdQ-cPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.core.log.internal.Activator" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.core.log" vendor="Eclipse Modeling Project" version="1.0.0.v201406030454" exportPackage="_KdWeAPCMEeOEP-VOZrQAkw" base_Component="_KdPwUPCMEeOEP-VOZrQAkw" name="Papyrus Logging plugin" isIncubation="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdWeAPCMEeOEP-VOZrQAkw" base_Package="_KdVP4PCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_KdY6QPCMEeOEP-VOZrQAkw" base_Dependency="_KdXFEPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:Plugin xmi:id="_KdavcPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.widgets.Activator" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.widgets" vendor="Eclipse Modeling Project" version="1.0.0.v201406030454" exportPackage="_KdgPAPCMEeOEP-VOZrQAkw _KdiEMPCMEeOEP-VOZrQAkw _Kdj5YPCMEeOEP-VOZrQAkw _KdlukPCMEeOEP-VOZrQAkw _KdnjwPCMEeOEP-VOZrQAkw _Kdox4PCMEeOEP-VOZrQAkw _KdqnEPCMEeOEP-VOZrQAkw _KdscQPCMEeOEP-VOZrQAkw _KduRcPCMEeOEP-VOZrQAkw _KdwGoPCMEeOEP-VOZrQAkw" base_Component="_KdZhUPCMEeOEP-VOZrQAkw" name="Papyrus widgets" isIncubation="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdgPAPCMEeOEP-VOZrQAkw" base_Package="_KdfA4PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdiEMPCMEeOEP-VOZrQAkw" base_Package="_Kdg2EPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kdj5YPCMEeOEP-VOZrQAkw" base_Package="_KdirQPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdlukPCMEeOEP-VOZrQAkw" base_Package="_Kdj5YfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdnjwPCMEeOEP-VOZrQAkw" base_Package="_KdlukfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kdox4PCMEeOEP-VOZrQAkw" base_Package="_KdnjwfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdqnEPCMEeOEP-VOZrQAkw" base_Package="_KdpY8PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdscQPCMEeOEP-VOZrQAkw" base_Package="_KdrOIPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KduRcPCMEeOEP-VOZrQAkw" base_Package="_KdtDUPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KdwGoPCMEeOEP-VOZrQAkw" base_Package="_Kdu4gPCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_Kdyi4PCMEeOEP-VOZrQAkw" base_Dependency="_KdwtsPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kd6esPCMEeOEP-VOZrQAkw" base_Package="_Kd5QkPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kd868PCMEeOEP-VOZrQAkw" base_Package="_Kd7s0PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kd-wIPCMEeOEP-VOZrQAkw" base_Package="_Kd9iAPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KeAlUPCMEeOEP-VOZrQAkw" base_Package="_Kd_XMPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:Plugin xmi:id="_KeKWUPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.views.modelexplorer.newchild.Activator" description="The purpose of this plugin  is to do the connection with the model explorer is org.eclipse.papyrus.view.modelexplorer.newchild. More documentation (models and file.doc) has been store in the docs directory of the plugin org.eclipse.papyrus.infra.newchild" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.views.modelexplorer.newchild" vendor="Eclipse Modeling Project" version="1.0.0.qualifier" base_Component="_KeJIMPCMEeOEP-VOZrQAkw" name="Papyrus view model explorer new child"/>
+  <ModuleLayer:BundleReference xmi:id="_KeMLgPCMEeOEP-VOZrQAkw" base_Dependency="_KeK9YPCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_KeOnwPCMEeOEP-VOZrQAkw" base_Dependency="_KeMykPCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_KeQc8PCMEeOEP-VOZrQAkw" base_Dependency="_KeOnwfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:Plugin xmi:id="_KeSSIPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.core.Activator" localization="plugin" requiredExecutionEnvironment="JavaSE-1.6" symbolicName="org.eclipse.papyrus.infra.core" vendor="Eclipse Modeling Project" version="1.0.0.v201406030454" exportPackage="_KeXxsPCMEeOEP-VOZrQAkw _KeZm4PCMEeOEP-VOZrQAkw _KebcEPCMEeOEP-VOZrQAkw _KecqMPCMEeOEP-VOZrQAkw _KeefYPCMEeOEP-VOZrQAkw _KegUkPCMEeOEP-VOZrQAkw _KeiJwPCMEeOEP-VOZrQAkw _Kej-8PCMEeOEP-VOZrQAkw _Kel0IPCMEeOEP-VOZrQAkw _KenpUPCMEeOEP-VOZrQAkw _Keo3cPCMEeOEP-VOZrQAkw _KeqsoPCMEeOEP-VOZrQAkw _Kesh0PCMEeOEP-VOZrQAkw _KeuXAPCMEeOEP-VOZrQAkw _KewMMPCMEeOEP-VOZrQAkw _KeyBYPCMEeOEP-VOZrQAkw _KezPgPCMEeOEP-VOZrQAkw _Ke1EsPCMEeOEP-VOZrQAkw _Ke254PCMEeOEP-VOZrQAkw" base_Component="_KeREAPCMEeOEP-VOZrQAkw" name="Papyrus Backbone" isIncubation="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KeXxsPCMEeOEP-VOZrQAkw" base_Package="_KeWjkPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KeZm4PCMEeOEP-VOZrQAkw" base_Package="_KeYYwPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KebcEPCMEeOEP-VOZrQAkw" base_Package="_KeZm4fCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KecqMPCMEeOEP-VOZrQAkw" base_Package="_KebcEfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KeefYPCMEeOEP-VOZrQAkw" base_Package="_KedRQPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KegUkPCMEeOEP-VOZrQAkw" base_Package="_KefGcPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KeiJwPCMEeOEP-VOZrQAkw" base_Package="_Keg7oPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kej-8PCMEeOEP-VOZrQAkw" base_Package="_Keiw0PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kel0IPCMEeOEP-VOZrQAkw" base_Package="_KekmAPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KenpUPCMEeOEP-VOZrQAkw" base_Package="_Kel0IfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Keo3cPCMEeOEP-VOZrQAkw" base_Package="_KenpUfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KeqsoPCMEeOEP-VOZrQAkw" base_Package="_KepegPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kesh0PCMEeOEP-VOZrQAkw" base_Package="_KerTsPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KeuXAPCMEeOEP-VOZrQAkw" base_Package="_KetI4PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KewMMPCMEeOEP-VOZrQAkw" base_Package="_Keu-EPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KeyBYPCMEeOEP-VOZrQAkw" base_Package="_KewMMfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KezPgPCMEeOEP-VOZrQAkw" base_Package="_KeyBYfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Ke1EsPCMEeOEP-VOZrQAkw" base_Package="_Kez2kPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Ke254PCMEeOEP-VOZrQAkw" base_Package="_Ke1rwPCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_Ke5WIPCMEeOEP-VOZrQAkw" base_Dependency="_Ke4IAPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:Plugin xmi:id="_Ke7LUPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.emf.Activator" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.emf" vendor="Eclipse Modeling Project" version="1.0.0.v201406030454" exportPackage="_KfAq4PCMEeOEP-VOZrQAkw _KfCgEPCMEeOEP-VOZrQAkw _KfEVQPCMEeOEP-VOZrQAkw _KfGKcPCMEeOEP-VOZrQAkw _KfH_oPCMEeOEP-VOZrQAkw _KfJ00PCMEeOEP-VOZrQAkw _KfLqAPCMEeOEP-VOZrQAkw _KfOGQPCMEeOEP-VOZrQAkw _KfP7cPCMEeOEP-VOZrQAkw _KfRJkPCMEeOEP-VOZrQAkw" base_Component="_Ke59MPCMEeOEP-VOZrQAkw" name="EMF Tools" isIncubation="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfAq4PCMEeOEP-VOZrQAkw" base_Package="_Ke_cwPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfCgEPCMEeOEP-VOZrQAkw" base_Package="_KfBR8PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfEVQPCMEeOEP-VOZrQAkw" base_Package="_KfDHIPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfGKcPCMEeOEP-VOZrQAkw" base_Package="_KfE8UPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfH_oPCMEeOEP-VOZrQAkw" base_Package="_KfGxgPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfJ00PCMEeOEP-VOZrQAkw" base_Package="_KfImsPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfLqAPCMEeOEP-VOZrQAkw" base_Package="_KfKb4PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfOGQPCMEeOEP-VOZrQAkw" base_Package="_KfLqAfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfP7cPCMEeOEP-VOZrQAkw" base_Package="_KfOGQfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfRJkPCMEeOEP-VOZrQAkw" base_Package="_KfP7cfCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_KfTl0PCMEeOEP-VOZrQAkw" base_Dependency="_KfSXsPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:Plugin xmi:id="_KfVbAPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.uml.service.types.Activator" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.uml.service.types" vendor="Eclipse Modeling Project" version="1.0.0.v201406030454" exportPackage="_Kfa6kPCMEeOEP-VOZrQAkw _KfcvwPCMEeOEP-VOZrQAkw _Kfek8PCMEeOEP-VOZrQAkw _KfgaIPCMEeOEP-VOZrQAkw _KfiPUPCMEeOEP-VOZrQAkw _KfkEgPCMEeOEP-VOZrQAkw _Kfl5sPCMEeOEP-VOZrQAkw _Kfnu4PCMEeOEP-VOZrQAkw _KfpkEPCMEeOEP-VOZrQAkw" base_Component="_KfUM4PCMEeOEP-VOZrQAkw" name="Papyrus UML ElementType Service" isIncubation="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kfa6kPCMEeOEP-VOZrQAkw" base_Package="_KfZscPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfcvwPCMEeOEP-VOZrQAkw" base_Package="_KfbhoPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kfek8PCMEeOEP-VOZrQAkw" base_Package="_KfdW0PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfgaIPCMEeOEP-VOZrQAkw" base_Package="_KffMAPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfiPUPCMEeOEP-VOZrQAkw" base_Package="_KfhBMPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfkEgPCMEeOEP-VOZrQAkw" base_Package="_Kfi2YPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kfl5sPCMEeOEP-VOZrQAkw" base_Package="_KfkrkPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kfnu4PCMEeOEP-VOZrQAkw" base_Package="_KfmgwPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KfpkEPCMEeOEP-VOZrQAkw" base_Package="_KfoV8PCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_KfsAUPCMEeOEP-VOZrQAkw" base_Dependency="_KfqLIPCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_Kft1gPCMEeOEP-VOZrQAkw" base_Dependency="_KfsAUfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:Plugin xmi:id="_KfvqsPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.gmf.runtime.common.core.internal.CommonCorePlugin" localization="plugin" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.gmf.runtime.common.core" vendor="Eclipse Modeling Project" version="1.7.0.201405281701" exportPackage="_Kf1KQPCMEeOEP-VOZrQAkw _Kf2_cPCMEeOEP-VOZrQAkw _Kf40oPCMEeOEP-VOZrQAkw _Kf6p0PCMEeOEP-VOZrQAkw _Kf8fAPCMEeOEP-VOZrQAkw _Kf-UMPCMEeOEP-VOZrQAkw _KgAJYPCMEeOEP-VOZrQAkw" base_Component="_KfuckPCMEeOEP-VOZrQAkw" name="GMF Common Core"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kf1KQPCMEeOEP-VOZrQAkw" base_Package="_Kfz8IPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kf2_cPCMEeOEP-VOZrQAkw" base_Package="_Kf1xUPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kf40oPCMEeOEP-VOZrQAkw" base_Package="_Kf3mgPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kf6p0PCMEeOEP-VOZrQAkw" base_Package="_Kf5bsPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kf8fAPCMEeOEP-VOZrQAkw" base_Package="_Kf7Q4PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_Kf-UMPCMEeOEP-VOZrQAkw" base_Package="_Kf9GEPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KgAJYPCMEeOEP-VOZrQAkw" base_Package="_Kf-UMfCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_KgCloPCMEeOEP-VOZrQAkw" base_Dependency="_KgAwcPCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_KgEa0PCMEeOEP-VOZrQAkw" base_Dependency="_KgClofCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_KgGQAPCMEeOEP-VOZrQAkw" base_Dependency="_KgFB4PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:Plugin xmi:id="_KgIFMPCMEeOEP-VOZrQAkw" hasLazyActivationPolicy="true" activator="org.eclipse.papyrus.infra.tools.Activator" requiredExecutionEnvironment="J2SE-1.5" symbolicName="org.eclipse.papyrus.infra.tools" vendor="Eclipse Modeling Project" version="1.0.0.v201406030454" exportPackage="_KgNkwPCMEeOEP-VOZrQAkw _KgPZ8PCMEeOEP-VOZrQAkw _KgRPIPCMEeOEP-VOZrQAkw _KgTEUPCMEeOEP-VOZrQAkw _KgUScPCMEeOEP-VOZrQAkw _KgWusPCMEeOEP-VOZrQAkw" base_Component="_KgG3EPCMEeOEP-VOZrQAkw" name="Papyrus Tools" isIncubation="true"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KgNkwPCMEeOEP-VOZrQAkw" base_Package="_KgMWoPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KgPZ8PCMEeOEP-VOZrQAkw" base_Package="_KgOL0PCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KgRPIPCMEeOEP-VOZrQAkw" base_Package="_KgQBAPCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KgTEUPCMEeOEP-VOZrQAkw" base_Package="_KgRPIfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KgUScPCMEeOEP-VOZrQAkw" base_Package="_KgTEUfCMEeOEP-VOZrQAkw"/>
+  <ADL4Eclipse:EclipseExportedPackage xmi:id="_KgWusPCMEeOEP-VOZrQAkw" base_Package="_KgU5gPCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_KgZK8PCMEeOEP-VOZrQAkw" base_Dependency="_KgXVwPCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_KgbAIPCMEeOEP-VOZrQAkw" base_Dependency="_KgZK8fCMEeOEP-VOZrQAkw"/>
+  <ModuleLayer:BundleReference xmi:id="_Kgc1UPCMEeOEP-VOZrQAkw" base_Dependency="_KgbnMPCMEeOEP-VOZrQAkw"/>
+  <structure:UserDoc xmi:id="_OHG5gPC5EeOVd6MoZuILbA" base_Comment="_LfJYwPC5EeOVd6MoZuILbA"/>
+  <structure:UserDoc xmi:id="_uC45oPC5EeOVd6MoZuILbA" base_Comment="_P_VmcPC5EeOVd6MoZuILbA"/>
+  <structure:UserDoc xmi:id="_wAf10PC5EeOVd6MoZuILbA" base_Comment="_QuekYPC5EeOVd6MoZuILbA"/>
+  <structure:UserDoc xmi:id="_nud3UPE_EeOsMc9uAZsKjQ" base_Comment="_Y6GWAPE9EeOsMc9uAZsKjQ"/>
+  <structure:UserDoc xmi:id="_omHRAPE_EeOsMc9uAZsKjQ" base_Comment="_Zlv7EPE9EeOsMc9uAZsKjQ"/>
+  <structure:UserDoc xmi:id="_pV-nsPE_EeOsMc9uAZsKjQ" base_Comment="_aJwAAPE9EeOsMc9uAZsKjQ"/>
+  <Document:Document xmi:id="_C07_QPFJEeOieZKVW9xRxg" base_Model="_C04U4PFJEeOieZKVW9xRxg" author="CEA LIST" version="0.2"/>
+  <Document:Section xmi:id="_C1AQsPFJEeOieZKVW9xRxg" base_Package="_C090cPFJEeOieZKVW9xRxg"/>
+  <Document:Content xmi:id="_C1GXUPFJEeOieZKVW9xRxg" base_Comment="_C1D7EPFJEeOieZKVW9xRxg"/>
+  <Document:Content xmi:id="_C1L24PFJEeOieZKVW9xRxg" base_Comment="_C1JaoPFJEeOieZKVW9xRxg"/>
+  <Document:Content xmi:id="_C1QIUPFJEeOieZKVW9xRxg" base_Comment="_C1OTIPFJEeOieZKVW9xRxg"/>
+  <Document:Content xmi:id="_C1UZwPFJEeOieZKVW9xRxg" base_Comment="_C1SkkPFJEeOieZKVW9xRxg"/>
+  <Document:Content xmi:id="_C1Z5UPFJEeOieZKVW9xRxg" base_Comment="_C1W2APFJEeOieZKVW9xRxg"/>
+  <Document:Section xmi:id="_C1djsPFJEeOieZKVW9xRxg" base_Package="_C1bHcPFJEeOieZKVW9xRxg"/>
+  <Document:ImageRef xmi:id="_C3ye8PFJEeOieZKVW9xRxg" base_Comment="_C3wCsPFJEeOieZKVW9xRxg" ref="C:/git/org.eclipse.papyrus/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/UseCaseDiagram.png"/>
+  <Document:Section xmi:id="_C307MPFJEeOieZKVW9xRxg" base_Package="_C3zGAPFJEeOieZKVW9xRxg"/>
+  <Document:Content xmi:id="_C33XcPFJEeOieZKVW9xRxg" base_Comment="_C32JUPFJEeOieZKVW9xRxg"/>
+  <Document:Section xmi:id="_C35zsPFJEeOieZKVW9xRxg" base_Package="_C33-gPFJEeOieZKVW9xRxg"/>
+  <Document:Content xmi:id="_C38P8PFJEeOieZKVW9xRxg" base_Comment="_C36awPFJEeOieZKVW9xRxg"/>
+  <Document:ImageRef xmi:id="_C3-sMPFJEeOieZKVW9xRxg" base_Comment="_C383APFJEeOieZKVW9xRxg" ref="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\EnableCreationMenu.png"/>
+  <Document:Section xmi:id="_C4BIcPFJEeOieZKVW9xRxg" base_Package="_C3_TQPFJEeOieZKVW9xRxg"/>
+  <Document:Content xmi:id="_C4DksPFJEeOieZKVW9xRxg" base_Comment="_C4BvgPFJEeOieZKVW9xRxg"/>
+  <Document:Section xmi:id="_C4GA8PFJEeOieZKVW9xRxg" base_Package="_C4ELwPFJEeOieZKVW9xRxg"/>
+  <Document:Content xmi:id="_C4H2IPFJEeOieZKVW9xRxg" base_Comment="_C4GoAPFJEeOieZKVW9xRxg"/>
+  <Document:Content xmi:id="_C4KSYPFJEeOieZKVW9xRxg" base_Comment="_C4IdMPFJEeOieZKVW9xRxg"/>
+  <Document:ImageRef xmi:id="_C4MuoPFJEeOieZKVW9xRxg" base_Comment="_C4K5cPFJEeOieZKVW9xRxg" ref="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\PackageWithIconO.png"/>
+  <Document:ImageRef xmi:id="_C4PK4PFJEeOieZKVW9xRxg" base_Comment="_C4NVsPFJEeOieZKVW9xRxg" ref="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\PackageWithIconOIllustration.png"/>
+  <Document:Content xmi:id="_C4RnIPFJEeOieZKVW9xRxg" base_Comment="_C4Px8PFJEeOieZKVW9xRxg"/>
+  <Document:ImageRef xmi:id="_C4UDYPFJEeOieZKVW9xRxg" base_Comment="_C4SOMPFJEeOieZKVW9xRxg" ref="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\NestedClassifierIllustration.png"/>
+  <Document:ImageRef xmi:id="_C4XGsPFJEeOieZKVW9xRxg" base_Comment="_C4UqcPFJEeOieZKVW9xRxg" ref="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\NestedClassifier.png"/>
+  <Document:Content xmi:id="_C4Zi8PFJEeOieZKVW9xRxg" base_Comment="_C4XtwPFJEeOieZKVW9xRxg"/>
+  <Document:ImageRef xmi:id="_C4b_MPFJEeOieZKVW9xRxg" base_Comment="_C4aKAPFJEeOieZKVW9xRxg" ref="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\AllPossibleActivities.png"/>
+  <Document:ImageRef xmi:id="_C4ebcPFJEeOieZKVW9xRxg" base_Comment="_C4cmQPFJEeOieZKVW9xRxg" ref="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\AllPossibleActivitiesIllustration.png"/>
+  <Document:Section xmi:id="_C4g3sPFJEeOieZKVW9xRxg" base_Package="_C4fCgPFJEeOieZKVW9xRxg"/>
+  <Document:Content xmi:id="_C4jT8PFJEeOieZKVW9xRxg" base_Comment="_C4hewPFJEeOieZKVW9xRxg"/>
+  <Document:Section xmi:id="_C4lwMPFJEeOieZKVW9xRxg" base_Package="_C4j7APFJEeOieZKVW9xRxg"/>
+  <Document:Content xmi:id="_C4nlYPFJEeOieZKVW9xRxg" base_Comment="_C4mXQPFJEeOieZKVW9xRxg"/>
+  <Document:Section xmi:id="_C4qBoPFJEeOieZKVW9xRxg" base_Package="_C4oMcPFJEeOieZKVW9xRxg"/>
+  <Document:Content xmi:id="_C4sd4PFJEeOieZKVW9xRxg" base_Comment="_C4qosPFJEeOieZKVW9xRxg"/>
+  <Document:Section xmi:id="_C4uTEPFJEeOieZKVW9xRxg" base_Package="_C4tE8PFJEeOieZKVW9xRxg"/>
+  <Document:Content xmi:id="_C4wvUPFJEeOieZKVW9xRxg" base_Comment="_C4u6IPFJEeOieZKVW9xRxg"/>
+  <Document:Section xmi:id="_C4zLkPFJEeOieZKVW9xRxg" base_Package="_C4xWYPFJEeOieZKVW9xRxg"/>
+  <Document:ImageRef xmi:id="_C6TncPFJEeOieZKVW9xRxg" base_Comment="_C6RyQPFJEeOieZKVW9xRxg" ref="C:/git/org.eclipse.papyrus/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/Architecture.png"/>
+  <Document:Content xmi:id="_C6WDsPFJEeOieZKVW9xRxg" base_Comment="_C6U1kPFJEeOieZKVW9xRxg"/>
+  <Document:ImageRef xmi:id="_C7YlgPFJEeOieZKVW9xRxg" base_Comment="_C7WwUPFJEeOieZKVW9xRxg" ref="C:/git/org.eclipse.papyrus/plugins/infra/org.eclipse.papyrus.infra.newchild/doc/imgDOC/NewDiagram.png"/>
+  <Document:Content xmi:id="_C7bBwPFJEeOieZKVW9xRxg" base_Comment="_C7ZzoPFJEeOieZKVW9xRxg"/>
+  <Document:ImageRef xmi:id="_C7deAPFJEeOieZKVW9xRxg" base_Comment="_C7cP4PFJEeOieZKVW9xRxg" ref="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\MenuExample.png"/>
+  <Document:ImageRef xmi:id="_C7f6QPFJEeOieZKVW9xRxg" base_Comment="_C7esIPFJEeOieZKVW9xRxg" ref="C:\git\org.eclipse.papyrus\plugins\infra\org.eclipse.papyrus.infra.newchild\doc\imgDOC\codeXML.PNG"/>
+  <Document:Content xmi:id="_C7iWgPFJEeOieZKVW9xRxg" base_Comment="_C7hIYPFJEeOieZKVW9xRxg"/>
+  <Document:Section xmi:id="_C7kywPFJEeOieZKVW9xRxg" base_Package="_C7i9kPFJEeOieZKVW9xRxg"/>
+  <Document:Section xmi:id="_C7nPAPFJEeOieZKVW9xRxg" base_Package="_C7lZ0PFJEeOieZKVW9xRxg"/>
+  <Document:Section xmi:id="_C7prQPFJEeOieZKVW9xRxg" base_Package="_C7n2EPFJEeOieZKVW9xRxg"/>
+  <Document:Section xmi:id="_C7sHgPFJEeOieZKVW9xRxg" base_Package="_C7qSUPFJEeOieZKVW9xRxg"/>
+  <Document:Section xmi:id="_C7ujwPFJEeOieZKVW9xRxg" base_Package="_C7tVoPFJEeOieZKVW9xRxg"/>
+  <Document:Section xmi:id="_C7xAAPFJEeOieZKVW9xRxg" base_Package="_C7vx4PFJEeOieZKVW9xRxg"/>
+  <Document:Section xmi:id="_C7zcQPFJEeOieZKVW9xRxg" base_Package="_C7yOIPFJEeOieZKVW9xRxg"/>
+</xmi:XMI>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.properties b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/plugin.properties
index d536a86344a..d536a86344a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.properties
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/plugin.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.xml b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/plugin.xml
index 932b305a4bf..932b305a4bf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.xml
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/plugin.xml
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/pom.xml b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/pom.xml
index c1b9bc94d48..07c3dbc2571 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/pom.xml
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-newchild</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.newchild</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.ecore b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.ecore
index 0b99f66f1d0..0b99f66f1d0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.ecore
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.ecore
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.genmodel b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.genmodel
index a6b4d18dc0f..a6b4d18dc0f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.genmodel
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.genmodel
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/schema/org.eclipse.papyrus.infra.newchild.exsd b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/schema/org.eclipse.papyrus.infra.newchild.exsd
index 6771f72a294..5babf641b01 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/schema/org.eclipse.papyrus.infra.newchild.exsd
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/schema/org.eclipse.papyrus.infra.newchild.exsd
@@ -1,107 +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>

+<?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-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/CreateRelationshipMenu.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/CreateRelationshipMenu.java
index db813e7631d..db813e7631d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/CreateRelationshipMenu.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/CreateRelationshipMenu.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/CreationMenu.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/CreationMenu.java
index ba6842d7afd..ba6842d7afd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/CreationMenu.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/CreationMenu.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/ElementCreationMenuModelFactory.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/ElementCreationMenuModelFactory.java
index 2719cab7a04..2719cab7a04 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/ElementCreationMenuModelFactory.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/ElementCreationMenuModelFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/ElementCreationMenuModelPackage.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/ElementCreationMenuModelPackage.java
index 1c0a1e77d2b..1c0a1e77d2b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/ElementCreationMenuModelPackage.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/ElementCreationMenuModelPackage.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Folder.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Folder.java
index 1ecd7979991..1ecd7979991 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Folder.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Folder.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Menu.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Menu.java
index e71fe059789..e71fe059789 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Menu.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/Menu.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/CreateRelationshipMenuImpl.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/CreateRelationshipMenuImpl.java
index ce410f3c31c..ce410f3c31c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/CreateRelationshipMenuImpl.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/CreateRelationshipMenuImpl.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/CreationMenuImpl.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/CreationMenuImpl.java
index 84811b4abb8..84811b4abb8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/CreationMenuImpl.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/CreationMenuImpl.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/ElementCreationMenuModelFactoryImpl.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/ElementCreationMenuModelFactoryImpl.java
index a72d9a71ea4..a72d9a71ea4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/ElementCreationMenuModelFactoryImpl.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/ElementCreationMenuModelFactoryImpl.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/ElementCreationMenuModelPackageImpl.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/ElementCreationMenuModelPackageImpl.java
index 4f66c25e18f..4f66c25e18f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/ElementCreationMenuModelPackageImpl.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/ElementCreationMenuModelPackageImpl.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/FolderImpl.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/FolderImpl.java
index ec01fef8f87..ec01fef8f87 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/FolderImpl.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/FolderImpl.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/MenuImpl.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/MenuImpl.java
index 42db1f7c0eb..42db1f7c0eb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/MenuImpl.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/impl/MenuImpl.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelAdapterFactory.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelAdapterFactory.java
index a1631710f05..a1631710f05 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelAdapterFactory.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelAdapterFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelResourceFactoryImpl.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelResourceFactoryImpl.java
index 96a82ed16b7..96a82ed16b7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelResourceFactoryImpl.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelResourceFactoryImpl.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelResourceImpl.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelResourceImpl.java
index 71fa2107a43..71fa2107a43 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelResourceImpl.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelResourceImpl.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelSwitch.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelSwitch.java
index 0760ebe29a9..0760ebe29a9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelSwitch.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelSwitch.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelXMLProcessor.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelXMLProcessor.java
index 5af50b5eb4d..5af50b5eb4d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelXMLProcessor.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src-gen/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/ElementCreationMenuModelXMLProcessor.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/Activator.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/Activator.java
index 60eabeff67e..60eabeff67e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/Activator.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/Activator.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java
index 905147763b1..ae2fda9fa0a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java
@@ -42,6 +42,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.papyrus.infra.core.resource.IModel;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
 import org.eclipse.papyrus.infra.filters.Filter;
@@ -383,7 +384,7 @@ public class CreationMenuFactory {
 		}
 
 		if (createGMFCommand != null) {
-			Command emfCommand = org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper.wrap(createGMFCommand);
+			Command emfCommand = GMFtoEMFCommandWrapper.wrap(createGMFCommand);
 			return emfCommand;
 		}
 		return UnexecutableCommand.INSTANCE;
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuListener.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuListener.java
index 99f9786fe7e..17aabab35bc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuListener.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuListener.java
@@ -1,65 +1,65 @@
-/*****************************************************************************

- * 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);

-	}

-

-

-

+/*****************************************************************************
+ * 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/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuRegistry.java
index a5707b67310..a5707b67310 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuRegistry.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuRegistry.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/SetTargetAndRelationshipCommand.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/SetTargetAndRelationshipCommand.java
index 8972c13019d..c5136828bab 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/SetTargetAndRelationshipCommand.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/SetTargetAndRelationshipCommand.java
@@ -28,7 +28,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
 import org.eclipse.papyrus.infra.widgets.editors.ITreeSelectorDialog;
 
@@ -95,7 +95,7 @@ public class SetTargetAndRelationshipCommand extends AbstractCommand {
 				throw new OperationCanceledException();
 			}
 
-			emfCommand = new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(createGMFCommand);
+			emfCommand = new GMFtoEMFCommandWrapper(createGMFCommand);
 			emfCommand.execute();
 			CommandResult commandResult = createGMFCommand.getCommandResult();
 			return commandResult;
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/CustomElementCreationMenuModelResource.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/CustomElementCreationMenuModelResource.java
index e955f1b041f..e955f1b041f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/CustomElementCreationMenuModelResource.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/CustomElementCreationMenuModelResource.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/CustomElementCreationMenuModelResourceFactory.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/CustomElementCreationMenuModelResourceFactory.java
index ca3dd98ece7..ca3dd98ece7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/CustomElementCreationMenuModelResourceFactory.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/elementcreationmenumodel/util/CustomElementCreationMenuModelResourceFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ui/DynamicNewChild.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ui/DynamicNewChild.java
index 8356d1ea7a1..38a78662edb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ui/DynamicNewChild.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ui/DynamicNewChild.java
@@ -30,10 +30,10 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITreeSelection;
 import org.eclipse.jface.viewers.TreePath;
-import org.eclipse.papyrus.commands.Activator;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.newchild.Activator;
 import org.eclipse.papyrus.infra.newchild.CreationMenuFactory;
 import org.eclipse.papyrus.infra.newchild.CreationMenuRegistry;
 import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.Folder;
diff --git a/plugins/infra/newchild/pom.xml b/plugins/infra/newchild/pom.xml
new file mode 100644
index 00000000000..ac3c821a91a
--- /dev/null
+++ b/plugins/infra/newchild/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.infra-newchild</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+	<name>Papyrus Infra New-Child Model</name>
+	<description>The model definition for the "New Child" context menu.</description>
+
+	<modules>
+		<module>org.eclipse.papyrus.infra.newchild</module>
+		<module>org.eclipse.papyrus.infra.newchild.edit</module>
+	</modules>
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.psf/.classpath b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.psf/.classpath
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/.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/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.onefile/.project b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/.project
index 3ab9eb83cfd..ab602231128 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/.project
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.onefile</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>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.onefile</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/org.eclipse.papyrus.eclipse.project.editors/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-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

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+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
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF
index 74bd2bb9cf1..118b99ce9ac 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.onefile.model,

- org.eclipse.papyrus.infra.onefile.providers,

- org.eclipse.papyrus.infra.onefile.utils

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.core.resources;bundle-version="3.7.0",

- org.eclipse.core.runtime;bundle-version="3.7.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.onefile.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.onefile;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.onefile.model,
+ org.eclipse.papyrus.infra.onefile.providers,
+ org.eclipse.papyrus.infra.onefile.utils
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.core.resources;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.onefile.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.onefile;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/about.html b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/about.html
new file mode 100644
index 00000000000..dd3c089a94c
--- /dev/null
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/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/infra/org.eclipse.papyrus.infra.onefile/build.properties b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/build.properties
index 824dd1248b9..69eedd8463b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/build.properties
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/build.properties
@@ -1,7 +1,7 @@
-#

-#Mon Sep 12 09:29:59 CEST 2011

-bin.includes=META-INF/,.,plugin.xml,schema/,about.html,plugin.properties

-output..=bin/

-src.includes = about.html

-source..=src/

-bin..=bin/

+#
+#Mon Sep 12 09:29:59 CEST 2011
+bin.includes=META-INF/,.,plugin.xml,schema/,about.html,plugin.properties
+output..=bin/
+src.includes = about.html
+source..=src/
+bin..=bin/
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/plugin.properties b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/plugin.properties
index 0f8efca14cf..1c31b1d8f36 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/plugin.properties
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/plugin.properties
@@ -1,15 +1,15 @@
-#################################################################################

-# Copyright (c) 2011, 2016 Atos Origin, Christian W. Damus, and others.

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#   Vincent Hemery  vincent.hemery@atos.net - Initial API and implementation

-#   Christian W. Damus - bug 485220

-#   

-##################################################################################

-pluginName=Papyrus Onefile Model

-providerName=Eclipse Modeling Project

+#################################################################################
+# Copyright (c) 2011, 2016 Atos Origin, Christian W. Damus, and others.
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#   Vincent Hemery  vincent.hemery@atos.net - Initial API and implementation
+#   Christian W. Damus - bug 485220
+#   
+##################################################################################
+pluginName=Papyrus Onefile Model
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/plugin.xml b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/plugin.xml
index b4a3ef00313..b4a3ef00313 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/plugin.xml
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/plugin.xml
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/pom.xml b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/pom.xml
index ac53c9ff287..9d0f4c70d0c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/pom.xml
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-onefile</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.onefile</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/schema/modelFactory.exsd b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/schema/modelFactory.exsd
index fc5fb322311..b10b880517c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/schema/modelFactory.exsd
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/schema/modelFactory.exsd
@@ -1,111 +1,111 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.onefile" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.onefile" id="modelFactory" name="Model Factory"/>

-      </appinfo>

-      <documentation>

-         This extension point allows developer to change implementation of logical navigator model.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence minOccurs="1" maxOccurs="unbounded">

-            <element ref="factory" 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="factory">

-      <complexType>

-         <attribute name="instance" type="string" use="required">

-            <annotation>

-               <documentation>

-                  the instance of the factory

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.onefile.model.IPapyrusModelFactory"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-         <attribute name="priority" type="string" use="required">

-            <annotation>

-               <documentation>

-                  the content provider will use the factory with highest priority. Set a high priority and your factory will be used. 

-

-The standard factory has a priority set to 1.

-               </documentation>

-            </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>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.onefile" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.onefile" id="modelFactory" name="Model Factory"/>
+      </appinfo>
+      <documentation>
+         This extension point allows developer to change implementation of logical navigator model.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="factory" 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="factory">
+      <complexType>
+         <attribute name="instance" type="string" use="required">
+            <annotation>
+               <documentation>
+                  the instance of the factory
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.onefile.model.IPapyrusModelFactory"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+         <attribute name="priority" type="string" use="required">
+            <annotation>
+               <documentation>
+                  the content provider will use the factory with highest priority. Set a high priority and your factory will be used. 
+
+The standard factory has a priority set to 1.
+               </documentation>
+            </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.onefile/src/org/eclipse/papyrus/infra/onefile/Activator.java b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/Activator.java
index dea652ac93e..c5d26c6b258 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/Activator.java
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/Activator.java
@@ -1,75 +1,75 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2016 Atos Origin Integration, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile;

-

-import org.eclipse.core.runtime.Plugin;

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends Plugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.onefile"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see

-	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

-	 * )

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see

-	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

-	 * )

-	 */

-	@Override

-	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;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 Atos Origin Integration, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile;
+
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends Plugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.onefile"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
+	 * )
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
+	 * )
+	 */
+	@Override
+	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.onefile/src/org/eclipse/papyrus/infra/onefile/model/IPapyrusElement.java b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/IPapyrusElement.java
index 6c84a4e1790..24a93bfe147 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/IPapyrusElement.java
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/IPapyrusElement.java
@@ -1,26 +1,26 @@
-package org.eclipse.papyrus.infra.onefile.model;

-

-import org.eclipse.core.resources.IProject;

-

-/**

- * Basic operations for Papyrus Model Elements

- *

- * @author tristan.faure@atosorigin.com

- *

- */

-public interface IPapyrusElement {

-	/**

-	 * Return the text displayed for the {@link IPapyrusFile}

-	 *

-	 * @return

-	 */

-	String getText();

-

-	/**

-	 * Return the project containing the {@link IPapyrusFile}

-	 *

-	 * @return an {@link IProject}

-	 */

-	IProject getProject();

-

-}

+package org.eclipse.papyrus.infra.onefile.model;
+
+import org.eclipse.core.resources.IProject;
+
+/**
+ * Basic operations for Papyrus Model Elements
+ *
+ * @author tristan.faure@atosorigin.com
+ *
+ */
+public interface IPapyrusElement {
+	/**
+	 * Return the text displayed for the {@link IPapyrusFile}
+	 *
+	 * @return
+	 */
+	String getText();
+
+	/**
+	 * Return the project containing the {@link IPapyrusFile}
+	 *
+	 * @return an {@link IProject}
+	 */
+	IProject getProject();
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/IPapyrusFile.java b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/IPapyrusFile.java
index 7f624280be1..8665627c804 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/IPapyrusFile.java
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/IPapyrusFile.java
@@ -1,56 +1,56 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin Integration.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile.model;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.runtime.IAdaptable;

-

-/**

- * Contract for Papyrus Files representation

- *

- * @author tristan.faure@atosorigin.com

- *

- */

-public interface IPapyrusFile extends IPapyrusElement, IAdaptable {

-

-	/**

-	 * Return the resources associated to the DI, the di must be included in the

-	 * resutl

-	 *

-	 * @return

-	 */

-	IResource[] getAssociatedResources();

-

-	/**

-	 * Return the main file (normally the di)

-	 *

-	 * @return

-	 */

-	IFile getMainFile();

-

-	/**

-	 * Return the parent of the current {@link IPapyrusFile}

-	 *

-	 * @return an IContainer

-	 */

-	IContainer getParent();

-

-	/**

-	 * Return the text displayed for the {@link IPapyrusFile}

-	 *

-	 * @return

-	 */

-	String getName();

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Atos Origin Integration.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile.model;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IAdaptable;
+
+/**
+ * Contract for Papyrus Files representation
+ *
+ * @author tristan.faure@atosorigin.com
+ *
+ */
+public interface IPapyrusFile extends IPapyrusElement, IAdaptable {
+
+	/**
+	 * Return the resources associated to the DI, the di must be included in the
+	 * resutl
+	 *
+	 * @return
+	 */
+	IResource[] getAssociatedResources();
+
+	/**
+	 * Return the main file (normally the di)
+	 *
+	 * @return
+	 */
+	IFile getMainFile();
+
+	/**
+	 * Return the parent of the current {@link IPapyrusFile}
+	 *
+	 * @return an IContainer
+	 */
+	IContainer getParent();
+
+	/**
+	 * Return the text displayed for the {@link IPapyrusFile}
+	 *
+	 * @return
+	 */
+	String getName();
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/IPapyrusModelFactory.java b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/IPapyrusModelFactory.java
index 458785f50b3..a36aa621e15 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/IPapyrusModelFactory.java
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/IPapyrusModelFactory.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin Integration.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile.model;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IResource;

-

-/**

- * Factory able to create instances of model interfaces

- *

- * @author tristan.faure@atosorigin.com

- *

- */

-public interface IPapyrusModelFactory {

-

-	/**

-	 * Create an instance of {@link IPapyrusFile} with the given file

-	 *

-	 * @param file

-	 * @return

-	 */

-	IPapyrusFile createIPapyrusFile(IFile file);

-

-	/**

-	 * Create an instanceof {@link IPapyrusFile} with the given file and the

-	 * given {@link IPapyrusFile}

-	 *

-	 * @param papy

-	 * @param r

-	 * @return

-	 */

-	ISubResourceFile createISubResourceFile(IPapyrusFile papy, IFile r);

-

-	/**

-	 * Determines if the file in parameter is a di

-	 *

-	 * @param file

-	 * @return

-	 */

-	boolean isDi(IResource file);

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Atos Origin Integration.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile.model;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+
+/**
+ * Factory able to create instances of model interfaces
+ *
+ * @author tristan.faure@atosorigin.com
+ *
+ */
+public interface IPapyrusModelFactory {
+
+	/**
+	 * Create an instance of {@link IPapyrusFile} with the given file
+	 *
+	 * @param file
+	 * @return
+	 */
+	IPapyrusFile createIPapyrusFile(IFile file);
+
+	/**
+	 * Create an instanceof {@link IPapyrusFile} with the given file and the
+	 * given {@link IPapyrusFile}
+	 *
+	 * @param papy
+	 * @param r
+	 * @return
+	 */
+	ISubResourceFile createISubResourceFile(IPapyrusFile papy, IFile r);
+
+	/**
+	 * Determines if the file in parameter is a di
+	 *
+	 * @param file
+	 * @return
+	 */
+	boolean isDi(IResource file);
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/ISubResourceFile.java b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/ISubResourceFile.java
index 64b6f80878b..b5a58408687 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/ISubResourceFile.java
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/ISubResourceFile.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin Integration - CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile.model;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.runtime.IAdaptable;

-

-/**

- * Contract for elements bellow an {@link IPapyrusFile}

- *

- * @author tfaure

- *

- */

-public interface ISubResourceFile extends IPapyrusElement, IAdaptable {

-

-	/**

-	 * Returns the IFile associated to the {@link ISubResourceFile}

-	 *

-	 * @return

-	 */

-	IFile getFile();

-

-	/**

-	 * Returns the top-element (onefile) associated with this subresource

-	 *

-	 * @return

-	 */

-	IPapyrusFile getParent();

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Atos Origin Integration - CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile.model;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IAdaptable;
+
+/**
+ * Contract for elements bellow an {@link IPapyrusFile}
+ *
+ * @author tfaure
+ *
+ */
+public interface ISubResourceFile extends IPapyrusElement, IAdaptable {
+
+	/**
+	 * Returns the IFile associated to the {@link ISubResourceFile}
+	 *
+	 * @return
+	 */
+	IFile getFile();
+
+	/**
+	 * Returns the top-element (onefile) associated with this subresource
+	 *
+	 * @return
+	 */
+	IPapyrusFile getParent();
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/PapyrusModelHelper.java b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/PapyrusModelHelper.java
index a4881e2465c..dd442476dca 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/PapyrusModelHelper.java
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/PapyrusModelHelper.java
@@ -1,111 +1,111 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin Integration.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile.model;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.Comparator;

-import java.util.List;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.infra.onefile.Activator;

-import org.osgi.framework.Bundle;

-

-/**

- * Helper class able to get the correct {@link IPapyrusModelFactory}

- *

- * @author tfaure

- *

- */

-public class PapyrusModelHelper {

-

-	private static final String MODEL_FACTORY = "modelFactory";

-	static List<Segment> segments;

-

-	static {

-		IConfigurationElement[] elements = Platform

-				.getExtensionRegistry()

-				.getConfigurationElementsFor(Activator.PLUGIN_ID, MODEL_FACTORY);

-		segments = new ArrayList<PapyrusModelHelper.Segment>(elements.length);

-		for (IConfigurationElement e : elements) {

-			Segment s = new PapyrusModelHelper.Segment();

-			try {

-				s.priority = Integer.parseInt(e.getAttribute("priority"));

-				s.bundle = Platform.getBundle(e.getContributor().getName());

-				s.className = e.getAttribute("instance");

-				segments.add(s);

-			} catch (NumberFormatException ex) {

-				// in case of exception the process continue but the stack is

-				// traced

-				ex.printStackTrace();

-			}

-		}

-		// sort elements according to their priorities

-		Collections.sort(segments, new Comparator<Segment>() {

-			public int compare(Segment o1, Segment o2) {

-				Integer val1 = 0;

-				Integer val2 = 0;

-				if (o1 != null) {

-					val1 = o1.priority;

-				}

-				if (o2 != null) {

-					val2 = o2.priority;

-				}

-				return val1.compareTo(val2);

-			}

-		});

-	}

-

-	/**

-	 * get the {@link IPapyrusModelFactory} in the current platform

-	 *

-	 * @return a {@link IPapyrusModelFactory}

-	 */

-	public static IPapyrusModelFactory getPapyrusModelFactory() {

-		if (segments == null || segments.size() == 0) {

-			throw new RuntimeException(

-					"Initialisation error, please register extension to "

-							+ Activator.PLUGIN_ID + "." + MODEL_FACTORY);

-		}

-		// segments are sorted by priorities, the highest is at the end of the

-		// list

-		return segments.get(segments.size() - 1).getFactory();

-	}

-

-	/**

-	 * Utility class to save extension point information

-	 *

-	 */

-	private static class Segment {

-		public String className;

-		Bundle bundle;

-		int priority;

-		IPapyrusModelFactory instance = null;

-

-		IPapyrusModelFactory getFactory() {

-			if (instance == null) {

-				try {

-					instance = (IPapyrusModelFactory) bundle.loadClass(

-							className).newInstance();

-				} catch (InstantiationException e) {

-					e.printStackTrace();

-				} catch (IllegalAccessException e) {

-					e.printStackTrace();

-				} catch (ClassNotFoundException e) {

-					e.printStackTrace();

-				}

-			}

-			return instance;

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Atos Origin Integration.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile.model;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.papyrus.infra.onefile.Activator;
+import org.osgi.framework.Bundle;
+
+/**
+ * Helper class able to get the correct {@link IPapyrusModelFactory}
+ *
+ * @author tfaure
+ *
+ */
+public class PapyrusModelHelper {
+
+	private static final String MODEL_FACTORY = "modelFactory";
+	static List<Segment> segments;
+
+	static {
+		IConfigurationElement[] elements = Platform
+				.getExtensionRegistry()
+				.getConfigurationElementsFor(Activator.PLUGIN_ID, MODEL_FACTORY);
+		segments = new ArrayList<PapyrusModelHelper.Segment>(elements.length);
+		for (IConfigurationElement e : elements) {
+			Segment s = new PapyrusModelHelper.Segment();
+			try {
+				s.priority = Integer.parseInt(e.getAttribute("priority"));
+				s.bundle = Platform.getBundle(e.getContributor().getName());
+				s.className = e.getAttribute("instance");
+				segments.add(s);
+			} catch (NumberFormatException ex) {
+				// in case of exception the process continue but the stack is
+				// traced
+				ex.printStackTrace();
+			}
+		}
+		// sort elements according to their priorities
+		Collections.sort(segments, new Comparator<Segment>() {
+			public int compare(Segment o1, Segment o2) {
+				Integer val1 = 0;
+				Integer val2 = 0;
+				if (o1 != null) {
+					val1 = o1.priority;
+				}
+				if (o2 != null) {
+					val2 = o2.priority;
+				}
+				return val1.compareTo(val2);
+			}
+		});
+	}
+
+	/**
+	 * get the {@link IPapyrusModelFactory} in the current platform
+	 *
+	 * @return a {@link IPapyrusModelFactory}
+	 */
+	public static IPapyrusModelFactory getPapyrusModelFactory() {
+		if (segments == null || segments.size() == 0) {
+			throw new RuntimeException(
+					"Initialisation error, please register extension to "
+							+ Activator.PLUGIN_ID + "." + MODEL_FACTORY);
+		}
+		// segments are sorted by priorities, the highest is at the end of the
+		// list
+		return segments.get(segments.size() - 1).getFactory();
+	}
+
+	/**
+	 * Utility class to save extension point information
+	 *
+	 */
+	private static class Segment {
+		public String className;
+		Bundle bundle;
+		int priority;
+		IPapyrusModelFactory instance = null;
+
+		IPapyrusModelFactory getFactory() {
+			if (instance == null) {
+				try {
+					instance = (IPapyrusModelFactory) bundle.loadClass(
+							className).newInstance();
+				} catch (InstantiationException e) {
+					e.printStackTrace();
+				} catch (IllegalAccessException e) {
+					e.printStackTrace();
+				} catch (ClassNotFoundException e) {
+					e.printStackTrace();
+				}
+			}
+			return instance;
+		}
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/ModelAdapterFactory.java b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/ModelAdapterFactory.java
index a50fdeaf13a..3d90978cb8c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/ModelAdapterFactory.java
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/ModelAdapterFactory.java
@@ -1,54 +1,54 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2016 Atos Origin Integration, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *  

- *****************************************************************************/

-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;

-import org.eclipse.papyrus.infra.onefile.model.mapping.PapyrusResourceMapping;

-

-/**

- * Adapter factory to adapt {@link IPapyrusFile}

- *

- * @author tristan.faure@atosorigin.com

- */

-public class ModelAdapterFactory implements IAdapterFactory {

-

-	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {

-		if (ResourceMapping.class.equals(adapterType)) {

-			if (adaptableObject instanceof IPapyrusFile) {

-				return adapterType.cast(new PapyrusResourceMapping((IPapyrusFile) adaptableObject));

-			}

-		}

-		if (adapterType == IFile.class || adapterType == IResource.class) {

-			return adapterType.cast(((IPapyrusFile) adaptableObject).getMainFile());

-		}

-		if (Collection.class.equals(adapterType)) {

-			if (adaptableObject instanceof IPapyrusFile) {

-				return adapterType.cast(Arrays.asList(((IPapyrusFile) adaptableObject).getAssociatedResources()));

-			}

-		}

-		return null;

-	}

-

-	public Class<?>[] getAdapterList() {

-		return new Class[] { ResourceMapping.class, IFile.class, IResource.class, Collection.class };

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 Atos Origin Integration, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+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;
+import org.eclipse.papyrus.infra.onefile.model.mapping.PapyrusResourceMapping;
+
+/**
+ * Adapter factory to adapt {@link IPapyrusFile}
+ *
+ * @author tristan.faure@atosorigin.com
+ */
+public class ModelAdapterFactory implements IAdapterFactory {
+
+	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
+		if (ResourceMapping.class.equals(adapterType)) {
+			if (adaptableObject instanceof IPapyrusFile) {
+				return adapterType.cast(new PapyrusResourceMapping((IPapyrusFile) adaptableObject));
+			}
+		}
+		if (adapterType == IFile.class || adapterType == IResource.class) {
+			return adapterType.cast(((IPapyrusFile) adaptableObject).getMainFile());
+		}
+		if (Collection.class.equals(adapterType)) {
+			if (adaptableObject instanceof IPapyrusFile) {
+				return adapterType.cast(Arrays.asList(((IPapyrusFile) adaptableObject).getAssociatedResources()));
+			}
+		}
+		return null;
+	}
+
+	public Class<?>[] getAdapterList() {
+		return new Class[] { ResourceMapping.class, IFile.class, IResource.class, Collection.class };
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/SubResourceAdapterFactory.java b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/SubResourceAdapterFactory.java
index e6802247045..1ec5d8c5db9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/SubResourceAdapterFactory.java
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/SubResourceAdapterFactory.java
@@ -1,48 +1,48 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2016 Atos Origin Integration, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile.model.adapters;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.mapping.ResourceMapping;

-import org.eclipse.core.runtime.IAdapterFactory;

-import org.eclipse.papyrus.infra.onefile.model.ISubResourceFile;

-import org.eclipse.papyrus.infra.onefile.model.impl.SubResourceFile;

-import org.eclipse.papyrus.infra.onefile.model.mapping.SubResourceMapping;

-

-/**

- * Adapter Factory for {@link SubResourceFile}

- *

- * @author tristan.faure@atosorigin.com

- *

- */

-public class SubResourceAdapterFactory implements IAdapterFactory {

-

-	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {

-		if (ResourceMapping.class.equals(adapterType)) {

-			if (adaptableObject instanceof ISubResourceFile) {

-				return adapterType.cast(new SubResourceMapping((ISubResourceFile) adaptableObject));

-			}

-		} else if (IFile.class.equals(adapterType)) {

-			if (adaptableObject instanceof ISubResourceFile) {

-				return adapterType.cast(((ISubResourceFile) adaptableObject).getFile());

-			}

-		}

-		return null;

-	}

-

-	public Class<?>[] getAdapterList() {

-		return new Class[] { ResourceMapping.class, IFile.class };

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 Atos Origin Integration, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile.model.adapters;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.mapping.ResourceMapping;
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.papyrus.infra.onefile.model.ISubResourceFile;
+import org.eclipse.papyrus.infra.onefile.model.impl.SubResourceFile;
+import org.eclipse.papyrus.infra.onefile.model.mapping.SubResourceMapping;
+
+/**
+ * Adapter Factory for {@link SubResourceFile}
+ *
+ * @author tristan.faure@atosorigin.com
+ *
+ */
+public class SubResourceAdapterFactory implements IAdapterFactory {
+
+	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
+		if (ResourceMapping.class.equals(adapterType)) {
+			if (adaptableObject instanceof ISubResourceFile) {
+				return adapterType.cast(new SubResourceMapping((ISubResourceFile) adaptableObject));
+			}
+		} else if (IFile.class.equals(adapterType)) {
+			if (adaptableObject instanceof ISubResourceFile) {
+				return adapterType.cast(((ISubResourceFile) adaptableObject).getFile());
+			}
+		}
+		return null;
+	}
+
+	public Class<?>[] getAdapterList() {
+		return new Class[] { ResourceMapping.class, IFile.class };
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/impl/PapyrusFile.java b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/impl/PapyrusFile.java
index 8f42089a09a..e7888b7cfa7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/impl/PapyrusFile.java
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/impl/PapyrusFile.java
@@ -1,97 +1,97 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin Integration.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile.model.impl;

-

-import java.util.ArrayList;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

-import org.eclipse.papyrus.infra.onefile.utils.OneFileUtils;

-

-/**

- * Default Implementation of {@link IPapyrusFile}

- *

- * @author tristan.faure@atosorigin.com

- *

- */

-public class PapyrusFile implements IPapyrusFile {

-

-	private final IFile file;

-

-

-	public PapyrusFile(IFile file) {

-		this.file = file;

-	}

-

-	public IFile getMainFile() {

-		return file;

-	}

-

-	public IResource[] getAssociatedResources() {

-		ArrayList<IResource> files = new ArrayList<IResource>();

-		try {

-			for (IResource res : file.getParent().members()) {

-				if (res instanceof IFile && OneFileUtils.withoutFileExtension(file).equals(OneFileUtils.withoutFileExtension(res))) {

-					files.add(res);

-				}

-			}

-		} catch (CoreException e) {

-		}

-		return files.toArray(new IResource[] {});

-	}

-

-	public String getLabel() {

-		return file.getName();

-	}

-

-

-

-	@Override

-	public int hashCode() {

-		return getMainFile().hashCode();

-	}

-

-	@Override

-	public boolean equals(Object obj) {

-		if (obj instanceof PapyrusFile) {

-			PapyrusFile papy = (PapyrusFile) obj;

-			return getMainFile().equals(papy.getMainFile());

-		}

-		return super.equals(obj);

-	}

-

-	public IProject getProject() {

-		return file.getProject();

-	}

-

-	public IContainer getParent() {

-		return file.getParent();

-	}

-

-	public String getName() {

-		return file.getName();

-	}

-

-	public String getText() {

-		return getName().substring(0, getName().lastIndexOf('.'));

-	}

-

-	public Object getAdapter(Class adapter) {

-		return Platform.getAdapterManager().getAdapter(this, adapter);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Atos Origin Integration.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile.model.impl;
+
+import java.util.ArrayList;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;
+import org.eclipse.papyrus.infra.onefile.utils.OneFileUtils;
+
+/**
+ * Default Implementation of {@link IPapyrusFile}
+ *
+ * @author tristan.faure@atosorigin.com
+ *
+ */
+public class PapyrusFile implements IPapyrusFile {
+
+	private final IFile file;
+
+
+	public PapyrusFile(IFile file) {
+		this.file = file;
+	}
+
+	public IFile getMainFile() {
+		return file;
+	}
+
+	public IResource[] getAssociatedResources() {
+		ArrayList<IResource> files = new ArrayList<IResource>();
+		try {
+			for (IResource res : file.getParent().members()) {
+				if (res instanceof IFile && OneFileUtils.withoutFileExtension(file).equals(OneFileUtils.withoutFileExtension(res))) {
+					files.add(res);
+				}
+			}
+		} catch (CoreException e) {
+		}
+		return files.toArray(new IResource[] {});
+	}
+
+	public String getLabel() {
+		return file.getName();
+	}
+
+
+
+	@Override
+	public int hashCode() {
+		return getMainFile().hashCode();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (obj instanceof PapyrusFile) {
+			PapyrusFile papy = (PapyrusFile) obj;
+			return getMainFile().equals(papy.getMainFile());
+		}
+		return super.equals(obj);
+	}
+
+	public IProject getProject() {
+		return file.getProject();
+	}
+
+	public IContainer getParent() {
+		return file.getParent();
+	}
+
+	public String getName() {
+		return file.getName();
+	}
+
+	public String getText() {
+		return getName().substring(0, getName().lastIndexOf('.'));
+	}
+
+	public Object getAdapter(Class adapter) {
+		return Platform.getAdapterManager().getAdapter(this, adapter);
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/impl/PapyrusModelFactory.java b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/impl/PapyrusModelFactory.java
index b36588251ba..db0a9390b1f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/impl/PapyrusModelFactory.java
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/impl/PapyrusModelFactory.java
@@ -1,35 +1,35 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin Integration.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile.model.impl;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;

-import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

-import org.eclipse.papyrus.infra.onefile.model.IPapyrusModelFactory;

-import org.eclipse.papyrus.infra.onefile.model.ISubResourceFile;

-

-public class PapyrusModelFactory implements IPapyrusModelFactory {

-

-	public IPapyrusFile createIPapyrusFile(IFile file) {

-		return new PapyrusFile(file);

-	}

-

-	public ISubResourceFile createISubResourceFile(IPapyrusFile papy, IFile r) {

-		return new SubResourceFile(papy, r);

-	}

-

-	public boolean isDi(IResource file) {

-		return DiModel.DI_FILE_EXTENSION.equals(file.getFileExtension());

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Atos Origin Integration.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile.model.impl;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;
+import org.eclipse.papyrus.infra.onefile.model.IPapyrusModelFactory;
+import org.eclipse.papyrus.infra.onefile.model.ISubResourceFile;
+
+public class PapyrusModelFactory implements IPapyrusModelFactory {
+
+	public IPapyrusFile createIPapyrusFile(IFile file) {
+		return new PapyrusFile(file);
+	}
+
+	public ISubResourceFile createISubResourceFile(IPapyrusFile papy, IFile r) {
+		return new SubResourceFile(papy, r);
+	}
+
+	public boolean isDi(IResource file) {
+		return DiModel.DI_FILE_EXTENSION.equals(file.getFileExtension());
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/impl/SubResourceFile.java b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/impl/SubResourceFile.java
index 80e1aa52c38..3ddcf35ad8d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/impl/SubResourceFile.java
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/impl/SubResourceFile.java
@@ -1,64 +1,64 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin Integration.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile.model.impl;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

-import org.eclipse.papyrus.infra.onefile.model.ISubResourceFile;

-

-/**

- * Default implementation of {@link ISubResourceFile}

- *

- * @author tristan.faure@atosorigin.com

- *

- */

-public class SubResourceFile implements ISubResourceFile {

-

-	private IPapyrusFile parent;

-

-	private final IFile subResource;

-

-	public SubResourceFile(IPapyrusFile papy, IFile r) {

-		this.parent = papy;

-		this.subResource = r;

-

-	}

-

-	public IProject getProject() {

-		return subResource.getProject();

-	}

-

-	@Override

-	public String toString() {

-		String fileExtension = subResource.getFileExtension();

-		return fileExtension != null ? fileExtension : subResource.getName();

-	}

-

-	public IFile getFile() {

-		return subResource;

-	}

-

-	public String getText() {

-		return toString();

-	}

-

-	public Object getAdapter(Class adapter) {

-		return Platform.getAdapterManager().getAdapter(this, adapter);

-	}

-

-	public IPapyrusFile getParent() {

-		return parent;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Atos Origin Integration.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile.model.impl;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;
+import org.eclipse.papyrus.infra.onefile.model.ISubResourceFile;
+
+/**
+ * Default implementation of {@link ISubResourceFile}
+ *
+ * @author tristan.faure@atosorigin.com
+ *
+ */
+public class SubResourceFile implements ISubResourceFile {
+
+	private IPapyrusFile parent;
+
+	private final IFile subResource;
+
+	public SubResourceFile(IPapyrusFile papy, IFile r) {
+		this.parent = papy;
+		this.subResource = r;
+
+	}
+
+	public IProject getProject() {
+		return subResource.getProject();
+	}
+
+	@Override
+	public String toString() {
+		String fileExtension = subResource.getFileExtension();
+		return fileExtension != null ? fileExtension : subResource.getName();
+	}
+
+	public IFile getFile() {
+		return subResource;
+	}
+
+	public String getText() {
+		return toString();
+	}
+
+	public Object getAdapter(Class adapter) {
+		return Platform.getAdapterManager().getAdapter(this, adapter);
+	}
+
+	public IPapyrusFile getParent() {
+		return parent;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/mapping/PapyrusResourceMapping.java b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/mapping/PapyrusResourceMapping.java
index 4752a3d8936..f41a182ea02 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/mapping/PapyrusResourceMapping.java
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/mapping/PapyrusResourceMapping.java
@@ -1,84 +1,84 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin Integration.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile.model.mapping;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceVisitor;

-import org.eclipse.core.resources.mapping.ResourceMapping;

-import org.eclipse.core.resources.mapping.ResourceMappingContext;

-import org.eclipse.core.resources.mapping.ResourceTraversal;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

-import org.eclipse.papyrus.infra.onefile.model.PapyrusModelHelper;

-import org.eclipse.papyrus.infra.onefile.providers.OneFileModelProvider;

-

-/**

- * Resource Mapping for Papyrus File

- *

- */

-public class PapyrusResourceMapping extends ResourceMapping {

-

-	private final IPapyrusFile papyrusFile;

-

-	public PapyrusResourceMapping(IPapyrusFile adaptableObject) {

-		this.papyrusFile = adaptableObject;

-	}

-

-	public PapyrusResourceMapping(IFile resource) {

-		this.papyrusFile = PapyrusModelHelper.getPapyrusModelFactory()

-				.createIPapyrusFile(resource);

-	}

-

-	@Override

-	public Object getModelObject() {

-		return papyrusFile;

-	}

-

-	@Override

-	public String getModelProviderId() {

-		return OneFileModelProvider.MODEL_PROVIDER_ID;

-	}

-

-	@Override

-	public IProject[] getProjects() {

-		return new IProject[] { papyrusFile.getProject() };

-	}

-

-	@Override

-	public ResourceTraversal[] getTraversals(ResourceMappingContext context,

-			IProgressMonitor monitor) throws CoreException {

-		// if (ResourceMappingContext.LOCAL_CONTEXT == context)

-		// {

-		// return new ResourceTraversal[]{new ResourceTraversal(new

-		// IResource[]{papyrusFile.get()}, IResource.DEPTH_ONE,

-		// IResource.NONE)};

-		// }

-		// else

-		// {

-		return new ResourceTraversal[] { new ResourceTraversal(

-				papyrusFile.getAssociatedResources(), IResource.DEPTH_INFINITE,

-				IResource.NONE) };

-		// }

-

-	}

-

-	@Override

-	public void accept(ResourceMappingContext context,

-			IResourceVisitor visitor, IProgressMonitor monitor)

-			throws CoreException {

-		super.accept(context, visitor, monitor);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Atos Origin Integration.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile.model.mapping;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.core.resources.mapping.ResourceMapping;
+import org.eclipse.core.resources.mapping.ResourceMappingContext;
+import org.eclipse.core.resources.mapping.ResourceTraversal;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;
+import org.eclipse.papyrus.infra.onefile.model.PapyrusModelHelper;
+import org.eclipse.papyrus.infra.onefile.providers.OneFileModelProvider;
+
+/**
+ * Resource Mapping for Papyrus File
+ *
+ */
+public class PapyrusResourceMapping extends ResourceMapping {
+
+	private final IPapyrusFile papyrusFile;
+
+	public PapyrusResourceMapping(IPapyrusFile adaptableObject) {
+		this.papyrusFile = adaptableObject;
+	}
+
+	public PapyrusResourceMapping(IFile resource) {
+		this.papyrusFile = PapyrusModelHelper.getPapyrusModelFactory()
+				.createIPapyrusFile(resource);
+	}
+
+	@Override
+	public Object getModelObject() {
+		return papyrusFile;
+	}
+
+	@Override
+	public String getModelProviderId() {
+		return OneFileModelProvider.MODEL_PROVIDER_ID;
+	}
+
+	@Override
+	public IProject[] getProjects() {
+		return new IProject[] { papyrusFile.getProject() };
+	}
+
+	@Override
+	public ResourceTraversal[] getTraversals(ResourceMappingContext context,
+			IProgressMonitor monitor) throws CoreException {
+		// if (ResourceMappingContext.LOCAL_CONTEXT == context)
+		// {
+		// return new ResourceTraversal[]{new ResourceTraversal(new
+		// IResource[]{papyrusFile.get()}, IResource.DEPTH_ONE,
+		// IResource.NONE)};
+		// }
+		// else
+		// {
+		return new ResourceTraversal[] { new ResourceTraversal(
+				papyrusFile.getAssociatedResources(), IResource.DEPTH_INFINITE,
+				IResource.NONE) };
+		// }
+
+	}
+
+	@Override
+	public void accept(ResourceMappingContext context,
+			IResourceVisitor visitor, IProgressMonitor monitor)
+			throws CoreException {
+		super.accept(context, visitor, monitor);
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/mapping/SubResourceMapping.java b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/mapping/SubResourceMapping.java
index 1f436dc1162..770c35993e8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/mapping/SubResourceMapping.java
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/mapping/SubResourceMapping.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin Integration.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile.model.mapping;

-

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceVisitor;

-import org.eclipse.core.resources.mapping.ResourceMapping;

-import org.eclipse.core.resources.mapping.ResourceMappingContext;

-import org.eclipse.core.resources.mapping.ResourceTraversal;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.papyrus.infra.onefile.model.ISubResourceFile;

-import org.eclipse.papyrus.infra.onefile.providers.OneFileModelProvider;

-

-public class SubResourceMapping extends ResourceMapping {

-	private final ISubResourceFile file;

-

-	public SubResourceMapping(ISubResourceFile adaptableObject) {

-		this.file = adaptableObject;

-	}

-

-	@Override

-	public Object getModelObject() {

-		return file;

-	}

-

-	@Override

-	public String getModelProviderId() {

-		return OneFileModelProvider.MODEL_PROVIDER_ID;

-	}

-

-	@Override

-	public IProject[] getProjects() {

-		return new IProject[] { file.getProject() };

-	}

-

-	@Override

-	public ResourceTraversal[] getTraversals(ResourceMappingContext context,

-			IProgressMonitor monitor) throws CoreException {

-		// if (ResourceMappingContext.LOCAL_CONTEXT == context)

-		// {

-		// return new ResourceTraversal[]{new ResourceTraversal(new

-		// IResource[]{papyrusFile.get()}, IResource.DEPTH_ONE,

-		// IResource.NONE)};

-		// }

-		// else

-		// {

-		return new ResourceTraversal[] { new ResourceTraversal(

-				new IResource[] { file.getFile() }, IResource.DEPTH_INFINITE,

-				IResource.NONE) };

-		// }

-

-	}

-

-	@Override

-	public void accept(ResourceMappingContext context,

-			IResourceVisitor visitor, IProgressMonitor monitor)

-			throws CoreException {

-		super.accept(context, visitor, monitor);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Atos Origin Integration.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile.model.mapping;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.core.resources.mapping.ResourceMapping;
+import org.eclipse.core.resources.mapping.ResourceMappingContext;
+import org.eclipse.core.resources.mapping.ResourceTraversal;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.papyrus.infra.onefile.model.ISubResourceFile;
+import org.eclipse.papyrus.infra.onefile.providers.OneFileModelProvider;
+
+public class SubResourceMapping extends ResourceMapping {
+	private final ISubResourceFile file;
+
+	public SubResourceMapping(ISubResourceFile adaptableObject) {
+		this.file = adaptableObject;
+	}
+
+	@Override
+	public Object getModelObject() {
+		return file;
+	}
+
+	@Override
+	public String getModelProviderId() {
+		return OneFileModelProvider.MODEL_PROVIDER_ID;
+	}
+
+	@Override
+	public IProject[] getProjects() {
+		return new IProject[] { file.getProject() };
+	}
+
+	@Override
+	public ResourceTraversal[] getTraversals(ResourceMappingContext context,
+			IProgressMonitor monitor) throws CoreException {
+		// if (ResourceMappingContext.LOCAL_CONTEXT == context)
+		// {
+		// return new ResourceTraversal[]{new ResourceTraversal(new
+		// IResource[]{papyrusFile.get()}, IResource.DEPTH_ONE,
+		// IResource.NONE)};
+		// }
+		// else
+		// {
+		return new ResourceTraversal[] { new ResourceTraversal(
+				new IResource[] { file.getFile() }, IResource.DEPTH_INFINITE,
+				IResource.NONE) };
+		// }
+
+	}
+
+	@Override
+	public void accept(ResourceMappingContext context,
+			IResourceVisitor visitor, IProgressMonitor monitor)
+			throws CoreException {
+		super.accept(context, visitor, monitor);
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/OneFileModelProvider.java b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/OneFileModelProvider.java
index a5a5ce07791..c9e6139f7f3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/OneFileModelProvider.java
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/providers/OneFileModelProvider.java
@@ -1,63 +1,63 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin Integration.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile.providers;

-

-import org.eclipse.core.internal.resources.mapping.SimpleResourceMapping;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.mapping.ModelProvider;

-import org.eclipse.core.resources.mapping.ResourceMapping;

-import org.eclipse.core.resources.mapping.ResourceMappingContext;

-import org.eclipse.core.resources.mapping.ResourceTraversal;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.papyrus.infra.onefile.model.mapping.PapyrusResourceMapping;

-import org.eclipse.papyrus.infra.onefile.utils.OneFileUtils;

-

-@SuppressWarnings("restriction")

-public class OneFileModelProvider extends ModelProvider {

-

-	public static String MODEL_PROVIDER_ID = "org.eclipse.papyrus.infra.onefile.modelProvider";

-

-	public OneFileModelProvider() {

-	}

-

-	@Override

-	public ResourceMapping[] getMappings(IResource resource, ResourceMappingContext context, IProgressMonitor monitor) {

-		if (OneFileUtils.isDi(resource)) {

-			return new ResourceMapping[] { new PapyrusResourceMapping((IFile) resource) };

-		}

-		return new ResourceMapping[] { new SimpleResourceMapping(resource) };

-	}

-

-	@Override

-	public ResourceMapping[] getMappings(IResource[] resources, ResourceMappingContext context, IProgressMonitor monitor) throws CoreException {

-		return super.getMappings(resources, context, monitor);

-	}

-

-	@Override

-	public ResourceTraversal[] getTraversals(ResourceMapping[] mappings, ResourceMappingContext context, IProgressMonitor monitor) throws CoreException {

-		return super.getTraversals(mappings, context, monitor);

-	}

-

-	@Override

-	public ResourceMapping[] getMappings(ResourceTraversal[] traversals, ResourceMappingContext context, IProgressMonitor monitor) throws CoreException {

-		return super.getMappings(traversals, context, monitor);

-	}

-

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class adapter) {

-		return super.getAdapter(adapter);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Atos Origin Integration.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile.providers;
+
+import org.eclipse.core.internal.resources.mapping.SimpleResourceMapping;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.mapping.ModelProvider;
+import org.eclipse.core.resources.mapping.ResourceMapping;
+import org.eclipse.core.resources.mapping.ResourceMappingContext;
+import org.eclipse.core.resources.mapping.ResourceTraversal;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.papyrus.infra.onefile.model.mapping.PapyrusResourceMapping;
+import org.eclipse.papyrus.infra.onefile.utils.OneFileUtils;
+
+@SuppressWarnings("restriction")
+public class OneFileModelProvider extends ModelProvider {
+
+	public static String MODEL_PROVIDER_ID = "org.eclipse.papyrus.infra.onefile.modelProvider";
+
+	public OneFileModelProvider() {
+	}
+
+	@Override
+	public ResourceMapping[] getMappings(IResource resource, ResourceMappingContext context, IProgressMonitor monitor) {
+		if (OneFileUtils.isDi(resource)) {
+			return new ResourceMapping[] { new PapyrusResourceMapping((IFile) resource) };
+		}
+		return new ResourceMapping[] { new SimpleResourceMapping(resource) };
+	}
+
+	@Override
+	public ResourceMapping[] getMappings(IResource[] resources, ResourceMappingContext context, IProgressMonitor monitor) throws CoreException {
+		return super.getMappings(resources, context, monitor);
+	}
+
+	@Override
+	public ResourceTraversal[] getTraversals(ResourceMapping[] mappings, ResourceMappingContext context, IProgressMonitor monitor) throws CoreException {
+		return super.getTraversals(mappings, context, monitor);
+	}
+
+	@Override
+	public ResourceMapping[] getMappings(ResourceTraversal[] traversals, ResourceMappingContext context, IProgressMonitor monitor) throws CoreException {
+		return super.getMappings(traversals, context, monitor);
+	}
+
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class adapter) {
+		return super.getAdapter(adapter);
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/utils/OneFileUtils.java b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/utils/OneFileUtils.java
index 199eb10f341..7f83f65c988 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/utils/OneFileUtils.java
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/utils/OneFileUtils.java
@@ -1,159 +1,159 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2016 Atos Origin Integration, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile.utils;

-

-import java.util.ArrayList;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;

-import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

-import org.eclipse.papyrus.infra.onefile.model.PapyrusModelHelper;

-

-/**

- * Utility methods

- *

- * @author tristan.faure@atosorigin.com

- *

- */

-public class OneFileUtils {

-

-	/**

-	 * Determines if a di exist in the container from a file name

-	 *

-	 * @param fileName

-	 * @param parent

-	 * @return

-	 */

-	public static boolean diExists(String fileName, IContainer parent) {

-		return getDi(fileName, parent) != null;

-	}

-

-	/**

-	 * Determines if a di exist in the container from a file name

-	 *

-	 * @param fileName

-	 * @param parent

-	 * @return

-	 */

-	public static IFile getDi(String fileName, IContainer parent) {

-		if (parent == null || parent.getType() == IResource.ROOT) {

-			return null;

-		}

-		String substring = fileName;

-		if (fileName.indexOf('.') > 0) {

-			substring = fileName.substring(0, fileName.lastIndexOf('.'));

-		}

-		IFile file = parent.getFile(new Path(substring + "." + DiModel.DI_FILE_EXTENSION));

-		if (file.exists()) {

-			return file;

-		}

-		return null;

-	}

-

-	/**

-	 * check if the element has children or not

-	 *

-	 * @param element

-	 * @return

-	 */

-	public static boolean hasChildren(Object element) {

-		if (element instanceof IContainer) {

-			IContainer container = (IContainer) element;

-			try {

-				return container.members().length > 0;

-			} catch (CoreException e) {

-			}

-		}

-		if (element instanceof IPapyrusFile) {

-			IPapyrusFile iPapyrusFile = (IPapyrusFile) element;

-			return iPapyrusFile.getMainFile() != null && iPapyrusFile.getAssociatedResources().length > 1;

-		}

-		return false;

-	}

-

-	/**

-	 * Check if the element in parameter is visible or not

-	 *

-	 * @param element

-	 * @return

-	 */

-	public static boolean isVisible(Object element) {

-		if (element instanceof IFile) {

-			IFile file = (IFile) element;

-			return !OneFileUtils.diExists(file.getName(), file.getParent());

-		}

-		return true; // Don't filter unknown types

-	}

-

-	/**

-	 * Check if the resource is a Papyrus Di

-	 *

-	 * @param fileName

-	 * @return

-	 */

-	public static boolean isDi(IResource fileName) {

-		return PapyrusModelHelper.getPapyrusModelFactory().isDi(fileName);

-	}

-

-	/**

-	 * Returns the name without the extension of the file

-	 *

-	 * @param res

-	 * @return

-	 */

-	public static String withoutFileExtension(IResource res) {

-		if (res.getFileExtension() != null && res.getFileExtension().length() > 0) {

-			return res.getName().substring(0, res.getName().lastIndexOf('.'));

-		} else {

-			return res.getName();

-		}

-	}

-

-	/**

-	 * Check if the resource has a DI inside it

-	 *

-	 * @param resource

-	 * @return

-	 */

-	public static boolean containsModelFiles(IResource resource) {

-		if (resource instanceof IContainer) {

-			IContainer container = (IContainer) resource;

-			try {

-				for (IResource m : container.members()) {

-					if (isDi(m)) {

-						return true;

-					}

-				}

-			} catch (CoreException e) {

-				// TODO Auto-generated catch block

-				e.printStackTrace();

-			}

-		}

-		return false;

-	}

-

-	public static IFile[] getAssociatedFiles(IPapyrusFile papyrusFile) {

-		ArrayList<IFile> files = new ArrayList<IFile>();

-		for (IResource res : papyrusFile.getAssociatedResources()) {

-			if (res instanceof IFile) {

-				files.add((IFile) res);

-			}

-		}

-		return files.toArray(new IFile[files.size()]);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 Atos Origin Integration, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile.utils;
+
+import java.util.ArrayList;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;
+import org.eclipse.papyrus.infra.onefile.model.PapyrusModelHelper;
+
+/**
+ * Utility methods
+ *
+ * @author tristan.faure@atosorigin.com
+ *
+ */
+public class OneFileUtils {
+
+	/**
+	 * Determines if a di exist in the container from a file name
+	 *
+	 * @param fileName
+	 * @param parent
+	 * @return
+	 */
+	public static boolean diExists(String fileName, IContainer parent) {
+		return getDi(fileName, parent) != null;
+	}
+
+	/**
+	 * Determines if a di exist in the container from a file name
+	 *
+	 * @param fileName
+	 * @param parent
+	 * @return
+	 */
+	public static IFile getDi(String fileName, IContainer parent) {
+		if (parent == null || parent.getType() == IResource.ROOT) {
+			return null;
+		}
+		String substring = fileName;
+		if (fileName.indexOf('.') > 0) {
+			substring = fileName.substring(0, fileName.lastIndexOf('.'));
+		}
+		IFile file = parent.getFile(new Path(substring + "." + DiModel.DI_FILE_EXTENSION));
+		if (file.exists()) {
+			return file;
+		}
+		return null;
+	}
+
+	/**
+	 * check if the element has children or not
+	 *
+	 * @param element
+	 * @return
+	 */
+	public static boolean hasChildren(Object element) {
+		if (element instanceof IContainer) {
+			IContainer container = (IContainer) element;
+			try {
+				return container.members().length > 0;
+			} catch (CoreException e) {
+			}
+		}
+		if (element instanceof IPapyrusFile) {
+			IPapyrusFile iPapyrusFile = (IPapyrusFile) element;
+			return iPapyrusFile.getMainFile() != null && iPapyrusFile.getAssociatedResources().length > 1;
+		}
+		return false;
+	}
+
+	/**
+	 * Check if the element in parameter is visible or not
+	 *
+	 * @param element
+	 * @return
+	 */
+	public static boolean isVisible(Object element) {
+		if (element instanceof IFile) {
+			IFile file = (IFile) element;
+			return !OneFileUtils.diExists(file.getName(), file.getParent());
+		}
+		return true; // Don't filter unknown types
+	}
+
+	/**
+	 * Check if the resource is a Papyrus Di
+	 *
+	 * @param fileName
+	 * @return
+	 */
+	public static boolean isDi(IResource fileName) {
+		return PapyrusModelHelper.getPapyrusModelFactory().isDi(fileName);
+	}
+
+	/**
+	 * Returns the name without the extension of the file
+	 *
+	 * @param res
+	 * @return
+	 */
+	public static String withoutFileExtension(IResource res) {
+		if (res.getFileExtension() != null && res.getFileExtension().length() > 0) {
+			return res.getName().substring(0, res.getName().lastIndexOf('.'));
+		} else {
+			return res.getName();
+		}
+	}
+
+	/**
+	 * Check if the resource has a DI inside it
+	 *
+	 * @param resource
+	 * @return
+	 */
+	public static boolean containsModelFiles(IResource resource) {
+		if (resource instanceof IContainer) {
+			IContainer container = (IContainer) resource;
+			try {
+				for (IResource m : container.members()) {
+					if (isDi(m)) {
+						return true;
+					}
+				}
+			} catch (CoreException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		return false;
+	}
+
+	public static IFile[] getAssociatedFiles(IPapyrusFile papyrusFile) {
+		ArrayList<IFile> files = new ArrayList<IFile>();
+		for (IResource res : papyrusFile.getAssociatedResources()) {
+			if (res instanceof IFile) {
+				files.add((IFile) res);
+			}
+		}
+		return files.toArray(new IFile[files.size()]);
+	}
+}
diff --git a/plugins/infra/onefile/pom.xml b/plugins/infra/onefile/pom.xml
new file mode 100644
index 00000000000..12566a4b18c
--- /dev/null
+++ b/plugins/infra/onefile/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.infra-onefile</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+	<name>Papyrus Infra One-file</name>
+	<description>Integration of Papyrus models into the Project Explorer.</description>
+
+	<modules>
+		<module>org.eclipse.papyrus.infra.onefile</module>
+	</modules>
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.classpath b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.classpath
deleted file mode 100644
index 49a283a34c3..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-	<classpathentry kind="src" path="src"/>
-</classpath>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.project b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.project
deleted file mode 100644
index 1da496825fa..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.eclipse.project.editors</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/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF
deleted file mode 100644
index ead283e0418..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.eclipse.project.editors.file,

- org.eclipse.papyrus.eclipse.project.editors.interfaces,

- org.eclipse.papyrus.eclipse.project.editors.project

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.core.resources,

- org.eclipse.jdt.core,

- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

- org.eclipse.pde.ui;bundle-version="3.6.100",

- org.eclipse.emf.ecore;bundle-version="2.10.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.eclipse.project.editors.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.eclipse.project.editors

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/build.properties b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/build.properties
deleted file mode 100644
index 1b08f841b5e..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               plugin.properties

-src.includes = about.html

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/plugin.properties b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/plugin.properties
deleted file mode 100644
index 8e1889256bb..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.eclipse.project.editors

-providerName = Eclipse Modeling Project

-pluginName = Editors for the Eclipse Project
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/pom.xml b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/pom.xml
deleted file mode 100644
index 6f334a2a207..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
-	</parent>
-	<artifactId>org.eclipse.papyrus.eclipse.project.editors</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/AbstractFileEditor.java b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/AbstractFileEditor.java
deleted file mode 100644
index 1cb84ffefb5..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/AbstractFileEditor.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.eclipse.project.editors.file;

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.StringReader;

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.core.resources.IProject;

-import org.eclipse.papyrus.eclipse.project.editors.Activator;

-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IFileEditor;

-

-/**

- *

- * An abstract class for File Editor

- *

- */

-public abstract class AbstractFileEditor implements IFileEditor {

-

-	/** the Eclipse Project */

-	private final IProject project;

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param project

-	 *            the eclipse project

-	 */

-	public AbstractFileEditor(final IProject project) {

-		this.project = project;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the eclipse project

-	 */

-	public IProject getProject() {

-		return this.project;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.AbstractProjectEditor#init()

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void init() {

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IProjectEditor#getMissingFiles()

-	 *

-	 *      {@inheritDoc}

-	 */

-	public Set<String> getMissingFiles() {

-		return new HashSet<String>();

-	}

-

-	/**

-	 *

-	 * @param text

-	 *            the initial text

-	 * @return

-	 *         an input stream

-	 */

-	protected InputStream getInputStream(final String text) {

-		if (text == null) {

-			Activator.log.warn("Cannot open an input stream for a null text"); //$NON-NLS-1$

-			return null;

-		}

-

-		final StringReader sr = new StringReader(text);

-		InputStream is = new InputStream() {

-

-			@Override

-			public int read() throws IOException {

-				return sr.read();

-			}

-

-		};

-		return is;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.AbstractProjectEditor.plugin.AbstractEditor#exists()

-	 *

-	 *      {@inheritDoc}

-	 */

-	public boolean exists() {

-		return getMissingFiles().size() == 0;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IFileEditor#create()

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void create() {

-		createFiles(getMissingFiles());

-		init();

-	}

-}

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/BuildEditor.java b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/BuildEditor.java
deleted file mode 100644
index f54b6dc8ef8..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/BuildEditor.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr

- *****************************************************************************/

-package org.eclipse.papyrus.eclipse.project.editors.file;

-

-import java.io.File;

-import java.io.FileInputStream;

-import java.io.FileNotFoundException;

-import java.io.FileOutputStream;

-import java.io.IOException;

-import java.util.Arrays;

-import java.util.List;

-import java.util.Properties;

-import java.util.Set;

-

-import org.eclipse.core.resources.IProject;

-import org.eclipse.papyrus.eclipse.project.editors.Activator;

-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor;

-import org.eclipse.papyrus.infra.widgets.util.FileUtil;

-

-public class BuildEditor extends AbstractFileEditor implements IBuildEditor {

-

-	/** the build config */

-	private Properties buildConfig;

-

-	/** the buidl file */

-	private File buildFile;

-

-	/**

-	 * The build key to edit

-	 * Defaults to "bin.includes" (The eclipse standard binary build)

-	 */

-	private String buildKey = "bin.includes"; //$NON-NLS-1$

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param project

-	 *            the eclipse project

-	 */

-	public BuildEditor(final IProject project) {

-		super(project);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param project

-	 *            the eclipse project

-	 * @param buildKey

-	 *            the build key to edit. If null, the "bin.includes" key will be used

-	 *

-	 * @see IBuildEditor#BINARY_BUILD

-	 * @see IBuildEditor#SOURCE_BUILD

-	 */

-	public BuildEditor(final IProject project, String buildKey) {

-		super(project);

-		if (buildKey != null) {

-			this.buildKey = buildKey;

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#init()

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public void init() {

-		this.buildConfig = new Properties();

-		this.buildFile = getBuildProperties();

-		if (this.buildFile != null && this.buildFile.exists()) {

-			try {

-				this.buildConfig.load(new FileInputStream(this.buildFile));

-			} catch (FileNotFoundException e) {

-				Activator.log.error(e);

-			} catch (IOException e) {

-				Activator.log.error(e);

-			}

-		}

-	}

-

-

-	private File getBuildProperties() {

-		return this.buildFile = FileUtil.getWorkspaceFile("/" + getProject().getName() + "/" + BUILD_PROPERTIES_FILE); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#addToBuild(java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void addToBuild(final String path) {

-		if (exists()) {

-			String currentValue = this.buildConfig.getProperty(buildKey);

-			if (Arrays.asList(getElementsInBuild()).contains(path)) {

-				return;

-			}

-			if (currentValue == null || currentValue.trim().equals("")) { //$NON-NLS-1$

-				this.buildConfig.setProperty(buildKey, path);

-			} else {

-				this.buildConfig.setProperty(buildKey, currentValue + "," + path); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#removeFromBuild(java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void removeFromBuild(String path) {

-		if (isRegisteredSourceFolder(path)) {

-			// Get the files from the build

-			List<String> allFiles = Arrays.asList(getElementsInBuild());

-

-			// Clear the build

-			this.buildConfig.setProperty(buildKey, "");

-

-			// Recreate the build without the removed files

-			for (String filePath : allFiles) {

-				if (!filePath.equals(path)) {

-					addToBuild(filePath);

-				}

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @throws Throwable

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#save()

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void save() {

-		if (exists()) {

-			try {

-				this.buildConfig.store(new FileOutputStream(this.buildFile), "");

-			} catch (FileNotFoundException ex) {

-				Activator.log.error(ex);

-			} catch (IOException ex) {

-				Activator.log.error(ex);

-			}

-		}

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#registerSourceFolder(java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void registerSourceFolder(final String path) {

-		if (exists() && !isRegisteredSourceFolder(path)) {

-			String currentValue = this.buildConfig.getProperty(SOURCE_FOLDER_KEY);

-			if (currentValue == null || currentValue.trim().equals("")) { //$NON-NLS-1$

-				this.buildConfig.setProperty(SOURCE_FOLDER_KEY, path);

-			} else {

-				this.buildConfig.setProperty(SOURCE_FOLDER_KEY, currentValue + "," + path); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#isRegistred(java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public boolean isRegisteredSourceFolder(final String path) {

-		return Arrays.asList(getSourceFolders()).contains(path);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.file.AbstractFileEditor#getMissingFiles()

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public Set<String> getMissingFiles() {

-		Set<String> files = super.getMissingFiles();

-		if (!getBuildProperties().exists()) {

-			files.add(BUILD_PROPERTIES_FILE);

-		}

-		return files;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#getSourceFolders()

-	 *

-	 *      {@inheritDoc}

-	 */

-	public String[] getSourceFolders() {

-		if (exists()) {

-			String currentValue = this.buildConfig.getProperty(SOURCE_FOLDER_KEY, "").replaceAll("\t|\r|\n", "").trim();

-			String[] values = currentValue.split(","); //$NON-NLS-1$

-			return values;

-		}

-		return new String[0];

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.AbstractProjectEditor#exists()

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public boolean exists() {

-		return this.buildFile.getParentFile().exists() && this.buildFile.exists() && super.exists();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#createFiles(Set)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void createFiles(final Set<String> files) {

-		if (files.contains(BUILD_PROPERTIES_FILE)) {

-			if (!this.buildFile.exists()) {

-				if (!this.buildFile.getParentFile().exists()) {

-					this.buildFile.getParentFile().mkdirs();

-				}

-				try {

-					this.buildFile.createNewFile();

-					init();

-				} catch (IOException e) {

-					Activator.log.error(e);

-				}

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#getElementsInBuild()

-	 *

-	 *      {@inheritDoc}

-	 */

-	public String[] getElementsInBuild() {

-		String value = this.buildConfig.getProperty(buildKey);

-		return splitValues(value);

-	}

-

-	private String[] splitValues(String value) {

-		if (value == null) {

-			return new String[0];

-		}

-		return value.replace("\t|\r|\n", "").split(","); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	public void registerBinFolder(String binFolder) {

-		if (isRegisteredBinFolder(binFolder)) {

-			return;

-		}

-

-		String value = this.buildConfig.getProperty(BIN_KEY, ""); //$NON-NLS-1$

-		if (value.trim().equals("")) { //$NON-NLS-1$

-			value = binFolder;

-		} else {

-			value = value + "," + binFolder;

-		}

-		this.buildConfig.setProperty(BIN_KEY, value);

-	}

-

-	public boolean isRegisteredBinFolder(String binFolder) {

-		List<String> folders = Arrays.asList(splitValues(this.buildConfig.getProperty(BIN_KEY, ""))); //$NON-NLS-1$

-		return folders.contains(binFolder);

-	}

-}

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/BundlePropertiesEditor.java b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/BundlePropertiesEditor.java
deleted file mode 100644
index 477d720315b..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/BundlePropertiesEditor.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.papyrus.eclipse.project.editors.file;

-

-import java.io.File;

-import java.io.FileInputStream;

-import java.io.FileNotFoundException;

-import java.io.IOException;

-import java.util.Properties;

-import java.util.Set;

-

-import org.eclipse.core.resources.IProject;

-import org.eclipse.papyrus.eclipse.project.editors.Activator;

-import org.eclipse.papyrus.infra.widgets.util.FileUtil;

-

-

-public class BundlePropertiesEditor extends AbstractFileEditor {

-

-	/** the build config */

-	private Properties bundleConfig;

-

-	/** the buidl file */

-	private File bundleFile;

-

-	private String filePath;

-

-	public BundlePropertiesEditor(IProject project, String filePath) {

-		super(project);

-		this.filePath = filePath;

-

-	}

-

-	@Override

-	public void init() {

-		this.bundleFile = getBundleProperties();

-		// if(this.bundleFile != null && this.bundleFile.exists()) {

-		try {

-			this.bundleConfig.load(new FileInputStream(this.bundleFile));

-		} catch (FileNotFoundException e) {

-			Activator.log.error(e);

-		} catch (IOException e) {

-			Activator.log.error(e);

-		}

-		// }

-	}

-

-	public void createFiles(Set<String> files) {

-		// TODO Auto-generated method stub

-

-	}

-

-	public void save() {

-		// TODO Auto-generated method stub

-

-	}

-

-	public String getValue(String propertyName) {

-		return this.bundleConfig.getProperty(propertyName);

-

-	}

-

-

-

-

-

-	private File getBundleProperties() {

-		return this.bundleFile = FileUtil.getWorkspaceFile("/" + getProject().getName() + "/" + filePath + ".properties"); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-}

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/ClasspathEditor.java b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/ClasspathEditor.java
deleted file mode 100644
index 303bb572936..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/ClasspathEditor.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr

- *

- *****************************************************************************/

-package org.eclipse.papyrus.eclipse.project.editors.file;

-

-

-import java.io.InputStream;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.runtime.AssertionFailedException;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.jdt.core.IAccessRule;

-import org.eclipse.jdt.core.IClasspathAttribute;

-import org.eclipse.jdt.core.IClasspathEntry;

-import org.eclipse.jdt.core.IJavaProject;

-import org.eclipse.jdt.core.IPackageFragmentRoot;

-import org.eclipse.jdt.core.JavaCore;

-import org.eclipse.jdt.core.JavaModelException;

-import org.eclipse.jdt.internal.core.ClasspathEntry;

-import org.eclipse.papyrus.eclipse.project.editors.Activator;

-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IClasspathEditor;

-

-/**

- *

- * The editor for the classpath file

- *

- */

-public class ClasspathEditor extends AbstractFileEditor implements IClasspathEditor {

-

-	/**

-	 * the edited java project

-	 */

-	private final IJavaProject javaProject;

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param project

-	 */

-	public ClasspathEditor(final IProject project) throws AssertionFailedException {

-		super(project);

-		this.javaProject = JavaCore.create(project);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param javaProject

-	 *            a java project

-	 */

-	public ClasspathEditor(final IJavaProject javaProject) {

-		super(javaProject.getProject());

-		this.javaProject = javaProject;

-	}

-

-	@Override

-	public void init() {

-		// nothing to do here

-	}

-

-	/**

-	 * save the modification

-	 *

-	 * @throws Throwable

-	 */

-	public void save() {

-		try {

-			this.javaProject.save(new NullProgressMonitor(), true);

-		} catch (JavaModelException ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IClasspathEditor#addSourceFolderToClasspath(java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void addSourceFolderToClasspath(final String folderPath) {

-

-		if (exists() && !isSourceFolderRegistered(folderPath)) {

-

-			// parameters for the new ClasspathEntry

-			boolean isExported = false;

-			IPath[] exclusionPatterns = new IPath[0];

-			IPath sourceAttachmentPath = null;

-			IPath specificOutputLocation = null;

-			boolean combineAccessRules = false;

-			IClasspathAttribute[] extraAttributes = new IClasspathAttribute[0];

-			IPath sourceAttachmentRootPath = null;

-			IAccessRule[] accessRules = null;

-			int contentKind = IPackageFragmentRoot.K_SOURCE;

-			IPath[] inclusionPatterns = new IPath[0];

-			int entryKind = IClasspathEntry.CPE_SOURCE;

-			IPath path2 = new Path(folderPath);

-

-			IClasspathEntry[] classpathes = null;

-			try {

-				classpathes = this.javaProject.getRawClasspath();

-			} catch (JavaModelException e) {

-				e.printStackTrace();

-			}

-

-			IClasspathEntry[] entries = new IClasspathEntry[classpathes.length + 1];

-			for (int i = 0; i < classpathes.length; i++) {

-				entries[i] = classpathes[i];

-			}

-			entries[classpathes.length] = new ClasspathEntry(contentKind, entryKind, path2, inclusionPatterns, exclusionPatterns, sourceAttachmentPath, sourceAttachmentRootPath, specificOutputLocation, isExported, accessRules, combineAccessRules,

-					extraAttributes);

-			try {

-				this.javaProject.setRawClasspath(entries, new NullProgressMonitor());

-			} catch (JavaModelException e) {

-				Activator.log.error(e);

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IClasspathEditor#isSourceFolderRegistered(java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public boolean isSourceFolderRegistered(final String folderPath) {

-		IClasspathEntry[] entries = null;

-		try {

-			entries = this.javaProject.getRawClasspath();

-		} catch (JavaModelException e) {

-			Activator.log.error(e);

-		}

-

-		for (int i = 0; i < entries.length; i++) {

-			IClasspathEntry entry = entries[i];

-			if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {

-				if (entry.getPath().equals(new Path(folderPath))) {

-					return true;

-				}

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * Tests if the classpath file exists

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.AbstractProjectEditor.plugin.AbstractEditor#exists()

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public boolean exists() {

-		IFile classpath = getProject().getFile(CLASSPATH_FILE);

-		return classpath.exists();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#getMissingFiles()

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public Set<String> getMissingFiles() {

-		Set<String> files = super.getMissingFiles();

-		IFile classpath = getProject().getFile(CLASSPATH_FILE);

-		if (!classpath.exists()) {

-			files.add(CLASSPATH_FILE);

-		}

-		return files;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#createFiles(Set)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void createFiles(final Set<String> files) {

-		if (files.contains(CLASSPATH_FILE)) {

-			IFile classpath = getProject().getFile(CLASSPATH_FILE);

-			if (!classpath.exists()) {

-				InputStream is = getInputStream("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<?eclipse version=\"3.4\"?>\n" + "<classpath>\n" + "</classpath>\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$

-

-				try {

-					classpath.create(is, true, null);

-				} catch (CoreException ex) {

-					Activator.log.error(ex);

-				}

-			}

-		}

-	}

-

-	public String[] getSourceFolders() {

-		List<String> sourceFolders = new LinkedList<String>();

-		IClasspathEntry[] entries = null;

-		try {

-			entries = this.javaProject.getRawClasspath();

-		} catch (JavaModelException e) {

-			Activator.log.error(e);

-		}

-

-		for (int i = 0; i < entries.length; i++) {

-			IClasspathEntry entry = entries[i];

-			if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {

-				sourceFolders.add(entry.getPath().makeRelativeTo(javaProject.getPath()).toString());

-			}

-		}

-

-		return sourceFolders.toArray(new String[sourceFolders.size()]);

-	}

-

-	public String[] getBinFolders() {

-		List<String> binFolders = new LinkedList<String>();

-		try {

-			// General bin folder

-			binFolders.add(javaProject.getOutputLocation().makeRelativeTo(javaProject.getPath()).toString());

-		} catch (JavaModelException ex) {

-			Activator.log.error(ex);

-		}

-		IClasspathEntry[] entries = null;

-		try {

-			entries = this.javaProject.getRawClasspath();

-		} catch (JavaModelException e) {

-			Activator.log.error(e);

-		}

-

-		for (int i = 0; i < entries.length; i++) {

-			IClasspathEntry entry = entries[i];

-			if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {

-				if (entry.getOutputLocation() != null) {

-					// Bin folder associated to each source folder

-					binFolders.add(entry.getOutputLocation().makeRelativeTo(javaProject.getPath()).toString());

-				}

-			}

-		}

-

-		return binFolders.toArray(new String[binFolders.size()]);

-	}

-}

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/ManifestEditor.java b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/ManifestEditor.java
deleted file mode 100644
index 3ccb481a373..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/file/ManifestEditor.java
+++ /dev/null
@@ -1,594 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.eclipse.project.editors.file;

-

-import java.io.ByteArrayOutputStream;

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.StringReader;

-import java.util.Set;

-import java.util.jar.Attributes;

-import java.util.jar.Attributes.Name;

-import java.util.jar.Manifest;

-

-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.runtime.CoreException;

-import org.eclipse.papyrus.eclipse.project.editors.Activator;

-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor;

-import org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor;

-

-public class ManifestEditor extends ProjectEditor implements IManifestEditor {

-

-	// string constants

-	private static final String CRNL = "\r\n"; //$NON-NLS-1$

-

-	private static final String CRNLSP = "\r\n "; //$NON-NLS-1$

-

-	private static final String SEMICOLON = ";"; //$NON-NLS-1$

-

-	private static final String COMMA = ","; //$NON-NLS-1$

-

-	private static final String ASSIGN = "="; //$NON-NLS-1$

-

-	private static final String BUNDLE_SYMBOLIC_NAME = "Bundle-SymbolicName"; //$NON-NLS-1$

-

-	private static final String IMPORT_PACKAGE = "Import-Package";

-

-	private static final String EXPORT_PACKAGE = "Export-Package";

-

-	private static final String SINGLETON = "singleton:="; //$NON-NLS-1$

-

-	/** the manifest file */

-	private IFile manifestFile;

-

-	/** the manifest itself */

-	private Manifest manifest;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param project

-	 * @throws IOException

-	 * @throws CoreException

-	 */

-	public ManifestEditor(final IProject project) throws IOException, CoreException {

-		super(project);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#initOk()

-	 *

-	 *      {@inheritDoc}

-	 */

-	public boolean initOk() {

-		return manifest != null && manifestFile != null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#addDependency(java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void addDependency(final String dependency) {

-		addDependency(dependency, null);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#init()

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public void init() {

-		super.init();

-		if (manifest != null && manifestFile != null) {

-			return;

-		}

-		if (manifestFile == null) {

-			manifestFile = getManifestFile();

-		}

-		if (manifestFile != null) {

-			try {

-				manifest = new Manifest(manifestFile.getContents());

-			} catch (final IOException e) {

-				Activator.log.error(e);

-				// assure that exception is not silently captured (for users not examining the error log)

-				throw new RuntimeException(e);

-			} catch (final CoreException e) {

-				Activator.log.error(e);

-				// assure that exception is not silently captured (for users not examining the error log)

-				throw new RuntimeException(e);

-			}

-		}

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#addDependency(java.lang.String, java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void addDependency(final String dependency, final String version) {

-		final Name rqBundle = new Name(REQUIRED_BUNDLE);

-		String requireBundle = manifest.getMainAttributes().getValue(rqBundle);

-

-		// TODO : Improve the detection of existing dependency

-		// If a.b.c exists, then a.b cannot be added (Because it is already contained)

-		// Moreover, the Manifest allows newlines anywhere (Including in the

-		// middle of a word) : check if these newlines appear in this map,

-		// or if they have already been parsed. If the manifest value is copied as-is in the map,

-		// then we need to take care of newlines when parsing it

-

-		if (requireBundle == null) {

-			requireBundle = dependency;

-

-			if (version != null) {

-				requireBundle += SEMICOLON + "bundle-version=\"" + version + "\"";

-			}

-		} else if (!requireBundle.contains(dependency)) {

-			requireBundle += COMMA + dependency;

-			// TODO: Update version

-		}

-

-		manifest.getMainAttributes().put(rqBundle, requireBundle);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#hasDependency(java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public boolean hasDependency(final String dependency) {

-		final Name rqBundle = new Name(REQUIRED_BUNDLE);

-		String requireBundle = manifest.getMainAttributes().getValue(rqBundle);

-		return requireBundle != null && requireBundle.contains(dependency);

-	}

-

-	public void setDependenciesVersion(final String dependencyPattern, final String newVersion) {

-		final Name rqBundle = new Name(REQUIRED_BUNDLE);

-		final String requireBundles = manifest.getMainAttributes().getValue(rqBundle);

-		final String[] bundles = requireBundles.split(COMMA);

-		String newRequiredBundles = ""; //$NON-NLS-1$

-		for (int ii = 0; ii < bundles.length; ii++) {// we iterate on the declared dependencies

-			final String currentDependency = bundles[ii];

-			final String[] dependencyValue = currentDependency.split(SEMICOLON);

-			if (dependencyValue[0].contains(dependencyPattern)) {

-				final String newBundleVersion = BUNDLE_VERSION + ASSIGN + '"' + newVersion + '"';

-				newRequiredBundles += dependencyValue[0] + SEMICOLON + newBundleVersion;

-				for (int i = 1; i < dependencyValue.length; i++) {

-					final String declaration = dependencyValue[i];

-					if (declaration.contains(BUNDLE_VERSION + ASSIGN)) {

-						// we ignore it

-					} else {

-						newRequiredBundles += SEMICOLON + dependencyValue[i];// we add the others declaration

-					}

-				}

-			} else {

-				newRequiredBundles += currentDependency;// we copy the existing declaration

-			}

-			if (ii < bundles.length - 1) {

-				newRequiredBundles += COMMA;

-			}

-		}

-		setValue(REQUIRED_BUNDLE, newRequiredBundles);

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#setValue(java.lang.String, java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void setValue(final String key, final String value) {

-		setValue(key, "", value); //$NON-NLS-1$

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#setValue(java.lang.String, java.lang.String, java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void setValue(final String key, final String name, final String value) {

-		manifest.getMainAttributes().putValue(key, value);

-		// this.manifest.getAttributes(key).put(name, value);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#removeValue(java.lang.String, java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void removeValue(final String key, final String value) {

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#removeValue(java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void removeValue(final String key) {

-		manifest.getAttributes(key).remove(key);

-	}

-

-	/**

-	 *

-	 * @return

-	 */

-	private IFile getManifestFile() {

-		final IFile manifest = getProject().getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$

-		if (manifest.exists()) {

-			return manifest;

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.AbstractProjectEditor#exists()

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public boolean exists() {

-		return super.exists() && getManifestFile() != null && getSymbolicBundleName() != null && getBundleVersion() != null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#save()

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public void save() {

-

-		final ByteArrayOutputStream os = new ByteArrayOutputStream();

-

-		try {

-			manifest.write(os);

-

-			final StringReader reader = new StringReader(format(os.toString("UTF-8"))); //$NON-NLS-1$

-			manifestFile.setContents(new InputStream() {

-

-				@Override

-				public int read() throws IOException {

-					return reader.read();

-				}

-			}, true, true, null);

-

-		} catch (final IOException ex) {

-			Activator.log.error(ex);

-		} catch (final CoreException ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	/**

-	 * Simple formatting of the MANIFEST. Do not use the PDE formatter, since this makes an already opened

-	 * MANIFEST editor dirty (see bug 447548 [OCL for Papyrus] Buggy DSML plugin generator)

-	 */

-	protected String format(String text) {

-		// 1. undo 72safe formatting

-		String[] lines = text.split(CRNLSP);

-		String non72safe = ""; //$NON-NLS-1$

-		for (String line : lines) {

-			non72safe += line;

-		}

-		// 2. split lines on comma

-		lines = non72safe.split(COMMA);

-		String newText = ""; //$NON-NLS-1$

-		for (int i = 0; i < lines.length; i++) {

-			newText += lines[i].trim();

-			if (i < lines.length - 1) {

-				newText += COMMA + CRNLSP;

-			}

-		}

-		return newText + CRNL;

-	}

-

-	@Override

-	public Set<String> getMissingFiles() {

-		final Set<String> files = super.getMissingFiles();

-		final IFile classpath = getProject().getFile(MANIFEST_PATH);

-		if (!classpath.exists()) {

-			files.add(MANIFEST_PATH);

-		}

-		return files;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#createFiles(java.util.Set)

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public void createFiles(final Set<String> files) {

-		if (files.contains(MANIFEST_PATH)) {

-			manifestFile = getProject().getFile(MANIFEST_PATH);

-			if (!manifestFile.exists()) {

-				try {

-					final String input = "Manifest-Version: 1.0\n"; //without the "/n", it doesn't work!!!!! //$NON-NLS-1$

-					if (!manifestFile.getParent().exists()) {

-						final IContainer parent = manifestFile.getParent();

-						if (parent instanceof IFolder) {

-							if (!parent.exists()) {

-								((IFolder) parent).create(true, false, null);

-							}

-						}

-					}

-					manifestFile.create(getInputStream(input), true, null);

-					manifestFile = getProject().getFile(MANIFEST_PATH);

-

-					// final int i;

-					// InputStream is = this.manifestFile.getContents();

-					// while((i = is.read()) > 0) {

-					// System.out.println(i);

-					// }

-					// this.manifest = new Manifest(this.manifestFile.getContents());

-

-				} catch (final CoreException ex) {

-					Activator.log.error(ex);

-				}

-			}

-		}

-

-		try {

-			manifest = new Manifest(manifestFile.getContents());

-		} catch (IOException e) {

-			Activator.log.error(e);

-		} catch (CoreException e) {

-			Activator.log.error(e);

-		}

-

-		if (getSymbolicBundleName() == null) {

-			setSymbolicBundleName(getProject().getName());

-		}

-

-		if (getBundleVersion() == null) {

-			setBundleVersion("0.0.1"); //$NON-NLS-1$

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#setSymbolicBundleName(java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void setSymbolicBundleName(String newName) {

-		if (newName == null) {

-			newName = "noName"; //$NON-NLS-1$

-		}

-		final Name symbolicName = new Name(BUNDLE_SYMBOLIC_NAME);

-		manifest.getMainAttributes().put(symbolicName, newName);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#getSymbolicBundleName()

-	 *

-	 *      {@inheritDoc}

-	 */

-	public String getSymbolicBundleName() {

-		if (manifest != null) {

-			final Name symbolicName = new Name(BUNDLE_SYMBOLIC_NAME);

-			final String name = manifest.getMainAttributes().getValue(symbolicName);

-

-			if (name != null) {

-				int semiColon = name.indexOf(SEMICOLON);

-				return semiColon != -1 ? name.substring(0, semiColon) : name;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#getBundleVersion()

-	 *

-	 *      {@inheritDoc}

-	 */

-	public String getBundleVersion() {

-		if (manifest != null) {

-			final Name symbolicName = new Name(BUNDLE_VERSION);

-			final String version = manifest.getMainAttributes().getValue(symbolicName);

-			return version;

-		}

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#setBundleVersion(java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void setBundleVersion(final String version) {

-		if (manifest != null) {

-			final Name bundleVersion = new Name(BUNDLE_VERSION);

-			if (version == null) {

-				manifest.getMainAttributes().remove(bundleVersion);

-			} else {

-				manifest.getMainAttributes().put(bundleVersion, version);

-			}

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#getBundleVendor()

-	 *

-	 *      {@inheritDoc}

-	 */

-	public String getBundleVendor() {

-		if (manifest != null) {

-			final Name bundleVendor = new Name(BUNDLE_VENDOR);

-			return manifest.getMainAttributes().getValue(bundleVendor);

-		}

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#setBundleVendor(java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void setBundleVendor(final String vendor) {

-		if (manifest != null) {

-			final Name bundleVendor = new Name(BUNDLE_VENDOR);

-			if (vendor == null) {

-				manifest.getMainAttributes().remove(bundleVendor);

-			} else {

-				manifest.getMainAttributes().put(bundleVendor, vendor);

-			}

-		}

-	}

-

-	public String getValue(final String key) {

-		if (manifest != null) {

-			String value = manifest.getMainAttributes().getValue(key);

-			if (value == null) {

-				final Attributes attributes = manifest.getAttributes(key);

-				if (attributes != null) {

-					value = attributes.getValue(key);

-				}

-			}

-			return value;

-		}

-		return null;

-	}

-

-	public String getBundleName() {

-		if (manifest != null) {

-			final Name bundleName = new Name(BUNDLE_NAME);

-			final String name = manifest.getMainAttributes().getValue(bundleName);

-			return name;

-		}

-		return null;

-	}

-

-	public void setBundleName(String newName) {

-		if (newName == null) {

-			newName = "noName"; //$NON-NLS-1$

-		}

-		final Name bundleNameName = new Name(BUNDLE_NAME);

-		manifest.getMainAttributes().put(bundleNameName, newName);

-	}

-

-	public String getBundleLocalization() {

-		if (manifest != null) {

-			final Name bundleLocalization = new Name(BUNDLE_LOCALIZATION);

-			final String name = manifest.getMainAttributes().getValue(bundleLocalization);

-			return name;

-		}

-		return null;

-	}

-

-	public void setSingleton(final boolean singleton) {

-		String value = manifest.getMainAttributes().getValue(BUNDLE_SYMBOLIC_NAME);

-		final String[] directives = value.split(SEMICOLON);

-

-		if (directives.length == 0) {

-			return; // This should not happen if the Manifest is well-formed

-		} else {

-			value = directives[0];

-			boolean isDefined = false;

-			for (int i = 1; i < directives.length; i++) {

-				String directive = directives[i];

-				if (directive.startsWith(SINGLETON)) {

-					directive = SINGLETON + singleton;

-					isDefined = true;

-				}

-				value += SEMICOLON + directive;

-			}

-			if (!isDefined) {

-				value += SEMICOLON + SINGLETON + singleton;

-			}

-		}

-

-		manifest.getMainAttributes().putValue(BUNDLE_SYMBOLIC_NAME, value);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#addImportPackage(java.lang.String)

-	 *

-	 * @param packageName

-	 */

-	public void addImportPackage(String packageName) {

-		addImportPackage(packageName, null);

-	}

-

-	public void addImportPackage(String packageName, String version) {

-		addPackage(packageName, IMPORT_PACKAGE, version);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#addExportPackage(java.lang.String)

-	 *

-	 * @param packageName

-	 */

-	public void addExportPackage(String packageName) {

-		addExportPackage(packageName, null);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#addExportPackage(java.lang.String, java.lang.String)

-	 *

-	 * @param packageName

-	 * @param version

-	 */

-	public void addExportPackage(String packageName, String version) {

-		addPackage(packageName, EXPORT_PACKAGE, version);

-	}

-

-	/**

-	 * Adds a package name in a manifest header type.

-	 *

-	 * @param packageName the package name to add

-	 * @param type IMPORT_PACKAGE or EXPORT_PACKAGE

-	 */

-	private void addPackage(String packageName, String type, String version) {

-		final Name manifestHeader = new Name(type);

-		String manifestHeaderValue = manifest.getMainAttributes().getValue(manifestHeader);

-

-		// TODO: Same as addDependency(final String, final String) : Improve the detection of existing packages

-

-		if (manifestHeaderValue == null) {

-			manifestHeaderValue = packageName;

-

-			if (version != null) {

-				manifestHeaderValue += SEMICOLON + "version=\"" + version + "\"";

-			}

-		} else if (!manifestHeaderValue.contains(packageName)) {

-			manifestHeaderValue += COMMA + packageName;

-

-			// TODO: Update version

-		}

-

-		manifest.getMainAttributes().put(manifestHeader, manifestHeaderValue);

-	}

-}

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IBuildEditor.java b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IBuildEditor.java
deleted file mode 100644
index 919266f84ef..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IBuildEditor.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr

- *

- *****************************************************************************/

-package org.eclipse.papyrus.eclipse.project.editors.interfaces;

-

-/**

- *

- * Editor for the build.properties

- *

- */

-public interface IBuildEditor extends IFileEditor {

-

-	/**

-	 * key for the bin

-	 *

-	 * @Deprecated The build key should be specified for each IBuildEditor instance

-	 */

-	@Deprecated

-	public final static String BUILD_KEY = "bin.includes"; //$NON-NLS-1$

-

-	/** key for the source folders */

-	public final static String SOURCE_FOLDER_KEY = "source.."; //$NON-NLS-1$

-

-	/** key for the bin folders */

-	public static final String BIN_KEY = "bin.."; //$NON-NLS-1$

-

-	/** name of the file build.properties */

-	public static final String BUILD_PROPERTIES_FILE = "build.properties"; //$NON-NLS-1$

-

-	/**

-	 * The build key for the Eclipse Binary Build

-	 */

-	public static final String BINARY_BUILD = "bin.includes";

-

-	/**

-	 * The build key for the Eclipse Source Build

-	 */

-	public static final String SOURCE_BUILD = "src.includes";

-

-	/** the method to register a new source folder */

-	public void registerSourceFolder(String string);

-

-	/** registers a new bin folder */

-	public void registerBinFolder(String binFolder);

-

-	/** the method to add an element to the build */

-	public void addToBuild(final String path);

-

-	/** removes the given path from the build */

-	public void removeFromBuild(final String path);

-

-	/**

-	 * Returns <code>true</code> if the folder is registered as a Source Folder

-	 *

-	 * @param path

-	 *            the path of a source folder

-	 * @return

-	 *         <code>true</code> if the folder is registered

-	 */

-	public boolean isRegisteredSourceFolder(final String path);

-

-	/**

-	 * Returns <code>true</code> if the folder is registered as a Bin Folder

-	 *

-	 * @param path

-	 *            the path of a bin folder

-	 * @return

-	 *         <code>true</code> if the folder is registered

-	 */

-	public boolean isRegisteredBinFolder(final String binFolder);

-

-	/**

-	 * Returns all the registered source folders

-	 *

-	 * @return

-	 *         all the registered source folders

-	 */

-	public String[] getSourceFolders();

-

-	/**

-	 * Returns all the files added to the build

-	 *

-	 * @return

-	 *         all the files added to the build

-	 */

-	public String[] getElementsInBuild();

-}

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IClasspathEditor.java b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IClasspathEditor.java
deleted file mode 100644
index 4448cbd1065..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IClasspathEditor.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr

- *

- *****************************************************************************/

-package org.eclipse.papyrus.eclipse.project.editors.interfaces;

-

-

-/**

- *

- * This interface for the file .classpath

- *

- */

-public interface IClasspathEditor extends IFileEditor {

-

-	/** the classpath file */

-	public static final String CLASSPATH_FILE = ".classpath"; //$NON-NLS-1$

-

-	/**

-	 * add a source folder to the class path

-	 *

-	 * @param folderPath

-	 */

-	public void addSourceFolderToClasspath(final String folderPath);

-

-	/**

-	 * Tests if a folder is already registered in the classpath

-	 *

-	 * @param folderPath

-	 *            a folder path

-	 * @return

-	 *         <code>true</code> if the folderPath is already registered

-	 */

-	public boolean isSourceFolderRegistered(final String folderPath);

-

-	/**

-	 *

-	 * @return the source folders for this classpath

-	 */

-	public String[] getSourceFolders();

-

-	/**

-	 *

-	 * @return the bin folders for this classpath

-	 */

-	public String[] getBinFolders();

-}

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IFeatureProjectEditor.java b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IFeatureProjectEditor.java
deleted file mode 100644
index bd2a55630d3..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IFeatureProjectEditor.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.eclipse.papyrus.eclipse.project.editors.interfaces;

-

-import java.util.Set;

-

-import org.w3c.dom.Document;

-

-public interface IFeatureProjectEditor {

-

-	void init();

-

-	void save();

-

-	void createFiles(final Set<String> files);

-

-	/**

-	 * Retrieves the feature.xml XML Document associated to this project.

-	 *

-	 * @return The XML Document associated to this feature.xml file

-	 */

-	Document getDocument();

-

-	/**

-	 * Gets the feature's id.

-	 *

-	 * @return the feature's id

-	 */

-	String getId();

-

-	/**

-	 * Gets the feature's label.

-	 *

-	 * @return the feature's label

-	 */

-	String getLabel();

-

-	/**

-	 * Gets the feature's version.

-	 *

-	 * @return the feature's version

-	 */

-	String getVersion();

-

-	/**

-	 * Gets the feature's provider name.

-	 *

-	 * @return the feature's provider name

-	 */

-	String getProviderName();

-

-	/**

-	 * Gets the operating system of the feature

-	 * @return

-	 */

-	String getOS();

-

-	String getWS();

-

-	String getNL();

-

-	String getArch();

-

-	String getDescriptionText();

-

-	String getDescriptionURL();

-

-	String getCopyrightText();

-

-	String getCopyrightURL();

-

-	String getLicenseText();

-

-	String getLicenceURL();

-

-	void setId(final String id);

-

-	void setLabel(final String label);

-

-	void setVersion(final String version);

-

-	void setProviderName(final String providerName);

-

-	void setOS(final String os);

-

-	void setWS(final String ws);

-

-	void setNL(final String nl);

-

-	void setArch(final String arch);

-

-	void setDescription(final String descriptionURL, final String descriptionDesc);

-

-	void setCopyright(final String copyrightURL, final String copyrightDesc);

-

-	void setLicense(final String licenseURL, final String licenseDesc);

-

-	void setUpdateURL(final String urlLabel, final String url);

-

-	void addPlugin(final String pluginName);

-

-	void addRequiredFeature(final String featureName, final String version);

-

-	void addRequiredPlugin(String pluginName);

-

-	void addInclude(String featureName, String version);

-

-}

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IFileEditor.java b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IFileEditor.java
deleted file mode 100644
index 732653fdb12..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IFileEditor.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.eclipse.project.editors.interfaces;

-

-import java.util.Set;

-

-import org.eclipse.core.resources.IProject;

-

-/**

- *

- * Interface to edit file

- *

- */

-public interface IFileEditor {

-

-	/** test if all the required elements exist for the editor */

-	public boolean exists();

-

-

-	/** create the required elements for the editor */

-	public abstract void create();

-

-	/**

-	 * a method to initialize the field of the editors

-	 * This method should be called by the programmer AFTER the construciton of the element

-	 */

-	public abstract void init();

-

-	/**

-	 *

-	 * @return

-	 *         the missing files for the project

-	 */

-	public Set<String> getMissingFiles();

-

-	/**

-	 *

-	 * @param files

-	 *            create the required files

-	 */

-	public void createFiles(final Set<String> files);

-

-

-	// TODO : Remove that "Throwable" exception...

-	/** save the modification on the editor */

-	public void save();

-

-	/**

-	 *

-	 * @return

-	 *         the eclipse project

-	 */

-	public IProject getProject();

-

-}

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IJavaProjectEditor.java b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IJavaProjectEditor.java
deleted file mode 100644
index d6ec9942788..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IJavaProjectEditor.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.eclipse.project.editors.interfaces;

-

-/**

- *

- * Editor for the java project

- *

- */

-public interface IJavaProjectEditor extends IBuildEditor {

-

-	/** The java nature */

-	public static final String JAVA_NATURE = "org.eclipse.jdt.core.javanature"; //$NON-NLS-1$

-

-	/** the build command for the java project */

-	public static final String JAVA_BUILD_COMMAND = "org.eclipse.jdt.core.javabuilder"; //$NON-NLS-1$

-

-	/**

-	 * Add a new java source folder in the .classpath and in the build.properties

-	 *

-	 * @param path

-	 *            the path of the java source folder

-	 */

-	public void addJavaSourceFolder(final String path);

-

-	/**

-	 * Gets the classpath editor.

-	 *

-	 * @return the classpath editor

-	 */

-	public IClasspathEditor getClasspathEditor();

-

-

-	/**

-	 * Gets the builds the editor.

-	 *

-	 * @return the builds the editor

-	 */

-	public IBuildEditor getBuildEditor();

-

-}

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IManifestEditor.java b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IManifestEditor.java
deleted file mode 100644
index eb15371b8d0..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IManifestEditor.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr

- *

- *****************************************************************************/

-package org.eclipse.papyrus.eclipse.project.editors.interfaces;

-

-

-

-/**

- *

- * Editor for the Manifest

- *

- */

-public interface IManifestEditor extends IProjectEditor, IFileEditor {

-

-	/** the path for the manifest file */

-	public static final String MANIFEST_PATH = "META-INF/MANIFEST.MF"; //$NON-NLS-1$

-

-	/** the path for the META-INF folder */

-	public static final String META_INF_PATH = "META-INF/"; //$NON-NLS-1$

-

-	/** the key for the bundle symbolic name */

-	public static final String BUNDLE_SYMBOLIC_NAME = "Bundle-SymbolicName"; //$NON-NLS-1$

-

-	/** the key for the bundle name */

-	public static final String BUNDLE_NAME = "Bundle-Name";//$NON-NLS-1$

-

-	/** the key for the required bundle */

-	public static final String REQUIRED_BUNDLE = "Require-Bundle"; //$NON-NLS-1$

-

-	/** the key for the bundle version */

-	public static final String BUNDLE_VERSION = "Bundle-Version"; //$NON-NLS-1$

-

-	/** the key for the bundle vendor */

-	public static final String BUNDLE_VENDOR = "Bundle-Vendor"; //$NON-NLS-1$

-

-	/** the build command for the manifest */

-	public static final String MANIFEST_BUILD_COMMAND = "org.eclipse.pde.ManifestBuilder"; //$NON-NLS-1$

-

-	/** the key for the bundle localization */

-	public static final String BUNDLE_LOCALIZATION = "Bundle-Localization"; //$NON-NLS-1$

-

-	/**

-	 * Add a dependency to the MANIFEST

-	 * @param dependency

-	 *            the dependency to add

-	 */

-	public void addDependency(final String dependency);

-

-	/**

-	 * Add a specific version of a dependency to the MANIFEST

-	 *

-	 * @param dependency

-	 *            the dependency to add

-	 * @param version

-	 *            the version of the dependency

-	 */

-	public void addDependency(final String dependency, final String version);

-

-	/**

-	 * Check whether a dependency is already present in the MANIFEST

-	 *

-	 * @param dependency

-	 *            the dependency to check

-	 */

-	public boolean hasDependency(final String dependency);

-

-	/**

-	 *

-	 * @param key

-	 *            the key

-	 * @param value

-	 *            the new value for the key

-	 */

-	public void setValue(final String key, final String value);

-

-	public String getValue(final String key);

-

-	/**

-	 *

-	 * @param key

-	 *            the key

-	 * @param name

-	 *            the name

-	 * @param value

-	 *            the new value for the key

-	 */

-	public void setValue(final String key, final String name, final String value);

-

-	/**

-	 *

-	 * @param key

-	 *            the key

-	 * @param value

-	 *            the value to remove for this key

-	 */

-	public void removeValue(final String key, final String value);

-

-	/**

-	 *

-	 * @param key

-	 *            a key to remove from the manifest

-	 *

-	 */

-	public void removeValue(final String key);

-

-	/**

-	 *

-	 * @param name

-	 *            the symbolic name for the bundle

-	 */

-	public void setSymbolicBundleName(final String name);

-

-

-	/**

-	 *

-	 * @return

-	 *         the bundle name for the project

-	 */

-	public String getSymbolicBundleName();

-

-	/**

-	 *

-	 * @return

-	 *         the symbolic bundle name for the project

-	 */

-	public String getBundleName();

-

-	/**

-	 *

-	 * @param name

-	 *            the bundle name for the bundle

-	 */

-	public void setBundleName(final String name);

-

-	/**

-	 *

-	 * @return

-	 *         the version of the bundle

-	 */

-	public String getBundleVersion();

-

-	/**

-	 * Set the version of the bundle

-	 */

-	public void setBundleVersion(final String version);

-

-	/**

-	 * Gets this plug-in's provider

-	 *

-	 * @return

-	 *         this plug-in's provider

-	 */

-	public String getBundleVendor();

-

-	/**

-	 * Sets this plug-in's provider

-	 *

-	 * @param vendor

-	 *            this plug-in's provider

-	 */

-	public void setBundleVendor(final String vendor);

-

-	/**

-	 * Get the bundle localization

-	 *

-	 * @return

-	 *         the bundle localization

-	 */

-	public String getBundleLocalization();

-

-	/**

-	 * Sets the Manifest's singleton directive

-	 *

-	 * @param singleton

-	 *            Whether this plug-in should be a singleton

-	 */

-	public void setSingleton(boolean singleton);

-

-	/**

-	 *

-	 * @param dependencyPattern

-	 *            the pattern for the dependency to update

-	 * @param newVersion

-	 *            the version for the dependency

-	 */

-	public void setDependenciesVersion(final String dependencyPattern, final String newVersion);

-

-	/**

-	 * Adds an import package to the MANIFEST.

-	 *

-	 * @param packageName the package name to add

-	 */

-	public void addImportPackage(String packageName);

-

-	/**

-	 * Adds an import package and its version to the MANIFEST.

-	 *

-	 * @param packageName the package name to add

-	 * @param version the package version

-	 */

-	public void addImportPackage(String packageName, String version);

-

-	/**

-	 * Adds an export package to the MANFIEST.

-	 *

-	 * @param packageName the package name to add

-	 */

-	public void addExportPackage(String packageName);

-

-	/**

-	 * Adds an export package and its version to the MANIFEST.

-	 *

-	 * @param packageName the package name to add

-	 * @param version the package version

-	 */

-	public void addExportPackage(String packageName, String version);

-

-}

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IPluginProjectEditor.java b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IPluginProjectEditor.java
deleted file mode 100644
index ee7ef38ddb2..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IPluginProjectEditor.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.eclipse.project.editors.interfaces;

-

-import java.util.List;

-

-import org.w3c.dom.Document;

-import org.w3c.dom.Element;

-import org.w3c.dom.Node;

-

-/**

- *

- * Editor for the file plugin.xml

- *

- */

-public interface IPluginProjectEditor extends IProjectEditor, IFileEditor {

-

-	/** the node extension */

-	public static final String EXTENSION = "extension"; //$NON-NLS-1$

-

-	/** the attribute point */

-	public static final String POINT = "point"; //$NON-NLS-1$

-

-	/** the name of the file plugin.xml */

-	public static final String PLUGIN_XML_FILE = "plugin.xml"; //$NON-NLS-1$

-

-	/** the plugin nature */

-	public static final String PLUGIN_NATURE = "org.eclipse.pde.PluginNature"; //$NON-NLS-1$

-

-	/** the plugin build command */

-	public static final String PLUGIN_BUILD_COMMAND = "org.eclipse.pde.SchemaBuilder"; //$NON-NLS-1$

-

-	/** the method to add an extension to the plugin */

-	public Element addExtension(final String extensionPoint);

-

-	/** the method to get all the extensions of the type extensionPoint */

-	public List<Node> getExtensions(final String extensionPoint);

-

-	/** the method to set an attribute to an element */

-	public void setAttribute(final Element element, final String attributeName, final String attributeValue);

-

-	/** the method to add a child to an element */

-	public Element addChild(final Element element, final String childName);

-

-	/** the method to retrieve the plugin.xml XML Document associated to this project */

-	public Document getDocument();

-}

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IProjectEditor.java b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IProjectEditor.java
deleted file mode 100644
index 351b76693a8..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/interfaces/IProjectEditor.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.eclipse.project.editors.interfaces;

-

-import java.net.URL;

-import java.util.Set;

-

-/**

- *

- * This interface defines the methods for the ProjectEditor

- *

- */

-public interface IProjectEditor extends IFileEditor {

-

-	/** the node buildSpec */

-	public static final String BUILD_SPEC = "buildSpec"; //$NON-NLS-1$

-

-	/** the node comment */

-	public static final String COMMENT = "comment"; //$NON-NLS-1$

-

-	/** the node name */

-	public static final String NAME = "name"; //$NON-NLS-1$

-

-	/** the node nature */

-	public static final String NATURE = "nature"; //$NON-NLS-1$

-

-	/** the node project description */

-	public static final String PROJECT_DESCRIPTION = "projectDescription"; //$NON-NLS-1$

-

-	/** the name of the project file */

-	public static final String PROJECT_FILE = ".project"; //$NON-NLS-1$

-

-

-

-	/**

-	 *

-	 * @return

-	 *         the missing nature for the project

-	 */

-	public Set<String> getMissingNature();

-

-	/**

-	 *

-	 * @param nature

-	 *            a nature

-	 * @return

-	 *         <code>true</code> if the project has this nature

-	 */

-	public boolean hasNature(final String nature);

-

-	/**

-	 *

-	 * @return

-	 *         the missing build command

-	 */

-	public Set<String> getMissingBuildCommand();

-

-	/**

-	 *

-	 * @param commands

-	 *            the command to add

-	 */

-	public void addBuildCommands(Set<String> commands);

-

-	/**

-	 *

-	 * @param command

-	 *            a build command

-	 * @return

-	 *         <code>true</code> if the project has the build command

-	 */

-	public boolean hasBuildCommand(String command);

-

-	/**

-	 *

-	 * @param url

-	 *            the url of the file to copy

-	 * @param fileDestinationPath

-	 *            the destination path for the added file

-	 */

-	public void addFile(final URL url, final String fileDestinationPath, final boolean eraseExistingFile);

-}

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/AbstractProjectEditor.java b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/AbstractProjectEditor.java
deleted file mode 100644
index e1052f22082..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/AbstractProjectEditor.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.eclipse.project.editors.project;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.internal.events.BuildCommand;

-import org.eclipse.core.resources.ICommand;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IProjectDescription;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.papyrus.eclipse.project.editors.Activator;

-import org.eclipse.papyrus.eclipse.project.editors.file.AbstractFileEditor;

-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IProjectEditor;

-

-/**

- *

- * This class provides useful method for project editor

- *

- */

-public abstract class AbstractProjectEditor extends AbstractFileEditor implements IProjectEditor {

-

-

-	/** the header for XML files */

-	public static final String XML_HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"; //$NON-NLS-1$

-

-	/**

-	 * the project description

-	 */

-	private final IProjectDescription description;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param project

-	 *            the eclipse project

-	 * @throws CoreException

-	 */

-	public AbstractProjectEditor(final IProject project) throws CoreException {

-		super(project);

-		this.description = getProject().getDescription();

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.AbstractProjectEditor.plugin.AbstractEditor#exists()

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public boolean exists() {

-		return super.exists() && getMissingNature().size() == 0 && getMissingBuildCommand().size() == 0;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.file.AbstractFileEditor#create()

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public void create() {

-		createFiles(getMissingFiles());

-		addNatures(getMissingNature());

-		addBuildCommands(getMissingBuildCommand());

-		init();

-	}

-

-	/**

-	 *

-	 * @param nature

-	 *            a nature

-	 * @return

-	 *         <code>true</code> if the project has the wanted nature

-	 */

-	public boolean hasNature(final String nature) {

-		List<String> natures = new LinkedList<String>(Arrays.asList(this.description.getNatureIds()));

-		return natures.contains(nature);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IProjectEditor#getMissingNature()

-	 *

-	 *      {@inheritDoc}

-	 */

-	public Set<String> getMissingNature() {

-		return new HashSet<String>();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IProjectEditor#addNatures(java.util.List)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void addNatures(final Set<String> natures) {

-		List<String> existingNatures = new LinkedList<String>(Arrays.asList(this.description.getNatureIds()));

-		Iterator<String> iter = natures.iterator();

-		while (iter.hasNext()) {

-			String nature = iter.next();

-			if (!existingNatures.contains(nature)) {

-				existingNatures.add(nature);

-			}

-		}

-		this.description.setNatureIds(existingNatures.toArray(new String[existingNatures.size()]));

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.AbstractProjectEditor#hasBuildCommand(java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public boolean hasBuildCommand(final String command) {

-		ICommand[] buildSpec = this.description.getBuildSpec();

-		for (int i = 0; i < buildSpec.length; i++) {

-			if (buildSpec[i].getBuilderName().equals(command)) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.AbstractProjectEditor#addBuildCommands(java.util.Set)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void addBuildCommands(final Set<String> commands) {

-		ICommand[] buildSpec = this.description.getBuildSpec();

-

-		List<ICommand> buildSpecList = new ArrayList<ICommand>();

-		buildSpecList.addAll(Arrays.asList(buildSpec));

-

-		Iterator<String> iter = commands.iterator();

-		while (iter.hasNext()) {

-			String name = iter.next();

-			if (!hasBuildCommand(name)) {

-				ICommand cmd = new BuildCommand();

-				cmd.setBuilderName(name);

-				buildSpecList.add(cmd);

-			}

-		}

-		this.description.setBuildSpec(buildSpecList.toArray(new ICommand[buildSpecList.size()]));

-	}

-

-	/**

-	 *

-	 * @throws Throwable

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IProjectEditor#save()

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void save() {

-		if (this.description != null) {

-			try {

-				getProject().setDescription(this.description, null);

-			} catch (CoreException e) {

-				Activator.log.error(e);

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IProjectEditor#getMissingBuildCommand()

-	 *

-	 *      {@inheritDoc}

-	 */

-	public Set<String> getMissingBuildCommand() {

-		return new HashSet<String>();

-	}

-

-}

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/FeatureProjectEditor.java b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/FeatureProjectEditor.java
deleted file mode 100644
index f53b3e0cd4e..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/FeatureProjectEditor.java
+++ /dev/null
@@ -1,552 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.eclipse.project.editors.project;

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.StringWriter;

-import java.util.Collections;

-import java.util.Properties;

-import java.util.Set;

-

-import javax.xml.parsers.DocumentBuilder;

-import javax.xml.parsers.DocumentBuilderFactory;

-import javax.xml.parsers.ParserConfigurationException;

-import javax.xml.transform.OutputKeys;

-import javax.xml.transform.Transformer;

-import javax.xml.transform.TransformerException;

-import javax.xml.transform.TransformerFactory;

-import javax.xml.transform.dom.DOMSource;

-import javax.xml.transform.stream.StreamResult;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.papyrus.eclipse.project.editors.Activator;

-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IFeatureProjectEditor;

-import org.w3c.dom.Document;

-import org.w3c.dom.Element;

-import org.w3c.dom.Node;

-import org.w3c.dom.NodeList;

-import org.xml.sax.SAXException;

-

-public class FeatureProjectEditor extends ProjectEditor implements IFeatureProjectEditor {

-

-	/** the name of the file feature.xml */

-	public static final String FRAGMENT_XML_FILE = "feature.xml"; //$NON-NLS-1$

-

-	private static final String ID = "id"; //$NON-NLS-1$

-	private static final String LABEL = "label"; //$NON-NLS-1$

-	private static final String VERSION = "version"; //$NON-NLS-1$

-	private static final String PROVIDER = "provider-name"; //$NON-NLS-1$

-

-	private static final String URL = "url"; //$NON-NLS-1$

-	private static final String COPYRIGHT = "copyright"; //$NON-NLS-1$

-	private static final String LICENSE = "license"; //$NON-NLS-1$

-	private static final String DESCRIPTION = "description"; //$NON-NLS-1$

-

-	private static final String OS = "os"; //$NON-NLS-1$

-	private static final String WS = "ws"; //$NON-NLS-1$

-	private static final String NL = "nl"; //$NON-NLS-1$

-	private static final String ARCH = "arch"; //$NON-NLS-1$

-	private static final String UPDATE = "update"; //$NON-NLS-1$

-

-	private static final String PLUGIN = "plugin"; //$NON-NLS-1$

-	private static final String IMPORT = "import"; //$NON-NLS-1$

-	private static final String INCLUDES = "includes"; //$NON-NLS-1$

-	private static final String REQUIRES = "requires"; //$NON-NLS-1$

-	private static final String FEATURE = "feature"; //$NON-NLS-1$

-

-	// TODO pour l'externalization : utiliser l'éditeur de Properties! dans java Utils

-

-	private Document fragmentXML;

-

-	private IFile fragmentFile;

-

-	private Element fragmentRoot;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param project the eclipse project

-	 * @throws ParserConfigurationException

-	 * @throws SAXException

-	 * @throws IOException

-	 * @throws CoreException

-	 */

-	public FeatureProjectEditor(final IProject project) throws ParserConfigurationException, SAXException, IOException, CoreException {

-		super(project);

-	}

-

-	@Override

-	public void init() {

-		fragmentFile = getFeature();

-		if (fragmentFile != null && fragmentFile.exists()) {

-			final DocumentBuilderFactory documentFactory = DocumentBuilderFactory.newInstance();

-			try {

-				DocumentBuilder documentBuilder = documentFactory.newDocumentBuilder();

-				fragmentXML = documentBuilder.parse(fragmentFile.getLocation().toOSString());

-				fragmentRoot = fragmentXML.getDocumentElement();

-			} catch (final ParserConfigurationException e) {

-				Activator.log.error(e);

-			} catch (final SAXException e) {

-				Activator.log.error(e);

-			} catch (final IOException e) {

-				Activator.log.error(e);

-			}

-		}

-	}

-

-	@Override

-	public void createFiles(final Set<String> files) {

-		if (files.contains(FRAGMENT_XML_FILE)) {

-			fragmentFile = getProject().getFile(FRAGMENT_XML_FILE);

-			if (!fragmentFile.exists()) {

-				InputStream content = getInputStream("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<feature>\n</feature>\n\n"); //$NON-NLS-1$

-

-				try {

-					fragmentFile.create(content, true, null);

-				} catch (CoreException e) {

-					Activator.log.error(e);

-				}

-			}

-		}

-	}

-

-	@Override

-	public boolean exists() {

-		return getFeature().exists() && super.exists();

-	}

-

-	public void setAttribute(final Element element, final String attributeName, final String attributeValue) {

-		element.setAttribute(attributeName, attributeValue);

-	}

-

-	/**

-	 * @return the feature.xml file if it exists

-	 */

-	private IFile getFeature() {

-		final IFile fragment = getProject().getFile(FRAGMENT_XML_FILE);

-

-		if (fragment.exists()) {

-			return fragment;

-		}

-

-		return null;

-	}

-

-	@Override

-	public void save() {

-		if (exists()) {

-			try {

-				final TransformerFactory transformerFactory = TransformerFactory.newInstance();

-				final Transformer transformer = transformerFactory.newTransformer();

-				transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); //$NON-NLS-1$

-				final StreamResult result = new StreamResult(new StringWriter());

-				final DOMSource source = new DOMSource(fragmentXML);

-				transformer.transform(source, result);

-

-				final InputStream inputStream = getInputStream(result.getWriter().toString());

-				fragmentFile.setContents(inputStream, true, true, null);

-			} catch (final TransformerException ex) {

-				Activator.log.error(ex);

-			} catch (final CoreException ex) {

-				Activator.log.error(ex);

-			}

-		}

-		super.save();

-	}

-

-	@Override

-	public Set<String> getMissingNature() {

-		// TODO

-		return Collections.emptySet();

-	}

-

-	@Override

-	public Set<String> getMissingFiles() {

-		// TODO

-		return Collections.emptySet();

-	}

-

-	@Override

-	public Set<String> getMissingBuildCommand() {

-		// TODO

-		return Collections.emptySet();

-	}

-

-	public Document getDocument() {

-		return fragmentXML;

-	}

-

-	public String getId() {

-		return fragmentRoot.getAttribute(ID);

-	}

-

-	public String getLabel() {

-		return fragmentRoot.getAttribute(LABEL);

-	}

-

-	public String getVersion() {

-		return fragmentRoot.getAttribute(VERSION);

-	}

-

-	public String getProviderName() {

-		return fragmentRoot.getAttribute(PROVIDER);

-	}

-

-	public String getDescriptionText() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	public String getDescriptionURL() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	public String getCopyrightURL() {

-		final Element copyrightNode = getNode(COPYRIGHT);

-		if (copyrightNode != null) {

-			final String value = copyrightNode.getAttribute("url");

-			if (value != null && value.startsWith("%")) {

-				final IFile file = getProject().getFile("feature.properties");

-				final Properties prop = new Properties(); // TODO create a method to use Properties for others fields too

-				try {

-					prop.load(file.getContents());

-				} catch (final IOException e) {

-					Activator.log.error(e);

-				} catch (final CoreException e) {

-					Activator.log.error(e);

-				}

-				final Object val = prop.get("url");

-				if (val != null) {

-					return (String) val;

-				}

-			}

-			return copyrightNode.getAttribute("url");

-		}

-		return null;

-	}

-

-	public String getCopyrightText() {

-		final Element copyrightNode = getNode(COPYRIGHT);

-

-		return copyrightNode != null ? copyrightNode.getTextContent() : null;

-	}

-

-	public String getLicenseText() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	public String getLicenceURL() {

-		// TODO Auto-generated method stub

-		return null;

-	}

-

-	public String getOS() {

-		return fragmentRoot.getAttribute(OS);

-	}

-

-	public String getWS() {

-		return fragmentRoot.getAttribute(WS);

-	}

-

-	public String getNL() {

-		return fragmentRoot.getAttribute(NL);

-	}

-

-	public String getArch() {

-		return fragmentRoot.getAttribute(ARCH);

-	}

-

-	public void setId(final String id) {

-		fragmentRoot.setAttribute(ID, id);

-	}

-

-	public void setLabel(final String label) {

-		fragmentRoot.setAttribute(LABEL, label);

-	}

-

-	public void setVersion(final String version) {

-		fragmentRoot.setAttribute(VERSION, version);

-	}

-

-	public void setProviderName(final String providerName) {

-		fragmentRoot.setAttribute(PROVIDER, providerName);

-	}

-

-	public void setDescription(final String descriptionURL, final String description) {

-		if (exists()) {

-			Element extension = getNode(DESCRIPTION);

-

-			if (extension == null) {

-				extension = fragmentXML.createElement(DESCRIPTION);

-				fragmentRoot.appendChild(extension);

-			}

-

-			extension.setAttribute(URL, descriptionURL);

-			extension.setTextContent(description);

-		}

-	}

-

-	public void setCopyright(final String copyrightURL, final String copyrightDesc) {

-		setURLNode(COPYRIGHT, copyrightURL, copyrightDesc);

-	}

-

-	public void setLicense(final String licenseURL, final String licenseDesc) {

-		setURLNode(LICENSE, licenseURL, licenseDesc);

-	}

-

-	public void setOS(final String os) {

-		fragmentRoot.setAttribute(OS, os);

-	}

-

-	public void setWS(final String ws) {

-		fragmentRoot.setAttribute(WS, ws);

-	}

-

-	public void setNL(final String nl) {

-		fragmentRoot.setAttribute(NL, nl);

-	}

-

-	public void setArch(final String architecture) {

-		fragmentRoot.setAttribute(ARCH, architecture);

-	}

-

-	public void setUpdateURL(final String urlLabel, final String url) {

-		Element urlNode = getNode(URL);

-

-		if (urlNode == null) {

-			urlNode = createElement(URL);

-			fragmentRoot.appendChild(urlNode);

-		}

-

-		Element updateNode = getNodeChild(UPDATE, urlNode);

-		if (updateNode == null) {

-			updateNode = createElement(UPDATE);

-			urlNode.appendChild(updateNode);

-		}

-

-		updateNode.setAttribute(LABEL, urlLabel);

-		updateNode.setAttribute(URL, url);

-	}

-

-	public void addPlugin(final String pluginName) {

-		// Get the plug-in element or create it if it does not exist

-		Element pluginNode = getPlugin(pluginName);

-

-		if (pluginNode == null) {

-			pluginNode = createElement(PLUGIN);

-			fragmentRoot.appendChild(pluginNode);

-		}

-

-		// Set the id on the element

-		pluginNode.setAttribute(ID, pluginName);

-	}

-

-	public void addRequiredFeature(final String featureName, final String version) {

-		// Make sure the "requires" element exists

-		Element requires = getNode(REQUIRES);

-

-		if (requires == null) {

-			requires = createElement(REQUIRES);

-			fragmentRoot.appendChild(requires);

-		}

-

-		// Get or create the required feature element

-		Element feature = getRequiredFeature(featureName);

-

-		if (feature == null) {

-			feature = createElement(IMPORT);

-			requires.appendChild(feature);

-		}

-

-		// Set the element values

-		feature.setAttribute(FEATURE, featureName);

-		feature.setAttribute(VERSION, version);

-	}

-

-	public void addRequiredPlugin(final String pluginName) {

-		// Make sure the "requires" element exists

-		Element requires = getNode(REQUIRES);

-

-		if (requires == null) {

-			requires = createElement(REQUIRES);

-			fragmentRoot.appendChild(requires);

-		}

-

-		// Get or create the plug-in element

-		Element plugin = getRequiredPlugin(pluginName);

-

-		if (plugin == null) {

-			plugin = createElement(IMPORT);

-			requires.appendChild(plugin);

-		}

-

-		plugin.setAttribute(PLUGIN, pluginName);

-	}

-

-	public void addInclude(final String featureName, final String version) {

-		Element includeNode = getInclude(featureName);

-

-		if (includeNode == null) {

-			includeNode = createElement(INCLUDES);

-			fragmentRoot.appendChild(includeNode);

-		}

-

-		includeNode.setAttribute(ID, featureName);

-		includeNode.setAttribute(VERSION, version);

-	}

-

-	/**

-	 * Creates an element and returns it.

-	 *

-	 * @param elementName the name of the element to create

-	 * @return the created element

-	 */

-	private Element createElement(String elementName) {

-		return fragmentXML.createElement(elementName);

-	}

-

-	protected void setURLNode(final String nodeName, final String url, final String description) {

-		if (exists()) {

-			Element extension = getNode(nodeName);

-			if (extension == null) {

-				extension = fragmentXML.createElement(nodeName);

-				if (url != null) {

-					extension.setAttribute(URL, url);

-				}

-				extension.setTextContent(description);

-				fragmentRoot.appendChild(extension);

-			} else {

-				if (url != null) {

-					extension.setAttribute(URL, url);

-				}

-				extension.setTextContent(description);

-			}

-		}

-	}

-

-	/**

-	 * Gets an element inside a parent element.

-	 *

-	 * @param parentElement

-	 * @param nodeName the node name of the element

-	 * @param attributeValue the value of the element's attribute to retrieve

-	 * @return the element or null if it does not exist

-	 */

-	private Element getElement(final Element parentElement, final String nodeName, final String attributeName, final String attributeValue) {

-		NodeList childNodes = parentElement.getChildNodes();

-

-		for (int i = 0; i < childNodes.getLength(); i++) {

-			Node item = childNodes.item(i);

-

-			if (nodeName.equals(item.getNodeName())) {

-				if (attributeValue.equals(getNodeAttribute(item, attributeName))) {

-					if (item instanceof Element) {

-						return (Element) item;

-					}

-				}

-			}

-		}

-

-		return null;

-	}

-

-	private Element getNodeChild(final String childName, final Element node) {

-		NodeList childNodes = node.getChildNodes();

-

-		if (childNodes == null) {

-			return null;

-		}

-

-		for (int i = 0; i < childNodes.getLength(); i++) {

-			Node item = childNodes.item(i);

-

-			if (item.getNodeName().equals(childName)) {

-				if (item instanceof Element) {

-					return (Element) item;

-				}

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * Gets a node element inside the root element.

-	 *

-	 * @param nodeName the node name

-	 * @return the node element or null if it does not exist.

-	 */

-	private Element getNode(final String nodeName) {

-		if (exists()) {

-			final NodeList nodes = fragmentRoot.getChildNodes();

-			for (int i = 0; i < nodes.getLength(); i++) {

-				final Node item = nodes.item(i);

-				if (item instanceof NodeList) {

-					final String name = item.getNodeName();

-					if (name.equals(nodeName)) {

-						if (item instanceof Element) {

-							return (Element) item;

-						}

-					}

-				}

-			}

-		}

-

-		return null;

-	}

-

-	private Element getPlugin(String pluginName) {

-		return getElement(fragmentRoot, PLUGIN, ID, pluginName);

-	}

-

-	private Element getInclude(String featureName) {

-		return getElement(fragmentRoot, INCLUDES, ID, featureName);

-	}

-

-	/**

-	 * @param pluginName

-	 * @return

-	 */

-	private Element getRequiredPlugin(String pluginName) {

-		Element requires = getNode(REQUIRES);

-

-		if (requires != null) {

-			return getElement(requires, IMPORT, PLUGIN, pluginName);

-		}

-

-		return null;

-	}

-

-	private String getNodeAttribute(Node node, String name) {

-		Node attribute = node.getAttributes().getNamedItem(name);

-

-		return attribute != null ? attribute.getNodeValue() : null;

-	}

-

-	private Element getRequiredFeature(String featureName) {

-		Element requires = getNode(REQUIRES);

-

-		if (requires != null) {

-			return getElement(requires, IMPORT, FEATURE, featureName);

-		}

-

-		return null;

-	}

-

-}

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/JavaProjectEditor.java b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/JavaProjectEditor.java
deleted file mode 100644
index befd2e8b174..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/JavaProjectEditor.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.eclipse.project.editors.project;

-

-import java.util.Set;

-

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.jdt.core.IJavaProject;

-import org.eclipse.jdt.core.JavaCore;

-import org.eclipse.jdt.core.JavaModelException;

-import org.eclipse.papyrus.eclipse.project.editors.Activator;

-import org.eclipse.papyrus.eclipse.project.editors.file.BuildEditor;

-import org.eclipse.papyrus.eclipse.project.editors.file.ClasspathEditor;

-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor;

-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IClasspathEditor;

-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IJavaProjectEditor;

-

-/**

- *

- * This editor allows to manage a JavaProject

- *

- */

-public class JavaProjectEditor extends ProjectEditor implements IJavaProjectEditor {

-

-

-	/** the java project */

-	private final IJavaProject javaProject;

-

-

-

-	/**

-	 * Gets the classpath editor.

-	 *

-	 * @return the classpath editor

-	 */

-	public IClasspathEditor getClasspathEditor() {

-		return classpathEditor;

-	}

-

-

-	/**

-	 * Gets the builds the editor.

-	 *

-	 * @return the builds the editor

-	 */

-	public IBuildEditor getBuildEditor() {

-		return buildEditor;

-	}

-

-	/** the classpath editor */

-	private final IClasspathEditor classpathEditor;

-

-	/** the build editor */

-	private final IBuildEditor buildEditor;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param project

-	 *            the eclipse project

-	 * @throws CoreException

-	 */

-	public JavaProjectEditor(final IProject project) throws CoreException {

-		super(project);

-		this.javaProject = JavaCore.create(project);

-		this.buildEditor = new BuildEditor(project);

-		this.classpathEditor = new ClasspathEditor(this.javaProject);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         <code>true</code> if the project is a java project :

-	 *

-	 */

-	@Override

-	public boolean exists() {

-		return super.exists() && this.javaProject.exists();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#getMissingFiles()

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public Set<String> getMissingFiles() {

-		Set<String> files = super.getMissingFiles();

-		files.addAll(this.classpathEditor.getMissingFiles());

-		files.addAll(this.buildEditor.getMissingFiles());

-		return files;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.AbstractProjectEditor#getMissingNature()

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public Set<String> getMissingNature() {

-		Set<String> natures = super.getMissingNature();

-		if (!hasNature(JAVA_NATURE)) {

-			natures.add(JAVA_NATURE);

-		}

-		return natures;

-	}

-

-	@Override

-	public void init() {

-		// TODO Auto-generated method stub

-		super.init();

-		this.classpathEditor.init();

-		this.buildEditor.init();

-	}

-

-	@Override

-	public void createFiles(final Set<String> files) {

-		super.createFiles(files);

-		this.classpathEditor.createFiles(files);

-		this.buildEditor.createFiles(files);

-	}

-

-

-

-	/**

-	 * save the modification

-	 *

-	 * @throws Throwable

-	 */

-	@Override

-	public void save() {

-		super.save();

-		try {

-			this.javaProject.save(new NullProgressMonitor(), true);

-		} catch (JavaModelException ex) {

-			Activator.log.error(ex);

-		}

-		this.classpathEditor.save();

-		this.buildEditor.save();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IJavaProjectEditor#addJavaSourceFolder(java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void addJavaSourceFolder(final String path) {

-		if (exists()) {

-			// we add this source folder to the class path

-			// String classPath = "/" + this.project.getName()+"/" + path;

-			String classPath = path;

-			this.classpathEditor.addSourceFolderToClasspath(classPath);

-

-			// we add this source folder in the build file

-			this.buildEditor.registerSourceFolder(path + "/"); //$NON-NLS-1$

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#registerSourceFolder(java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void registerSourceFolder(final String string) {

-		this.buildEditor.registerSourceFolder(string);

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#addToBuild(java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void addToBuild(final String path) {

-		this.buildEditor.addToBuild(path);

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#isRegistred(java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public boolean isRegisteredSourceFolder(final String path) {

-		return this.buildEditor.isRegisteredSourceFolder(path);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#getSourceFolders()

-	 *

-	 *      {@inheritDoc}

-	 */

-	public String[] getSourceFolders() {

-		return this.buildEditor.getSourceFolders();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.file.AbstractFileEditor#getMissingBuildCommand()

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public Set<String> getMissingBuildCommand() {

-		Set<String> buildCommand = super.getMissingBuildCommand();

-		if (!hasBuildCommand(IJavaProjectEditor.JAVA_BUILD_COMMAND)) {

-			buildCommand.add(IJavaProjectEditor.JAVA_BUILD_COMMAND);

-		}

-		return buildCommand;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#removeFromBuild(java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void removeFromBuild(String path) {

-		buildEditor.removeFromBuild(path);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#getElementsInBuild()

-	 *

-	 *      {@inheritDoc}

-	 */

-	public String[] getElementsInBuild() {

-		return buildEditor.getElementsInBuild();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#registerBinFolder(java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void registerBinFolder(String binFolder) {

-		buildEditor.registerBinFolder(binFolder);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor#isRegisteredBinFolder(java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public boolean isRegisteredBinFolder(String binFolder) {

-		return buildEditor.isRegisteredBinFolder(binFolder);

-	}

-}

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/PluginProjectEditor.java b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/PluginProjectEditor.java
deleted file mode 100644
index a6d34a6af4b..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/PluginProjectEditor.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Vincent Lorenzot (CEA-LIST) vincent.lorenzo@cea.fr

- *****************************************************************************/

-package org.eclipse.papyrus.eclipse.project.editors.project;

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.StringWriter;

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Set;

-

-import javax.xml.parsers.DocumentBuilder;

-import javax.xml.parsers.DocumentBuilderFactory;

-import javax.xml.parsers.ParserConfigurationException;

-import javax.xml.transform.OutputKeys;

-import javax.xml.transform.Transformer;

-import javax.xml.transform.TransformerException;

-import javax.xml.transform.TransformerFactory;

-import javax.xml.transform.dom.DOMSource;

-import javax.xml.transform.stream.StreamResult;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.papyrus.eclipse.project.editors.Activator;

-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor;

-import org.w3c.dom.Document;

-import org.w3c.dom.Element;

-import org.w3c.dom.NamedNodeMap;

-import org.w3c.dom.Node;

-import org.w3c.dom.NodeList;

-import org.xml.sax.SAXException;

-

-/**

- *

- * This editor allows to edit the plugin file

- *

- */

-public class PluginProjectEditor extends ProjectEditor implements IPluginProjectEditor {

-

-	private Document pluginXML;

-

-	private IFile pluginFile;

-

-	private Element pluginRoot;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param project

-	 *            the eclipse project

-	 * @throws ParserConfigurationException

-	 * @throws SAXException

-	 * @throws IOException

-	 * @throws CoreException

-	 */

-	public PluginProjectEditor(final IProject project) throws ParserConfigurationException, SAXException, IOException, CoreException {

-		super(project);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#init()

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public void init() {

-		this.pluginFile = getPlugin();

-		if (this.pluginFile != null && this.pluginFile.exists()) {

-			DocumentBuilderFactory documentFactory = DocumentBuilderFactory.newInstance();

-			DocumentBuilder documentBuilder;

-			try {

-				documentBuilder = documentFactory.newDocumentBuilder();

-				this.pluginXML = documentBuilder.parse(this.pluginFile.getLocation().toOSString());

-				this.pluginRoot = this.pluginXML.getDocumentElement();

-			} catch (ParserConfigurationException e) {

-				Activator.log.error(e);

-			} catch (SAXException e) {

-				Activator.log.error(e);

-			} catch (IOException e) {

-				Activator.log.error(e);

-			}

-		}

-	}

-

-	/**

-	 * Create the file plugin.xml

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#createFiles(Set)

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public void createFiles(final Set<String> files) {

-		if (files.contains(PLUGIN_XML_FILE)) {

-			IFile plugin = getProject().getFile(PLUGIN_XML_FILE);

-			if (!plugin.exists()) {

-				InputStream is = getInputStream("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<?eclipse version=\"3.4\"?>\n" + "<plugin>\n" + "</plugin>\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$

-				try {

-					plugin.create(is, true, null);

-				} catch (CoreException e) {

-					Activator.log.error(e);

-				}

-			}

-		}

-		super.createFiles(files);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.AbstractProjectEditor.plugin.AbstractEditor#exists()

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public boolean exists() {

-		IFile plugin = getProject().getFile(PLUGIN_XML_FILE);

-		return plugin.exists() && super.exists();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor#addExtension(java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public Element addExtension(final String extensionPoint) {

-		if (exists()) {

-			Element extension = this.pluginXML.createElement(EXTENSION);

-			extension.setAttribute(POINT, extensionPoint);

-			this.pluginRoot.appendChild(extension);

-			return extension;

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the list of the registered extension with this extension point

-	 *

-	 * @param extensionPoint

-	 *            the name of an extension point

-	 * @return

-	 *         the list of the registered extension with this extension point

-	 */

-	public List<Node> getExtensions(final String extensionPoint) {

-		if (exists()) {

-			NodeList nodes = this.pluginRoot.getChildNodes();

-			List<Node> extensions = new ArrayList<Node>();

-			for (int i = 0; i < nodes.getLength(); i++) {

-				Node item = nodes.item(i);

-				if (item instanceof NodeList) {

-					String name = item.getNodeName();

-					if (name.equals(EXTENSION)) {

-						NamedNodeMap attributes = item.getAttributes();

-						Node point = attributes.getNamedItem(POINT);

-						if (extensionPoint.equals(point.getNodeValue())) {

-							if (item instanceof Node) {

-								extensions.add(item);

-							}

-						}

-					}

-				}

-			}

-			return extensions;

-		}

-		return null;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor#setAttribute(org.w3c.dom.Element, java.lang.String, java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void setAttribute(final Element element, final String attributeName, final String attributeValue) {

-		element.setAttribute(attributeName, attributeValue);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor#addChild(org.w3c.dom.Element, java.lang.String)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public Element addChild(final Element element, final String childName) {

-		Element child = this.pluginXML.createElement(childName);

-		element.appendChild(child);

-		return child;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the plugin file if it exists

-	 */

-	private IFile getPlugin() {

-		IFile plugin = getProject().getFile(PLUGIN_XML_FILE);

-		if (plugin.exists()) {

-			return plugin;

-		}

-		return null;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#save()

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public void save() {

-		if (exists()) {

-			try {

-				TransformerFactory transformerFactory = TransformerFactory.newInstance();

-				Transformer transformer = transformerFactory.newTransformer();

-				transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); //$NON-NLS-1$

-				transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$

-				transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", //$NON-NLS-1$

-						"3"); //$NON-NLS-1$

-				StreamResult result = new StreamResult(new StringWriter());

-				DOMSource source = new DOMSource(this.pluginXML);

-				transformer.transform(source, result);

-

-				String resultAsString = result.getWriter().toString();

-				if (!resultAsString.endsWith("\n")) { //$NON-NLS-1$

-					resultAsString += "\n"; //$NON-NLS-1$

-				}

-				InputStream inputStream = getInputStream(resultAsString);

-				this.pluginFile.setContents(inputStream, true, true, null);

-			} catch (TransformerException ex) {

-				Activator.log.error(ex);

-			} catch (CoreException ex) {

-				Activator.log.error(ex);

-			}

-		}

-		super.save();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#getMissingNature()

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public Set<String> getMissingNature() {

-		Set<String> natures = super.getMissingNature();

-		if (!hasNature(PLUGIN_NATURE)) {

-			natures.add(PLUGIN_NATURE);

-		}

-		return natures;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.project.ProjectEditor#getMissingFiles()

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public Set<String> getMissingFiles() {

-		Set<String> files = super.getMissingFiles();

-		IFile plugin = getProject().getFile(PLUGIN_XML_FILE);

-		if (!plugin.exists()) {

-			files.add(PLUGIN_XML_FILE);

-		}

-		return files;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.file.AbstractFileEditor#getMissingBuildCommand()

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public Set<String> getMissingBuildCommand() {

-		Set<String> commands = super.getMissingBuildCommand();

-		if (!hasBuildCommand(PLUGIN_BUILD_COMMAND)) {

-			commands.add(PLUGIN_BUILD_COMMAND);

-		}

-		return commands;

-	}

-

-	/**

-	 * @return The XML Document associated to this plugin.xml file

-	 * @see PluginProjectEditor#init()

-	 * @see PluginProjectEditor#create()

-	 */

-	public Document getDocument() {

-		return pluginXML;

-	}

-}

diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/ProjectEditor.java b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/ProjectEditor.java
deleted file mode 100644
index 29a56b8e2cd..00000000000
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/src/org/eclipse/papyrus/eclipse/project/editors/project/ProjectEditor.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.eclipse.project.editors.project;

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.net.URL;

-import java.util.Set;

-

-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.runtime.CoreException;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.papyrus.eclipse.project.editors.Activator;

-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IProjectEditor;

-

-/**

- *

- * This class allows to manage the eclipse project

- *

- */

-public class ProjectEditor extends AbstractProjectEditor implements IProjectEditor {

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param project

-	 *            the eclipse project

-	 * @throws CoreException

-	 */

-	public ProjectEditor(final IProject project) throws CoreException {

-		super(project);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param folder

-	 *            a folder

-	 * @throws CoreException

-	 */

-	public ProjectEditor(final IFolder folder) throws CoreException {

-		super(null);

-		// TODO : create an action to import a folder as a project!

-		// this will allow to test the create method

-		throw new UnsupportedOperationException();

-	}

-

-

-

-	/**

-	 * Create the project file

-	 * TODO NOT TESTED

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IProjectEditor#createFiles(Set)

-	 *

-	 *      {@inheritDoc}

-	 */

-	public void createFiles(final Set<String> files) {

-		if (files.contains(PROJECT_FILE)) {

-			final IFile file = getProject().getFile(PROJECT_FILE);

-			if (!file.exists()) {

-				String input = ""; //$NON-NLS-1$

-				input += AbstractProjectEditor.XML_HEADER;

-				input += "<" + NAME + ">"; //$NON-NLS-1$ //$NON-NLS-2$

-				input += getProject().getName();

-				input += "</" + NAME + ">"; //$NON-NLS-1$ //$NON-NLS-2$

-				input += "<" + COMMENT + ">"; //$NON-NLS-1$ //$NON-NLS-2$

-				input += "</" + COMMENT + ">"; //$NON-NLS-1$ //$NON-NLS-2$

-				input += "<" + BUILD_SPEC + ">"; //$NON-NLS-1$ //$NON-NLS-2$

-				input += "</" + BUILD_SPEC + ">"; //$NON-NLS-1$ //$NON-NLS-2$

-				input += "<" + NATURE + ">"; //$NON-NLS-1$ //$NON-NLS-2$

-				input += "</" + NATURE + ">"; //$NON-NLS-1$ //$NON-NLS-2$

-

-				try {

-					file.create(getInputStream(input), true, null);

-				} catch (final CoreException e) {

-					Activator.log.error(e);

-				}

-			}

-		}

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IProjectEditor#getMissingFiles()

-	 *

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public Set<String> getMissingFiles() {

-		final Set<String> missingFile = super.getMissingFiles();

-		final IFile projectFile = getProject().getFile(PROJECT_FILE);

-		if (!projectFile.exists()) {

-			missingFile.add(IProjectEditor.PROJECT_FILE);

-		}

-		return missingFile;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IProjectEditor#addFile(java.net.URL, java.lang.String)

-	 *

-	 * @param url

-	 * @param fileDestinationPath

-	 * @param eraseExitingFile

-	 */

-	public void addFile(final URL url, final String fileDestinationPath, final boolean eraseExitingFile) {

-		final IFile targetFile = getProject().getFile(new Path(fileDestinationPath));

-		if (targetFile.exists()) {

-			if (eraseExitingFile) {

-				try {

-					targetFile.delete(true, new NullProgressMonitor());

-				} catch (final CoreException e) {

-					Activator.log.error(e);

-				}

-			} else {

-				return;

-			}

-		}

-		try {

-			final InputStream is = url.openStream();

-			;

-			targetFile.create(is, false, new NullProgressMonitor());

-			is.close();

-			targetFile.refreshLocal(IResource.DEPTH_ZERO, new NullProgressMonitor());

-		} catch (final CoreException e) {

-			Activator.log.error(e);

-		} catch (final IOException e) {

-			Activator.log.error(e);

-		}

-

-

-	}

-}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/.classpath b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/.classpath
index 858bac421b8..75556083f6e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/.classpath
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<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="output" path="bin"/>
 </classpath>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/plugin.xml
index c93f6d2c536..e53a18745aa 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/plugin.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/plugin.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

- Copyright (c) 2014 CEA LIST.

- 

- 

- All rights reserved. This program and the accompanying materials

- are made available under the terms of the Eclipse Public License v1.0

- which accompanies this distribution, and is available at

- http://www.eclipse.org/legal/epl-v10.html

- 

- Contributors:

-  CEA LIST - Initial API and implementation

--->

-

-<plugin>

-

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated ElementTypesConfigurations -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"

-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.provider.ElementtypesconfigurationsItemProviderAdapterFactory"

-            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>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2014 CEA LIST.
+ 
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+ 
+ Contributors:
+  CEA LIST - Initial API and implementation
+-->
+
+<plugin>
+
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated ElementTypesConfigurations -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
+            class="org.eclipse.papyrus.infra.elementtypesconfigurations.provider.ElementtypesconfigurationsItemProviderAdapterFactory"
+            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/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/pom.xml
index aa2a0ef6da8..d877e3e155b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.elementtypesconfigurations.edit</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/.classpath b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/.classpath
index 3fb4047155a..858bac421b8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/.classpath
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="src" path="src-gen"/>

-	<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="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/pom.xml
index db3c5bcee4f..18f2a8eb0da 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.elementtypesconfigurations.editor</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/model/RuntimeValuesEditionAdviceConfiguration.ecore b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/model/RuntimeValuesEditionAdviceConfiguration.ecore
index 619a73da67d..293b641ddaf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/model/RuntimeValuesEditionAdviceConfiguration.ecore
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/model/RuntimeValuesEditionAdviceConfiguration.ecore
@@ -1,13 +1,13 @@
-<?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="runtimevalueseditionadviceconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/1.1"

-    nsPrefix="runtimevalueseditionadviceconfiguration">

-  <eClassifiers xsi:type="ecore:EClass" name="RuntimeValuesEditionAdviceConfiguration"

-      eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="viewsToDisplay" upperBound="-1"

-        eType="#//ViewToDisplay" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ViewToDisplay">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="view" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.infra.properties/Model/Properties.ecore#//contexts/View"/>

-  </eClassifiers>

-</ecore:EPackage>

+<?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="runtimevalueseditionadviceconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/1.1"
+    nsPrefix="runtimevalueseditionadviceconfiguration">
+  <eClassifiers xsi:type="ecore:EClass" name="RuntimeValuesEditionAdviceConfiguration"
+      eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="viewsToDisplay" upperBound="-1"
+        eType="#//ViewToDisplay" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ViewToDisplay">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="view" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.infra.properties/Model/Properties.ecore#//contexts/View"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/model/RuntimeValuesEditionAdviceConfiguration.genmodel b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/model/RuntimeValuesEditionAdviceConfiguration.genmodel
index 0e887e796ec..6db547d5874 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/model/RuntimeValuesEditionAdviceConfiguration.genmodel
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/model/RuntimeValuesEditionAdviceConfiguration.genmodel
@@ -1,24 +1,24 @@
-<?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) 2014 CEA LIST.&#xD;&#xA;&#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; CEA LIST - Initial API and implementation"

-    modelDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen"

-    editDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen"

-    editorDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.editor/src-gen"

-    modelPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui" modelName="RuntimeValuesEditionAdviceConfiguration"

-    editPluginClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.setvaluesadviceconfiguration.provider.RuntimeValuesEditionAdviceConfigurationEditPlugin"

-    editorPluginClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.setvaluesadviceconfiguration.presentation.RuntimeValuesEditionAdviceConfigurationEditorPlugin"

-    testSuiteClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.tests.RuntimeValuesEditionAdviceConfigurationAllTests"

-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"

-    editPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui" usedGenPackages="../../org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.genmodel#//elementtypesconfigurations ../../org.eclipse.papyrus.infra.properties/Model/Properties.genmodel#//properties">

-  <foreignModel>RuntimeValuesEditionAdviceConfiguration.ecore</foreignModel>

-  <genPackages prefix="Runtimevalueseditionadviceconfiguration" basePackage="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui"

-      resource="XMI" disposableProviderFactory="true" childCreationExtenders="true"

-      ecorePackage="RuntimeValuesEditionAdviceConfiguration.ecore#/">

-    <genClasses ecoreClass="RuntimeValuesEditionAdviceConfiguration.ecore#//RuntimeValuesEditionAdviceConfiguration">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuntimeValuesEditionAdviceConfiguration.ecore#//RuntimeValuesEditionAdviceConfiguration/viewsToDisplay"/>

-    </genClasses>

-    <genClasses ecoreClass="RuntimeValuesEditionAdviceConfiguration.ecore#//ViewToDisplay">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference RuntimeValuesEditionAdviceConfiguration.ecore#//ViewToDisplay/view"/>

-    </genClasses>

-  </genPackages>

-</genmodel:GenModel>

+<?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) 2014 CEA LIST.&#xD;&#xA;&#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; CEA LIST - Initial API and implementation"
+    modelDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen"
+    editDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen"
+    editorDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.editor/src-gen"
+    modelPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui" modelName="RuntimeValuesEditionAdviceConfiguration"
+    editPluginClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.setvaluesadviceconfiguration.provider.RuntimeValuesEditionAdviceConfigurationEditPlugin"
+    editorPluginClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.setvaluesadviceconfiguration.presentation.RuntimeValuesEditionAdviceConfigurationEditorPlugin"
+    testSuiteClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.tests.RuntimeValuesEditionAdviceConfigurationAllTests"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"
+    editPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui" usedGenPackages="../../org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.genmodel#//elementtypesconfigurations ../../org.eclipse.papyrus.infra.properties/Model/Properties.genmodel#//properties">
+  <foreignModel>RuntimeValuesEditionAdviceConfiguration.ecore</foreignModel>
+  <genPackages prefix="Runtimevalueseditionadviceconfiguration" basePackage="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui"
+      resource="XMI" disposableProviderFactory="true" childCreationExtenders="true"
+      ecorePackage="RuntimeValuesEditionAdviceConfiguration.ecore#/">
+    <genClasses ecoreClass="RuntimeValuesEditionAdviceConfiguration.ecore#//RuntimeValuesEditionAdviceConfiguration">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuntimeValuesEditionAdviceConfiguration.ecore#//RuntimeValuesEditionAdviceConfiguration/viewsToDisplay"/>
+    </genClasses>
+    <genClasses ecoreClass="RuntimeValuesEditionAdviceConfiguration.ecore#//ViewToDisplay">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference RuntimeValuesEditionAdviceConfiguration.ecore#//ViewToDisplay/view"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/plugin.properties b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/plugin.properties
index a8ccad94c5e..36074245c9a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/plugin.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/plugin.properties
@@ -1,23 +1,23 @@
-

-# <copyright>

-# </copyright>

-#

-# $Id$

-

-pluginName = UI for EMF ElementTypesConfigurations Model

-providerName = Eclipse Modeling Project

-_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_RuntimeValuesEditionAdviceConfiguration_type = Runtime Values Edition Advice Configuration

-_UI_ViewToDisplay_type = View To Display

-_UI_Unknown_type = Object

-
_UI_Unknown_datatype= Value

-
_UI_RuntimeValuesEditionAdviceConfiguration_viewsToDisplay_feature = Views To Display

-_UI_ViewToDisplay_view_feature = View

-_UI_Unknown_feature = Unspecified

+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+pluginName = UI for EMF ElementTypesConfigurations Model
+providerName = Eclipse Modeling Project
+_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_RuntimeValuesEditionAdviceConfiguration_type = Runtime Values Edition Advice Configuration
+_UI_ViewToDisplay_type = View To Display
+_UI_Unknown_type = Object
+
_UI_Unknown_datatype= Value
+
_UI_RuntimeValuesEditionAdviceConfiguration_viewsToDisplay_feature = Views To Display
+_UI_ViewToDisplay_view_feature = View
+_UI_Unknown_feature = Unspecified
 
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/pom.xml
index d6b678c7cde..c9cb43cafa6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/internal/ui/Activator.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/internal/ui/Activator.java
index 801f04da3ab..03d821e00f7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/internal/ui/Activator.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/internal/ui/Activator.java
@@ -1,50 +1,50 @@
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.internal.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.infra.elementtypesconfigurations.emf.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;

-	}

-

-}

+package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.internal.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.infra.elementtypesconfigurations.emf.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/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/internal/ui/advice/RuntimeValuesEditionAdviceEditHelperAdvice.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/internal/ui/advice/RuntimeValuesEditionAdviceEditHelperAdvice.java
index ee842a9f9d4..e10663520fd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/internal/ui/advice/RuntimeValuesEditionAdviceEditHelperAdvice.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/internal/ui/advice/RuntimeValuesEditionAdviceEditHelperAdvice.java
@@ -1,137 +1,137 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.internal.ui.advice;

-

-import java.util.Collections;

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

-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.core.util.EMFCoreUtil;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-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.IEditCommandRequest;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.ViewToDisplay;

-import org.eclipse.papyrus.infra.properties.contexts.View;

-import org.eclipse.papyrus.infra.services.edit.utils.ElementTypeUtils;

-import org.eclipse.papyrus.views.properties.creation.EditionDialog;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * advice for the {@link SetValuesAdviceConfiguration}

- */

-public class RuntimeValuesEditionAdviceEditHelperAdvice extends AbstractEditHelperAdvice {

-

-	/** list of views to display */

-	protected Set<View> viewsToDisplay;

-

-

-	/**

-	 * Default Constructor

-	 */

-	public RuntimeValuesEditionAdviceEditHelperAdvice(RuntimeValuesEditionAdviceConfiguration configuration) {

-		viewsToDisplay = new HashSet<View>();

-		for (ViewToDisplay display : configuration.getViewsToDisplay()) {

-			View view = display.getView();

-			if (view != null) {

-				viewsToDisplay.add(view);

-			}

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean approveRequest(IEditCommandRequest request) {

-		return super.approveRequest(request);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getBeforeCreateCommand(CreateElementRequest request) {

-		return super.getBeforeCreateCommand(request);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getAfterCreateCommand(CreateElementRequest request) {

-		return super.getAfterCreateCommand(request);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {

-		return super.getBeforeConfigureCommand(request);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {

-		final EObject elementToConfigure = request.getElementToConfigure();

-		if (elementToConfigure == null) {

-			return null;

-		}

-

-		final boolean dialogCancellable = ElementTypeUtils.dialogCancellable(request);

-

-		return new AbstractTransactionalCommand(request.getEditingDomain(), "Editing " + EMFCoreUtil.getName(elementToConfigure), Collections.singletonList(WorkspaceSynchronizer.getFile((elementToConfigure.eResource())))) {

-			/**

-			 * {@inheritDoc}

-			 */

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-				Set<View> viewsToDisplay = getViewsToDisplay();

-				if (!viewsToDisplay.isEmpty()) {

-					EditionDialog dialog = new EditionDialog(Display.getCurrent().getActiveShell(), dialogCancellable) {

-

-					};

-					dialog.setTitle("Edit " + EMFCoreUtil.getName(elementToConfigure));

-					dialog.setViews(viewsToDisplay);

-					dialog.setInput(elementToConfigure);

-

-					dialog.open();

-				}

-

-				return CommandResult.newOKCommandResult(elementToConfigure);

-			}

-		};

-

-	}

-

-

-	/**

-	 * @return the viewsToDisplay

-	 */

-	public Set<View> getViewsToDisplay() {

-		return viewsToDisplay;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.internal.ui.advice;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
+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.core.util.EMFCoreUtil;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+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.IEditCommandRequest;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.ViewToDisplay;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.ui.creation.EditionDialog;
+import org.eclipse.papyrus.infra.services.edit.utils.ElementTypeUtils;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * advice for the {@link SetValuesAdviceConfiguration}
+ */
+public class RuntimeValuesEditionAdviceEditHelperAdvice extends AbstractEditHelperAdvice {
+
+	/** list of views to display */
+	protected Set<View> viewsToDisplay;
+
+
+	/**
+	 * Default Constructor
+	 */
+	public RuntimeValuesEditionAdviceEditHelperAdvice(RuntimeValuesEditionAdviceConfiguration configuration) {
+		viewsToDisplay = new HashSet<View>();
+		for (ViewToDisplay display : configuration.getViewsToDisplay()) {
+			View view = display.getView();
+			if (view != null) {
+				viewsToDisplay.add(view);
+			}
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean approveRequest(IEditCommandRequest request) {
+		return super.approveRequest(request);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getBeforeCreateCommand(CreateElementRequest request) {
+		return super.getBeforeCreateCommand(request);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getAfterCreateCommand(CreateElementRequest request) {
+		return super.getAfterCreateCommand(request);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {
+		return super.getBeforeConfigureCommand(request);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {
+		final EObject elementToConfigure = request.getElementToConfigure();
+		if (elementToConfigure == null) {
+			return null;
+		}
+
+		final boolean dialogCancellable = ElementTypeUtils.dialogCancellable(request);
+
+		return new AbstractTransactionalCommand(request.getEditingDomain(), "Editing " + EMFCoreUtil.getName(elementToConfigure), Collections.singletonList(WorkspaceSynchronizer.getFile((elementToConfigure.eResource())))) {
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+				Set<View> viewsToDisplay = getViewsToDisplay();
+				if (!viewsToDisplay.isEmpty()) {
+					EditionDialog dialog = new EditionDialog(Display.getCurrent().getActiveShell(), dialogCancellable) {
+
+					};
+					dialog.setTitle("Edit " + EMFCoreUtil.getName(elementToConfigure));
+					dialog.setViews(viewsToDisplay);
+					dialog.setInput(elementToConfigure);
+
+					dialog.open();
+				}
+
+				return CommandResult.newOKCommandResult(elementToConfigure);
+			}
+		};
+
+	}
+
+
+	/**
+	 * @return the viewsToDisplay
+	 */
+	public Set<View> getViewsToDisplay() {
+		return viewsToDisplay;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/internal/ui/advice/RuntimeValuesEditionAdviceEditHelperAdviceFactory.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/internal/ui/advice/RuntimeValuesEditionAdviceEditHelperAdviceFactory.java
index 6896e6494bd..a60597a4c43 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/internal/ui/advice/RuntimeValuesEditionAdviceEditHelperAdviceFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/internal/ui/advice/RuntimeValuesEditionAdviceEditHelperAdviceFactory.java
@@ -1,31 +1,31 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.internal.ui.advice;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.AbstractAdviceBindingFactory;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.NullEditHelperAdvice;

-

-public class RuntimeValuesEditionAdviceEditHelperAdviceFactory extends AbstractAdviceBindingFactory<AbstractAdviceBindingConfiguration> {

-

-	@Override

-	protected IEditHelperAdvice getEditHelperAdvice(AbstractAdviceBindingConfiguration adviceConfiguration) {

-		if (adviceConfiguration instanceof RuntimeValuesEditionAdviceConfiguration) {

-			IEditHelperAdvice editHelperAdvice = new RuntimeValuesEditionAdviceEditHelperAdvice((RuntimeValuesEditionAdviceConfiguration) adviceConfiguration);

-			return editHelperAdvice;

-		}

-		return NullEditHelperAdvice.getInstance();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.internal.ui.advice;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.AbstractAdviceBindingFactory;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.NullEditHelperAdvice;
+
+public class RuntimeValuesEditionAdviceEditHelperAdviceFactory extends AbstractAdviceBindingFactory<AbstractAdviceBindingConfiguration> {
+
+	@Override
+	protected IEditHelperAdvice getEditHelperAdvice(AbstractAdviceBindingConfiguration adviceConfiguration) {
+		if (adviceConfiguration instanceof RuntimeValuesEditionAdviceConfiguration) {
+			IEditHelperAdvice editHelperAdvice = new RuntimeValuesEditionAdviceEditHelperAdvice((RuntimeValuesEditionAdviceConfiguration) adviceConfiguration);
+			return editHelperAdvice;
+		}
+		return NullEditHelperAdvice.getInstance();
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/META-INF/MANIFEST.MF
index 4e6fe3cfb12..6aa337dd49d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/META-INF/MANIFEST.MF
@@ -1,42 +1,42 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.xmi;visibility:=reexport,

- org.eclipse.papyrus.infra.constraints;visibility:=reexport,

- org.eclipse.papyrus.infra.elementtypesconfigurations;visibility:=reexport,

- org.eclipse.uml2.uml;visibility:=reexport,

- org.eclipse.uml2.types;visibility:=reexport,

- org.eclipse.papyrus.infra.properties;visibility:=reexport,

- org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.emf.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport,

- org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.elementtypesconfigurations.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.properties.edit;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.uml2.uml.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.core.databinding;bundle-version="1.4.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.infra.elementtypesconfigurations.emf,

- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.converter,

- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerconfiguration,

- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration,

- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl,

- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.provider,

- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.util,

- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration,

- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl,

- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider,

- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.util

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider.SetValuesAdviceConfigurationEditPlugin$Implementation

-Bundle-SymbolicName: org.eclipse.papyrus.infra.elementtypesconfigurations.emf;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints;visibility:=reexport,
+ org.eclipse.papyrus.infra.elementtypesconfigurations;visibility:=reexport,
+ org.eclipse.uml2.uml;visibility:=reexport,
+ org.eclipse.uml2.types;visibility:=reexport,
+ org.eclipse.papyrus.infra.properties;visibility:=reexport,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes;bundle-version="1.2.0";visibility:=reexport,
+ org.eclipse.emf.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.properties.edit;bundle-version="1.2.0";visibility:=reexport,
+ org.eclipse.uml2.uml.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
+ org.eclipse.core.databinding;bundle-version="1.4.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0"
+Export-Package: org.eclipse.papyrus.infra.elementtypesconfigurations.emf,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.emf.converter,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerconfiguration,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.provider,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.util,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.util
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider.SetValuesAdviceConfigurationEditPlugin$Implementation
+Bundle-SymbolicName: org.eclipse.papyrus.infra.elementtypesconfigurations.emf;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/InvariantContainerRuleConfiguration.ecore b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/InvariantContainerRuleConfiguration.ecore
index f3ae807d8df..9c6eb857b49 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/InvariantContainerRuleConfiguration.ecore
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/InvariantContainerRuleConfiguration.ecore
@@ -1,18 +1,18 @@
-<?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="invariantcontainerruleconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/containerruleconfiguration/1.1"

-    nsPrefix="invariantcontainerruleconfiguration">

-  <eClassifiers xsi:type="ecore:EClass" name="InvariantContainerRuleConfiguration"

-      eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.ecore#//InvariantRuleConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="permissions" upperBound="-1"

-        eType="#//HierarchyPermission" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="HierarchyPermission">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="containerType" lowerBound="1"

-        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="permitted" lowerBound="1"

-        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="strict" lowerBound="1"

-        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

-  </eClassifiers>

-</ecore:EPackage>

+<?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="invariantcontainerruleconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/containerruleconfiguration/1.1"
+    nsPrefix="invariantcontainerruleconfiguration">
+  <eClassifiers xsi:type="ecore:EClass" name="InvariantContainerRuleConfiguration"
+      eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.ecore#//InvariantRuleConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="permissions" upperBound="-1"
+        eType="#//HierarchyPermission" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="HierarchyPermission">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="containerType" lowerBound="1"
+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="permitted" lowerBound="1"
+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="strict" lowerBound="1"
+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/SetValuesAdviceConfiguration.ecore b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/SetValuesAdviceConfiguration.ecore
index 1436cc326e2..dee75073a34 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/SetValuesAdviceConfiguration.ecore
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/SetValuesAdviceConfiguration.ecore
@@ -1,26 +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="setvaluesadviceconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/1.1"

-    nsPrefix="setvaluesadviceconfiguration">

-  <eClassifiers xsi:type="ecore:EClass" name="SetValuesAdviceConfiguration" eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="featuresToSet" upperBound="-1"

-        eType="#//FeatureToSet" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="FeatureToSet">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="featureName" lowerBound="1"

-        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="#//FeatureValue"

-        containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="FeatureValue" abstract="true"/>

-  <eClassifiers xsi:type="ecore:EClass" name="DynamicValue" abstract="true" eSuperTypes="#//FeatureValue"/>

-  <eClassifiers xsi:type="ecore:EClass" name="ConstantValue" eSuperTypes="#//FeatureValue">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="valueInstance" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ValueSpecification"

-        containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ListValue" eSuperTypes="#//FeatureValue">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"

-        eType="#//FeatureValue" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="QueryExecutionValue" eSuperTypes="#//DynamicValue"/>

-</ecore:EPackage>

+<?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="setvaluesadviceconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/1.1"
+    nsPrefix="setvaluesadviceconfiguration">
+  <eClassifiers xsi:type="ecore:EClass" name="SetValuesAdviceConfiguration" eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="featuresToSet" upperBound="-1"
+        eType="#//FeatureToSet" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FeatureToSet">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="featureName" lowerBound="1"
+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="#//FeatureValue"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FeatureValue" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="DynamicValue" abstract="true" eSuperTypes="#//FeatureValue"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ConstantValue" eSuperTypes="#//FeatureValue">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="valueInstance" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ValueSpecification"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ListValue" eSuperTypes="#//FeatureValue">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"
+        eType="#//FeatureValue" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="QueryExecutionValue" eSuperTypes="#//DynamicValue"/>
+</ecore:EPackage>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/plugin.xml
index 4a3ff0c116f..f0109c24dfc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/plugin.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/plugin.xml
@@ -1,96 +1,96 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<plugin>

-

-

-

-

-

-
-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated SetValuesAdviceConfiguration -->

-      <package

-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/1.1"

-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage"

-            genModel="model/SetValuesAdviceConfiguration.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.extension_parser">

-      <!-- @generated SetValuesAdviceConfiguration -->

-      <parser

-            type="setvaluesadviceconfiguration"

-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.util.SetValuesAdviceConfigurationResourceFactoryImpl"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated SetValuesAdviceConfiguration -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/1.1"

-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider.SetValuesAdviceConfigurationItemProviderAdapterFactory"

-            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.childCreationExtenders">

-      <!-- @generated SetValuesAdviceConfiguration -->

-      <extender

-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"

-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider.SetValuesAdviceConfigurationItemProviderAdapterFactory$ElementtypesconfigurationsChildCreationExtender"/>

-   </extension>

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated InvariantContainerRuleConfiguration -->

-      <package

-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/containerruleconfiguration/1.1"

-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage"

-            genModel="model/InvariantContainerRuleConfiguration.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.extension_parser">

-      <!-- @generated InvariantContainerRuleConfiguration -->

-      <parser

-            type="invariantcontainerruleconfiguration"

-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.util.InvariantContainerRuleConfigurationResourceFactoryImpl"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated InvariantContainerRuleConfiguration -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/containerruleconfiguration/1.1"

-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.provider.InvariantContainerRuleConfigurationItemProviderAdapterFactory"

-            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.childCreationExtenders">

-      <!-- @generated InvariantContainerRuleConfiguration -->

-      <extender

-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.0"

-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.provider.InvariantContainerRuleConfigurationItemProviderAdapterFactory$InvariantTypeConfigurationChildCreationExtender"/>

-   </extension>

-

-

-

-   <extension

-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.adviceConfigurationType">

-      <adviceConfigurationType

-            configurationClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfiguration"

-            factoryClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceEditHelperAdviceFactory">

-      </adviceConfigurationType>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invariantRule">

-      <invariantRule

-            configurationClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfiguration"

-            invariantRuleClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerconfiguration.InvariantContainerRule">

-      </invariantRule>

-   </extension>

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<plugin>
+
+
+
+
+
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated SetValuesAdviceConfiguration -->
+      <package
+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/1.1"
+            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage"
+            genModel="model/SetValuesAdviceConfiguration.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.extension_parser">
+      <!-- @generated SetValuesAdviceConfiguration -->
+      <parser
+            type="setvaluesadviceconfiguration"
+            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.util.SetValuesAdviceConfigurationResourceFactoryImpl"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated SetValuesAdviceConfiguration -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/1.1"
+            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider.SetValuesAdviceConfigurationItemProviderAdapterFactory"
+            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.childCreationExtenders">
+      <!-- @generated SetValuesAdviceConfiguration -->
+      <extender
+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
+            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider.SetValuesAdviceConfigurationItemProviderAdapterFactory$ElementtypesconfigurationsChildCreationExtender"/>
+   </extension>
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated InvariantContainerRuleConfiguration -->
+      <package
+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/containerruleconfiguration/1.1"
+            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage"
+            genModel="model/InvariantContainerRuleConfiguration.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.extension_parser">
+      <!-- @generated InvariantContainerRuleConfiguration -->
+      <parser
+            type="invariantcontainerruleconfiguration"
+            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.util.InvariantContainerRuleConfigurationResourceFactoryImpl"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated InvariantContainerRuleConfiguration -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/containerruleconfiguration/1.1"
+            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.provider.InvariantContainerRuleConfigurationItemProviderAdapterFactory"
+            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.childCreationExtenders">
+      <!-- @generated InvariantContainerRuleConfiguration -->
+      <extender
+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.0"
+            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.provider.InvariantContainerRuleConfigurationItemProviderAdapterFactory$InvariantTypeConfigurationChildCreationExtender"/>
+   </extension>
+
+
+
+   <extension
+         point="org.eclipse.papyrus.infra.elementtypesconfigurations.adviceConfigurationType">
+      <adviceConfigurationType
+            configurationClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfiguration"
+            factoryClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceEditHelperAdviceFactory">
+      </adviceConfigurationType>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invariantRule">
+      <invariantRule
+            configurationClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfiguration"
+            invariantRuleClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerconfiguration.InvariantContainerRule">
+      </invariantRule>
+   </extension>
+</plugin>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/pom.xml
index 4a7d572b7f1..6fa070e3e02 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.elementtypesconfigurations.emf</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/SetValuesAdviceEditHelperAdviceFactory.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/SetValuesAdviceEditHelperAdviceFactory.java
index 09a9376a31f..85f7146e0fa 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/SetValuesAdviceEditHelperAdviceFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/SetValuesAdviceEditHelperAdviceFactory.java
@@ -1,31 +1,31 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.AbstractAdviceBindingFactory;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.NullEditHelperAdvice;

-

-public class SetValuesAdviceEditHelperAdviceFactory extends AbstractAdviceBindingFactory<AbstractAdviceBindingConfiguration> {

-

-	@Override

-	protected IEditHelperAdvice getEditHelperAdvice(AbstractAdviceBindingConfiguration adviceConfiguration) {

-		if (adviceConfiguration instanceof SetValuesAdviceConfiguration) {

-			IEditHelperAdvice editHelperAdvice = new SetValuesAdviceEditHelperAdvice((SetValuesAdviceConfiguration) adviceConfiguration);

-			return editHelperAdvice;

-		}

-		return NullEditHelperAdvice.getInstance();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.AbstractAdviceBindingFactory;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.NullEditHelperAdvice;
+
+public class SetValuesAdviceEditHelperAdviceFactory extends AbstractAdviceBindingFactory<AbstractAdviceBindingConfiguration> {
+
+	@Override
+	protected IEditHelperAdvice getEditHelperAdvice(AbstractAdviceBindingConfiguration adviceConfiguration) {
+		if (adviceConfiguration instanceof SetValuesAdviceConfiguration) {
+			IEditHelperAdvice editHelperAdvice = new SetValuesAdviceEditHelperAdvice((SetValuesAdviceConfiguration) adviceConfiguration);
+			return editHelperAdvice;
+		}
+		return NullEditHelperAdvice.getInstance();
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.ecore b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.ecore
index 0f47b40f520..9ea45aa16a5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.ecore
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.ecore
@@ -1,21 +1,21 @@
-<?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="invarianttypeconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.1"

-    nsPrefix="invarianttypeconfiguration">

-  <eClassifiers xsi:type="ecore:EClass" name="InvariantTypeConfiguration" eSuperTypes="../../org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="invariantRuleConfiguration"

-        lowerBound="1" eType="#//InvariantRuleConfiguration" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="InvariantRuleConfiguration" abstract="true"/>

-  <eClassifiers xsi:type="ecore:EClass" name="CompositeInvariantRuleConfiguration"

-      abstract="true" eSuperTypes="#//InvariantRuleConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="composedRules" lowerBound="2"

-        upperBound="-1" eType="#//InvariantRuleConfiguration" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="NotInvariantRuleConfiguration" eSuperTypes="#//InvariantRuleConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="composedRule" lowerBound="1"

-        eType="#//InvariantRuleConfiguration"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="AndInvariantRuleConfiguration" eSuperTypes="#//CompositeInvariantRuleConfiguration"/>

-  <eClassifiers xsi:type="ecore:EClass" name="OrInvariantRuleConfiguration" eSuperTypes="#//CompositeInvariantRuleConfiguration"/>

-</ecore:EPackage>

+<?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="invarianttypeconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.1"
+    nsPrefix="invarianttypeconfiguration">
+  <eClassifiers xsi:type="ecore:EClass" name="InvariantTypeConfiguration" eSuperTypes="../../org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="invariantRuleConfiguration"
+        lowerBound="1" eType="#//InvariantRuleConfiguration" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="InvariantRuleConfiguration" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CompositeInvariantRuleConfiguration"
+      abstract="true" eSuperTypes="#//InvariantRuleConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="composedRules" lowerBound="2"
+        upperBound="-1" eType="#//InvariantRuleConfiguration" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="NotInvariantRuleConfiguration" eSuperTypes="#//InvariantRuleConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="composedRule" lowerBound="1"
+        eType="#//InvariantRuleConfiguration"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AndInvariantRuleConfiguration" eSuperTypes="#//CompositeInvariantRuleConfiguration"/>
+  <eClassifiers xsi:type="ecore:EClass" name="OrInvariantRuleConfiguration" eSuperTypes="#//CompositeInvariantRuleConfiguration"/>
+</ecore:EPackage>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/invarianttype.elementtypesconfigurations b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/invarianttype.elementtypesconfigurations
index f9a41f0c22c..4c77694c3bc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/invarianttype.elementtypesconfigurations
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/invarianttype.elementtypesconfigurations
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/invarianttype" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="InvariantTypes" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">

-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.DefaultInvariantEditHelperAdvice" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.DefaultInvariantEditHelperAdvice" inheritance="all" xmi:id="_mqX8YMHdEeSpuJnfbRdiWQ" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

-    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

-  </adviceBindingsConfigurations>

+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/invarianttype" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="InvariantTypes" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">
+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.DefaultInvariantEditHelperAdvice" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.DefaultInvariantEditHelperAdvice" inheritance="all" xmi:id="_mqX8YMHdEeSpuJnfbRdiWQ" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </adviceBindingsConfigurations>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/plugin.xml
index 2f05fb2649b..b535ce1fc47 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/plugin.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/plugin.xml
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension-point id="invariantRule" name="Invariant Rule Extension Point" schema="schema/invariantRule.exsd"/>

-

-

-

-

-

-

-

-
-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated InvariantTypeConfiguration -->

-      <package

-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.1"

-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage"

-            genModel="model/InvariantTypeConfiguration.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.extension_parser">

-      <!-- @generated InvariantTypeConfiguration -->

-      <parser

-            type="invarianttypeconfiguration"

-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.util.InvariantTypeConfigurationResourceFactoryImpl"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated InvariantTypeConfiguration -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.1"

-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.provider.InvariantTypeConfigurationItemProviderAdapterFactory"

-            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.childCreationExtenders">

-      <!-- @generated InvariantTypeConfiguration -->

-      <extender

-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"

-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.provider.InvariantTypeConfigurationItemProviderAdapterFactory$ElementtypesconfigurationsChildCreationExtender"/>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeConfigurationType">

-      <elementTypeConfigurationType

-            configurationClass="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration"

-            factoryClass="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.InvariantElementTypeFactory">

-      </elementTypeConfigurationType>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">

-      <elementTypeSet

-            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"

-            path="model/invarianttype.elementtypesconfigurations">

-      </elementTypeSet>

-   </extension>

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension-point id="invariantRule" name="Invariant Rule Extension Point" schema="schema/invariantRule.exsd"/>
+
+
+
+
+
+
+
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated InvariantTypeConfiguration -->
+      <package
+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.1"
+            class="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage"
+            genModel="model/InvariantTypeConfiguration.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.extension_parser">
+      <!-- @generated InvariantTypeConfiguration -->
+      <parser
+            type="invarianttypeconfiguration"
+            class="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.util.InvariantTypeConfigurationResourceFactoryImpl"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated InvariantTypeConfiguration -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.1"
+            class="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.provider.InvariantTypeConfigurationItemProviderAdapterFactory"
+            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.childCreationExtenders">
+      <!-- @generated InvariantTypeConfiguration -->
+      <extender
+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
+            class="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.provider.InvariantTypeConfigurationItemProviderAdapterFactory$ElementtypesconfigurationsChildCreationExtender"/>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeConfigurationType">
+      <elementTypeConfigurationType
+            configurationClass="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration"
+            factoryClass="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.InvariantElementTypeFactory">
+      </elementTypeConfigurationType>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      <elementTypeSet
+            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
+            path="model/invarianttype.elementtypesconfigurations">
+      </elementTypeSet>
+   </extension>
+</plugin>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/pom.xml
index 67329b66604..61cae9899c1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfigurationPackage.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfigurationPackage.java
index d1e9b912191..25e1c9d4409 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfigurationPackage.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfigurationPackage.java
@@ -1,576 +1,576 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;

-

-/**

- * <!-- 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.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationFactory

- * @model kind="package"

- * @generated

- */

-public interface InvariantTypeConfigurationPackage extends EPackage {

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "invarianttypeconfiguration";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.1";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "invarianttypeconfiguration";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	InvariantTypeConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationImpl <em>Invariant Type Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getInvariantTypeConfiguration()

-	 * @generated

-	 */

-	int INVARIANT_TYPE_CONFIGURATION = 0;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_TYPE_CONFIGURATION__DESCRIPTION = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_TYPE_CONFIGURATION__IDENTIFIER = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__IDENTIFIER;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_TYPE_CONFIGURATION__NAME = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Hint</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_TYPE_CONFIGURATION__HINT = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__HINT;

-

-	/**

-	 * The feature id for the '<em><b>Kind</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_TYPE_CONFIGURATION__KIND = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__KIND;

-

-	/**

-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_TYPE_CONFIGURATION__ICON_ENTRY = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__ICON_ENTRY;

-

-	/**

-	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID;

-

-	/**

-	 * The feature id for the '<em><b>Edit Helper Advice Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Container Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Invariant Rule Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Invariant Type Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_TYPE_CONFIGURATION_FEATURE_COUNT = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of operations of the '<em>Invariant Type Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_TYPE_CONFIGURATION_OPERATION_COUNT = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantRuleConfigurationImpl <em>Invariant Rule Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantRuleConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getInvariantRuleConfiguration()

-	 * @generated

-	 */

-	int INVARIANT_RULE_CONFIGURATION = 1;

-

-	/**

-	 * The number of structural features of the '<em>Invariant Rule Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT = 0;

-

-	/**

-	 * The number of operations of the '<em>Invariant Rule Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.CompositeInvariantRuleConfigurationImpl <em>Composite Invariant Rule Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.CompositeInvariantRuleConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getCompositeInvariantRuleConfiguration()

-	 * @generated

-	 */

-	int COMPOSITE_INVARIANT_RULE_CONFIGURATION = 2;

-

-	/**

-	 * The feature id for the '<em><b>Composed Rules</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES = INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Composite Invariant Rule Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int COMPOSITE_INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT = INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of operations of the '<em>Composite Invariant Rule Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int COMPOSITE_INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT = INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.NotInvariantRuleConfigurationImpl <em>Not Invariant Rule Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.NotInvariantRuleConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getNotInvariantRuleConfiguration()

-	 * @generated

-	 */

-	int NOT_INVARIANT_RULE_CONFIGURATION = 3;

-

-	/**

-	 * The feature id for the '<em><b>Composed Rule</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE = INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Not Invariant Rule Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int NOT_INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT = INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of operations of the '<em>Not Invariant Rule Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int NOT_INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT = INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.AndInvariantRuleConfigurationImpl <em>And Invariant Rule Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.AndInvariantRuleConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getAndInvariantRuleConfiguration()

-	 * @generated

-	 */

-	int AND_INVARIANT_RULE_CONFIGURATION = 4;

-

-	/**

-	 * The feature id for the '<em><b>Composed Rules</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AND_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES = COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES;

-

-	/**

-	 * The number of structural features of the '<em>And Invariant Rule Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AND_INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT = COMPOSITE_INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of operations of the '<em>And Invariant Rule Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int AND_INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT = COMPOSITE_INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.OrInvariantRuleConfigurationImpl <em>Or Invariant Rule Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.OrInvariantRuleConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getOrInvariantRuleConfiguration()

-	 * @generated

-	 */

-	int OR_INVARIANT_RULE_CONFIGURATION = 5;

-

-	/**

-	 * The feature id for the '<em><b>Composed Rules</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OR_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES = COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES;

-

-	/**

-	 * The number of structural features of the '<em>Or Invariant Rule Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OR_INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT = COMPOSITE_INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of operations of the '<em>Or Invariant Rule Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OR_INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT = COMPOSITE_INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT + 0;

-

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration <em>Invariant Type Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Invariant Type Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration

-	 * @generated

-	 */

-	EClass getInvariantTypeConfiguration();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration#getInvariantRuleConfiguration <em>Invariant Rule Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Invariant Rule Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration#getInvariantRuleConfiguration()

-	 * @see #getInvariantTypeConfiguration()

-	 * @generated

-	 */

-	EReference getInvariantTypeConfiguration_InvariantRuleConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration <em>Invariant Rule Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Invariant Rule Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration

-	 * @generated

-	 */

-	EClass getInvariantRuleConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration <em>Composite Invariant Rule Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Composite Invariant Rule Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration

-	 * @generated

-	 */

-	EClass getCompositeInvariantRuleConfiguration();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration#getComposedRules <em>Composed Rules</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>Composed Rules</em>'.

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration#getComposedRules()

-	 * @see #getCompositeInvariantRuleConfiguration()

-	 * @generated

-	 */

-	EReference getCompositeInvariantRuleConfiguration_ComposedRules();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration <em>Not Invariant Rule Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Not Invariant Rule Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration

-	 * @generated

-	 */

-	EClass getNotInvariantRuleConfiguration();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration#getComposedRule <em>Composed Rule</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Composed Rule</em>'.

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration#getComposedRule()

-	 * @see #getNotInvariantRuleConfiguration()

-	 * @generated

-	 */

-	EReference getNotInvariantRuleConfiguration_ComposedRule();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration <em>And Invariant Rule Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>And Invariant Rule Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration

-	 * @generated

-	 */

-	EClass getAndInvariantRuleConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration <em>Or Invariant Rule Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Or Invariant Rule Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration

-	 * @generated

-	 */

-	EClass getOrInvariantRuleConfiguration();

-

-	/**

-	 * 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

-	 */

-	InvariantTypeConfigurationFactory getInvariantTypeConfigurationFactory();

-

-	/**

-	 * <!-- 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.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationImpl <em>Invariant Type Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getInvariantTypeConfiguration()

-		 * @generated

-		 */

-		EClass INVARIANT_TYPE_CONFIGURATION = eINSTANCE.getInvariantTypeConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Invariant Rule Configuration</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION = eINSTANCE.getInvariantTypeConfiguration_InvariantRuleConfiguration();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantRuleConfigurationImpl <em>Invariant Rule Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantRuleConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getInvariantRuleConfiguration()

-		 * @generated

-		 */

-		EClass INVARIANT_RULE_CONFIGURATION = eINSTANCE.getInvariantRuleConfiguration();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.CompositeInvariantRuleConfigurationImpl <em>Composite Invariant Rule Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.CompositeInvariantRuleConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getCompositeInvariantRuleConfiguration()

-		 * @generated

-		 */

-		EClass COMPOSITE_INVARIANT_RULE_CONFIGURATION = eINSTANCE.getCompositeInvariantRuleConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Composed Rules</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES = eINSTANCE.getCompositeInvariantRuleConfiguration_ComposedRules();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.NotInvariantRuleConfigurationImpl <em>Not Invariant Rule Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.NotInvariantRuleConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getNotInvariantRuleConfiguration()

-		 * @generated

-		 */

-		EClass NOT_INVARIANT_RULE_CONFIGURATION = eINSTANCE.getNotInvariantRuleConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Composed Rule</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE = eINSTANCE.getNotInvariantRuleConfiguration_ComposedRule();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.AndInvariantRuleConfigurationImpl <em>And Invariant Rule Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.AndInvariantRuleConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getAndInvariantRuleConfiguration()

-		 * @generated

-		 */

-		EClass AND_INVARIANT_RULE_CONFIGURATION = eINSTANCE.getAndInvariantRuleConfiguration();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.OrInvariantRuleConfigurationImpl <em>Or Invariant Rule Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.OrInvariantRuleConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getOrInvariantRuleConfiguration()

-		 * @generated

-		 */

-		EClass OR_INVARIANT_RULE_CONFIGURATION = eINSTANCE.getOrInvariantRuleConfiguration();

-

-	}

-

-} //InvariantTypeConfigurationPackage

+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+
+/**
+ * <!-- 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.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface InvariantTypeConfigurationPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "invarianttypeconfiguration";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.1";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "invarianttypeconfiguration";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	InvariantTypeConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationImpl <em>Invariant Type Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getInvariantTypeConfiguration()
+	 * @generated
+	 */
+	int INVARIANT_TYPE_CONFIGURATION = 0;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_TYPE_CONFIGURATION__DESCRIPTION = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_TYPE_CONFIGURATION__IDENTIFIER = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__IDENTIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_TYPE_CONFIGURATION__NAME = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Hint</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_TYPE_CONFIGURATION__HINT = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__HINT;
+
+	/**
+	 * The feature id for the '<em><b>Kind</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_TYPE_CONFIGURATION__KIND = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__KIND;
+
+	/**
+	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_TYPE_CONFIGURATION__ICON_ENTRY = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__ICON_ENTRY;
+
+	/**
+	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID;
+
+	/**
+	 * The feature id for the '<em><b>Edit Helper Advice Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Container Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Invariant Rule Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Invariant Type Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_TYPE_CONFIGURATION_FEATURE_COUNT = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Invariant Type Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_TYPE_CONFIGURATION_OPERATION_COUNT = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantRuleConfigurationImpl <em>Invariant Rule Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantRuleConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getInvariantRuleConfiguration()
+	 * @generated
+	 */
+	int INVARIANT_RULE_CONFIGURATION = 1;
+
+	/**
+	 * The number of structural features of the '<em>Invariant Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT = 0;
+
+	/**
+	 * The number of operations of the '<em>Invariant Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.CompositeInvariantRuleConfigurationImpl <em>Composite Invariant Rule Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.CompositeInvariantRuleConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getCompositeInvariantRuleConfiguration()
+	 * @generated
+	 */
+	int COMPOSITE_INVARIANT_RULE_CONFIGURATION = 2;
+
+	/**
+	 * The feature id for the '<em><b>Composed Rules</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES = INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Composite Invariant Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMPOSITE_INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT = INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Composite Invariant Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMPOSITE_INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT = INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.NotInvariantRuleConfigurationImpl <em>Not Invariant Rule Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.NotInvariantRuleConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getNotInvariantRuleConfiguration()
+	 * @generated
+	 */
+	int NOT_INVARIANT_RULE_CONFIGURATION = 3;
+
+	/**
+	 * The feature id for the '<em><b>Composed Rule</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE = INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Not Invariant Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NOT_INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT = INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Not Invariant Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NOT_INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT = INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.AndInvariantRuleConfigurationImpl <em>And Invariant Rule Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.AndInvariantRuleConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getAndInvariantRuleConfiguration()
+	 * @generated
+	 */
+	int AND_INVARIANT_RULE_CONFIGURATION = 4;
+
+	/**
+	 * The feature id for the '<em><b>Composed Rules</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AND_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES = COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES;
+
+	/**
+	 * The number of structural features of the '<em>And Invariant Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AND_INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT = COMPOSITE_INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>And Invariant Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AND_INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT = COMPOSITE_INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.OrInvariantRuleConfigurationImpl <em>Or Invariant Rule Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.OrInvariantRuleConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getOrInvariantRuleConfiguration()
+	 * @generated
+	 */
+	int OR_INVARIANT_RULE_CONFIGURATION = 5;
+
+	/**
+	 * The feature id for the '<em><b>Composed Rules</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OR_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES = COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES;
+
+	/**
+	 * The number of structural features of the '<em>Or Invariant Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OR_INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT = COMPOSITE_INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Or Invariant Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OR_INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT = COMPOSITE_INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT + 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration <em>Invariant Type Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Invariant Type Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration
+	 * @generated
+	 */
+	EClass getInvariantTypeConfiguration();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration#getInvariantRuleConfiguration <em>Invariant Rule Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Invariant Rule Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration#getInvariantRuleConfiguration()
+	 * @see #getInvariantTypeConfiguration()
+	 * @generated
+	 */
+	EReference getInvariantTypeConfiguration_InvariantRuleConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration <em>Invariant Rule Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Invariant Rule Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration
+	 * @generated
+	 */
+	EClass getInvariantRuleConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration <em>Composite Invariant Rule Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Composite Invariant Rule Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration
+	 * @generated
+	 */
+	EClass getCompositeInvariantRuleConfiguration();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration#getComposedRules <em>Composed Rules</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Composed Rules</em>'.
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration#getComposedRules()
+	 * @see #getCompositeInvariantRuleConfiguration()
+	 * @generated
+	 */
+	EReference getCompositeInvariantRuleConfiguration_ComposedRules();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration <em>Not Invariant Rule Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Not Invariant Rule Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration
+	 * @generated
+	 */
+	EClass getNotInvariantRuleConfiguration();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration#getComposedRule <em>Composed Rule</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Composed Rule</em>'.
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration#getComposedRule()
+	 * @see #getNotInvariantRuleConfiguration()
+	 * @generated
+	 */
+	EReference getNotInvariantRuleConfiguration_ComposedRule();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration <em>And Invariant Rule Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>And Invariant Rule Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration
+	 * @generated
+	 */
+	EClass getAndInvariantRuleConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration <em>Or Invariant Rule Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Or Invariant Rule Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration
+	 * @generated
+	 */
+	EClass getOrInvariantRuleConfiguration();
+
+	/**
+	 * 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
+	 */
+	InvariantTypeConfigurationFactory getInvariantTypeConfigurationFactory();
+
+	/**
+	 * <!-- 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.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationImpl <em>Invariant Type Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getInvariantTypeConfiguration()
+		 * @generated
+		 */
+		EClass INVARIANT_TYPE_CONFIGURATION = eINSTANCE.getInvariantTypeConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Invariant Rule Configuration</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION = eINSTANCE.getInvariantTypeConfiguration_InvariantRuleConfiguration();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantRuleConfigurationImpl <em>Invariant Rule Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantRuleConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getInvariantRuleConfiguration()
+		 * @generated
+		 */
+		EClass INVARIANT_RULE_CONFIGURATION = eINSTANCE.getInvariantRuleConfiguration();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.CompositeInvariantRuleConfigurationImpl <em>Composite Invariant Rule Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.CompositeInvariantRuleConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getCompositeInvariantRuleConfiguration()
+		 * @generated
+		 */
+		EClass COMPOSITE_INVARIANT_RULE_CONFIGURATION = eINSTANCE.getCompositeInvariantRuleConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Composed Rules</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES = eINSTANCE.getCompositeInvariantRuleConfiguration_ComposedRules();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.NotInvariantRuleConfigurationImpl <em>Not Invariant Rule Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.NotInvariantRuleConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getNotInvariantRuleConfiguration()
+		 * @generated
+		 */
+		EClass NOT_INVARIANT_RULE_CONFIGURATION = eINSTANCE.getNotInvariantRuleConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Composed Rule</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE = eINSTANCE.getNotInvariantRuleConfiguration_ComposedRule();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.AndInvariantRuleConfigurationImpl <em>And Invariant Rule Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.AndInvariantRuleConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getAndInvariantRuleConfiguration()
+		 * @generated
+		 */
+		EClass AND_INVARIANT_RULE_CONFIGURATION = eINSTANCE.getAndInvariantRuleConfiguration();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.OrInvariantRuleConfigurationImpl <em>Or Invariant Rule Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.OrInvariantRuleConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getOrInvariantRuleConfiguration()
+		 * @generated
+		 */
+		EClass OR_INVARIANT_RULE_CONFIGURATION = eINSTANCE.getOrInvariantRuleConfiguration();
+
+	}
+
+} //InvariantTypeConfigurationPackage
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/util/InvariantTypeConfigurationAdapterFactory.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/util/InvariantTypeConfigurationAdapterFactory.java
index 8e6ff33bd04..9a657332b20 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/util/InvariantTypeConfigurationAdapterFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/util/InvariantTypeConfigurationAdapterFactory.java
@@ -1,316 +1,316 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.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.elementtypesconfigurations.ConfigurationElement;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.*;

-

-/**

- * <!-- 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.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage

- * @generated

- */

-public class InvariantTypeConfigurationAdapterFactory extends AdapterFactoryImpl {

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static InvariantTypeConfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public InvariantTypeConfigurationAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = InvariantTypeConfigurationPackage.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 InvariantTypeConfigurationSwitch<Adapter> modelSwitch =

-		new InvariantTypeConfigurationSwitch<Adapter>() {

-			@Override

-			public Adapter caseInvariantTypeConfiguration(InvariantTypeConfiguration object) {

-				return createInvariantTypeConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {

-				return createInvariantRuleConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseCompositeInvariantRuleConfiguration(CompositeInvariantRuleConfiguration object) {

-				return createCompositeInvariantRuleConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseNotInvariantRuleConfiguration(NotInvariantRuleConfiguration object) {

-				return createNotInvariantRuleConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseAndInvariantRuleConfiguration(AndInvariantRuleConfiguration object) {

-				return createAndInvariantRuleConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseOrInvariantRuleConfiguration(OrInvariantRuleConfiguration object) {

-				return createOrInvariantRuleConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseConfigurationElement(ConfigurationElement object) {

-				return createConfigurationElementAdapter();

-			}

-			@Override

-			public Adapter caseIdentifiedConfiguration(IdentifiedConfiguration object) {

-				return createIdentifiedConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseNamedConfiguration(NamedConfiguration object) {

-				return createNamedConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseElementTypeConfiguration(ElementTypeConfiguration object) {

-				return createElementTypeConfigurationAdapter();

-			}

-			@Override

-			public Adapter caseSpecializationTypeConfiguration(SpecializationTypeConfiguration object) {

-				return createSpecializationTypeConfigurationAdapter();

-			}

-			@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.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration <em>Invariant Type Configuration</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.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration

-	 * @generated

-	 */

-	public Adapter createInvariantTypeConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration <em>Invariant Rule Configuration</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.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration

-	 * @generated

-	 */

-	public Adapter createInvariantRuleConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration <em>Composite Invariant Rule Configuration</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.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration

-	 * @generated

-	 */

-	public Adapter createCompositeInvariantRuleConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration <em>Not Invariant Rule Configuration</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.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration

-	 * @generated

-	 */

-	public Adapter createNotInvariantRuleConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration <em>And Invariant Rule Configuration</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.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration

-	 * @generated

-	 */

-	public Adapter createAndInvariantRuleConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration <em>Or Invariant Rule Configuration</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.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration

-	 * @generated

-	 */

-	public Adapter createOrInvariantRuleConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement <em>Configuration 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.infra.elementtypesconfigurations.ConfigurationElement

-	 * @generated

-	 */

-	public Adapter createConfigurationElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration <em>Identified Configuration</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.elementtypesconfigurations.IdentifiedConfiguration

-	 * @generated

-	 */

-	public Adapter createIdentifiedConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration <em>Named Configuration</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.elementtypesconfigurations.NamedConfiguration

-	 * @generated

-	 */

-	public Adapter createNamedConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration <em>Element Type Configuration</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.elementtypesconfigurations.ElementTypeConfiguration

-	 * @generated

-	 */

-	public Adapter createElementTypeConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration <em>Specialization Type Configuration</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.elementtypesconfigurations.SpecializationTypeConfiguration

-	 * @generated

-	 */

-	public Adapter createSpecializationTypeConfigurationAdapter() {

-		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;

-	}

-

-} //InvariantTypeConfigurationAdapterFactory

+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.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.elementtypesconfigurations.ConfigurationElement;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
+
+import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.*;
+
+/**
+ * <!-- 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.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage
+ * @generated
+ */
+public class InvariantTypeConfigurationAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static InvariantTypeConfigurationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public InvariantTypeConfigurationAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = InvariantTypeConfigurationPackage.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 InvariantTypeConfigurationSwitch<Adapter> modelSwitch =
+		new InvariantTypeConfigurationSwitch<Adapter>() {
+			@Override
+			public Adapter caseInvariantTypeConfiguration(InvariantTypeConfiguration object) {
+				return createInvariantTypeConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {
+				return createInvariantRuleConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseCompositeInvariantRuleConfiguration(CompositeInvariantRuleConfiguration object) {
+				return createCompositeInvariantRuleConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseNotInvariantRuleConfiguration(NotInvariantRuleConfiguration object) {
+				return createNotInvariantRuleConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseAndInvariantRuleConfiguration(AndInvariantRuleConfiguration object) {
+				return createAndInvariantRuleConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseOrInvariantRuleConfiguration(OrInvariantRuleConfiguration object) {
+				return createOrInvariantRuleConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseConfigurationElement(ConfigurationElement object) {
+				return createConfigurationElementAdapter();
+			}
+			@Override
+			public Adapter caseIdentifiedConfiguration(IdentifiedConfiguration object) {
+				return createIdentifiedConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseNamedConfiguration(NamedConfiguration object) {
+				return createNamedConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseElementTypeConfiguration(ElementTypeConfiguration object) {
+				return createElementTypeConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseSpecializationTypeConfiguration(SpecializationTypeConfiguration object) {
+				return createSpecializationTypeConfigurationAdapter();
+			}
+			@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.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration <em>Invariant Type Configuration</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.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration
+	 * @generated
+	 */
+	public Adapter createInvariantTypeConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration <em>Invariant Rule Configuration</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.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration
+	 * @generated
+	 */
+	public Adapter createInvariantRuleConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration <em>Composite Invariant Rule Configuration</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.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration
+	 * @generated
+	 */
+	public Adapter createCompositeInvariantRuleConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration <em>Not Invariant Rule Configuration</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.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration
+	 * @generated
+	 */
+	public Adapter createNotInvariantRuleConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration <em>And Invariant Rule Configuration</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.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration
+	 * @generated
+	 */
+	public Adapter createAndInvariantRuleConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration <em>Or Invariant Rule Configuration</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.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration
+	 * @generated
+	 */
+	public Adapter createOrInvariantRuleConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement <em>Configuration 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.infra.elementtypesconfigurations.ConfigurationElement
+	 * @generated
+	 */
+	public Adapter createConfigurationElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration <em>Identified Configuration</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.elementtypesconfigurations.IdentifiedConfiguration
+	 * @generated
+	 */
+	public Adapter createIdentifiedConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration <em>Named Configuration</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.elementtypesconfigurations.NamedConfiguration
+	 * @generated
+	 */
+	public Adapter createNamedConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration <em>Element Type Configuration</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.elementtypesconfigurations.ElementTypeConfiguration
+	 * @generated
+	 */
+	public Adapter createElementTypeConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration <em>Specialization Type Configuration</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.elementtypesconfigurations.SpecializationTypeConfiguration
+	 * @generated
+	 */
+	public Adapter createSpecializationTypeConfigurationAdapter() {
+		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;
+	}
+
+} //InvariantTypeConfigurationAdapterFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/util/InvariantTypeConfigurationSwitch.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/util/InvariantTypeConfigurationSwitch.java
index d5d62120b46..7b2516affad 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/util/InvariantTypeConfigurationSwitch.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/util/InvariantTypeConfigurationSwitch.java
@@ -1,317 +1,317 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.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.elementtypesconfigurations.ConfigurationElement;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.*;

-

-/**

- * <!-- 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.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage

- * @generated

- */

-public class InvariantTypeConfigurationSwitch<T> extends Switch<T> {

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static InvariantTypeConfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public InvariantTypeConfigurationSwitch() {

-		if (modelPackage == null) {

-			modelPackage = InvariantTypeConfigurationPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param 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 InvariantTypeConfigurationPackage.INVARIANT_TYPE_CONFIGURATION: {

-				InvariantTypeConfiguration invariantTypeConfiguration = (InvariantTypeConfiguration)theEObject;

-				T result = caseInvariantTypeConfiguration(invariantTypeConfiguration);

-				if (result == null) result = caseSpecializationTypeConfiguration(invariantTypeConfiguration);

-				if (result == null) result = caseElementTypeConfiguration(invariantTypeConfiguration);

-				if (result == null) result = caseConfigurationElement(invariantTypeConfiguration);

-				if (result == null) result = caseIdentifiedConfiguration(invariantTypeConfiguration);

-				if (result == null) result = caseNamedConfiguration(invariantTypeConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case InvariantTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION: {

-				InvariantRuleConfiguration invariantRuleConfiguration = (InvariantRuleConfiguration)theEObject;

-				T result = caseInvariantRuleConfiguration(invariantRuleConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case InvariantTypeConfigurationPackage.COMPOSITE_INVARIANT_RULE_CONFIGURATION: {

-				CompositeInvariantRuleConfiguration compositeInvariantRuleConfiguration = (CompositeInvariantRuleConfiguration)theEObject;

-				T result = caseCompositeInvariantRuleConfiguration(compositeInvariantRuleConfiguration);

-				if (result == null) result = caseInvariantRuleConfiguration(compositeInvariantRuleConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case InvariantTypeConfigurationPackage.NOT_INVARIANT_RULE_CONFIGURATION: {

-				NotInvariantRuleConfiguration notInvariantRuleConfiguration = (NotInvariantRuleConfiguration)theEObject;

-				T result = caseNotInvariantRuleConfiguration(notInvariantRuleConfiguration);

-				if (result == null) result = caseInvariantRuleConfiguration(notInvariantRuleConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case InvariantTypeConfigurationPackage.AND_INVARIANT_RULE_CONFIGURATION: {

-				AndInvariantRuleConfiguration andInvariantRuleConfiguration = (AndInvariantRuleConfiguration)theEObject;

-				T result = caseAndInvariantRuleConfiguration(andInvariantRuleConfiguration);

-				if (result == null) result = caseCompositeInvariantRuleConfiguration(andInvariantRuleConfiguration);

-				if (result == null) result = caseInvariantRuleConfiguration(andInvariantRuleConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case InvariantTypeConfigurationPackage.OR_INVARIANT_RULE_CONFIGURATION: {

-				OrInvariantRuleConfiguration orInvariantRuleConfiguration = (OrInvariantRuleConfiguration)theEObject;

-				T result = caseOrInvariantRuleConfiguration(orInvariantRuleConfiguration);

-				if (result == null) result = caseCompositeInvariantRuleConfiguration(orInvariantRuleConfiguration);

-				if (result == null) result = caseInvariantRuleConfiguration(orInvariantRuleConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Invariant Type Configuration</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>Invariant Type Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseInvariantTypeConfiguration(InvariantTypeConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Invariant Rule Configuration</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>Invariant Rule Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Composite Invariant Rule Configuration</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>Composite Invariant Rule Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseCompositeInvariantRuleConfiguration(CompositeInvariantRuleConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Not Invariant Rule Configuration</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>Not Invariant Rule Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseNotInvariantRuleConfiguration(NotInvariantRuleConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>And Invariant Rule Configuration</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>And Invariant Rule Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseAndInvariantRuleConfiguration(AndInvariantRuleConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Or Invariant Rule Configuration</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>Or Invariant Rule Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseOrInvariantRuleConfiguration(OrInvariantRuleConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Configuration 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>Configuration Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseConfigurationElement(ConfigurationElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Identified Configuration</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>Identified Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIdentifiedConfiguration(IdentifiedConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Named Configuration</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>Named Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseNamedConfiguration(NamedConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Element Type Configuration</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>Element Type Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseElementTypeConfiguration(ElementTypeConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Specialization Type Configuration</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>Specialization Type Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseSpecializationTypeConfiguration(SpecializationTypeConfiguration 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;

-	}

-

-} //InvariantTypeConfigurationSwitch

+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.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.elementtypesconfigurations.ConfigurationElement;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
+
+import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.*;
+
+/**
+ * <!-- 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.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage
+ * @generated
+ */
+public class InvariantTypeConfigurationSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static InvariantTypeConfigurationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public InvariantTypeConfigurationSwitch() {
+		if (modelPackage == null) {
+			modelPackage = InvariantTypeConfigurationPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param 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 InvariantTypeConfigurationPackage.INVARIANT_TYPE_CONFIGURATION: {
+				InvariantTypeConfiguration invariantTypeConfiguration = (InvariantTypeConfiguration)theEObject;
+				T result = caseInvariantTypeConfiguration(invariantTypeConfiguration);
+				if (result == null) result = caseSpecializationTypeConfiguration(invariantTypeConfiguration);
+				if (result == null) result = caseElementTypeConfiguration(invariantTypeConfiguration);
+				if (result == null) result = caseConfigurationElement(invariantTypeConfiguration);
+				if (result == null) result = caseIdentifiedConfiguration(invariantTypeConfiguration);
+				if (result == null) result = caseNamedConfiguration(invariantTypeConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case InvariantTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION: {
+				InvariantRuleConfiguration invariantRuleConfiguration = (InvariantRuleConfiguration)theEObject;
+				T result = caseInvariantRuleConfiguration(invariantRuleConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case InvariantTypeConfigurationPackage.COMPOSITE_INVARIANT_RULE_CONFIGURATION: {
+				CompositeInvariantRuleConfiguration compositeInvariantRuleConfiguration = (CompositeInvariantRuleConfiguration)theEObject;
+				T result = caseCompositeInvariantRuleConfiguration(compositeInvariantRuleConfiguration);
+				if (result == null) result = caseInvariantRuleConfiguration(compositeInvariantRuleConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case InvariantTypeConfigurationPackage.NOT_INVARIANT_RULE_CONFIGURATION: {
+				NotInvariantRuleConfiguration notInvariantRuleConfiguration = (NotInvariantRuleConfiguration)theEObject;
+				T result = caseNotInvariantRuleConfiguration(notInvariantRuleConfiguration);
+				if (result == null) result = caseInvariantRuleConfiguration(notInvariantRuleConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case InvariantTypeConfigurationPackage.AND_INVARIANT_RULE_CONFIGURATION: {
+				AndInvariantRuleConfiguration andInvariantRuleConfiguration = (AndInvariantRuleConfiguration)theEObject;
+				T result = caseAndInvariantRuleConfiguration(andInvariantRuleConfiguration);
+				if (result == null) result = caseCompositeInvariantRuleConfiguration(andInvariantRuleConfiguration);
+				if (result == null) result = caseInvariantRuleConfiguration(andInvariantRuleConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case InvariantTypeConfigurationPackage.OR_INVARIANT_RULE_CONFIGURATION: {
+				OrInvariantRuleConfiguration orInvariantRuleConfiguration = (OrInvariantRuleConfiguration)theEObject;
+				T result = caseOrInvariantRuleConfiguration(orInvariantRuleConfiguration);
+				if (result == null) result = caseCompositeInvariantRuleConfiguration(orInvariantRuleConfiguration);
+				if (result == null) result = caseInvariantRuleConfiguration(orInvariantRuleConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Invariant Type Configuration</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>Invariant Type Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseInvariantTypeConfiguration(InvariantTypeConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Invariant Rule Configuration</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>Invariant Rule Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Composite Invariant Rule Configuration</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>Composite Invariant Rule Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCompositeInvariantRuleConfiguration(CompositeInvariantRuleConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Not Invariant Rule Configuration</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>Not Invariant Rule Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseNotInvariantRuleConfiguration(NotInvariantRuleConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>And Invariant Rule Configuration</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>And Invariant Rule Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAndInvariantRuleConfiguration(AndInvariantRuleConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Or Invariant Rule Configuration</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>Or Invariant Rule Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseOrInvariantRuleConfiguration(OrInvariantRuleConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Configuration 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>Configuration Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseConfigurationElement(ConfigurationElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Identified Configuration</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>Identified Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIdentifiedConfiguration(IdentifiedConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Named Configuration</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>Named Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseNamedConfiguration(NamedConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Element Type Configuration</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>Element Type Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseElementTypeConfiguration(ElementTypeConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Specialization Type Configuration</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>Specialization Type Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSpecializationTypeConfiguration(SpecializationTypeConfiguration 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;
+	}
+
+} //InvariantTypeConfigurationSwitch
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/META-INF/MANIFEST.MF
index 5be06b0095a..39f9853294d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",

- org.eclipse.ui;bundle-version="3.100.0",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui;x-internal:=true,

- org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.handlers;x-internal:=true

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.elementtypesconfigurations.ui;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.100.0",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0"
+Export-Package: org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui;x-internal:=true,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.handlers;x-internal:=true
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.elementtypesconfigurations.ui;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/pom.xml
index ea41c8add2f..13dc0825cbb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.elementtypesconfigurations.ui</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/META-INF/MANIFEST.MF
index b3a76a45bdd..3d917c000d5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/META-INF/MANIFEST.MF
@@ -1,30 +1,30 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.xmi;visibility:=reexport,

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.infra.elementtypesconfigurations,

- org.eclipse.papyrus.infra.elementtypesconfigurations.extensionpoints,

- org.eclipse.papyrus.infra.elementtypesconfigurations.factories,

- org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl,

- org.eclipse.papyrus.infra.elementtypesconfigurations.impl,

- org.eclipse.papyrus.infra.elementtypesconfigurations.notification,

- org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events,

- org.eclipse.papyrus.infra.elementtypesconfigurations.registries,

- org.eclipse.papyrus.infra.elementtypesconfigurations.resource,

- org.eclipse.papyrus.infra.elementtypesconfigurations.util,

- org.eclipse.papyrus.infra.elementtypesconfigurations.utils

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.elementtypesconfigurations.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.elementtypesconfigurations;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0"
+Export-Package: org.eclipse.papyrus.infra.elementtypesconfigurations,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.extensionpoints,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.factories,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.impl,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.notification,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.registries,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.resource,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.util,
+ org.eclipse.papyrus.infra.elementtypesconfigurations.utils
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.elementtypesconfigurations.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.elementtypesconfigurations;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore
index 3ecb0b2f792..a436cfb25f6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore
@@ -1,98 +1,98 @@
-<?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="elementtypesconfigurations" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"

-    nsPrefix="elementtypesconfigurations">

-  <eClassifiers xsi:type="ecore:EClass" name="ElementTypeSetConfiguration" eSuperTypes="#//ConfigurationElement #//IdentifiedConfiguration #//NamedConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="elementTypeConfigurations"

-        upperBound="-1" eType="#//ElementTypeConfiguration" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="adviceBindingsConfigurations"

-        upperBound="-1" eType="#//AbstractAdviceBindingConfiguration" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="metamodelNsURI" lowerBound="1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ElementTypeConfiguration" abstract="true"

-      eSuperTypes="#//ConfigurationElement #//IdentifiedConfiguration #//NamedConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hint" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"

-        defaultValueLiteral=""/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"

-        defaultValueLiteral="org.eclipse.gmf.runtime.emf.type.core.IHintedType"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="iconEntry" eType="#//IconEntry"

-        containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="IconEntry">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bundleId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ConfigurationElement" abstract="true">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="AbstractMatcherConfiguration" abstract="true"/>

-  <eClassifiers xsi:type="ecore:EClass" name="AdviceConfiguration" abstract="true"

-      eSuperTypes="#//ConfigurationElement">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="before" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="after" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="AbstractAdviceBindingConfiguration"

-      abstract="true" eSuperTypes="#//AdviceConfiguration #//IdentifiedConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"

-        eType="#//ElementTypeConfiguration"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="containerConfiguration"

-        eType="#//ContainerConfiguration" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="matcherConfiguration" eType="#//AbstractMatcherConfiguration"

-        containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="inheritance" lowerBound="1"

-        eType="#//InheritanceKind"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="SpecializationTypeConfiguration" eSuperTypes="#//ElementTypeConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="specializedTypesID" lowerBound="1"

-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="editHelperAdviceConfiguration"

-        eType="#//AbstractEditHelperAdviceConfiguration" containment="true" eOpposite="#//AbstractEditHelperAdviceConfiguration/target"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="containerConfiguration"

-        eType="#//ContainerConfiguration" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="matcherConfiguration" eType="#//AbstractMatcherConfiguration"

-        containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ContainerConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="containerMatcherConfiguration"

-        eType="#//AbstractMatcherConfiguration" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="eContainmentFeatures" upperBound="-1"

-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="MetamodelTypeConfiguration" eSuperTypes="#//ElementTypeConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="eClass" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editHelperClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="AbstractEditHelperAdviceConfiguration"

-      abstract="true" eSuperTypes="#//AdviceConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"

-        eType="#//SpecializationTypeConfiguration" eOpposite="#//SpecializationTypeConfiguration/editHelperAdviceConfiguration"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EEnum" name="InheritanceKind">

-    <eLiterals name="none"/>

-    <eLiterals name="all" value="1"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="EditHelperAdviceConfiguration" eSuperTypes="#//AbstractEditHelperAdviceConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editHelperAdviceClassName"

-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="AdviceBindingConfiguration" eSuperTypes="#//AbstractAdviceBindingConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editHelperAdviceClassName"

-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="MatcherConfiguration" eSuperTypes="#//AbstractMatcherConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="matcherClassName" lowerBound="1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="IdentifiedConfiguration" abstract="true"

-      interface="true">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="NamedConfiguration" abstract="true"

-      interface="true">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-</ecore:EPackage>

+<?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="elementtypesconfigurations" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
+    nsPrefix="elementtypesconfigurations">
+  <eClassifiers xsi:type="ecore:EClass" name="ElementTypeSetConfiguration" eSuperTypes="#//ConfigurationElement #//IdentifiedConfiguration #//NamedConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="elementTypeConfigurations"
+        upperBound="-1" eType="#//ElementTypeConfiguration" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="adviceBindingsConfigurations"
+        upperBound="-1" eType="#//AbstractAdviceBindingConfiguration" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="metamodelNsURI" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ElementTypeConfiguration" abstract="true"
+      eSuperTypes="#//ConfigurationElement #//IdentifiedConfiguration #//NamedConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hint" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        defaultValueLiteral=""/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        defaultValueLiteral="org.eclipse.gmf.runtime.emf.type.core.IHintedType"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="iconEntry" eType="#//IconEntry"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IconEntry">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bundleId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ConfigurationElement" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AbstractMatcherConfiguration" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="AdviceConfiguration" abstract="true"
+      eSuperTypes="#//ConfigurationElement">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="before" upperBound="-1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="after" upperBound="-1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AbstractAdviceBindingConfiguration"
+      abstract="true" eSuperTypes="#//AdviceConfiguration #//IdentifiedConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
+        eType="#//ElementTypeConfiguration"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="containerConfiguration"
+        eType="#//ContainerConfiguration" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="matcherConfiguration" eType="#//AbstractMatcherConfiguration"
+        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="inheritance" lowerBound="1"
+        eType="#//InheritanceKind"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SpecializationTypeConfiguration" eSuperTypes="#//ElementTypeConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="specializedTypesID" lowerBound="1"
+        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="editHelperAdviceConfiguration"
+        eType="#//AbstractEditHelperAdviceConfiguration" containment="true" eOpposite="#//AbstractEditHelperAdviceConfiguration/target"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="containerConfiguration"
+        eType="#//ContainerConfiguration" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="matcherConfiguration" eType="#//AbstractMatcherConfiguration"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ContainerConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="containerMatcherConfiguration"
+        eType="#//AbstractMatcherConfiguration" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="eContainmentFeatures" upperBound="-1"
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="MetamodelTypeConfiguration" eSuperTypes="#//ElementTypeConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="eClass" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editHelperClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AbstractEditHelperAdviceConfiguration"
+      abstract="true" eSuperTypes="#//AdviceConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
+        eType="#//SpecializationTypeConfiguration" eOpposite="#//SpecializationTypeConfiguration/editHelperAdviceConfiguration"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="InheritanceKind">
+    <eLiterals name="none"/>
+    <eLiterals name="all" value="1"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="EditHelperAdviceConfiguration" eSuperTypes="#//AbstractEditHelperAdviceConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editHelperAdviceClassName"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AdviceBindingConfiguration" eSuperTypes="#//AbstractAdviceBindingConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editHelperAdviceClassName"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="MatcherConfiguration" eSuperTypes="#//AbstractMatcherConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="matcherClassName" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IdentifiedConfiguration" abstract="true"
+      interface="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="NamedConfiguration" abstract="true"
+      interface="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore_diagram b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore_diagram
index 41273decd87..dc08b8fc59d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore_diagram
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore_diagram
@@ -1,555 +1,555 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram 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" xmi:id="_abOYABQPEeSwyuAkiSG7MA" type="Ecore" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_dZR9MBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">

-    <children xmi:type="notation:DecorationNode" xmi:id="_dZR9MhQSEeSwyuAkiSG7MA" type="5001"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZR9MxQSEeSwyuAkiSG7MA" type="7001">

-      <children xmi:type="notation:Node" xmi:id="_LxebkBu-EeSI_rJGQSJeSQ" type="3001">

-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/metamodelNsURI"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_LxebkRu-EeSI_rJGQSJeSQ"/>

-      </children>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZR9NBQSEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZR9NRQSEeSwyuAkiSG7MA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZR9NhQSEeSwyuAkiSG7MA" type="7002">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZR9NxQSEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZR9OBQSEeSwyuAkiSG7MA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZSkQBQSEeSwyuAkiSG7MA" type="7003">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZSkQRQSEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZSkQhQSEeSwyuAkiSG7MA"/>

-    </children>

-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZR9MRQSEeSwyuAkiSG7MA" x="510" y="335"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_dZSkQxQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">

-    <children xmi:type="notation:DecorationNode" xmi:id="_dZSkRRQSEeSwyuAkiSG7MA" type="5001"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZSkRhQSEeSwyuAkiSG7MA" type="7001">

-      <children xmi:type="notation:Node" xmi:id="_ok1poMpoEeWPW4wup-qMUw" type="3001">

-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//ElementTypeConfiguration/hint"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ok1pocpoEeWPW4wup-qMUw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_ok7wQMpoEeWPW4wup-qMUw" type="3001">

-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//ElementTypeConfiguration/kind"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ok7wQcpoEeWPW4wup-qMUw"/>

-      </children>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZSkRxQSEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZSkSBQSEeSwyuAkiSG7MA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZSkSRQSEeSwyuAkiSG7MA" type="7002">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZSkShQSEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZSkSxQSEeSwyuAkiSG7MA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZSkTBQSEeSwyuAkiSG7MA" type="7003">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZSkTRQSEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZSkThQSEeSwyuAkiSG7MA"/>

-    </children>

-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//ElementTypeConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZSkRBQSEeSwyuAkiSG7MA" x="315" y="610"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_dZTLUBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">

-    <children xmi:type="notation:DecorationNode" xmi:id="_dZTLUhQSEeSwyuAkiSG7MA" type="5001"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTLUxQSEeSwyuAkiSG7MA" type="7001">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTLVBQSEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTLVRQSEeSwyuAkiSG7MA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTLVhQSEeSwyuAkiSG7MA" type="7002">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTLVxQSEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTLWBQSEeSwyuAkiSG7MA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTLWRQSEeSwyuAkiSG7MA" type="7003">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTLWhQSEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTLWxQSEeSwyuAkiSG7MA"/>

-    </children>

-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//IconEntry"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZTLURQSEeSwyuAkiSG7MA" x="40" y="590"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_dZTyYBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">

-    <children xmi:type="notation:DecorationNode" xmi:id="_dZTyYhQSEeSwyuAkiSG7MA" type="5001"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTyYxQSEeSwyuAkiSG7MA" type="7001">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTyZBQSEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTyZRQSEeSwyuAkiSG7MA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTyZhQSEeSwyuAkiSG7MA" type="7002">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTyZxQSEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTyaBQSEeSwyuAkiSG7MA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTyaRQSEeSwyuAkiSG7MA" type="7003">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTyahQSEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTyaxQSEeSwyuAkiSG7MA"/>

-    </children>

-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//ConfigurationElement"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZTyYRQSEeSwyuAkiSG7MA" x="390" y="55"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_dZTybBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">

-    <children xmi:type="notation:DecorationNode" xmi:id="_dZUZcBQSEeSwyuAkiSG7MA" type="5001"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZUZcRQSEeSwyuAkiSG7MA" type="7001">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZUZchQSEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZUZcxQSEeSwyuAkiSG7MA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZUZdBQSEeSwyuAkiSG7MA" type="7002">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZUZdRQSEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZUZdhQSEeSwyuAkiSG7MA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZUZdxQSEeSwyuAkiSG7MA" type="7003">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZUZeBQSEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZUZeRQSEeSwyuAkiSG7MA"/>

-    </children>

-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//AbstractMatcherConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZTybRQSEeSwyuAkiSG7MA" x="990" y="870"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_dZUZehQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">

-    <children xmi:type="notation:DecorationNode" xmi:id="_dZUZfBQSEeSwyuAkiSG7MA" type="5001"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZUZfRQSEeSwyuAkiSG7MA" type="7001">

-      <children xmi:type="notation:Node" xmi:id="_lcjhoBY3EeSSL_L7W7Ic3A" type="3001">

-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//AdviceConfiguration/before"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_lcjhoRY3EeSSL_L7W7Ic3A"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_TCKh8BQeEeSwyuAkiSG7MA" type="3001">

-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//AdviceConfiguration/after"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TCKh8RQeEeSwyuAkiSG7MA"/>

-      </children>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZUZfhQSEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZUZfxQSEeSwyuAkiSG7MA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZUZgBQSEeSwyuAkiSG7MA" type="7002">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZVAgBQSEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZVAgRQSEeSwyuAkiSG7MA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZVAghQSEeSwyuAkiSG7MA" type="7003">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZVAgxQSEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZVAhBQSEeSwyuAkiSG7MA"/>

-    </children>

-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//AdviceConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZUZexQSEeSwyuAkiSG7MA" x="910" y="175"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_dZVnkBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">

-    <children xmi:type="notation:DecorationNode" xmi:id="_dZVnkhQSEeSwyuAkiSG7MA" type="5001"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZVnkxQSEeSwyuAkiSG7MA" type="7001">

-      <children xmi:type="notation:Node" xmi:id="_z6xdkBfKEeShg7yWMgp7yA" type="3001">

-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/inheritance"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_z6xdkRfKEeShg7yWMgp7yA"/>

-      </children>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZVnlBQSEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZVnlRQSEeSwyuAkiSG7MA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZVnlhQSEeSwyuAkiSG7MA" type="7002">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZVnlxQSEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZVnmBQSEeSwyuAkiSG7MA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZVnmRQSEeSwyuAkiSG7MA" type="7003">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZVnmhQSEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZVnmxQSEeSwyuAkiSG7MA"/>

-    </children>

-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZVnkRQSEeSwyuAkiSG7MA" x="890" y="620"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_r_7yoBQUEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">

-    <children xmi:type="notation:DecorationNode" xmi:id="_r_8ZsBQUEeSwyuAkiSG7MA" type="5001"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_r_8ZsRQUEeSwyuAkiSG7MA" type="7001">

-      <children xmi:type="notation:Node" xmi:id="_dZgmsBQSEeSwyuAkiSG7MA" type="3001">

-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/specializedTypesID"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_dZgmsRQSEeSwyuAkiSG7MA"/>

-      </children>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_r_8ZshQUEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_r_8ZsxQUEeSwyuAkiSG7MA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_r_8ZtBQUEeSwyuAkiSG7MA" type="7002">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_r_9AwBQUEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_r_9AwRQUEeSwyuAkiSG7MA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_r_9AwhQUEeSwyuAkiSG7MA" type="7003">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_r_9AwxQUEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_r_9AxBQUEeSwyuAkiSG7MA"/>

-    </children>

-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r_7yoRQUEeSwyuAkiSG7MA" x="420" y="1110"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_Rt13gBQXEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">

-    <children xmi:type="notation:DecorationNode" xmi:id="_Rt2ekBQXEeSwyuAkiSG7MA" type="5001"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_Rt2ekRQXEeSwyuAkiSG7MA" type="7001">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Rt2ekhQXEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Rt2ekxQXEeSwyuAkiSG7MA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_Rt3FoBQXEeSwyuAkiSG7MA" type="7002">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Rt3FoRQXEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Rt3FohQXEeSwyuAkiSG7MA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_Rt3FoxQXEeSwyuAkiSG7MA" type="7003">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Rt3FpBQXEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Rt3FpRQXEeSwyuAkiSG7MA"/>

-    </children>

-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//ContainerConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rt13gRQXEeSwyuAkiSG7MA" x="555" y="870"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_-uCeQBQZEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">

-    <children xmi:type="notation:DecorationNode" xmi:id="_-uDFUBQZEeSwyuAkiSG7MA" type="5001"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_-uDFURQZEeSwyuAkiSG7MA" type="7001">

-      <children xmi:type="notation:Node" xmi:id="_rBv9ABQdEeSwyuAkiSG7MA" type="3001">

-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//MetamodelTypeConfiguration/editHelperClassName"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rBv9ARQdEeSwyuAkiSG7MA"/>

-      </children>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_-uDFUhQZEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_-uDFUxQZEeSwyuAkiSG7MA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_-uDsYBQZEeSwyuAkiSG7MA" type="7002">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_-uDsYRQZEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_-uDsYhQZEeSwyuAkiSG7MA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_-uDsYxQZEeSwyuAkiSG7MA" type="7003">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_-uDsZBQZEeSwyuAkiSG7MA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_-uDsZRQZEeSwyuAkiSG7MA"/>

-    </children>

-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//MetamodelTypeConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-uCeQRQZEeSwyuAkiSG7MA" x="105" y="1115"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_18yYoBfKEeShg7yWMgp7yA" type="2005" fontName="Segoe UI">

-    <children xmi:type="notation:DecorationNode" xmi:id="_18yYohfKEeShg7yWMgp7yA" type="5005"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_18yYoxfKEeShg7yWMgp7yA" type="7011">

-      <children xmi:type="notation:Node" xmi:id="_6FTtMBfKEeShg7yWMgp7yA" type="3009">

-        <element xmi:type="ecore:EEnumLiteral" href="ElementTypesConfigurations.ecore#//InheritanceKind/all"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_6FTtMRfKEeShg7yWMgp7yA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_7Ybh8BfKEeShg7yWMgp7yA" type="3009">

-        <element xmi:type="ecore:EEnumLiteral" href="ElementTypesConfigurations.ecore#//InheritanceKind/none"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7Ybh8RfKEeShg7yWMgp7yA"/>

-      </children>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_18yYpBfKEeShg7yWMgp7yA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_18yYpRfKEeShg7yWMgp7yA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_18yYphfKEeShg7yWMgp7yA" type="7012">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_18yYpxfKEeShg7yWMgp7yA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_18yYqBfKEeShg7yWMgp7yA"/>

-    </children>

-    <element xmi:type="ecore:EEnum" href="ElementTypesConfigurations.ecore#//InheritanceKind"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_18yYoRfKEeShg7yWMgp7yA" x="1120" y="620"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_KdlD4BgSEeSAXuG_wvLrDw" type="2001" fontName="Segoe UI">

-    <children xmi:type="notation:DecorationNode" xmi:id="_KdlD4hgSEeSAXuG_wvLrDw" type="5001"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_KdlD4xgSEeSAXuG_wvLrDw" type="7001">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_KdlD5BgSEeSAXuG_wvLrDw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KdlD5RgSEeSAXuG_wvLrDw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_KdlD5hgSEeSAXuG_wvLrDw" type="7002">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_KdlD5xgSEeSAXuG_wvLrDw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KdlD6BgSEeSAXuG_wvLrDw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_Kdlq8BgSEeSAXuG_wvLrDw" type="7003">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Kdlq8RgSEeSAXuG_wvLrDw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Kdlq8hgSEeSAXuG_wvLrDw"/>

-    </children>

-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//AbstractEditHelperAdviceConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KdlD4RgSEeSAXuG_wvLrDw" x="1375" y="650"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_1pGfMMi9EeWPvPHRj0_oqw" type="2001" fontName="Segoe UI">

-    <children xmi:type="notation:DecorationNode" xmi:id="_1pHtUMi9EeWPvPHRj0_oqw" type="5001"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_1pHtUci9EeWPvPHRj0_oqw" type="7001">

-      <children xmi:type="notation:Node" xmi:id="_kjFZcMi9EeWPvPHRj0_oqw" type="3001">

-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//EditHelperAdviceConfiguration/editHelperAdviceClassName"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_kjFZcci9EeWPvPHRj0_oqw"/>

-      </children>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_1pHtUsi9EeWPvPHRj0_oqw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_1pHtU8i9EeWPvPHRj0_oqw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_1pHtVMi9EeWPvPHRj0_oqw" type="7002">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_1pHtVci9EeWPvPHRj0_oqw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_1pHtVsi9EeWPvPHRj0_oqw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_1pHtV8i9EeWPvPHRj0_oqw" type="7003">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_1pHtWMi9EeWPvPHRj0_oqw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_1pHtWci9EeWPvPHRj0_oqw"/>

-    </children>

-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//EditHelperAdviceConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pGfMci9EeWPvPHRj0_oqw" x="1240" y="810"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_vzQJUMjBEeWPvPHRj0_oqw" type="2001" fontName="Segoe UI">

-    <children xmi:type="notation:DecorationNode" xmi:id="_vzQwYMjBEeWPvPHRj0_oqw" type="5001"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_vzQwYcjBEeWPvPHRj0_oqw" type="7001">

-      <children xmi:type="notation:Node" xmi:id="_-VKBoMjDEeWPvPHRj0_oqw" type="3001">

-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//AdviceBindingConfiguration/editHelperAdviceClassName"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_-VKBocjDEeWPvPHRj0_oqw"/>

-      </children>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_vzQwYsjBEeWPvPHRj0_oqw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_vzQwY8jBEeWPvPHRj0_oqw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_vzQwZMjBEeWPvPHRj0_oqw" type="7002">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_vzQwZcjBEeWPvPHRj0_oqw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_vzQwZsjBEeWPvPHRj0_oqw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_vzQwZ8jBEeWPvPHRj0_oqw" type="7003">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_vzQwaMjBEeWPvPHRj0_oqw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_vzQwacjBEeWPvPHRj0_oqw"/>

-    </children>

-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//AdviceBindingConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vzQJUcjBEeWPvPHRj0_oqw" x="515" y="720"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_PI9n8MjCEeWPvPHRj0_oqw" type="2001" fontName="Segoe UI">

-    <children xmi:type="notation:DecorationNode" xmi:id="_PI-PAMjCEeWPvPHRj0_oqw" type="5001"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_PI-PAcjCEeWPvPHRj0_oqw" type="7001">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_PI-PAsjCEeWPvPHRj0_oqw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_PI-PA8jCEeWPvPHRj0_oqw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_PI-PBMjCEeWPvPHRj0_oqw" type="7002">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_PI-PBcjCEeWPvPHRj0_oqw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_PI-PBsjCEeWPvPHRj0_oqw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_PI-PB8jCEeWPvPHRj0_oqw" type="7003">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_PI-PCMjCEeWPvPHRj0_oqw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_PI-PCcjCEeWPvPHRj0_oqw"/>

-    </children>

-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//MatcherConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PI9n8cjCEeWPvPHRj0_oqw" x="1120" y="1050"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_WLo7QMmYEeWPvPHRj0_oqw" type="2001" fontName="Segoe UI">

-    <children xmi:type="notation:DecorationNode" xmi:id="_WLo7QsmYEeWPvPHRj0_oqw" type="5001"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_WLo7Q8mYEeWPvPHRj0_oqw" type="7001">

-      <children xmi:type="notation:Node" xmi:id="_SdpmlMmYEeWPvPHRj0_oqw" type="3001">

-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//IdentifiedConfiguration/identifier"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SdpmlcmYEeWPvPHRj0_oqw"/>

-      </children>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_WLo7RMmYEeWPvPHRj0_oqw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_WLo7RcmYEeWPvPHRj0_oqw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_WLo7RsmYEeWPvPHRj0_oqw" type="7002">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_WLo7R8mYEeWPvPHRj0_oqw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_WLo7SMmYEeWPvPHRj0_oqw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_WLo7ScmYEeWPvPHRj0_oqw" type="7003">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_WLo7SsmYEeWPvPHRj0_oqw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_WLo7S8mYEeWPvPHRj0_oqw"/>

-    </children>

-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//IdentifiedConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WLo7QcmYEeWPvPHRj0_oqw" x="680" y="535"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_jQEu8MppEeWPW4wup-qMUw" type="2001" fontName="Segoe UI">

-    <children xmi:type="notation:DecorationNode" xmi:id="_jQF9EMppEeWPW4wup-qMUw" type="5001"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_jQGkIMppEeWPW4wup-qMUw" type="7001">

-      <children xmi:type="notation:Node" xmi:id="_SdpmkMmYEeWPvPHRj0_oqw" type="3001">

-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//NamedConfiguration/name"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SdpmkcmYEeWPvPHRj0_oqw"/>

-      </children>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_jQGkIcppEeWPW4wup-qMUw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_jQGkIsppEeWPW4wup-qMUw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_jQGkI8ppEeWPW4wup-qMUw" type="7002">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_jQGkJMppEeWPW4wup-qMUw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_jQGkJcppEeWPW4wup-qMUw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_jQGkJsppEeWPW4wup-qMUw" type="7003">

-      <styles xmi:type="notation:SortingStyle" xmi:id="_jQGkJ8ppEeWPW4wup-qMUw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_jQGkKMppEeWPW4wup-qMUw"/>

-    </children>

-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//NamedConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jQEu8cppEeWPW4wup-qMUw" x="385" y="205"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_abOYARQPEeSwyuAkiSG7MA"/>

-  <element xmi:type="ecore:EPackage" href="ElementTypesConfigurations.ecore#/"/>

-  <edges xmi:type="notation:Connector" xmi:id="_daPmgBQSEeSwyuAkiSG7MA" type="4003" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_dZSkQxQSEeSwyuAkiSG7MA">

-    <children xmi:type="notation:DecorationNode" xmi:id="_daPmgxQSEeSwyuAkiSG7MA" type="6002">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_daPmhBQSEeSwyuAkiSG7MA" x="-9" y="-72"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_daPmhRQSEeSwyuAkiSG7MA" type="6004">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_daPmhhQSEeSwyuAkiSG7MA" x="-5" y="-15"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_daPmgRQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>

-    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/elementTypeConfigurations"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daPmghQSEeSwyuAkiSG7MA" points="[0, 0, 234, -337]$[-204, 293, 30, -44]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbIXUxQSEeSwyuAkiSG7MA" id="(0.3333333333333333,1.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbIXVBQSEeSwyuAkiSG7MA" id="(0.8641975308641975,0.14666666666666667)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_daTQ4BQSEeSwyuAkiSG7MA" type="4004" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_dZTyYBQSEeSwyuAkiSG7MA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_daTQ4RQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daTQ4hQSEeSwyuAkiSG7MA" points="[6, -29, 148, 280]$[6, -189, 148, 120]$[-142, -189, 0, 120]$[-142, -250, 0, 59]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbI-YBQSEeSwyuAkiSG7MA" id="(0.48905109489051096,0.0)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_daYJYBQSEeSwyuAkiSG7MA" type="4004" source="_dZSkQxQSEeSwyuAkiSG7MA" target="_dZTyYBQSEeSwyuAkiSG7MA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_daYJYRQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daYJYhQSEeSwyuAkiSG7MA" points="[0, -6, -78, 555]$[0, -441, -78, 120]$[78, -441, 0, 120]$[78, -502, 0, 59]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbF7ERQSEeSwyuAkiSG7MA" id="(0.11728395061728394,0.08)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbF7EhQSEeSwyuAkiSG7MA" id="(0.16058394160583941,0.0)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_daZXgBQSEeSwyuAkiSG7MA" type="4003" source="_dZSkQxQSEeSwyuAkiSG7MA" target="_dZTLUBQSEeSwyuAkiSG7MA">

-    <children xmi:type="notation:DecorationNode" xmi:id="_daZ-kBQSEeSwyuAkiSG7MA" type="6002">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_daZ-kRQSEeSwyuAkiSG7MA" x="4" y="-12"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_daZ-khQSEeSwyuAkiSG7MA" type="6004">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_daZ-kxQSEeSwyuAkiSG7MA" x="8" y="-23"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_daZXgRQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>

-    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//ElementTypeConfiguration/iconEntry"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daZXghQSEeSwyuAkiSG7MA" points="[0, 0, 0, -60]$[0, 60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbHwQhQSEeSwyuAkiSG7MA" id="(0.9135802469135802,0.14666666666666667)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbHwQxQSEeSwyuAkiSG7MA" id="(0.032520325203252036,0.5333333333333333)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_daca0BQSEeSwyuAkiSG7MA" type="4004" source="_dZUZehQSEeSwyuAkiSG7MA" target="_dZTyYBQSEeSwyuAkiSG7MA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_daca0RQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daca0hQSEeSwyuAkiSG7MA" points="[0, -4, 422, 82]$[0, -39, 422, 47]$[-422, -39, 0, 47]$[-422, -65, 0, 21]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbF7ExQSEeSwyuAkiSG7MA" id="(0.2868217054263566,0.054945054945054944)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbF7FBQSEeSwyuAkiSG7MA" id="(0.9854014598540146,0.6483516483516484)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_dagFMBQSEeSwyuAkiSG7MA" type="4004" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_dZUZehQSEeSwyuAkiSG7MA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_dagFMRQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dagFMhQSEeSwyuAkiSG7MA" points="[-2, -52, 22, 626]$[-22, -619, 2, 59]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbHJNBQSEeSwyuAkiSG7MA" id="(0.4971751412429379,1.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbHJNRQSEeSwyuAkiSG7MA" id="(0.5,0.0)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_s3NjcBQVEeSwyuAkiSG7MA" type="4003" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_dZTybBQSEeSwyuAkiSG7MA">

-    <children xmi:type="notation:DecorationNode" xmi:id="_s3NjcxQVEeSwyuAkiSG7MA" type="6002">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_s3NjdBQVEeSwyuAkiSG7MA" x="-8" y="-64"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_s3NjdRQVEeSwyuAkiSG7MA" type="6004">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_s3NjdhQVEeSwyuAkiSG7MA" x="-29" y="11"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_s3NjcRQVEeSwyuAkiSG7MA" fontName="Segoe UI"/>

-    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/matcherConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s3NjchQVEeSwyuAkiSG7MA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BhqqsBfDEeShg7yWMgp7yA" id="(0.8705882352941177,0.8461538461538461)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_s3PYoBQVEeSwyuAkiSG7MA" type="4004" source="_r_7yoBQUEeSwyuAkiSG7MA" target="_dZSkQxQSEeSwyuAkiSG7MA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_s3PYoRQVEeSwyuAkiSG7MA" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s3PYohQVEeSwyuAkiSG7MA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_hDfWYBQYEeSwyuAkiSG7MA" type="4003" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_Rt13gBQXEeSwyuAkiSG7MA">

-    <children xmi:type="notation:DecorationNode" xmi:id="_hDf9cBQYEeSwyuAkiSG7MA" type="6002">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hDf9cRQYEeSwyuAkiSG7MA" x="5" y="-39"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_hDf9chQYEeSwyuAkiSG7MA" type="6004">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hDf9cxQYEeSwyuAkiSG7MA" x="-35" y="13"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_hDfWYRQYEeSwyuAkiSG7MA" fontName="Segoe UI"/>

-    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/containerConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hDfWYhQYEeSwyuAkiSG7MA" points="[-2, 4, 29, -100]$[-23, 75, 8, -29]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hDjn0BQYEeSwyuAkiSG7MA" id="(0.9529411764705882,0.6346153846153846)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_IGuE4BQaEeSwyuAkiSG7MA" type="4004" source="_-uCeQBQZEeSwyuAkiSG7MA" target="_dZSkQxQSEeSwyuAkiSG7MA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_IGuE4RQaEeSwyuAkiSG7MA" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IGuE4hQaEeSwyuAkiSG7MA" points="[-2, -5, 97, 310]$[-94, -299, 5, 16]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IGzkcBQaEeSwyuAkiSG7MA" id="(0.5327102803738317,0.09615384615384616)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IGzkcRQaEeSwyuAkiSG7MA" id="(0.2716049382716049,0.9866666666666667)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_KdoHMBgSEeSAXuG_wvLrDw" type="4003" source="_r_7yoBQUEeSwyuAkiSG7MA" target="_KdlD4BgSEeSAXuG_wvLrDw">

-    <children xmi:type="notation:DecorationNode" xmi:id="_KdoHMxgSEeSAXuG_wvLrDw" type="6002">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KdoHNBgSEeSAXuG_wvLrDw" x="138" y="13"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_KdoHNRgSEeSAXuG_wvLrDw" type="6004">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KdoHNhgSEeSAXuG_wvLrDw" x="162" y="23"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_KdoHMRgSEeSAXuG_wvLrDw" fontName="Segoe UI"/>

-    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/editHelperAdviceConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KdoHMhgSEeSAXuG_wvLrDw" points="[96, 0, -878, 463]$[974, 0, 0, 463]$[974, -437, 0, 26]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_Kdp8YBgSEeSAXuG_wvLrDw" type="4004" source="_KdlD4BgSEeSAXuG_wvLrDw" target="_dZUZehQSEeSwyuAkiSG7MA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_Kdp8YRgSEeSAXuG_wvLrDw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Kdp8YhgSEeSAXuG_wvLrDw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_KGvBIBv3EeSyLpQry5wnWQ" type="4003" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_dZVnkBQSEeSwyuAkiSG7MA">

-    <children xmi:type="notation:DecorationNode" xmi:id="_KGwPQBv3EeSyLpQry5wnWQ" type="6002">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KGwPQRv3EeSyLpQry5wnWQ" x="18" y="-79"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_KGwPQhv3EeSyLpQry5wnWQ" type="6004">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KGwPQxv3EeSyLpQry5wnWQ" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_KGvBIRv3EeSyLpQry5wnWQ" fontName="Segoe UI"/>

-    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/adviceBindingsConfigurations"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KGvBIhv3EeSyLpQry5wnWQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_KG2V4Bv3EeSyLpQry5wnWQ" type="4002" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_dZSkQxQSEeSwyuAkiSG7MA">

-    <children xmi:type="notation:DecorationNode" xmi:id="_KG2V4xv3EeSyLpQry5wnWQ" type="6001">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KG2V5Bv3EeSyLpQry5wnWQ" x="37" y="-10"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_KG2V5Rv3EeSyLpQry5wnWQ" type="6003">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KG2V5hv3EeSyLpQry5wnWQ" x="40" y="-10"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_KG2V4Rv3EeSyLpQry5wnWQ" fontName="Segoe UI"/>

-    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/target"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KG2V4hv3EeSyLpQry5wnWQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_QwLaUBv3EeSyLpQry5wnWQ" type="4003" source="_r_7yoBQUEeSwyuAkiSG7MA" target="_Rt13gBQXEeSwyuAkiSG7MA">

-    <children xmi:type="notation:DecorationNode" xmi:id="_QwMBYBv3EeSyLpQry5wnWQ" type="6002">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QwMBYRv3EeSyLpQry5wnWQ" x="29" y="68"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_QwMBYhv3EeSyLpQry5wnWQ" type="6004">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QwMBYxv3EeSyLpQry5wnWQ" x="7" y="-14"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_QwLaURv3EeSyLpQry5wnWQ" fontName="Segoe UI"/>

-    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/containerConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QwLaUhv3EeSyLpQry5wnWQ" points="[25, -29, -127, 149]$[151, -152, -1, 26]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_TqIqABv3EeSyLpQry5wnWQ" type="4003" source="_r_7yoBQUEeSwyuAkiSG7MA" target="_dZTybBQSEeSwyuAkiSG7MA">

-    <children xmi:type="notation:DecorationNode" xmi:id="_TqJREBv3EeSyLpQry5wnWQ" type="6002">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_TqJRERv3EeSyLpQry5wnWQ" x="87" y="38"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_TqJREhv3EeSyLpQry5wnWQ" type="6004">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_TqJRExv3EeSyLpQry5wnWQ" x="49" y="13"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_TqIqARv3EeSyLpQry5wnWQ" fontName="Segoe UI"/>

-    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/matcherConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TqIqAhv3EeSyLpQry5wnWQ" points="[7, -3, -434, 140]$[405, -129, -36, 14]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TqRM4Bv3EeSyLpQry5wnWQ" id="(0.9633507853403142,0.22033898305084745)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TqRM4Rv3EeSyLpQry5wnWQ" id="(0.27932960893854747,0.7627118644067796)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_jEdp4Mi-EeWPvPHRj0_oqw" type="4004" source="_1pGfMMi9EeWPvPHRj0_oqw" target="_KdlD4BgSEeSAXuG_wvLrDw">

-    <styles xmi:type="notation:FontStyle" xmi:id="_jEdp4ci-EeWPvPHRj0_oqw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jEdp4si-EeWPvPHRj0_oqw" points="[30, -29, -124, 89]$[96, -144, -58, -26]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_9jrzUMjBEeWPvPHRj0_oqw" type="4004" source="_vzQJUMjBEeWPvPHRj0_oqw" target="_dZVnkBQSEeSwyuAkiSG7MA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_9jsaYMjBEeWPvPHRj0_oqw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9jsaYcjBEeWPvPHRj0_oqw" points="[32, -26, -107, 101]$[246, -134, 107, -7]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_SmnakMjCEeWPvPHRj0_oqw" type="4004" source="_PI9n8MjCEeWPvPHRj0_oqw" target="_dZTybBQSEeSwyuAkiSG7MA">

-    <styles xmi:type="notation:FontStyle" xmi:id="_SmnakcjCEeWPvPHRj0_oqw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SmnaksjCEeWPvPHRj0_oqw" points="[-23, -26, 80, 86]$[-105, -141, -2, -29]"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_46pKoMjMEeWPvPHRj0_oqw" type="4003" source="_Rt13gBQXEeSwyuAkiSG7MA" target="_dZTybBQSEeSwyuAkiSG7MA">

-    <children xmi:type="notation:DecorationNode" xmi:id="_46pxsMjMEeWPvPHRj0_oqw" type="6002">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_46pxscjMEeWPvPHRj0_oqw" x="-11" y="16"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_46pxssjMEeWPvPHRj0_oqw" type="6004">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_46pxs8jMEeWPvPHRj0_oqw" x="-3" y="-14"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_46pKocjMEeWPvPHRj0_oqw" fontName="Segoe UI"/>

-    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//ContainerConfiguration/containerMatcherConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_46pKosjMEeWPvPHRj0_oqw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9Vx5MMjMEeWPvPHRj0_oqw" id="(0.9241379310344827,0.5576923076923077)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_ZTrDMMmYEeWPvPHRj0_oqw" type="4004" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_WLo7QMmYEeWPvPHRj0_oqw">

-    <styles xmi:type="notation:FontStyle" xmi:id="_ZTrDMcmYEeWPvPHRj0_oqw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZTrDMsmYEeWPvPHRj0_oqw" points="[-4, -3, 120, 89]$[-52, -89, 72, 3]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZTtfcMmYEeWPvPHRj0_oqw" id="(0.14018691588785046,0.05084745762711865)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_ZuldkMmYEeWPvPHRj0_oqw" type="4004" source="_dZSkQxQSEeSwyuAkiSG7MA" target="_WLo7QMmYEeWPvPHRj0_oqw">

-    <styles xmi:type="notation:FontStyle" xmi:id="_ZumEoMmYEeWPvPHRj0_oqw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZumEocmYEeWPvPHRj0_oqw" points="[24, -15, -151, 84]$[104, -91, -71, 8]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZunSwMmYEeWPvPHRj0_oqw" id="(0.7777777777777778,0.2)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_aUOhQMmYEeWPvPHRj0_oqw" type="4004" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_WLo7QMmYEeWPvPHRj0_oqw">

-    <styles xmi:type="notation:FontStyle" xmi:id="_aUOhQcmYEeWPvPHRj0_oqw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aUOhQsmYEeWPvPHRj0_oqw" points="[-1, 30, 0, -188]$[-26, 206, -25, -12]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aUQWcMmYEeWPvPHRj0_oqw" id="(0.3006993006993007,0.23076923076923078)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_nnnW8MppEeWPW4wup-qMUw" type="4004" source="_dZSkQxQSEeSwyuAkiSG7MA" target="_jQEu8MppEeWPW4wup-qMUw">

-    <styles xmi:type="notation:FontStyle" xmi:id="_nnnW8cppEeWPW4wup-qMUw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nnnW8sppEeWPW4wup-qMUw" points="[11, -8, -135, 96]$[147, -74, 1, 30]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nnrBUMppEeWPW4wup-qMUw" id="(0.8333333333333334,0.10666666666666667)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2GZ7wMppEeWPW4wup-qMUw" id="(0.4621212121212121,0.8813559322033898)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_oA4LgMppEeWPW4wup-qMUw" type="4004" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_jQEu8MppEeWPW4wup-qMUw">

-    <styles xmi:type="notation:FontStyle" xmi:id="_oA4LgcppEeWPW4wup-qMUw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oA4LgsppEeWPW4wup-qMUw" points="[0, -29, 116, 77]$[0, -59, 116, 47]$[-116, -59, 0, 47]$[-116, -100, 0, 6]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_85h1YMppEeWPW4wup-qMUw" id="(0.7424242424242424,0.8983050847457628)"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram 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" xmi:id="_abOYABQPEeSwyuAkiSG7MA" type="Ecore" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_dZR9MBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
+    <children xmi:type="notation:DecorationNode" xmi:id="_dZR9MhQSEeSwyuAkiSG7MA" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZR9MxQSEeSwyuAkiSG7MA" type="7001">
+      <children xmi:type="notation:Node" xmi:id="_LxebkBu-EeSI_rJGQSJeSQ" type="3001">
+        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/metamodelNsURI"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LxebkRu-EeSI_rJGQSJeSQ"/>
+      </children>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZR9NBQSEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZR9NRQSEeSwyuAkiSG7MA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZR9NhQSEeSwyuAkiSG7MA" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZR9NxQSEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZR9OBQSEeSwyuAkiSG7MA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZSkQBQSEeSwyuAkiSG7MA" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZSkQRQSEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZSkQhQSEeSwyuAkiSG7MA"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZR9MRQSEeSwyuAkiSG7MA" x="510" y="335"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_dZSkQxQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
+    <children xmi:type="notation:DecorationNode" xmi:id="_dZSkRRQSEeSwyuAkiSG7MA" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZSkRhQSEeSwyuAkiSG7MA" type="7001">
+      <children xmi:type="notation:Node" xmi:id="_ok1poMpoEeWPW4wup-qMUw" type="3001">
+        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//ElementTypeConfiguration/hint"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ok1pocpoEeWPW4wup-qMUw"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_ok7wQMpoEeWPW4wup-qMUw" type="3001">
+        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//ElementTypeConfiguration/kind"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ok7wQcpoEeWPW4wup-qMUw"/>
+      </children>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZSkRxQSEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZSkSBQSEeSwyuAkiSG7MA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZSkSRQSEeSwyuAkiSG7MA" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZSkShQSEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZSkSxQSEeSwyuAkiSG7MA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZSkTBQSEeSwyuAkiSG7MA" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZSkTRQSEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZSkThQSEeSwyuAkiSG7MA"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//ElementTypeConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZSkRBQSEeSwyuAkiSG7MA" x="315" y="610"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_dZTLUBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
+    <children xmi:type="notation:DecorationNode" xmi:id="_dZTLUhQSEeSwyuAkiSG7MA" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTLUxQSEeSwyuAkiSG7MA" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTLVBQSEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTLVRQSEeSwyuAkiSG7MA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTLVhQSEeSwyuAkiSG7MA" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTLVxQSEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTLWBQSEeSwyuAkiSG7MA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTLWRQSEeSwyuAkiSG7MA" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTLWhQSEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTLWxQSEeSwyuAkiSG7MA"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//IconEntry"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZTLURQSEeSwyuAkiSG7MA" x="40" y="590"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_dZTyYBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
+    <children xmi:type="notation:DecorationNode" xmi:id="_dZTyYhQSEeSwyuAkiSG7MA" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTyYxQSEeSwyuAkiSG7MA" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTyZBQSEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTyZRQSEeSwyuAkiSG7MA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTyZhQSEeSwyuAkiSG7MA" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTyZxQSEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTyaBQSEeSwyuAkiSG7MA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTyaRQSEeSwyuAkiSG7MA" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTyahQSEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTyaxQSEeSwyuAkiSG7MA"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//ConfigurationElement"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZTyYRQSEeSwyuAkiSG7MA" x="390" y="55"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_dZTybBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
+    <children xmi:type="notation:DecorationNode" xmi:id="_dZUZcBQSEeSwyuAkiSG7MA" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZUZcRQSEeSwyuAkiSG7MA" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZUZchQSEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZUZcxQSEeSwyuAkiSG7MA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZUZdBQSEeSwyuAkiSG7MA" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZUZdRQSEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZUZdhQSEeSwyuAkiSG7MA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZUZdxQSEeSwyuAkiSG7MA" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZUZeBQSEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZUZeRQSEeSwyuAkiSG7MA"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//AbstractMatcherConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZTybRQSEeSwyuAkiSG7MA" x="990" y="870"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_dZUZehQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
+    <children xmi:type="notation:DecorationNode" xmi:id="_dZUZfBQSEeSwyuAkiSG7MA" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZUZfRQSEeSwyuAkiSG7MA" type="7001">
+      <children xmi:type="notation:Node" xmi:id="_lcjhoBY3EeSSL_L7W7Ic3A" type="3001">
+        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//AdviceConfiguration/before"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lcjhoRY3EeSSL_L7W7Ic3A"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_TCKh8BQeEeSwyuAkiSG7MA" type="3001">
+        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//AdviceConfiguration/after"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TCKh8RQeEeSwyuAkiSG7MA"/>
+      </children>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZUZfhQSEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZUZfxQSEeSwyuAkiSG7MA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZUZgBQSEeSwyuAkiSG7MA" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZVAgBQSEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZVAgRQSEeSwyuAkiSG7MA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZVAghQSEeSwyuAkiSG7MA" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZVAgxQSEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZVAhBQSEeSwyuAkiSG7MA"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//AdviceConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZUZexQSEeSwyuAkiSG7MA" x="910" y="175"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_dZVnkBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
+    <children xmi:type="notation:DecorationNode" xmi:id="_dZVnkhQSEeSwyuAkiSG7MA" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZVnkxQSEeSwyuAkiSG7MA" type="7001">
+      <children xmi:type="notation:Node" xmi:id="_z6xdkBfKEeShg7yWMgp7yA" type="3001">
+        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/inheritance"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_z6xdkRfKEeShg7yWMgp7yA"/>
+      </children>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZVnlBQSEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZVnlRQSEeSwyuAkiSG7MA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZVnlhQSEeSwyuAkiSG7MA" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZVnlxQSEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZVnmBQSEeSwyuAkiSG7MA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZVnmRQSEeSwyuAkiSG7MA" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZVnmhQSEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZVnmxQSEeSwyuAkiSG7MA"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZVnkRQSEeSwyuAkiSG7MA" x="890" y="620"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_r_7yoBQUEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
+    <children xmi:type="notation:DecorationNode" xmi:id="_r_8ZsBQUEeSwyuAkiSG7MA" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_r_8ZsRQUEeSwyuAkiSG7MA" type="7001">
+      <children xmi:type="notation:Node" xmi:id="_dZgmsBQSEeSwyuAkiSG7MA" type="3001">
+        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/specializedTypesID"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_dZgmsRQSEeSwyuAkiSG7MA"/>
+      </children>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_r_8ZshQUEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_r_8ZsxQUEeSwyuAkiSG7MA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_r_8ZtBQUEeSwyuAkiSG7MA" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_r_9AwBQUEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_r_9AwRQUEeSwyuAkiSG7MA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_r_9AwhQUEeSwyuAkiSG7MA" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_r_9AwxQUEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_r_9AxBQUEeSwyuAkiSG7MA"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r_7yoRQUEeSwyuAkiSG7MA" x="420" y="1110"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_Rt13gBQXEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
+    <children xmi:type="notation:DecorationNode" xmi:id="_Rt2ekBQXEeSwyuAkiSG7MA" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_Rt2ekRQXEeSwyuAkiSG7MA" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Rt2ekhQXEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Rt2ekxQXEeSwyuAkiSG7MA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_Rt3FoBQXEeSwyuAkiSG7MA" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Rt3FoRQXEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Rt3FohQXEeSwyuAkiSG7MA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_Rt3FoxQXEeSwyuAkiSG7MA" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Rt3FpBQXEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Rt3FpRQXEeSwyuAkiSG7MA"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//ContainerConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rt13gRQXEeSwyuAkiSG7MA" x="555" y="870"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_-uCeQBQZEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
+    <children xmi:type="notation:DecorationNode" xmi:id="_-uDFUBQZEeSwyuAkiSG7MA" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_-uDFURQZEeSwyuAkiSG7MA" type="7001">
+      <children xmi:type="notation:Node" xmi:id="_rBv9ABQdEeSwyuAkiSG7MA" type="3001">
+        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//MetamodelTypeConfiguration/editHelperClassName"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rBv9ARQdEeSwyuAkiSG7MA"/>
+      </children>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_-uDFUhQZEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_-uDFUxQZEeSwyuAkiSG7MA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_-uDsYBQZEeSwyuAkiSG7MA" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_-uDsYRQZEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_-uDsYhQZEeSwyuAkiSG7MA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_-uDsYxQZEeSwyuAkiSG7MA" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_-uDsZBQZEeSwyuAkiSG7MA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_-uDsZRQZEeSwyuAkiSG7MA"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//MetamodelTypeConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-uCeQRQZEeSwyuAkiSG7MA" x="105" y="1115"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_18yYoBfKEeShg7yWMgp7yA" type="2005" fontName="Segoe UI">
+    <children xmi:type="notation:DecorationNode" xmi:id="_18yYohfKEeShg7yWMgp7yA" type="5005"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_18yYoxfKEeShg7yWMgp7yA" type="7011">
+      <children xmi:type="notation:Node" xmi:id="_6FTtMBfKEeShg7yWMgp7yA" type="3009">
+        <element xmi:type="ecore:EEnumLiteral" href="ElementTypesConfigurations.ecore#//InheritanceKind/all"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6FTtMRfKEeShg7yWMgp7yA"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_7Ybh8BfKEeShg7yWMgp7yA" type="3009">
+        <element xmi:type="ecore:EEnumLiteral" href="ElementTypesConfigurations.ecore#//InheritanceKind/none"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7Ybh8RfKEeShg7yWMgp7yA"/>
+      </children>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_18yYpBfKEeShg7yWMgp7yA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_18yYpRfKEeShg7yWMgp7yA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_18yYphfKEeShg7yWMgp7yA" type="7012">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_18yYpxfKEeShg7yWMgp7yA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_18yYqBfKEeShg7yWMgp7yA"/>
+    </children>
+    <element xmi:type="ecore:EEnum" href="ElementTypesConfigurations.ecore#//InheritanceKind"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_18yYoRfKEeShg7yWMgp7yA" x="1120" y="620"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_KdlD4BgSEeSAXuG_wvLrDw" type="2001" fontName="Segoe UI">
+    <children xmi:type="notation:DecorationNode" xmi:id="_KdlD4hgSEeSAXuG_wvLrDw" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_KdlD4xgSEeSAXuG_wvLrDw" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_KdlD5BgSEeSAXuG_wvLrDw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_KdlD5RgSEeSAXuG_wvLrDw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_KdlD5hgSEeSAXuG_wvLrDw" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_KdlD5xgSEeSAXuG_wvLrDw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_KdlD6BgSEeSAXuG_wvLrDw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_Kdlq8BgSEeSAXuG_wvLrDw" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Kdlq8RgSEeSAXuG_wvLrDw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Kdlq8hgSEeSAXuG_wvLrDw"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//AbstractEditHelperAdviceConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KdlD4RgSEeSAXuG_wvLrDw" x="1375" y="650"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_1pGfMMi9EeWPvPHRj0_oqw" type="2001" fontName="Segoe UI">
+    <children xmi:type="notation:DecorationNode" xmi:id="_1pHtUMi9EeWPvPHRj0_oqw" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_1pHtUci9EeWPvPHRj0_oqw" type="7001">
+      <children xmi:type="notation:Node" xmi:id="_kjFZcMi9EeWPvPHRj0_oqw" type="3001">
+        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//EditHelperAdviceConfiguration/editHelperAdviceClassName"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kjFZcci9EeWPvPHRj0_oqw"/>
+      </children>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1pHtUsi9EeWPvPHRj0_oqw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1pHtU8i9EeWPvPHRj0_oqw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_1pHtVMi9EeWPvPHRj0_oqw" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1pHtVci9EeWPvPHRj0_oqw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1pHtVsi9EeWPvPHRj0_oqw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_1pHtV8i9EeWPvPHRj0_oqw" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_1pHtWMi9EeWPvPHRj0_oqw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1pHtWci9EeWPvPHRj0_oqw"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//EditHelperAdviceConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pGfMci9EeWPvPHRj0_oqw" x="1240" y="810"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_vzQJUMjBEeWPvPHRj0_oqw" type="2001" fontName="Segoe UI">
+    <children xmi:type="notation:DecorationNode" xmi:id="_vzQwYMjBEeWPvPHRj0_oqw" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_vzQwYcjBEeWPvPHRj0_oqw" type="7001">
+      <children xmi:type="notation:Node" xmi:id="_-VKBoMjDEeWPvPHRj0_oqw" type="3001">
+        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//AdviceBindingConfiguration/editHelperAdviceClassName"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-VKBocjDEeWPvPHRj0_oqw"/>
+      </children>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_vzQwYsjBEeWPvPHRj0_oqw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_vzQwY8jBEeWPvPHRj0_oqw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_vzQwZMjBEeWPvPHRj0_oqw" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_vzQwZcjBEeWPvPHRj0_oqw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_vzQwZsjBEeWPvPHRj0_oqw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_vzQwZ8jBEeWPvPHRj0_oqw" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_vzQwaMjBEeWPvPHRj0_oqw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_vzQwacjBEeWPvPHRj0_oqw"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//AdviceBindingConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vzQJUcjBEeWPvPHRj0_oqw" x="515" y="720"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_PI9n8MjCEeWPvPHRj0_oqw" type="2001" fontName="Segoe UI">
+    <children xmi:type="notation:DecorationNode" xmi:id="_PI-PAMjCEeWPvPHRj0_oqw" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_PI-PAcjCEeWPvPHRj0_oqw" type="7001">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_PI-PAsjCEeWPvPHRj0_oqw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_PI-PA8jCEeWPvPHRj0_oqw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_PI-PBMjCEeWPvPHRj0_oqw" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_PI-PBcjCEeWPvPHRj0_oqw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_PI-PBsjCEeWPvPHRj0_oqw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_PI-PB8jCEeWPvPHRj0_oqw" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_PI-PCMjCEeWPvPHRj0_oqw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_PI-PCcjCEeWPvPHRj0_oqw"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//MatcherConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PI9n8cjCEeWPvPHRj0_oqw" x="1120" y="1050"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_WLo7QMmYEeWPvPHRj0_oqw" type="2001" fontName="Segoe UI">
+    <children xmi:type="notation:DecorationNode" xmi:id="_WLo7QsmYEeWPvPHRj0_oqw" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_WLo7Q8mYEeWPvPHRj0_oqw" type="7001">
+      <children xmi:type="notation:Node" xmi:id="_SdpmlMmYEeWPvPHRj0_oqw" type="3001">
+        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//IdentifiedConfiguration/identifier"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SdpmlcmYEeWPvPHRj0_oqw"/>
+      </children>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_WLo7RMmYEeWPvPHRj0_oqw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_WLo7RcmYEeWPvPHRj0_oqw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_WLo7RsmYEeWPvPHRj0_oqw" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_WLo7R8mYEeWPvPHRj0_oqw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_WLo7SMmYEeWPvPHRj0_oqw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_WLo7ScmYEeWPvPHRj0_oqw" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_WLo7SsmYEeWPvPHRj0_oqw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_WLo7S8mYEeWPvPHRj0_oqw"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//IdentifiedConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WLo7QcmYEeWPvPHRj0_oqw" x="680" y="535"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_jQEu8MppEeWPW4wup-qMUw" type="2001" fontName="Segoe UI">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jQF9EMppEeWPW4wup-qMUw" type="5001"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jQGkIMppEeWPW4wup-qMUw" type="7001">
+      <children xmi:type="notation:Node" xmi:id="_SdpmkMmYEeWPvPHRj0_oqw" type="3001">
+        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//NamedConfiguration/name"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SdpmkcmYEeWPvPHRj0_oqw"/>
+      </children>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jQGkIcppEeWPW4wup-qMUw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jQGkIsppEeWPW4wup-qMUw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jQGkI8ppEeWPW4wup-qMUw" type="7002">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jQGkJMppEeWPW4wup-qMUw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jQGkJcppEeWPW4wup-qMUw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_jQGkJsppEeWPW4wup-qMUw" type="7003">
+      <styles xmi:type="notation:SortingStyle" xmi:id="_jQGkJ8ppEeWPW4wup-qMUw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jQGkKMppEeWPW4wup-qMUw"/>
+    </children>
+    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//NamedConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jQEu8cppEeWPW4wup-qMUw" x="385" y="205"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_abOYARQPEeSwyuAkiSG7MA"/>
+  <element xmi:type="ecore:EPackage" href="ElementTypesConfigurations.ecore#/"/>
+  <edges xmi:type="notation:Connector" xmi:id="_daPmgBQSEeSwyuAkiSG7MA" type="4003" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_dZSkQxQSEeSwyuAkiSG7MA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_daPmgxQSEeSwyuAkiSG7MA" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_daPmhBQSEeSwyuAkiSG7MA" x="-9" y="-72"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_daPmhRQSEeSwyuAkiSG7MA" type="6004">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_daPmhhQSEeSwyuAkiSG7MA" x="-5" y="-15"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_daPmgRQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>
+    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/elementTypeConfigurations"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daPmghQSEeSwyuAkiSG7MA" points="[0, 0, 234, -337]$[-204, 293, 30, -44]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbIXUxQSEeSwyuAkiSG7MA" id="(0.3333333333333333,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbIXVBQSEeSwyuAkiSG7MA" id="(0.8641975308641975,0.14666666666666667)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_daTQ4BQSEeSwyuAkiSG7MA" type="4004" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_dZTyYBQSEeSwyuAkiSG7MA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_daTQ4RQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daTQ4hQSEeSwyuAkiSG7MA" points="[6, -29, 148, 280]$[6, -189, 148, 120]$[-142, -189, 0, 120]$[-142, -250, 0, 59]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbI-YBQSEeSwyuAkiSG7MA" id="(0.48905109489051096,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_daYJYBQSEeSwyuAkiSG7MA" type="4004" source="_dZSkQxQSEeSwyuAkiSG7MA" target="_dZTyYBQSEeSwyuAkiSG7MA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_daYJYRQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daYJYhQSEeSwyuAkiSG7MA" points="[0, -6, -78, 555]$[0, -441, -78, 120]$[78, -441, 0, 120]$[78, -502, 0, 59]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbF7ERQSEeSwyuAkiSG7MA" id="(0.11728395061728394,0.08)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbF7EhQSEeSwyuAkiSG7MA" id="(0.16058394160583941,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_daZXgBQSEeSwyuAkiSG7MA" type="4003" source="_dZSkQxQSEeSwyuAkiSG7MA" target="_dZTLUBQSEeSwyuAkiSG7MA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_daZ-kBQSEeSwyuAkiSG7MA" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_daZ-kRQSEeSwyuAkiSG7MA" x="4" y="-12"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_daZ-khQSEeSwyuAkiSG7MA" type="6004">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_daZ-kxQSEeSwyuAkiSG7MA" x="8" y="-23"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_daZXgRQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>
+    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//ElementTypeConfiguration/iconEntry"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daZXghQSEeSwyuAkiSG7MA" points="[0, 0, 0, -60]$[0, 60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbHwQhQSEeSwyuAkiSG7MA" id="(0.9135802469135802,0.14666666666666667)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbHwQxQSEeSwyuAkiSG7MA" id="(0.032520325203252036,0.5333333333333333)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_daca0BQSEeSwyuAkiSG7MA" type="4004" source="_dZUZehQSEeSwyuAkiSG7MA" target="_dZTyYBQSEeSwyuAkiSG7MA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_daca0RQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daca0hQSEeSwyuAkiSG7MA" points="[0, -4, 422, 82]$[0, -39, 422, 47]$[-422, -39, 0, 47]$[-422, -65, 0, 21]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbF7ExQSEeSwyuAkiSG7MA" id="(0.2868217054263566,0.054945054945054944)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbF7FBQSEeSwyuAkiSG7MA" id="(0.9854014598540146,0.6483516483516484)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_dagFMBQSEeSwyuAkiSG7MA" type="4004" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_dZUZehQSEeSwyuAkiSG7MA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_dagFMRQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dagFMhQSEeSwyuAkiSG7MA" points="[-2, -52, 22, 626]$[-22, -619, 2, 59]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbHJNBQSEeSwyuAkiSG7MA" id="(0.4971751412429379,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbHJNRQSEeSwyuAkiSG7MA" id="(0.5,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_s3NjcBQVEeSwyuAkiSG7MA" type="4003" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_dZTybBQSEeSwyuAkiSG7MA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_s3NjcxQVEeSwyuAkiSG7MA" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_s3NjdBQVEeSwyuAkiSG7MA" x="-8" y="-64"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_s3NjdRQVEeSwyuAkiSG7MA" type="6004">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_s3NjdhQVEeSwyuAkiSG7MA" x="-29" y="11"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_s3NjcRQVEeSwyuAkiSG7MA" fontName="Segoe UI"/>
+    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/matcherConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s3NjchQVEeSwyuAkiSG7MA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BhqqsBfDEeShg7yWMgp7yA" id="(0.8705882352941177,0.8461538461538461)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_s3PYoBQVEeSwyuAkiSG7MA" type="4004" source="_r_7yoBQUEeSwyuAkiSG7MA" target="_dZSkQxQSEeSwyuAkiSG7MA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_s3PYoRQVEeSwyuAkiSG7MA" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s3PYohQVEeSwyuAkiSG7MA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_hDfWYBQYEeSwyuAkiSG7MA" type="4003" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_Rt13gBQXEeSwyuAkiSG7MA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_hDf9cBQYEeSwyuAkiSG7MA" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hDf9cRQYEeSwyuAkiSG7MA" x="5" y="-39"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_hDf9chQYEeSwyuAkiSG7MA" type="6004">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hDf9cxQYEeSwyuAkiSG7MA" x="-35" y="13"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_hDfWYRQYEeSwyuAkiSG7MA" fontName="Segoe UI"/>
+    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/containerConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hDfWYhQYEeSwyuAkiSG7MA" points="[-2, 4, 29, -100]$[-23, 75, 8, -29]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hDjn0BQYEeSwyuAkiSG7MA" id="(0.9529411764705882,0.6346153846153846)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_IGuE4BQaEeSwyuAkiSG7MA" type="4004" source="_-uCeQBQZEeSwyuAkiSG7MA" target="_dZSkQxQSEeSwyuAkiSG7MA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_IGuE4RQaEeSwyuAkiSG7MA" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IGuE4hQaEeSwyuAkiSG7MA" points="[-2, -5, 97, 310]$[-94, -299, 5, 16]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IGzkcBQaEeSwyuAkiSG7MA" id="(0.5327102803738317,0.09615384615384616)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IGzkcRQaEeSwyuAkiSG7MA" id="(0.2716049382716049,0.9866666666666667)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_KdoHMBgSEeSAXuG_wvLrDw" type="4003" source="_r_7yoBQUEeSwyuAkiSG7MA" target="_KdlD4BgSEeSAXuG_wvLrDw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_KdoHMxgSEeSAXuG_wvLrDw" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KdoHNBgSEeSAXuG_wvLrDw" x="138" y="13"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_KdoHNRgSEeSAXuG_wvLrDw" type="6004">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KdoHNhgSEeSAXuG_wvLrDw" x="162" y="23"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_KdoHMRgSEeSAXuG_wvLrDw" fontName="Segoe UI"/>
+    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/editHelperAdviceConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KdoHMhgSEeSAXuG_wvLrDw" points="[96, 0, -878, 463]$[974, 0, 0, 463]$[974, -437, 0, 26]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_Kdp8YBgSEeSAXuG_wvLrDw" type="4004" source="_KdlD4BgSEeSAXuG_wvLrDw" target="_dZUZehQSEeSwyuAkiSG7MA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_Kdp8YRgSEeSAXuG_wvLrDw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Kdp8YhgSEeSAXuG_wvLrDw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_KGvBIBv3EeSyLpQry5wnWQ" type="4003" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_dZVnkBQSEeSwyuAkiSG7MA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_KGwPQBv3EeSyLpQry5wnWQ" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KGwPQRv3EeSyLpQry5wnWQ" x="18" y="-79"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_KGwPQhv3EeSyLpQry5wnWQ" type="6004">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KGwPQxv3EeSyLpQry5wnWQ" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_KGvBIRv3EeSyLpQry5wnWQ" fontName="Segoe UI"/>
+    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/adviceBindingsConfigurations"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KGvBIhv3EeSyLpQry5wnWQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_KG2V4Bv3EeSyLpQry5wnWQ" type="4002" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_dZSkQxQSEeSwyuAkiSG7MA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_KG2V4xv3EeSyLpQry5wnWQ" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KG2V5Bv3EeSyLpQry5wnWQ" x="37" y="-10"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_KG2V5Rv3EeSyLpQry5wnWQ" type="6003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KG2V5hv3EeSyLpQry5wnWQ" x="40" y="-10"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_KG2V4Rv3EeSyLpQry5wnWQ" fontName="Segoe UI"/>
+    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/target"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KG2V4hv3EeSyLpQry5wnWQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_QwLaUBv3EeSyLpQry5wnWQ" type="4003" source="_r_7yoBQUEeSwyuAkiSG7MA" target="_Rt13gBQXEeSwyuAkiSG7MA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QwMBYBv3EeSyLpQry5wnWQ" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QwMBYRv3EeSyLpQry5wnWQ" x="29" y="68"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QwMBYhv3EeSyLpQry5wnWQ" type="6004">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QwMBYxv3EeSyLpQry5wnWQ" x="7" y="-14"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_QwLaURv3EeSyLpQry5wnWQ" fontName="Segoe UI"/>
+    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/containerConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QwLaUhv3EeSyLpQry5wnWQ" points="[25, -29, -127, 149]$[151, -152, -1, 26]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_TqIqABv3EeSyLpQry5wnWQ" type="4003" source="_r_7yoBQUEeSwyuAkiSG7MA" target="_dZTybBQSEeSwyuAkiSG7MA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_TqJREBv3EeSyLpQry5wnWQ" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_TqJRERv3EeSyLpQry5wnWQ" x="87" y="38"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_TqJREhv3EeSyLpQry5wnWQ" type="6004">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_TqJRExv3EeSyLpQry5wnWQ" x="49" y="13"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_TqIqARv3EeSyLpQry5wnWQ" fontName="Segoe UI"/>
+    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/matcherConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TqIqAhv3EeSyLpQry5wnWQ" points="[7, -3, -434, 140]$[405, -129, -36, 14]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TqRM4Bv3EeSyLpQry5wnWQ" id="(0.9633507853403142,0.22033898305084745)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TqRM4Rv3EeSyLpQry5wnWQ" id="(0.27932960893854747,0.7627118644067796)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_jEdp4Mi-EeWPvPHRj0_oqw" type="4004" source="_1pGfMMi9EeWPvPHRj0_oqw" target="_KdlD4BgSEeSAXuG_wvLrDw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_jEdp4ci-EeWPvPHRj0_oqw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jEdp4si-EeWPvPHRj0_oqw" points="[30, -29, -124, 89]$[96, -144, -58, -26]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_9jrzUMjBEeWPvPHRj0_oqw" type="4004" source="_vzQJUMjBEeWPvPHRj0_oqw" target="_dZVnkBQSEeSwyuAkiSG7MA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_9jsaYMjBEeWPvPHRj0_oqw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9jsaYcjBEeWPvPHRj0_oqw" points="[32, -26, -107, 101]$[246, -134, 107, -7]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_SmnakMjCEeWPvPHRj0_oqw" type="4004" source="_PI9n8MjCEeWPvPHRj0_oqw" target="_dZTybBQSEeSwyuAkiSG7MA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_SmnakcjCEeWPvPHRj0_oqw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SmnaksjCEeWPvPHRj0_oqw" points="[-23, -26, 80, 86]$[-105, -141, -2, -29]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_46pKoMjMEeWPvPHRj0_oqw" type="4003" source="_Rt13gBQXEeSwyuAkiSG7MA" target="_dZTybBQSEeSwyuAkiSG7MA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_46pxsMjMEeWPvPHRj0_oqw" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_46pxscjMEeWPvPHRj0_oqw" x="-11" y="16"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_46pxssjMEeWPvPHRj0_oqw" type="6004">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_46pxs8jMEeWPvPHRj0_oqw" x="-3" y="-14"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_46pKocjMEeWPvPHRj0_oqw" fontName="Segoe UI"/>
+    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//ContainerConfiguration/containerMatcherConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_46pKosjMEeWPvPHRj0_oqw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9Vx5MMjMEeWPvPHRj0_oqw" id="(0.9241379310344827,0.5576923076923077)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_ZTrDMMmYEeWPvPHRj0_oqw" type="4004" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_WLo7QMmYEeWPvPHRj0_oqw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_ZTrDMcmYEeWPvPHRj0_oqw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZTrDMsmYEeWPvPHRj0_oqw" points="[-4, -3, 120, 89]$[-52, -89, 72, 3]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZTtfcMmYEeWPvPHRj0_oqw" id="(0.14018691588785046,0.05084745762711865)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_ZuldkMmYEeWPvPHRj0_oqw" type="4004" source="_dZSkQxQSEeSwyuAkiSG7MA" target="_WLo7QMmYEeWPvPHRj0_oqw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_ZumEoMmYEeWPvPHRj0_oqw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZumEocmYEeWPvPHRj0_oqw" points="[24, -15, -151, 84]$[104, -91, -71, 8]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZunSwMmYEeWPvPHRj0_oqw" id="(0.7777777777777778,0.2)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_aUOhQMmYEeWPvPHRj0_oqw" type="4004" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_WLo7QMmYEeWPvPHRj0_oqw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_aUOhQcmYEeWPvPHRj0_oqw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aUOhQsmYEeWPvPHRj0_oqw" points="[-1, 30, 0, -188]$[-26, 206, -25, -12]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aUQWcMmYEeWPvPHRj0_oqw" id="(0.3006993006993007,0.23076923076923078)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_nnnW8MppEeWPW4wup-qMUw" type="4004" source="_dZSkQxQSEeSwyuAkiSG7MA" target="_jQEu8MppEeWPW4wup-qMUw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_nnnW8cppEeWPW4wup-qMUw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nnnW8sppEeWPW4wup-qMUw" points="[11, -8, -135, 96]$[147, -74, 1, 30]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nnrBUMppEeWPW4wup-qMUw" id="(0.8333333333333334,0.10666666666666667)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2GZ7wMppEeWPW4wup-qMUw" id="(0.4621212121212121,0.8813559322033898)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_oA4LgMppEeWPW4wup-qMUw" type="4004" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_jQEu8MppEeWPW4wup-qMUw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_oA4LgcppEeWPW4wup-qMUw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oA4LgsppEeWPW4wup-qMUw" points="[0, -29, 116, 77]$[0, -59, 116, 47]$[-116, -59, 0, 47]$[-116, -100, 0, 6]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_85h1YMppEeWPW4wup-qMUw" id="(0.7424242424242424,0.8983050847457628)"/>
+  </edges>
+</notation:Diagram>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/plugin.xml
index c7c06331637..1370cb96765 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/plugin.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/plugin.xml
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-<!--

- Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.

- 

- All rights reserved. This program and the accompanying materials

- are made available under the terms of the Eclipse Public License v1.0

- which accompanies this distribution, and is available at

- http://www.eclipse.org/legal/epl-v10.html

-

- Contributors:

-   CEA LIST - Initial API and implementation

-   Christian W. Damus - bug 485220

--->

-<plugin>

-	<extension-point id="elementTypeSetConfiguration" name="ElementType Set Configuration" schema="schema/elementTypeSetConfiguration.exsd"/>

-	<extension-point id="elementTypeConfigurationType" name="ElementType Configuration Type" schema="schema/elementTypeConfigurationType.exsd"/>

-	<extension-point id="adviceConfigurationType" name="Advice Configuration Type" schema="schema/adviceConfigurationType.exsd"/>

-	<extension-point id="containerConfigurationType" name="Container Configuration Type" schema="schema/containerConfigurationType.exsd"/>

-	<extension-point id="matcherConfigurationType" name="Matcher Configuration Type" schema="schema/matcherConfigurationType.exsd"/>

-   

-   <extension

-         point="org.eclipse.papyrus.infra.core.service">

-      <service

-            classname="org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypesConfigurationsRegistryService"

-            description="Service used to registrer elementTypes in the GMF elementTypes registry"

-            id="ElementTypesConfigurationsRegistryService"

-            priority="50"

-            startKind="startup">

-      </service>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.extension_parser">

-      <parser

-            type="elementtypesconfigurations"

-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.resource.CustomElementtypesconfigurationsResourceFactoryImpl"/>

-   </extension>

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated ElementTypesConfigurations -->

-      <package

-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"

-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage"

-            genModel="model/ElementTypesConfigurations.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.content_parser">

-      <!-- @generated ElementTypesConfigurations -->

-      <parser

-            contentTypeIdentifier="org.eclipse.papyrus.infra.elementtypesconfigurations"

-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.util.ElementtypesconfigurationsResourceFactoryImpl"/>

-   </extension>

-

-   <extension point="org.eclipse.core.contenttype.contentTypes">

-      <!-- @generated ElementTypesConfigurations -->

-      <content-type

-            base-type="org.eclipse.emf.ecore.xmi"

-            file-extensions="elementtypesconfigurations"

-            id="org.eclipse.papyrus.infra.elementtypesconfigurations"

-            name="%_UI_Elementtypesconfigurations_content_type"

-            priority="normal">

-         <describer class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">

-            <parameter name="namespace" value="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"/>

-            <parameter name="kind" value="xmi"/>

-         </describer>

-      </content-type>

-   </extension>

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<!--
+ Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+   CEA LIST - Initial API and implementation
+   Christian W. Damus - bug 485220
+-->
+<plugin>
+	<extension-point id="elementTypeSetConfiguration" name="ElementType Set Configuration" schema="schema/elementTypeSetConfiguration.exsd"/>
+	<extension-point id="elementTypeConfigurationType" name="ElementType Configuration Type" schema="schema/elementTypeConfigurationType.exsd"/>
+	<extension-point id="adviceConfigurationType" name="Advice Configuration Type" schema="schema/adviceConfigurationType.exsd"/>
+	<extension-point id="containerConfigurationType" name="Container Configuration Type" schema="schema/containerConfigurationType.exsd"/>
+	<extension-point id="matcherConfigurationType" name="Matcher Configuration Type" schema="schema/matcherConfigurationType.exsd"/>
+   
+   <extension
+         point="org.eclipse.papyrus.infra.core.service">
+      <service
+            classname="org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypesConfigurationsRegistryService"
+            description="Service used to registrer elementTypes in the GMF elementTypes registry"
+            id="ElementTypesConfigurationsRegistryService"
+            priority="50"
+            startKind="startup">
+      </service>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.extension_parser">
+      <parser
+            type="elementtypesconfigurations"
+            class="org.eclipse.papyrus.infra.elementtypesconfigurations.resource.CustomElementtypesconfigurationsResourceFactoryImpl"/>
+   </extension>
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated ElementTypesConfigurations -->
+      <package
+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
+            class="org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage"
+            genModel="model/ElementTypesConfigurations.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.content_parser">
+      <!-- @generated ElementTypesConfigurations -->
+      <parser
+            contentTypeIdentifier="org.eclipse.papyrus.infra.elementtypesconfigurations"
+            class="org.eclipse.papyrus.infra.elementtypesconfigurations.util.ElementtypesconfigurationsResourceFactoryImpl"/>
+   </extension>
+
+   <extension point="org.eclipse.core.contenttype.contentTypes">
+      <!-- @generated ElementTypesConfigurations -->
+      <content-type
+            base-type="org.eclipse.emf.ecore.xmi"
+            file-extensions="elementtypesconfigurations"
+            id="org.eclipse.papyrus.infra.elementtypesconfigurations"
+            name="%_UI_Elementtypesconfigurations_content_type"
+            priority="normal">
+         <describer class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
+            <parameter name="namespace" value="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"/>
+            <parameter name="kind" value="xmi"/>
+         </describer>
+      </content-type>
+   </extension>
+</plugin>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/pom.xml
index 656474510ea..ad940a8e9dd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/pom.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.elementtypesconfigurations</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/AbstractAdviceBindingFactory.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/AbstractAdviceBindingFactory.java
index a2da2d22012..200be497ffd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/AbstractAdviceBindingFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/AbstractAdviceBindingFactory.java
@@ -1,60 +1,60 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl;

-

-import org.eclipse.gmf.runtime.emf.type.core.AdviceBindingInheritance;

-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ContainerConfigurationTypeRegistry;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.MatcherConfigurationTypeRegistry;

-

-public abstract class AbstractAdviceBindingFactory<T extends AbstractAdviceBindingConfiguration> extends AbstractAdviceFactory<T> {

-

-	@Override

-	protected String getTypeId(T adviceConfiguration) {

-		return adviceConfiguration.getTarget().getIdentifier();

-	}

-

-	@Override

-	protected IContainerDescriptor getContainerDescriptor(T adviceConfiguration) {

-		ContainerConfiguration containerConfiguration = adviceConfiguration.getContainerConfiguration();

-		if (containerConfiguration == null) {

-			return null;

-		}

-		IContainerDescriptor containerDescriptor = ContainerConfigurationTypeRegistry.getInstance().getContainerDescriptor(containerConfiguration);

-		return containerDescriptor;

-	}

-

-	@Override

-	protected IElementMatcher getMatcher(T adviceConfiguration) {

-		AbstractMatcherConfiguration matcherConfiguration = adviceConfiguration.getMatcherConfiguration();

-		if (matcherConfiguration == null) {

-			return null;

-		}

-		IElementMatcher matcher = MatcherConfigurationTypeRegistry.getInstance().getMatcher(matcherConfiguration);

-		return matcher;

-	}

-

-	@Override

-	protected AdviceBindingInheritance getInheritance(T adviceConfiguration) {

-		return AdviceBindingInheritance.getAdviceBindingInheritance(adviceConfiguration.getInheritance().getName());

-	}

-

-	@Override

-	protected String getId(T adviceConfiguration) {

-		return adviceConfiguration.getIdentifier();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl;
+
+import org.eclipse.gmf.runtime.emf.type.core.AdviceBindingInheritance;
+import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ContainerConfigurationTypeRegistry;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.MatcherConfigurationTypeRegistry;
+
+public abstract class AbstractAdviceBindingFactory<T extends AbstractAdviceBindingConfiguration> extends AbstractAdviceFactory<T> {
+
+	@Override
+	protected String getTypeId(T adviceConfiguration) {
+		return adviceConfiguration.getTarget().getIdentifier();
+	}
+
+	@Override
+	protected IContainerDescriptor getContainerDescriptor(T adviceConfiguration) {
+		ContainerConfiguration containerConfiguration = adviceConfiguration.getContainerConfiguration();
+		if (containerConfiguration == null) {
+			return null;
+		}
+		IContainerDescriptor containerDescriptor = ContainerConfigurationTypeRegistry.getInstance().getContainerDescriptor(containerConfiguration);
+		return containerDescriptor;
+	}
+
+	@Override
+	protected IElementMatcher getMatcher(T adviceConfiguration) {
+		AbstractMatcherConfiguration matcherConfiguration = adviceConfiguration.getMatcherConfiguration();
+		if (matcherConfiguration == null) {
+			return null;
+		}
+		IElementMatcher matcher = MatcherConfigurationTypeRegistry.getInstance().getMatcher(matcherConfiguration);
+		return matcher;
+	}
+
+	@Override
+	protected AdviceBindingInheritance getInheritance(T adviceConfiguration) {
+		return AdviceBindingInheritance.getAdviceBindingInheritance(adviceConfiguration.getInheritance().getName());
+	}
+
+	@Override
+	protected String getId(T adviceConfiguration) {
+		return adviceConfiguration.getIdentifier();
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/AbstractEditHelperAdviceFactory.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/AbstractEditHelperAdviceFactory.java
index 9aa560628a0..7df9c5612a8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/AbstractEditHelperAdviceFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/AbstractEditHelperAdviceFactory.java
@@ -1,61 +1,61 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl;

-

-import org.eclipse.gmf.runtime.emf.type.core.AdviceBindingInheritance;

-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractEditHelperAdviceConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ContainerConfigurationTypeRegistry;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.MatcherConfigurationTypeRegistry;

-

-public abstract class AbstractEditHelperAdviceFactory<T extends AbstractEditHelperAdviceConfiguration> extends AbstractAdviceFactory<T> {

-

-	@Override

-	protected String getTypeId(T adviceConfiguration) {

-		return adviceConfiguration.getTarget().getIdentifier();

-	}

-

-	@Override

-	protected AdviceBindingInheritance getInheritance(T adviceConfiguration) {

-		return AdviceBindingInheritance.ALL;

-	}

-

-	@Override

-	protected IContainerDescriptor getContainerDescriptor(T adviceConfiguration) {

-		ContainerConfiguration containerConfiguration = ((SpecializationTypeConfiguration) adviceConfiguration.eContainer()).getContainerConfiguration();

-		if (containerConfiguration == null) {

-			return null;

-		}

-		IContainerDescriptor containerDescriptor = ContainerConfigurationTypeRegistry.getInstance().getContainerDescriptor(containerConfiguration);

-		return containerDescriptor;

-	}

-

-	@Override

-	protected IElementMatcher getMatcher(T adviceConfiguration) {

-		AbstractMatcherConfiguration matcherConfiguration = ((SpecializationTypeConfiguration) adviceConfiguration.eContainer()).getMatcherConfiguration();

-		if (matcherConfiguration == null) {

-			return null;

-		}

-		IElementMatcher matcher = MatcherConfigurationTypeRegistry.getInstance().getMatcher(matcherConfiguration);

-		return matcher;

-	}

-

-	@Override

-	protected String getId(T adviceConfiguration) {

-		return adviceConfiguration.getTarget().getIdentifier();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl;
+
+import org.eclipse.gmf.runtime.emf.type.core.AdviceBindingInheritance;
+import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractEditHelperAdviceConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ContainerConfigurationTypeRegistry;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.MatcherConfigurationTypeRegistry;
+
+public abstract class AbstractEditHelperAdviceFactory<T extends AbstractEditHelperAdviceConfiguration> extends AbstractAdviceFactory<T> {
+
+	@Override
+	protected String getTypeId(T adviceConfiguration) {
+		return adviceConfiguration.getTarget().getIdentifier();
+	}
+
+	@Override
+	protected AdviceBindingInheritance getInheritance(T adviceConfiguration) {
+		return AdviceBindingInheritance.ALL;
+	}
+
+	@Override
+	protected IContainerDescriptor getContainerDescriptor(T adviceConfiguration) {
+		ContainerConfiguration containerConfiguration = ((SpecializationTypeConfiguration) adviceConfiguration.eContainer()).getContainerConfiguration();
+		if (containerConfiguration == null) {
+			return null;
+		}
+		IContainerDescriptor containerDescriptor = ContainerConfigurationTypeRegistry.getInstance().getContainerDescriptor(containerConfiguration);
+		return containerDescriptor;
+	}
+
+	@Override
+	protected IElementMatcher getMatcher(T adviceConfiguration) {
+		AbstractMatcherConfiguration matcherConfiguration = ((SpecializationTypeConfiguration) adviceConfiguration.eContainer()).getMatcherConfiguration();
+		if (matcherConfiguration == null) {
+			return null;
+		}
+		IElementMatcher matcher = MatcherConfigurationTypeRegistry.getInstance().getMatcher(matcherConfiguration);
+		return matcher;
+	}
+
+	@Override
+	protected String getId(T adviceConfiguration) {
+		return adviceConfiguration.getTarget().getIdentifier();
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/DefaultAdviceBindingFactory.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/DefaultAdviceBindingFactory.java
index 5bb05848be9..c20d3697134 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/DefaultAdviceBindingFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/DefaultAdviceBindingFactory.java
@@ -1,33 +1,33 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration;

-import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;

-

-public class DefaultAdviceBindingFactory extends AbstractAdviceBindingFactory<AdviceBindingConfiguration> {

-

-	/**

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.AbstractAdviceFactory#getEditHelperAdvice(org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration)

-	 *

-	 * @param adviceConfiguration

-	 * @return

-	 */

-	@Override

-	protected IEditHelperAdvice getEditHelperAdvice(AdviceBindingConfiguration adviceConfiguration) {

-		IEditHelperAdvice editHelperAdvice = ClassLoaderHelper.newInstance(adviceConfiguration.getEditHelperAdviceClassName(), IEditHelperAdvice.class);

-		return editHelperAdvice;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
+
+public class DefaultAdviceBindingFactory extends AbstractAdviceBindingFactory<AdviceBindingConfiguration> {
+
+	/**
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.AbstractAdviceFactory#getEditHelperAdvice(org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration)
+	 *
+	 * @param adviceConfiguration
+	 * @return
+	 */
+	@Override
+	protected IEditHelperAdvice getEditHelperAdvice(AdviceBindingConfiguration adviceConfiguration) {
+		IEditHelperAdvice editHelperAdvice = ClassLoaderHelper.newInstance(adviceConfiguration.getEditHelperAdviceClassName(), IEditHelperAdvice.class);
+		return editHelperAdvice;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/DefaultEditHelperAdviceFactory.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/DefaultEditHelperAdviceFactory.java
index 354f06205c5..12de4cd5365 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/DefaultEditHelperAdviceFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/DefaultEditHelperAdviceFactory.java
@@ -1,33 +1,33 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.EditHelperAdviceConfiguration;

-import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;

-

-public class DefaultEditHelperAdviceFactory extends AbstractEditHelperAdviceFactory<EditHelperAdviceConfiguration> {

-

-	/**

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.AbstractAdviceFactory#getEditHelperAdvice(org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration)

-	 *

-	 * @param adviceConfiguration

-	 * @return

-	 */

-	@Override

-	protected IEditHelperAdvice getEditHelperAdvice(EditHelperAdviceConfiguration adviceConfiguration) {

-		IEditHelperAdvice editHelperAdvice = ClassLoaderHelper.newInstance(adviceConfiguration.getEditHelperAdviceClassName(), IEditHelperAdvice.class);

-		return editHelperAdvice;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.EditHelperAdviceConfiguration;
+import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
+
+public class DefaultEditHelperAdviceFactory extends AbstractEditHelperAdviceFactory<EditHelperAdviceConfiguration> {
+
+	/**
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.AbstractAdviceFactory#getEditHelperAdvice(org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration)
+	 *
+	 * @param adviceConfiguration
+	 * @return
+	 */
+	@Override
+	protected IEditHelperAdvice getEditHelperAdvice(EditHelperAdviceConfiguration adviceConfiguration) {
+		IEditHelperAdvice editHelperAdvice = ClassLoaderHelper.newInstance(adviceConfiguration.getEditHelperAdviceClassName(), IEditHelperAdvice.class);
+		return editHelperAdvice;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/DefaultMatcherFactory.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/DefaultMatcherFactory.java
index f5e26edc151..cdab0ed628b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/DefaultMatcherFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/DefaultMatcherFactory.java
@@ -1,34 +1,34 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl;

-

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.IMatcherFactory;

-import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;

-

-public class DefaultMatcherFactory implements IMatcherFactory<MatcherConfiguration> {

-

-	/**

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.AbstractMatcherFactory#createElementMatcher(org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration)

-	 *

-	 * @param matcherConfiguration

-	 * @return

-	 */

-	@Override

-	public IElementMatcher createElementMatcher(MatcherConfiguration matcherConfiguration) {

-		String matcherClassName = matcherConfiguration.getMatcherClassName();

-		IElementMatcher matcher = ClassLoaderHelper.newInstance(matcherClassName, IElementMatcher.class);

-		return matcher;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl;
+
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.IMatcherFactory;
+import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
+
+public class DefaultMatcherFactory implements IMatcherFactory<MatcherConfiguration> {
+
+	/**
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.AbstractMatcherFactory#createElementMatcher(org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration)
+	 *
+	 * @param matcherConfiguration
+	 * @return
+	 */
+	@Override
+	public IElementMatcher createElementMatcher(MatcherConfiguration matcherConfiguration) {
+		String matcherClassName = matcherConfiguration.getMatcherClassName();
+		IElementMatcher matcher = ClassLoaderHelper.newInstance(matcherClassName, IElementMatcher.class);
+		return matcher;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/SpecializationTypeFactory.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/SpecializationTypeFactory.java
index 6f75c4d1f71..44c46c1b7af 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/SpecializationTypeFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/SpecializationTypeFactory.java
@@ -1,89 +1,89 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus - bug 459174

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IAdviceBindingDescriptor;

-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-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.edithelper.IEditHelperAdvice;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractEditHelperAdviceConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.NullEditHelperAdvice;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.AdviceConfigurationTypeRegistry;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ContainerConfigurationTypeRegistry;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.MatcherConfigurationTypeRegistry;

-

-public class SpecializationTypeFactory extends AbstractElementTypeConfigurationFactory<SpecializationTypeConfiguration> {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public IHintedType createElementType(SpecializationTypeConfiguration elementTypeConfiguration) {

-		return new ConfiguredHintedSpecializationElementType(getID(elementTypeConfiguration), getIconURL(elementTypeConfiguration), getDisplayName(elementTypeConfiguration), getSpecializedID(elementTypeConfiguration),

-				createElementMatcher(elementTypeConfiguration), createContainerDescriptor(elementTypeConfiguration), getEditHelperAdvice(elementTypeConfiguration), getSemanticHint(elementTypeConfiguration), elementTypeConfiguration);

-	}

-

-	protected IEditHelperAdvice getEditHelperAdvice(SpecializationTypeConfiguration elementTypeConfiguration) {

-		AbstractEditHelperAdviceConfiguration editHelperAdviceConfiguration = elementTypeConfiguration.getEditHelperAdviceConfiguration();

-		if (editHelperAdviceConfiguration == null) {

-			return NullEditHelperAdvice.getInstance();

-		}

-		IAdviceBindingDescriptor editHelperAdviceDescriptor = AdviceConfigurationTypeRegistry.getInstance().getEditHelperAdviceDecriptor(editHelperAdviceConfiguration);

-		return editHelperAdviceDescriptor.getEditHelperAdvice();

-	}

-

-	protected IContainerDescriptor createContainerDescriptor(SpecializationTypeConfiguration elementTypeConfiguration) {

-		ContainerConfiguration containerConfiguration = elementTypeConfiguration.getContainerConfiguration();

-		if (containerConfiguration == null) {

-			return null;

-		}

-		IContainerDescriptor containerDescriptor = ContainerConfigurationTypeRegistry.getInstance().getContainerDescriptor(containerConfiguration);

-		return containerDescriptor;

-	}

-

-	protected IElementType[] getSpecializedID(SpecializationTypeConfiguration elementTypeConfiguration) {

-		// Specialized elementTypes

-		List<IElementType> specializedTypes = new ArrayList<IElementType>((elementTypeConfiguration).getSpecializedTypesID().size());

-		for (String specializedTypeId : (elementTypeConfiguration).getSpecializedTypesID()) {

-			IElementType specializedType = ElementTypeRegistry.getInstance().getType(specializedTypeId);

-			if (specializedType != null) {

-				specializedTypes.add(specializedType);

-			} else {

-				Activator.log.info("Unable to add specialization \"" + getID(elementTypeConfiguration) + "\" to \"" + specializedTypeId + "\"");

-			}

-		}

-		IElementType[] elementTypes = specializedTypes.toArray(new IElementType[] {});

-		return elementTypes;

-	}

-

-	protected IElementMatcher createElementMatcher(SpecializationTypeConfiguration configuration) {

-		AbstractMatcherConfiguration matcherConfiguration = configuration.getMatcherConfiguration();

-		if (matcherConfiguration == null) {

-			return null;

-		}

-		IElementMatcher matcher = MatcherConfigurationTypeRegistry.getInstance().getMatcher(matcherConfiguration);

-		return matcher;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 459174
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IAdviceBindingDescriptor;
+import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+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.edithelper.IEditHelperAdvice;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractEditHelperAdviceConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.NullEditHelperAdvice;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.AdviceConfigurationTypeRegistry;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ContainerConfigurationTypeRegistry;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.MatcherConfigurationTypeRegistry;
+
+public class SpecializationTypeFactory extends AbstractElementTypeConfigurationFactory<SpecializationTypeConfiguration> {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public IHintedType createElementType(SpecializationTypeConfiguration elementTypeConfiguration) {
+		return new ConfiguredHintedSpecializationElementType(getID(elementTypeConfiguration), getIconURL(elementTypeConfiguration), getDisplayName(elementTypeConfiguration), getSpecializedID(elementTypeConfiguration),
+				createElementMatcher(elementTypeConfiguration), createContainerDescriptor(elementTypeConfiguration), getEditHelperAdvice(elementTypeConfiguration), getSemanticHint(elementTypeConfiguration), elementTypeConfiguration);
+	}
+
+	protected IEditHelperAdvice getEditHelperAdvice(SpecializationTypeConfiguration elementTypeConfiguration) {
+		AbstractEditHelperAdviceConfiguration editHelperAdviceConfiguration = elementTypeConfiguration.getEditHelperAdviceConfiguration();
+		if (editHelperAdviceConfiguration == null) {
+			return NullEditHelperAdvice.getInstance();
+		}
+		IAdviceBindingDescriptor editHelperAdviceDescriptor = AdviceConfigurationTypeRegistry.getInstance().getEditHelperAdviceDecriptor(editHelperAdviceConfiguration);
+		return editHelperAdviceDescriptor.getEditHelperAdvice();
+	}
+
+	protected IContainerDescriptor createContainerDescriptor(SpecializationTypeConfiguration elementTypeConfiguration) {
+		ContainerConfiguration containerConfiguration = elementTypeConfiguration.getContainerConfiguration();
+		if (containerConfiguration == null) {
+			return null;
+		}
+		IContainerDescriptor containerDescriptor = ContainerConfigurationTypeRegistry.getInstance().getContainerDescriptor(containerConfiguration);
+		return containerDescriptor;
+	}
+
+	protected IElementType[] getSpecializedID(SpecializationTypeConfiguration elementTypeConfiguration) {
+		// Specialized elementTypes
+		List<IElementType> specializedTypes = new ArrayList<IElementType>((elementTypeConfiguration).getSpecializedTypesID().size());
+		for (String specializedTypeId : (elementTypeConfiguration).getSpecializedTypesID()) {
+			IElementType specializedType = ElementTypeRegistry.getInstance().getType(specializedTypeId);
+			if (specializedType != null) {
+				specializedTypes.add(specializedType);
+			} else {
+				Activator.log.info("Unable to add specialization \"" + getID(elementTypeConfiguration) + "\" to \"" + specializedTypeId + "\"");
+			}
+		}
+		IElementType[] elementTypes = specializedTypes.toArray(new IElementType[] {});
+		return elementTypes;
+	}
+
+	protected IElementMatcher createElementMatcher(SpecializationTypeConfiguration configuration) {
+		AbstractMatcherConfiguration matcherConfiguration = configuration.getMatcherConfiguration();
+		if (matcherConfiguration == null) {
+			return null;
+		}
+		IElementMatcher matcher = MatcherConfigurationTypeRegistry.getInstance().getMatcher(matcherConfiguration);
+		return matcher;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/AbstractNotifierEditHelper.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/AbstractNotifierEditHelper.java
index 0accc3d25c2..3c18e5d84f5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/AbstractNotifierEditHelper.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/AbstractNotifierEditHelper.java
@@ -1,258 +1,258 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification;

-

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.IdentityCommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdviceApprovedEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdviceDisapprovedEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdvicePhase;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdviceRequestConfigurationEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.EditHelperApprovedEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.EditHelperDisapprovedEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.EditHelperRequestConfigurationEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.ExecutableAdviceEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.ExecutableEditHelperEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IdentityAdviceEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IdentityEditHelperEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.UnexecutableAdviceEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.UnexecutableEditHelperEvent;

-

-/**

- * An override of the {@link AbstractEditHelper} to provide Notifications during edithelper execution.

- * The notifications provide EditHelper trace information for testing and debugging purpose.

- */

-public abstract class AbstractNotifierEditHelper extends AbstractEditHelper {

-

-	/**

-	 * 

-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#getEditCommand(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)

-	 *

-	 * @param req

-	 * @return

-	 */

-	@Override

-	public ICommand getEditCommand(IEditCommandRequest req) {

-		ElementTypesConfigurationsEventsChain eventsChain = new ElementTypesConfigurationsEventsChain(this, req);

-		// Get the matching edit helper advice

-		IEditHelperAdvice[] advice = getEditHelperAdvice(req);

-		// Consult advisors to allow them to configure the request

-		configureRequest(req, advice, eventsChain);

-		// Consult advisors to allow them approve the request

-		boolean approved = approveRequest(req, advice, eventsChain);

-		if (!approved) {

-			// Notify listeners

-			if (Platform.inDebugMode()) {

-				ElementTypesConfigurationsListenersRegistry.getInstance().notifyChain(eventsChain);

-			}

-			return null;

-		}

-		ICommand result = getEditCommand(req, advice, eventsChain);

-		if (result != null) {

-			// Notify listeners

-			if (Platform.inDebugMode()) {

-				ElementTypesConfigurationsListenersRegistry.getInstance().notifyChain(eventsChain);

-			}

-			return result.reduce();

-		}

-		// Notify listeners

-		if (Platform.inDebugMode()) {

-			ElementTypesConfigurationsListenersRegistry.getInstance().notifyChain(eventsChain);

-		}

-		return result;

-	}

-

-	/**

-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#getEditCommand(IEditCommandRequest, IEditHelperAdvice[])

-	 * 

-	 * @param req

-	 * @param advice

-	 * @param eventsChain

-	 * @return

-	 */

-	private ICommand getEditCommand(IEditCommandRequest req, IEditHelperAdvice[] advice, ElementTypesConfigurationsEventsChain eventsChain) {

-		ICompositeCommand command = createCommand(req);

-		// Get 'before' commands from matching element type

-		// specializations

-		if (advice != null) {

-			for (int i = 0; i < advice.length; i++) {

-				IEditHelperAdvice nextAdvice = advice[i];

-				// Before commands

-				ICommand beforeAdvice = nextAdvice.getBeforeEditCommand(req);

-				if (beforeAdvice != null) {

-					if (beforeAdvice.canExecute()) {

-						if (Platform.inDebugMode()) {

-							if (beforeAdvice.equals(IdentityCommand.INSTANCE)) {

-								IdentityAdviceEvent event = new IdentityAdviceEvent(req, this, nextAdvice, advice, AdvicePhase.before);

-								eventsChain.addBeforeAdvicesCommandsEvent(event);

-								ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);

-							} else {

-								ExecutableAdviceEvent event = new ExecutableAdviceEvent(req, this, nextAdvice, beforeAdvice, advice, AdvicePhase.before);

-								eventsChain.addBeforeAdvicesCommandsEvent(event);

-								ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);

-							}

-						}

-						command.compose(beforeAdvice);

-					} else {

-						if (Platform.inDebugMode()) {

-							UnexecutableAdviceEvent event = new UnexecutableAdviceEvent(req, this, nextAdvice, beforeAdvice, advice, AdvicePhase.before);

-							eventsChain.addBeforeAdvicesCommandsEvent(event);

-							ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);

-						}

-						return beforeAdvice;

-					}

-				}

-			}

-		}

-		// Check if the parameter has been set to ignore the default edit command.

-		Object replaceParam = req.getParameter(IEditCommandRequest.REPLACE_DEFAULT_COMMAND);

-		if (replaceParam != Boolean.TRUE) {

-			// Get 'instead' command from this edit helper

-			ICommand insteadCommand = getInsteadCommand(req);

-			if (insteadCommand != null) {

-				if (insteadCommand.canExecute()) {

-					if (Platform.inDebugMode()) {

-						if (insteadCommand.equals(IdentityCommand.INSTANCE)) {

-							IdentityEditHelperEvent event = new IdentityEditHelperEvent(req, this);

-							eventsChain.setEditHelperCommandEvent(event);

-							ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);

-						} else {

-							ExecutableEditHelperEvent event = new ExecutableEditHelperEvent(req, this, insteadCommand);

-							eventsChain.setEditHelperCommandEvent(event);

-							ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);

-						}

-					}

-					command.compose(insteadCommand);

-				} else {

-					if (Platform.inDebugMode()) {

-						UnexecutableEditHelperEvent event = new UnexecutableEditHelperEvent(req, this, insteadCommand);

-						eventsChain.setEditHelperCommandEvent(event);

-						ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);

-					}

-					return insteadCommand;

-				}

-			}

-		}

-		// Get 'after' commands from matching element type

-		// specializations

-		if (advice != null) {

-			for (int i = 0; i < advice.length; i++) {

-				IEditHelperAdvice nextAdvice = advice[i];

-				// After commands

-				ICommand afterAdvice = nextAdvice.getAfterEditCommand(req);

-				if (afterAdvice != null) {

-					if (afterAdvice.canExecute()) {

-						if (Platform.inDebugMode()) {

-							if (afterAdvice.equals(IdentityCommand.INSTANCE)) {

-								IdentityAdviceEvent event = new IdentityAdviceEvent(req, this, nextAdvice, advice, AdvicePhase.after);

-								eventsChain.addBeforeAdvicesCommandsEvent(event);

-								ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);

-							} else {

-								ExecutableAdviceEvent event = new ExecutableAdviceEvent(req, this, nextAdvice, afterAdvice, advice, AdvicePhase.after);

-								eventsChain.addBeforeAdvicesCommandsEvent(event);

-								ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);

-							}

-						}

-						command.compose(afterAdvice);

-					} else {

-						if (Platform.inDebugMode()) {

-							UnexecutableAdviceEvent event = new UnexecutableAdviceEvent(req, this, nextAdvice, afterAdvice, advice, AdvicePhase.after);

-							eventsChain.addBeforeAdvicesCommandsEvent(event);

-							ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);

-						}

-						return afterAdvice;

-					}

-				}

-			}

-		}

-		return command.isEmpty() ? null : command;

-	}

-

-	/**

-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#configureRequest(IEditCommandRequest, IEditHelperAdvice[])

-	 * 

-	 * @param req

-	 * @param advice

-	 * @param eventsChain

-	 */

-	private void configureRequest(IEditCommandRequest req, IEditHelperAdvice[] advice, ElementTypesConfigurationsEventsChain eventsChain) {

-		if (advice != null) {

-			for (int i = 0; i < advice.length; i++) {

-				IEditHelperAdvice nextAdvice = advice[i];

-				nextAdvice.configureRequest(req);

-				if (Platform.inDebugMode()) {

-					AdviceRequestConfigurationEvent event = new AdviceRequestConfigurationEvent(req, this, nextAdvice, advice);

-					eventsChain.addAdviceRequestConfigurationEvent(event);

-					ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);

-				}

-			}

-		}

-		// All advice has configured the request. Now consult this edit helper.

-		configureRequest(req);

-		if (Platform.inDebugMode()) {

-			EditHelperRequestConfigurationEvent event = new EditHelperRequestConfigurationEvent(req, this);

-			eventsChain.setEditHelperRequestConfigurationEvent(event);

-			ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);

-		}

-	}

-

-	/**

-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#approveRequest(IEditCommandRequest, IEditHelperAdvice[])

-	 * 

-	 * @param req

-	 * @param advice

-	 * @param eventsChain

-	 * @return

-	 */

-	private boolean approveRequest(IEditCommandRequest req, IEditHelperAdvice[] advice, ElementTypesConfigurationsEventsChain eventsChain) {

-		if (advice != null) {

-			for (int i = 0; i < advice.length; i++) {

-				IEditHelperAdvice nextAdvice = advice[i];

-				boolean approved = nextAdvice.approveRequest(req);

-				if (!approved) {

-					if (Platform.inDebugMode()) {

-						AdviceDisapprovedEvent event = new AdviceDisapprovedEvent(req, this, nextAdvice, advice);

-						eventsChain.addAdviceApprovalEvent(event);

-						ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);

-					}

-					return false;

-				} else {

-					if (Platform.inDebugMode()) {

-						AdviceApprovedEvent event = new AdviceApprovedEvent(req, this, nextAdvice, advice);

-						eventsChain.addAdviceApprovalEvent(event);

-						ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);

-					}

-				}

-			}

-		}

-		// All advice has approved the request. Now consult this edit helper.

-		boolean approved = approveRequest(req);

-		if (Platform.inDebugMode()) {

-			if (!approved) {

-				EditHelperDisapprovedEvent event = new EditHelperDisapprovedEvent(req, this);

-				eventsChain.setEditHelperApprovalEvent(event);

-				ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);

-			} else {

-				EditHelperApprovedEvent event = new EditHelperApprovedEvent(req, this);

-				eventsChain.setEditHelperApprovalEvent(event);

-				ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);

-			}

-		}

-		return approved;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification;
+
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.IdentityCommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdviceApprovedEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdviceDisapprovedEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdvicePhase;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdviceRequestConfigurationEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.EditHelperApprovedEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.EditHelperDisapprovedEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.EditHelperRequestConfigurationEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.ExecutableAdviceEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.ExecutableEditHelperEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IdentityAdviceEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IdentityEditHelperEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.UnexecutableAdviceEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.UnexecutableEditHelperEvent;
+
+/**
+ * An override of the {@link AbstractEditHelper} to provide Notifications during edithelper execution.
+ * The notifications provide EditHelper trace information for testing and debugging purpose.
+ */
+public abstract class AbstractNotifierEditHelper extends AbstractEditHelper {
+
+	/**
+	 * 
+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#getEditCommand(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
+	 *
+	 * @param req
+	 * @return
+	 */
+	@Override
+	public ICommand getEditCommand(IEditCommandRequest req) {
+		ElementTypesConfigurationsEventsChain eventsChain = new ElementTypesConfigurationsEventsChain(this, req);
+		// Get the matching edit helper advice
+		IEditHelperAdvice[] advice = getEditHelperAdvice(req);
+		// Consult advisors to allow them to configure the request
+		configureRequest(req, advice, eventsChain);
+		// Consult advisors to allow them approve the request
+		boolean approved = approveRequest(req, advice, eventsChain);
+		if (!approved) {
+			// Notify listeners
+			if (Platform.inDebugMode()) {
+				ElementTypesConfigurationsListenersRegistry.getInstance().notifyChain(eventsChain);
+			}
+			return null;
+		}
+		ICommand result = getEditCommand(req, advice, eventsChain);
+		if (result != null) {
+			// Notify listeners
+			if (Platform.inDebugMode()) {
+				ElementTypesConfigurationsListenersRegistry.getInstance().notifyChain(eventsChain);
+			}
+			return result.reduce();
+		}
+		// Notify listeners
+		if (Platform.inDebugMode()) {
+			ElementTypesConfigurationsListenersRegistry.getInstance().notifyChain(eventsChain);
+		}
+		return result;
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#getEditCommand(IEditCommandRequest, IEditHelperAdvice[])
+	 * 
+	 * @param req
+	 * @param advice
+	 * @param eventsChain
+	 * @return
+	 */
+	private ICommand getEditCommand(IEditCommandRequest req, IEditHelperAdvice[] advice, ElementTypesConfigurationsEventsChain eventsChain) {
+		ICompositeCommand command = createCommand(req);
+		// Get 'before' commands from matching element type
+		// specializations
+		if (advice != null) {
+			for (int i = 0; i < advice.length; i++) {
+				IEditHelperAdvice nextAdvice = advice[i];
+				// Before commands
+				ICommand beforeAdvice = nextAdvice.getBeforeEditCommand(req);
+				if (beforeAdvice != null) {
+					if (beforeAdvice.canExecute()) {
+						if (Platform.inDebugMode()) {
+							if (beforeAdvice.equals(IdentityCommand.INSTANCE)) {
+								IdentityAdviceEvent event = new IdentityAdviceEvent(req, this, nextAdvice, advice, AdvicePhase.before);
+								eventsChain.addBeforeAdvicesCommandsEvent(event);
+								ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
+							} else {
+								ExecutableAdviceEvent event = new ExecutableAdviceEvent(req, this, nextAdvice, beforeAdvice, advice, AdvicePhase.before);
+								eventsChain.addBeforeAdvicesCommandsEvent(event);
+								ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
+							}
+						}
+						command.compose(beforeAdvice);
+					} else {
+						if (Platform.inDebugMode()) {
+							UnexecutableAdviceEvent event = new UnexecutableAdviceEvent(req, this, nextAdvice, beforeAdvice, advice, AdvicePhase.before);
+							eventsChain.addBeforeAdvicesCommandsEvent(event);
+							ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
+						}
+						return beforeAdvice;
+					}
+				}
+			}
+		}
+		// Check if the parameter has been set to ignore the default edit command.
+		Object replaceParam = req.getParameter(IEditCommandRequest.REPLACE_DEFAULT_COMMAND);
+		if (replaceParam != Boolean.TRUE) {
+			// Get 'instead' command from this edit helper
+			ICommand insteadCommand = getInsteadCommand(req);
+			if (insteadCommand != null) {
+				if (insteadCommand.canExecute()) {
+					if (Platform.inDebugMode()) {
+						if (insteadCommand.equals(IdentityCommand.INSTANCE)) {
+							IdentityEditHelperEvent event = new IdentityEditHelperEvent(req, this);
+							eventsChain.setEditHelperCommandEvent(event);
+							ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
+						} else {
+							ExecutableEditHelperEvent event = new ExecutableEditHelperEvent(req, this, insteadCommand);
+							eventsChain.setEditHelperCommandEvent(event);
+							ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
+						}
+					}
+					command.compose(insteadCommand);
+				} else {
+					if (Platform.inDebugMode()) {
+						UnexecutableEditHelperEvent event = new UnexecutableEditHelperEvent(req, this, insteadCommand);
+						eventsChain.setEditHelperCommandEvent(event);
+						ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
+					}
+					return insteadCommand;
+				}
+			}
+		}
+		// Get 'after' commands from matching element type
+		// specializations
+		if (advice != null) {
+			for (int i = 0; i < advice.length; i++) {
+				IEditHelperAdvice nextAdvice = advice[i];
+				// After commands
+				ICommand afterAdvice = nextAdvice.getAfterEditCommand(req);
+				if (afterAdvice != null) {
+					if (afterAdvice.canExecute()) {
+						if (Platform.inDebugMode()) {
+							if (afterAdvice.equals(IdentityCommand.INSTANCE)) {
+								IdentityAdviceEvent event = new IdentityAdviceEvent(req, this, nextAdvice, advice, AdvicePhase.after);
+								eventsChain.addBeforeAdvicesCommandsEvent(event);
+								ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
+							} else {
+								ExecutableAdviceEvent event = new ExecutableAdviceEvent(req, this, nextAdvice, afterAdvice, advice, AdvicePhase.after);
+								eventsChain.addBeforeAdvicesCommandsEvent(event);
+								ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
+							}
+						}
+						command.compose(afterAdvice);
+					} else {
+						if (Platform.inDebugMode()) {
+							UnexecutableAdviceEvent event = new UnexecutableAdviceEvent(req, this, nextAdvice, afterAdvice, advice, AdvicePhase.after);
+							eventsChain.addBeforeAdvicesCommandsEvent(event);
+							ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
+						}
+						return afterAdvice;
+					}
+				}
+			}
+		}
+		return command.isEmpty() ? null : command;
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#configureRequest(IEditCommandRequest, IEditHelperAdvice[])
+	 * 
+	 * @param req
+	 * @param advice
+	 * @param eventsChain
+	 */
+	private void configureRequest(IEditCommandRequest req, IEditHelperAdvice[] advice, ElementTypesConfigurationsEventsChain eventsChain) {
+		if (advice != null) {
+			for (int i = 0; i < advice.length; i++) {
+				IEditHelperAdvice nextAdvice = advice[i];
+				nextAdvice.configureRequest(req);
+				if (Platform.inDebugMode()) {
+					AdviceRequestConfigurationEvent event = new AdviceRequestConfigurationEvent(req, this, nextAdvice, advice);
+					eventsChain.addAdviceRequestConfigurationEvent(event);
+					ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
+				}
+			}
+		}
+		// All advice has configured the request. Now consult this edit helper.
+		configureRequest(req);
+		if (Platform.inDebugMode()) {
+			EditHelperRequestConfigurationEvent event = new EditHelperRequestConfigurationEvent(req, this);
+			eventsChain.setEditHelperRequestConfigurationEvent(event);
+			ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
+		}
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#approveRequest(IEditCommandRequest, IEditHelperAdvice[])
+	 * 
+	 * @param req
+	 * @param advice
+	 * @param eventsChain
+	 * @return
+	 */
+	private boolean approveRequest(IEditCommandRequest req, IEditHelperAdvice[] advice, ElementTypesConfigurationsEventsChain eventsChain) {
+		if (advice != null) {
+			for (int i = 0; i < advice.length; i++) {
+				IEditHelperAdvice nextAdvice = advice[i];
+				boolean approved = nextAdvice.approveRequest(req);
+				if (!approved) {
+					if (Platform.inDebugMode()) {
+						AdviceDisapprovedEvent event = new AdviceDisapprovedEvent(req, this, nextAdvice, advice);
+						eventsChain.addAdviceApprovalEvent(event);
+						ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
+					}
+					return false;
+				} else {
+					if (Platform.inDebugMode()) {
+						AdviceApprovedEvent event = new AdviceApprovedEvent(req, this, nextAdvice, advice);
+						eventsChain.addAdviceApprovalEvent(event);
+						ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
+					}
+				}
+			}
+		}
+		// All advice has approved the request. Now consult this edit helper.
+		boolean approved = approveRequest(req);
+		if (Platform.inDebugMode()) {
+			if (!approved) {
+				EditHelperDisapprovedEvent event = new EditHelperDisapprovedEvent(req, this);
+				eventsChain.setEditHelperApprovalEvent(event);
+				ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
+			} else {
+				EditHelperApprovedEvent event = new EditHelperApprovedEvent(req, this);
+				eventsChain.setEditHelperApprovalEvent(event);
+				ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
+			}
+		}
+		return approved;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/ElementTypesConfigurationsEventsChain.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/ElementTypesConfigurationsEventsChain.java
index 3539d343be3..413b3fdf55f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/ElementTypesConfigurationsEventsChain.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/ElementTypesConfigurationsEventsChain.java
@@ -1,245 +1,245 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AbstractElementTypesConfigurationsEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdviceApprovedEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdviceDisapprovedEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdviceRequestConfigurationEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.EditHelperApprovedEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.EditHelperDisapprovedEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.ExecutableAdviceEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.ExecutableEditHelperEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IdentityAdviceEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IdentityEditHelperEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.UnexecutableAdviceEvent;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.UnexecutableEditHelperEvent;

-

-public class ElementTypesConfigurationsEventsChain {

-

-	/**

-	 * Timestamp of the creation of the chain

-	 */

-	private long timestamp;

-

-	/**

-	 * The {@link IEditHelper} that triggered the {@link ElementTypesConfigurationsEventsChain}

-	 */

-	private IEditHelper editHelper;

-

-	/**

-	 * The {@link IEditCommandRequest} that triggered the {@link ElementTypesConfigurationsEventsChain}

-	 */

-	private IEditCommandRequest req;

-

-	ElementTypesConfigurationsEventsChain(IEditHelper editHelper, IEditCommandRequest req) {

-		timestamp = System.currentTimeMillis();

-		this.editHelper = editHelper;

-		this.req = req;

-	}

-

-	/**

-	 * The various categories of events that occur during the execution of the {@link IEditHelper}

-	 */

-	private List<AbstractElementTypesConfigurationsEvent> adviceRequestConfigurationEvents = new ArrayList<AbstractElementTypesConfigurationsEvent>();

-

-	private AbstractElementTypesConfigurationsEvent editHelperRequestConfigurationEvent = null;

-

-	private List<AbstractElementTypesConfigurationsEvent> adviceApprovalEvents = new ArrayList<AbstractElementTypesConfigurationsEvent>();

-

-	private AbstractElementTypesConfigurationsEvent editHelperApprovalEvent = null;

-

-	private List<AbstractElementTypesConfigurationsEvent> beforeAdvicesCommandsEvents = new ArrayList<AbstractElementTypesConfigurationsEvent>();

-

-	private List<AbstractElementTypesConfigurationsEvent> afterAdvicesCommandsEvents = new ArrayList<AbstractElementTypesConfigurationsEvent>();

-

-	private AbstractElementTypesConfigurationsEvent editHelperCommandEvent = null;

-

-	/**

-	 * @return the adviceApprovalEvents

-	 */

-	public List<AbstractElementTypesConfigurationsEvent> getAdviceApprovalEvents() {

-		return adviceApprovalEvents;

-	}

-

-	/**

-	 * Add a {@link AdviceDisapprovedEvent} or {@link AdviceApprovedEvent} event

-	 * 

-	 * @param adviceApprovalEvent

-	 */

-	public void addAdviceApprovalEvent(AbstractElementTypesConfigurationsEvent adviceApprovalEvent) {

-		if(adviceApprovalEvent instanceof AdviceDisapprovedEvent || adviceApprovalEvent instanceof AdviceApprovedEvent) {

-			adviceApprovalEvents.add(adviceApprovalEvent);

-		}

-	}

-

-	/**

-	 * @return the editHelperAprrovalEvent

-	 */

-	public AbstractElementTypesConfigurationsEvent getEditHelperApprovalEvent() {

-		return editHelperApprovalEvent;

-	}

-

-	/**

-	 * @param editHelperAprrovalEvent

-	 *        the editHelperAprrovalEvent to set

-	 */

-	public void setEditHelperApprovalEvent(AbstractElementTypesConfigurationsEvent editHelperApprovalEvent) {

-		if(editHelperApprovalEvent instanceof EditHelperDisapprovedEvent || editHelperApprovalEvent instanceof EditHelperApprovedEvent) {

-			this.editHelperApprovalEvent = editHelperApprovalEvent;

-		}

-	}

-

-	/**

-	 * @return the beforeAdvicesCommandsEvents

-	 */

-	public List<AbstractElementTypesConfigurationsEvent> getBeforeAdvicesCommandsEvents() {

-		return beforeAdvicesCommandsEvents;

-	}

-

-	/**

-	 * Add a {@link ExecutableAdviceEvent}, {@link UnexecutableAdviceEvent} or {@link IdentityAdviceEvent} event

-	 * 

-	 * @param beforeAdvicesCommandsEvents

-	 *        the beforeAdvicesCommandsEvents to set

-	 */

-	public void addBeforeAdvicesCommandsEvent(AbstractElementTypesConfigurationsEvent beforeAdvicesCommandEvent) {

-		if(beforeAdvicesCommandEvent instanceof ExecutableAdviceEvent || beforeAdvicesCommandEvent instanceof UnexecutableAdviceEvent || beforeAdvicesCommandEvent instanceof IdentityAdviceEvent) {

-			beforeAdvicesCommandsEvents.add(beforeAdvicesCommandEvent);

-		}

-	}

-

-	/**

-	 * @return the afterAdvicesCommandsEvents

-	 */

-	public List<AbstractElementTypesConfigurationsEvent> getAfterAdvicesCommandsEvents() {

-		return afterAdvicesCommandsEvents;

-	}

-

-	/**

-	 * Add a {@link ExecutableAdviceEvent}, {@link UnexecutableAdviceEvent} or {@link IdentityAdviceEvent} event

-	 * 

-	 * @param afterAdvicesCommandEvent

-	 */

-	public void addAfterAdvicesCommandsEvent(AbstractElementTypesConfigurationsEvent afterAdvicesCommandEvent) {

-		if(afterAdvicesCommandEvent instanceof ExecutableAdviceEvent || afterAdvicesCommandEvent instanceof UnexecutableAdviceEvent || afterAdvicesCommandEvent instanceof IdentityAdviceEvent) {

-			afterAdvicesCommandsEvents.add(afterAdvicesCommandEvent);

-		}

-	}

-

-	/**

-	 * @return the editHelperCommandEvent

-	 */

-	public AbstractElementTypesConfigurationsEvent getEditHelperCommandEvent() {

-		return editHelperCommandEvent;

-	}

-

-	/**

-	 * @param editHelperCommandEvent

-	 *        the editHelperCommandEvent to set ({@link ExecutableEditHelperEvent}, {@link UnexecutableEditHelperEvent} or

-	 *        {@link IdentityEditHelperEvent})

-	 */

-	public void setEditHelperCommandEvent(AbstractElementTypesConfigurationsEvent editHelperCommandEvent) {

-		if(editHelperCommandEvent instanceof ExecutableEditHelperEvent || editHelperCommandEvent instanceof UnexecutableEditHelperEvent || editHelperCommandEvent instanceof IdentityEditHelperEvent) {

-			this.editHelperCommandEvent = editHelperCommandEvent;

-		}

-	}

-

-	/**

-	 * Returns all the events that occurred during the execution of the {@link IEditHelper} (i.e. all events categories)

-	 * 

-	 * @return

-	 */

-	public List<AbstractElementTypesConfigurationsEvent> getAllEvents() {

-		List<AbstractElementTypesConfigurationsEvent> result = new ArrayList<AbstractElementTypesConfigurationsEvent>();

-		if(!adviceRequestConfigurationEvents.isEmpty()) {

-			result.addAll(adviceRequestConfigurationEvents);

-		}

-		if(editHelperRequestConfigurationEvent != null) {

-			result.add(editHelperRequestConfigurationEvent);

-		}

-		if(!adviceApprovalEvents.isEmpty()) {

-			result.addAll(adviceApprovalEvents);

-		}

-		if(editHelperApprovalEvent != null) {

-			result.add(editHelperApprovalEvent);

-		}

-		if(!beforeAdvicesCommandsEvents.isEmpty()) {

-			result.addAll(beforeAdvicesCommandsEvents);

-		}

-		if(editHelperCommandEvent != null) {

-			result.add(editHelperCommandEvent);

-		}

-		if(!afterAdvicesCommandsEvents.isEmpty()) {

-			result.addAll(afterAdvicesCommandsEvents);

-		}

-		return result;

-	}

-

-	/**

-	 * @return the timestamp creation of this {@link ElementTypesConfigurationsEventsChain}

-	 */

-	public long getTimestamp() {

-		return timestamp;

-	}

-

-	/**

-	 * @return the req

-	 */

-	public IEditCommandRequest getRequest() {

-		return req;

-	}

-

-	/**

-	 * The Simple Name of the class of the {@link IEditHelper} that triggered this {@link ElementTypesConfigurationsEventsChain}

-	 * 

-	 * @return

-	 */

-	public String getName() {

-		return editHelper.getClass().getSimpleName();

-	}

-

-	/**

-	 * @return the adviceRequestConfigurationEvents

-	 */

-	public List<AbstractElementTypesConfigurationsEvent> getAdviceRequestConfigurationEvents() {

-		return adviceRequestConfigurationEvents;

-	}

-

-	/**

-	 * @param adviceConfigureEvent

-	 */

-	public void addAdviceRequestConfigurationEvent(AdviceRequestConfigurationEvent adviceConfigureEvent) {

-		adviceRequestConfigurationEvents.add(adviceConfigureEvent);

-	}

-

-	/**

-	 * @return the editHelperRequestConfigurationEvent

-	 */

-	public AbstractElementTypesConfigurationsEvent getEditHelperRequestConfigurationEvent() {

-		return editHelperRequestConfigurationEvent;

-	}

-

-	/**

-	 * @param editHelperRequestConfigurationEvent

-	 *        the editHelperRequestConfigurationEvent to set

-	 */

-	public void setEditHelperRequestConfigurationEvent(AbstractElementTypesConfigurationsEvent editHelperRequestConfigurationEvent) {

-		this.editHelperRequestConfigurationEvent = editHelperRequestConfigurationEvent;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AbstractElementTypesConfigurationsEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdviceApprovedEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdviceDisapprovedEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdviceRequestConfigurationEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.EditHelperApprovedEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.EditHelperDisapprovedEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.ExecutableAdviceEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.ExecutableEditHelperEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IdentityAdviceEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IdentityEditHelperEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.UnexecutableAdviceEvent;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.UnexecutableEditHelperEvent;
+
+public class ElementTypesConfigurationsEventsChain {
+
+	/**
+	 * Timestamp of the creation of the chain
+	 */
+	private long timestamp;
+
+	/**
+	 * The {@link IEditHelper} that triggered the {@link ElementTypesConfigurationsEventsChain}
+	 */
+	private IEditHelper editHelper;
+
+	/**
+	 * The {@link IEditCommandRequest} that triggered the {@link ElementTypesConfigurationsEventsChain}
+	 */
+	private IEditCommandRequest req;
+
+	ElementTypesConfigurationsEventsChain(IEditHelper editHelper, IEditCommandRequest req) {
+		timestamp = System.currentTimeMillis();
+		this.editHelper = editHelper;
+		this.req = req;
+	}
+
+	/**
+	 * The various categories of events that occur during the execution of the {@link IEditHelper}
+	 */
+	private List<AbstractElementTypesConfigurationsEvent> adviceRequestConfigurationEvents = new ArrayList<AbstractElementTypesConfigurationsEvent>();
+
+	private AbstractElementTypesConfigurationsEvent editHelperRequestConfigurationEvent = null;
+
+	private List<AbstractElementTypesConfigurationsEvent> adviceApprovalEvents = new ArrayList<AbstractElementTypesConfigurationsEvent>();
+
+	private AbstractElementTypesConfigurationsEvent editHelperApprovalEvent = null;
+
+	private List<AbstractElementTypesConfigurationsEvent> beforeAdvicesCommandsEvents = new ArrayList<AbstractElementTypesConfigurationsEvent>();
+
+	private List<AbstractElementTypesConfigurationsEvent> afterAdvicesCommandsEvents = new ArrayList<AbstractElementTypesConfigurationsEvent>();
+
+	private AbstractElementTypesConfigurationsEvent editHelperCommandEvent = null;
+
+	/**
+	 * @return the adviceApprovalEvents
+	 */
+	public List<AbstractElementTypesConfigurationsEvent> getAdviceApprovalEvents() {
+		return adviceApprovalEvents;
+	}
+
+	/**
+	 * Add a {@link AdviceDisapprovedEvent} or {@link AdviceApprovedEvent} event
+	 * 
+	 * @param adviceApprovalEvent
+	 */
+	public void addAdviceApprovalEvent(AbstractElementTypesConfigurationsEvent adviceApprovalEvent) {
+		if(adviceApprovalEvent instanceof AdviceDisapprovedEvent || adviceApprovalEvent instanceof AdviceApprovedEvent) {
+			adviceApprovalEvents.add(adviceApprovalEvent);
+		}
+	}
+
+	/**
+	 * @return the editHelperAprrovalEvent
+	 */
+	public AbstractElementTypesConfigurationsEvent getEditHelperApprovalEvent() {
+		return editHelperApprovalEvent;
+	}
+
+	/**
+	 * @param editHelperAprrovalEvent
+	 *        the editHelperAprrovalEvent to set
+	 */
+	public void setEditHelperApprovalEvent(AbstractElementTypesConfigurationsEvent editHelperApprovalEvent) {
+		if(editHelperApprovalEvent instanceof EditHelperDisapprovedEvent || editHelperApprovalEvent instanceof EditHelperApprovedEvent) {
+			this.editHelperApprovalEvent = editHelperApprovalEvent;
+		}
+	}
+
+	/**
+	 * @return the beforeAdvicesCommandsEvents
+	 */
+	public List<AbstractElementTypesConfigurationsEvent> getBeforeAdvicesCommandsEvents() {
+		return beforeAdvicesCommandsEvents;
+	}
+
+	/**
+	 * Add a {@link ExecutableAdviceEvent}, {@link UnexecutableAdviceEvent} or {@link IdentityAdviceEvent} event
+	 * 
+	 * @param beforeAdvicesCommandsEvents
+	 *        the beforeAdvicesCommandsEvents to set
+	 */
+	public void addBeforeAdvicesCommandsEvent(AbstractElementTypesConfigurationsEvent beforeAdvicesCommandEvent) {
+		if(beforeAdvicesCommandEvent instanceof ExecutableAdviceEvent || beforeAdvicesCommandEvent instanceof UnexecutableAdviceEvent || beforeAdvicesCommandEvent instanceof IdentityAdviceEvent) {
+			beforeAdvicesCommandsEvents.add(beforeAdvicesCommandEvent);
+		}
+	}
+
+	/**
+	 * @return the afterAdvicesCommandsEvents
+	 */
+	public List<AbstractElementTypesConfigurationsEvent> getAfterAdvicesCommandsEvents() {
+		return afterAdvicesCommandsEvents;
+	}
+
+	/**
+	 * Add a {@link ExecutableAdviceEvent}, {@link UnexecutableAdviceEvent} or {@link IdentityAdviceEvent} event
+	 * 
+	 * @param afterAdvicesCommandEvent
+	 */
+	public void addAfterAdvicesCommandsEvent(AbstractElementTypesConfigurationsEvent afterAdvicesCommandEvent) {
+		if(afterAdvicesCommandEvent instanceof ExecutableAdviceEvent || afterAdvicesCommandEvent instanceof UnexecutableAdviceEvent || afterAdvicesCommandEvent instanceof IdentityAdviceEvent) {
+			afterAdvicesCommandsEvents.add(afterAdvicesCommandEvent);
+		}
+	}
+
+	/**
+	 * @return the editHelperCommandEvent
+	 */
+	public AbstractElementTypesConfigurationsEvent getEditHelperCommandEvent() {
+		return editHelperCommandEvent;
+	}
+
+	/**
+	 * @param editHelperCommandEvent
+	 *        the editHelperCommandEvent to set ({@link ExecutableEditHelperEvent}, {@link UnexecutableEditHelperEvent} or
+	 *        {@link IdentityEditHelperEvent})
+	 */
+	public void setEditHelperCommandEvent(AbstractElementTypesConfigurationsEvent editHelperCommandEvent) {
+		if(editHelperCommandEvent instanceof ExecutableEditHelperEvent || editHelperCommandEvent instanceof UnexecutableEditHelperEvent || editHelperCommandEvent instanceof IdentityEditHelperEvent) {
+			this.editHelperCommandEvent = editHelperCommandEvent;
+		}
+	}
+
+	/**
+	 * Returns all the events that occurred during the execution of the {@link IEditHelper} (i.e. all events categories)
+	 * 
+	 * @return
+	 */
+	public List<AbstractElementTypesConfigurationsEvent> getAllEvents() {
+		List<AbstractElementTypesConfigurationsEvent> result = new ArrayList<AbstractElementTypesConfigurationsEvent>();
+		if(!adviceRequestConfigurationEvents.isEmpty()) {
+			result.addAll(adviceRequestConfigurationEvents);
+		}
+		if(editHelperRequestConfigurationEvent != null) {
+			result.add(editHelperRequestConfigurationEvent);
+		}
+		if(!adviceApprovalEvents.isEmpty()) {
+			result.addAll(adviceApprovalEvents);
+		}
+		if(editHelperApprovalEvent != null) {
+			result.add(editHelperApprovalEvent);
+		}
+		if(!beforeAdvicesCommandsEvents.isEmpty()) {
+			result.addAll(beforeAdvicesCommandsEvents);
+		}
+		if(editHelperCommandEvent != null) {
+			result.add(editHelperCommandEvent);
+		}
+		if(!afterAdvicesCommandsEvents.isEmpty()) {
+			result.addAll(afterAdvicesCommandsEvents);
+		}
+		return result;
+	}
+
+	/**
+	 * @return the timestamp creation of this {@link ElementTypesConfigurationsEventsChain}
+	 */
+	public long getTimestamp() {
+		return timestamp;
+	}
+
+	/**
+	 * @return the req
+	 */
+	public IEditCommandRequest getRequest() {
+		return req;
+	}
+
+	/**
+	 * The Simple Name of the class of the {@link IEditHelper} that triggered this {@link ElementTypesConfigurationsEventsChain}
+	 * 
+	 * @return
+	 */
+	public String getName() {
+		return editHelper.getClass().getSimpleName();
+	}
+
+	/**
+	 * @return the adviceRequestConfigurationEvents
+	 */
+	public List<AbstractElementTypesConfigurationsEvent> getAdviceRequestConfigurationEvents() {
+		return adviceRequestConfigurationEvents;
+	}
+
+	/**
+	 * @param adviceConfigureEvent
+	 */
+	public void addAdviceRequestConfigurationEvent(AdviceRequestConfigurationEvent adviceConfigureEvent) {
+		adviceRequestConfigurationEvents.add(adviceConfigureEvent);
+	}
+
+	/**
+	 * @return the editHelperRequestConfigurationEvent
+	 */
+	public AbstractElementTypesConfigurationsEvent getEditHelperRequestConfigurationEvent() {
+		return editHelperRequestConfigurationEvent;
+	}
+
+	/**
+	 * @param editHelperRequestConfigurationEvent
+	 *        the editHelperRequestConfigurationEvent to set
+	 */
+	public void setEditHelperRequestConfigurationEvent(AbstractElementTypesConfigurationsEvent editHelperRequestConfigurationEvent) {
+		this.editHelperRequestConfigurationEvent = editHelperRequestConfigurationEvent;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/ElementTypesConfigurationsListenersRegistry.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/ElementTypesConfigurationsListenersRegistry.java
index cfc9b4181d5..9606f9a38cc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/ElementTypesConfigurationsListenersRegistry.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/ElementTypesConfigurationsListenersRegistry.java
@@ -1,74 +1,74 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification;

-

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent;

-

-/**

- * Singleton used to register eventsChains listeners ({@link IElementTypesConfigurationsEventsChainListener})

- */

-public class ElementTypesConfigurationsListenersRegistry {

-

-	private static Set<IElementTypesConfigurationsEventsChainListener> eventChainListeners = null;

-

-	private static Set<IElementTypesConfigurationsEventsListener> eventListeners = null;

-

-	private static ElementTypesConfigurationsListenersRegistry instance = null;

-

-	private ElementTypesConfigurationsListenersRegistry() {

-	}

-

-	public static synchronized ElementTypesConfigurationsListenersRegistry getInstance() {

-		if (instance == null) {

-			instance = new ElementTypesConfigurationsListenersRegistry();

-			init();

-		}

-		return instance;

-	}

-

-	public static void init() {

-		eventChainListeners = new HashSet<IElementTypesConfigurationsEventsChainListener>();

-		eventListeners = new HashSet<IElementTypesConfigurationsEventsListener>();

-	}

-

-	public void addEventChainListener(IElementTypesConfigurationsEventsChainListener listener) {

-		eventChainListeners.add(listener);

-	}

-

-	public void removeEventChainListener(IElementTypesConfigurationsEventsChainListener listener) {

-		eventChainListeners.remove(listener);

-	}

-

-	public void addEventListener(IElementTypesConfigurationsEventsListener listener) {

-		eventListeners.add(listener);

-	}

-

-	public void removeEventChainListener(IElementTypesConfigurationsEventsListener listener) {

-		eventListeners.remove(listener);

-	}

-

-	public void notifyChain(ElementTypesConfigurationsEventsChain chain) {

-		for (IElementTypesConfigurationsEventsChainListener eventsChainListener : eventChainListeners) {

-			eventsChainListener.notifyChain(chain);

-		}

-	}

-

-	public void notifyEvent(IElementTypesConfigurationsEvent event) {

-		for (IElementTypesConfigurationsEventsListener eventsListener : eventListeners) {

-			eventsListener.notifyEvent(event);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent;
+
+/**
+ * Singleton used to register eventsChains listeners ({@link IElementTypesConfigurationsEventsChainListener})
+ */
+public class ElementTypesConfigurationsListenersRegistry {
+
+	private static Set<IElementTypesConfigurationsEventsChainListener> eventChainListeners = null;
+
+	private static Set<IElementTypesConfigurationsEventsListener> eventListeners = null;
+
+	private static ElementTypesConfigurationsListenersRegistry instance = null;
+
+	private ElementTypesConfigurationsListenersRegistry() {
+	}
+
+	public static synchronized ElementTypesConfigurationsListenersRegistry getInstance() {
+		if (instance == null) {
+			instance = new ElementTypesConfigurationsListenersRegistry();
+			init();
+		}
+		return instance;
+	}
+
+	public static void init() {
+		eventChainListeners = new HashSet<IElementTypesConfigurationsEventsChainListener>();
+		eventListeners = new HashSet<IElementTypesConfigurationsEventsListener>();
+	}
+
+	public void addEventChainListener(IElementTypesConfigurationsEventsChainListener listener) {
+		eventChainListeners.add(listener);
+	}
+
+	public void removeEventChainListener(IElementTypesConfigurationsEventsChainListener listener) {
+		eventChainListeners.remove(listener);
+	}
+
+	public void addEventListener(IElementTypesConfigurationsEventsListener listener) {
+		eventListeners.add(listener);
+	}
+
+	public void removeEventChainListener(IElementTypesConfigurationsEventsListener listener) {
+		eventListeners.remove(listener);
+	}
+
+	public void notifyChain(ElementTypesConfigurationsEventsChain chain) {
+		for (IElementTypesConfigurationsEventsChainListener eventsChainListener : eventChainListeners) {
+			eventsChainListener.notifyChain(chain);
+		}
+	}
+
+	public void notifyEvent(IElementTypesConfigurationsEvent event) {
+		for (IElementTypesConfigurationsEventsListener eventsListener : eventListeners) {
+			eventsListener.notifyEvent(event);
+		}
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/IElementTypesConfigurationsEventsChainListener.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/IElementTypesConfigurationsEventsChainListener.java
index 82b07534024..f5f5db57b93 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/IElementTypesConfigurationsEventsChainListener.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/IElementTypesConfigurationsEventsChainListener.java
@@ -1,21 +1,21 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification;

-

-/**

- * Interface to implemented by listeners that want to be notified of {@link ElementTypesConfigurationsEventsChain}

- */

-public interface IElementTypesConfigurationsEventsChainListener {

-

-	public void notifyChain(ElementTypesConfigurationsEventsChain chain);

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification;
+
+/**
+ * Interface to implemented by listeners that want to be notified of {@link ElementTypesConfigurationsEventsChain}
+ */
+public interface IElementTypesConfigurationsEventsChainListener {
+
+	public void notifyChain(ElementTypesConfigurationsEventsChain chain);
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/IElementTypesConfigurationsEventsListener.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/IElementTypesConfigurationsEventsListener.java
index b6b8a86a32f..d363b0935b3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/IElementTypesConfigurationsEventsListener.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/IElementTypesConfigurationsEventsListener.java
@@ -1,23 +1,23 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent;

-

-/**

- * Interface to implemented by listeners that want to be notified of {@link IElementTypesConfigurationsEvent}

- */

-public interface IElementTypesConfigurationsEventsListener {

-

-	public void notifyEvent(IElementTypesConfigurationsEvent event);

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification;
+
+import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent;
+
+/**
+ * Interface to implemented by listeners that want to be notified of {@link IElementTypesConfigurationsEvent}
+ */
+public interface IElementTypesConfigurationsEventsListener {
+
+	public void notifyEvent(IElementTypesConfigurationsEvent event);
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractApprovedEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractApprovedEvent.java
index e1706d33fee..54497eadf9d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractApprovedEvent.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractApprovedEvent.java
@@ -1,33 +1,33 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public abstract class AbstractApprovedEvent extends AbstractElementTypesConfigurationsEvent {

-

-	public AbstractApprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {

-		super(req, editHelper);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getEventType()

-	 *

-	 * @return

-	 */

-	@Override

-	public ElementTypesConfigurationsEventType getEventType() {

-		return ElementTypesConfigurationsEventType.Approved;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public abstract class AbstractApprovedEvent extends AbstractElementTypesConfigurationsEvent {
+
+	public AbstractApprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {
+		super(req, editHelper);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getEventType()
+	 *
+	 * @return
+	 */
+	@Override
+	public ElementTypesConfigurationsEventType getEventType() {
+		return ElementTypesConfigurationsEventType.Approved;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractDisapprovedEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractDisapprovedEvent.java
index ed63112afe6..c97e942ddbf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractDisapprovedEvent.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractDisapprovedEvent.java
@@ -1,33 +1,33 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public abstract class AbstractDisapprovedEvent extends AbstractElementTypesConfigurationsEvent {

-

-	public AbstractDisapprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {

-		super(req, editHelper);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getEventType()

-	 *

-	 * @return

-	 */

-	@Override

-	public ElementTypesConfigurationsEventType getEventType() {

-		return ElementTypesConfigurationsEventType.Disapproved;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public abstract class AbstractDisapprovedEvent extends AbstractElementTypesConfigurationsEvent {
+
+	public AbstractDisapprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {
+		super(req, editHelper);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getEventType()
+	 *
+	 * @return
+	 */
+	@Override
+	public ElementTypesConfigurationsEventType getEventType() {
+		return ElementTypesConfigurationsEventType.Disapproved;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractElementTypesConfigurationsEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractElementTypesConfigurationsEvent.java
index 82eed846254..97b2e37c735 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractElementTypesConfigurationsEvent.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractElementTypesConfigurationsEvent.java
@@ -1,75 +1,75 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public abstract class AbstractElementTypesConfigurationsEvent implements IElementTypesConfigurationsEvent {

-

-	/**

-	 * Timestamp of the creation of this event

-	 */

-	private long timestamp;

-

-	/**

-	 * The {@link IEditCommandRequest} that triggered this {@link IElementTypesConfigurationsEvent}

-	 */

-	private IEditCommandRequest request;

-

-	private IEditHelper editHelper;

-

-	public AbstractElementTypesConfigurationsEvent(IEditCommandRequest req, IEditHelper editHelper) {

-		this();

-		this.request = req;

-		this.editHelper = editHelper;

-	}

-

-	/**

-	 * @return the {@link IEditCommandRequest} that triggered the event

-	 */

-	public IEditCommandRequest getRequest() {

-		return request;

-	}

-

-	/**

-	 * @return the {@link IEditHelper} that triggered the event

-	 */

-	public IEditHelper getEditHelper() {

-		return editHelper;

-	}

-

-	AbstractElementTypesConfigurationsEvent() {

-		timestamp = System.currentTimeMillis();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getTimestamp()

-	 *

-	 * @return

-	 */

-	@Override

-	public long getTimestamp() {

-		return timestamp;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getEventName()

-	 *

-	 * @return

-	 */

-	@Override

-	public String getEventName() {

-		return this.getClass().getSimpleName();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public abstract class AbstractElementTypesConfigurationsEvent implements IElementTypesConfigurationsEvent {
+
+	/**
+	 * Timestamp of the creation of this event
+	 */
+	private long timestamp;
+
+	/**
+	 * The {@link IEditCommandRequest} that triggered this {@link IElementTypesConfigurationsEvent}
+	 */
+	private IEditCommandRequest request;
+
+	private IEditHelper editHelper;
+
+	public AbstractElementTypesConfigurationsEvent(IEditCommandRequest req, IEditHelper editHelper) {
+		this();
+		this.request = req;
+		this.editHelper = editHelper;
+	}
+
+	/**
+	 * @return the {@link IEditCommandRequest} that triggered the event
+	 */
+	public IEditCommandRequest getRequest() {
+		return request;
+	}
+
+	/**
+	 * @return the {@link IEditHelper} that triggered the event
+	 */
+	public IEditHelper getEditHelper() {
+		return editHelper;
+	}
+
+	AbstractElementTypesConfigurationsEvent() {
+		timestamp = System.currentTimeMillis();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getTimestamp()
+	 *
+	 * @return
+	 */
+	@Override
+	public long getTimestamp() {
+		return timestamp;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getEventName()
+	 *
+	 * @return
+	 */
+	@Override
+	public String getEventName() {
+		return this.getClass().getSimpleName();
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractExecutableEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractExecutableEvent.java
index e3c2167ffe3..ff511f06d54 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractExecutableEvent.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractExecutableEvent.java
@@ -1,45 +1,45 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public abstract class AbstractExecutableEvent extends AbstractElementTypesConfigurationsEvent {

-

-	private ICommand command;

-

-

-	public AbstractExecutableEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {

-		super(req, editHelper);

-		this.command = command;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getEventType()

-	 *

-	 * @return

-	 */

-	@Override

-	public ElementTypesConfigurationsEventType getEventType() {

-		return ElementTypesConfigurationsEventType.Executable;

-	}

-

-	/**

-	 * @return the command

-	 */

-	public ICommand getCommand() {

-		return command;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public abstract class AbstractExecutableEvent extends AbstractElementTypesConfigurationsEvent {
+
+	private ICommand command;
+
+
+	public AbstractExecutableEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {
+		super(req, editHelper);
+		this.command = command;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getEventType()
+	 *
+	 * @return
+	 */
+	@Override
+	public ElementTypesConfigurationsEventType getEventType() {
+		return ElementTypesConfigurationsEventType.Executable;
+	}
+
+	/**
+	 * @return the command
+	 */
+	public ICommand getCommand() {
+		return command;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractIdentityEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractIdentityEvent.java
index 99a6bdf7227..462db0338b6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractIdentityEvent.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractIdentityEvent.java
@@ -1,33 +1,33 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public abstract class AbstractIdentityEvent extends AbstractElementTypesConfigurationsEvent {

-

-	public AbstractIdentityEvent(IEditCommandRequest req, IEditHelper editHelper) {

-		super(req, editHelper);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getEventType()

-	 *

-	 * @return

-	 */

-	@Override

-	public ElementTypesConfigurationsEventType getEventType() {

-		return ElementTypesConfigurationsEventType.Identity;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public abstract class AbstractIdentityEvent extends AbstractElementTypesConfigurationsEvent {
+
+	public AbstractIdentityEvent(IEditCommandRequest req, IEditHelper editHelper) {
+		super(req, editHelper);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getEventType()
+	 *
+	 * @return
+	 */
+	@Override
+	public ElementTypesConfigurationsEventType getEventType() {
+		return ElementTypesConfigurationsEventType.Identity;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractRequestConfigurationEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractRequestConfigurationEvent.java
index d80e452fa80..f6996126c0b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractRequestConfigurationEvent.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractRequestConfigurationEvent.java
@@ -1,33 +1,33 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public abstract class AbstractRequestConfigurationEvent extends AbstractElementTypesConfigurationsEvent {

-

-	public AbstractRequestConfigurationEvent(IEditCommandRequest req, IEditHelper editHelper) {

-		super(req, editHelper);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getEventType()

-	 *

-	 * @return

-	 */

-	@Override

-	public ElementTypesConfigurationsEventType getEventType() {

-		return ElementTypesConfigurationsEventType.RequestConfiguration;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public abstract class AbstractRequestConfigurationEvent extends AbstractElementTypesConfigurationsEvent {
+
+	public AbstractRequestConfigurationEvent(IEditCommandRequest req, IEditHelper editHelper) {
+		super(req, editHelper);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getEventType()
+	 *
+	 * @return
+	 */
+	@Override
+	public ElementTypesConfigurationsEventType getEventType() {
+		return ElementTypesConfigurationsEventType.RequestConfiguration;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractUnexecutableEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractUnexecutableEvent.java
index eb87f2c41fe..64271bacfe8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractUnexecutableEvent.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractUnexecutableEvent.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public abstract class AbstractUnexecutableEvent extends AbstractElementTypesConfigurationsEvent {

-

-	public AbstractUnexecutableEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {

-		super(req, editHelper);

-		this.command = command;

-	}

-

-	/**

-	 * @return the command

-	 */

-	public ICommand getCommand() {

-		return command;

-	}

-

-	private ICommand command;

-

-

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getEventType()

-	 *

-	 * @return

-	 */

-	@Override

-	public ElementTypesConfigurationsEventType getEventType() {

-		return ElementTypesConfigurationsEventType.Unexecutable;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public abstract class AbstractUnexecutableEvent extends AbstractElementTypesConfigurationsEvent {
+
+	public AbstractUnexecutableEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {
+		super(req, editHelper);
+		this.command = command;
+	}
+
+	/**
+	 * @return the command
+	 */
+	public ICommand getCommand() {
+		return command;
+	}
+
+	private ICommand command;
+
+
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getEventType()
+	 *
+	 * @return
+	 */
+	@Override
+	public ElementTypesConfigurationsEventType getEventType() {
+		return ElementTypesConfigurationsEventType.Unexecutable;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdviceApprovedEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdviceApprovedEvent.java
index 3a5d6034c0b..dbb7cee41a2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdviceApprovedEvent.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdviceApprovedEvent.java
@@ -1,46 +1,46 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class AdviceApprovedEvent extends AbstractApprovedEvent implements IAdviceEvent {

-

-	private IEditHelperAdvice advice;

-

-	private IEditHelperAdvice[] advices;

-

-	public AdviceApprovedEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice nextAdvice, IEditHelperAdvice[] advices) {

-		super(req, editHelper);

-		this.advice = nextAdvice;

-		this.advices = advices;

-	}

-

-	/**

-	 * @return the advice

-	 */

-	@Override

-	public IEditHelperAdvice getAdvice() {

-		return advice;

-	}

-

-	/**

-	 * @return the advices

-	 */

-	@Override

-	public IEditHelperAdvice[] getAdvices() {

-		return advices;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class AdviceApprovedEvent extends AbstractApprovedEvent implements IAdviceEvent {
+
+	private IEditHelperAdvice advice;
+
+	private IEditHelperAdvice[] advices;
+
+	public AdviceApprovedEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice nextAdvice, IEditHelperAdvice[] advices) {
+		super(req, editHelper);
+		this.advice = nextAdvice;
+		this.advices = advices;
+	}
+
+	/**
+	 * @return the advice
+	 */
+	@Override
+	public IEditHelperAdvice getAdvice() {
+		return advice;
+	}
+
+	/**
+	 * @return the advices
+	 */
+	@Override
+	public IEditHelperAdvice[] getAdvices() {
+		return advices;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdviceDisapprovedEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdviceDisapprovedEvent.java
index eca7af0b0ef..edc98e1cdbf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdviceDisapprovedEvent.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdviceDisapprovedEvent.java
@@ -1,46 +1,46 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class AdviceDisapprovedEvent extends AbstractDisapprovedEvent implements IAdviceEvent {

-

-	private IEditHelperAdvice advice;

-

-	IEditHelperAdvice[] advices;

-

-	/**

-	 * @return the advice

-	 */

-	@Override

-	public IEditHelperAdvice getAdvice() {

-		return advice;

-	}

-

-	/**

-	 * @return the advices

-	 */

-	@Override

-	public IEditHelperAdvice[] getAdvices() {

-		return advices;

-	}

-

-	public AdviceDisapprovedEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice nextAdvice, IEditHelperAdvice[] advices) {

-		super(req, editHelper);

-		this.advice = nextAdvice;

-		this.advices = advices;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class AdviceDisapprovedEvent extends AbstractDisapprovedEvent implements IAdviceEvent {
+
+	private IEditHelperAdvice advice;
+
+	IEditHelperAdvice[] advices;
+
+	/**
+	 * @return the advice
+	 */
+	@Override
+	public IEditHelperAdvice getAdvice() {
+		return advice;
+	}
+
+	/**
+	 * @return the advices
+	 */
+	@Override
+	public IEditHelperAdvice[] getAdvices() {
+		return advices;
+	}
+
+	public AdviceDisapprovedEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice nextAdvice, IEditHelperAdvice[] advices) {
+		super(req, editHelper);
+		this.advice = nextAdvice;
+		this.advices = advices;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdvicePhase.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdvicePhase.java
index db639390ee3..b251d2863b0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdvicePhase.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdvicePhase.java
@@ -1,17 +1,17 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-public enum AdvicePhase {

-	before, after

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+public enum AdvicePhase {
+	before, after
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdviceRequestConfigurationEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdviceRequestConfigurationEvent.java
index 75aeb85d3b8..9cf18f699c7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdviceRequestConfigurationEvent.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdviceRequestConfigurationEvent.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class AdviceRequestConfigurationEvent extends AbstractRequestConfigurationEvent implements IAdviceEvent {

-

-	private IEditHelperAdvice advice;

-

-	private IEditHelperAdvice[] advices;

-

-	public AdviceRequestConfigurationEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, IEditHelperAdvice[] advices) {

-		super(req, editHelper);

-		this.advice = advice;

-		this.advices = advices;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IAdviceEvent#getAdvice()

-	 *

-	 * @return

-	 */

-	@Override

-	public IEditHelperAdvice getAdvice() {

-		return advice;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IAdviceEvent#getAdvices()

-	 *

-	 * @return

-	 */

-	@Override

-	public IEditHelperAdvice[] getAdvices() {

-		return advices;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class AdviceRequestConfigurationEvent extends AbstractRequestConfigurationEvent implements IAdviceEvent {
+
+	private IEditHelperAdvice advice;
+
+	private IEditHelperAdvice[] advices;
+
+	public AdviceRequestConfigurationEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, IEditHelperAdvice[] advices) {
+		super(req, editHelper);
+		this.advice = advice;
+		this.advices = advices;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IAdviceEvent#getAdvice()
+	 *
+	 * @return
+	 */
+	@Override
+	public IEditHelperAdvice getAdvice() {
+		return advice;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IAdviceEvent#getAdvices()
+	 *
+	 * @return
+	 */
+	@Override
+	public IEditHelperAdvice[] getAdvices() {
+		return advices;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/EditHelperApprovedEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/EditHelperApprovedEvent.java
index d8e91200f6d..e49b485d8c6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/EditHelperApprovedEvent.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/EditHelperApprovedEvent.java
@@ -1,23 +1,23 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class EditHelperApprovedEvent extends AbstractApprovedEvent {

-

-	public EditHelperApprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {

-		super(req, editHelper);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class EditHelperApprovedEvent extends AbstractApprovedEvent {
+
+	public EditHelperApprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {
+		super(req, editHelper);
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/EditHelperDisapprovedEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/EditHelperDisapprovedEvent.java
index 78df3cce678..149ee0c901d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/EditHelperDisapprovedEvent.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/EditHelperDisapprovedEvent.java
@@ -1,23 +1,23 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class EditHelperDisapprovedEvent extends AbstractDisapprovedEvent {

-

-	public EditHelperDisapprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {

-		super(req, editHelper);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class EditHelperDisapprovedEvent extends AbstractDisapprovedEvent {
+
+	public EditHelperDisapprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {
+		super(req, editHelper);
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/EditHelperRequestConfigurationEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/EditHelperRequestConfigurationEvent.java
index e50f1cc99df..e6c66afc27d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/EditHelperRequestConfigurationEvent.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/EditHelperRequestConfigurationEvent.java
@@ -1,23 +1,23 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class EditHelperRequestConfigurationEvent extends AbstractRequestConfigurationEvent {

-

-	public EditHelperRequestConfigurationEvent(IEditCommandRequest req, IEditHelper editHelper) {

-		super(req, editHelper);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class EditHelperRequestConfigurationEvent extends AbstractRequestConfigurationEvent {
+
+	public EditHelperRequestConfigurationEvent(IEditCommandRequest req, IEditHelper editHelper) {
+		super(req, editHelper);
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/ElementTypesConfigurationsEventType.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/ElementTypesConfigurationsEventType.java
index b88f4117104..386fb4ddad4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/ElementTypesConfigurationsEventType.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/ElementTypesConfigurationsEventType.java
@@ -1,17 +1,17 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-public enum ElementTypesConfigurationsEventType {

-	Disapproved, Unexecutable, Approved, Executable, Identity, RequestConfiguration

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+public enum ElementTypesConfigurationsEventType {
+	Disapproved, Unexecutable, Approved, Executable, Identity, RequestConfiguration
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/ExecutableAdviceEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/ExecutableAdviceEvent.java
index 67beeb1f727..97a98903269 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/ExecutableAdviceEvent.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/ExecutableAdviceEvent.java
@@ -1,57 +1,57 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class ExecutableAdviceEvent extends AbstractExecutableEvent implements IAdviceEvent {

-

-	private IEditHelperAdvice advice;

-

-	private IEditHelperAdvice[] advices;

-

-	private AdvicePhase advicePhase;

-

-	public ExecutableAdviceEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, ICommand command, IEditHelperAdvice[] advices, AdvicePhase advicePhase) {

-		super(req, editHelper, command);

-		this.advice = advice;

-		this.advices = advices;

-		this.advicePhase = advicePhase;

-	}

-

-	/**

-	 * @return the advice

-	 */

-	@Override

-	public IEditHelperAdvice getAdvice() {

-		return advice;

-	}

-

-	/**

-	 * @return the advices

-	 */

-	@Override

-	public IEditHelperAdvice[] getAdvices() {

-		return advices;

-	}

-

-	/**

-	 * @return the advicePhase

-	 */

-	public AdvicePhase getAdvicePhase() {

-		return advicePhase;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class ExecutableAdviceEvent extends AbstractExecutableEvent implements IAdviceEvent {
+
+	private IEditHelperAdvice advice;
+
+	private IEditHelperAdvice[] advices;
+
+	private AdvicePhase advicePhase;
+
+	public ExecutableAdviceEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, ICommand command, IEditHelperAdvice[] advices, AdvicePhase advicePhase) {
+		super(req, editHelper, command);
+		this.advice = advice;
+		this.advices = advices;
+		this.advicePhase = advicePhase;
+	}
+
+	/**
+	 * @return the advice
+	 */
+	@Override
+	public IEditHelperAdvice getAdvice() {
+		return advice;
+	}
+
+	/**
+	 * @return the advices
+	 */
+	@Override
+	public IEditHelperAdvice[] getAdvices() {
+		return advices;
+	}
+
+	/**
+	 * @return the advicePhase
+	 */
+	public AdvicePhase getAdvicePhase() {
+		return advicePhase;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/ExecutableEditHelperEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/ExecutableEditHelperEvent.java
index 6850f5c6c2f..f998e9145e3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/ExecutableEditHelperEvent.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/ExecutableEditHelperEvent.java
@@ -1,24 +1,24 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class ExecutableEditHelperEvent extends AbstractExecutableEvent {

-

-	public ExecutableEditHelperEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {

-		super(req, editHelper, command);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class ExecutableEditHelperEvent extends AbstractExecutableEvent {
+
+	public ExecutableEditHelperEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {
+		super(req, editHelper, command);
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IAdviceEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IAdviceEvent.java
index 0b5cd833bfe..58ef81a93da 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IAdviceEvent.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IAdviceEvent.java
@@ -1,28 +1,28 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-

-public interface IAdviceEvent extends IElementTypesConfigurationsEvent {

-

-	/**

-	 * @return the advice

-	 */

-	public IEditHelperAdvice getAdvice();

-

-	/**

-	 * @return the advices

-	 */

-	public IEditHelperAdvice[] getAdvices();

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+
+public interface IAdviceEvent extends IElementTypesConfigurationsEvent {
+
+	/**
+	 * @return the advice
+	 */
+	public IEditHelperAdvice getAdvice();
+
+	/**
+	 * @return the advices
+	 */
+	public IEditHelperAdvice[] getAdvices();
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IElementTypesConfigurationsEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IElementTypesConfigurationsEvent.java
index 527e93f5a92..5d93ff9cb0d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IElementTypesConfigurationsEvent.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IElementTypesConfigurationsEvent.java
@@ -1,29 +1,29 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public interface IElementTypesConfigurationsEvent {

-

-	public long getTimestamp();

-

-	public String getEventName();

-

-	public ElementTypesConfigurationsEventType getEventType();

-

-	public IEditCommandRequest getRequest();

-

-	public IEditHelper getEditHelper();

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public interface IElementTypesConfigurationsEvent {
+
+	public long getTimestamp();
+
+	public String getEventName();
+
+	public ElementTypesConfigurationsEventType getEventType();
+
+	public IEditCommandRequest getRequest();
+
+	public IEditHelper getEditHelper();
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IdentityAdviceEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IdentityAdviceEvent.java
index 7fab7c2b260..6acc4c14e4f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IdentityAdviceEvent.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IdentityAdviceEvent.java
@@ -1,56 +1,56 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class IdentityAdviceEvent extends AbstractIdentityEvent implements IAdviceEvent {

-

-	private IEditHelperAdvice advice;

-

-	private IEditHelperAdvice[] advices;

-

-	private AdvicePhase advicePhase;

-

-	public IdentityAdviceEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, IEditHelperAdvice[] advices, AdvicePhase advicePhase) {

-		super(req, editHelper);

-		this.advice = advice;

-		this.advices = advices;

-		this.advicePhase = advicePhase;

-	}

-

-	/**

-	 * @return the advice

-	 */

-	@Override

-	public IEditHelperAdvice getAdvice() {

-		return advice;

-	}

-

-	/**

-	 * @return the advices

-	 */

-	@Override

-	public IEditHelperAdvice[] getAdvices() {

-		return advices;

-	}

-

-	/**

-	 * @return the advicePhase

-	 */

-	public AdvicePhase getAdvicePhase() {

-		return advicePhase;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class IdentityAdviceEvent extends AbstractIdentityEvent implements IAdviceEvent {
+
+	private IEditHelperAdvice advice;
+
+	private IEditHelperAdvice[] advices;
+
+	private AdvicePhase advicePhase;
+
+	public IdentityAdviceEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, IEditHelperAdvice[] advices, AdvicePhase advicePhase) {
+		super(req, editHelper);
+		this.advice = advice;
+		this.advices = advices;
+		this.advicePhase = advicePhase;
+	}
+
+	/**
+	 * @return the advice
+	 */
+	@Override
+	public IEditHelperAdvice getAdvice() {
+		return advice;
+	}
+
+	/**
+	 * @return the advices
+	 */
+	@Override
+	public IEditHelperAdvice[] getAdvices() {
+		return advices;
+	}
+
+	/**
+	 * @return the advicePhase
+	 */
+	public AdvicePhase getAdvicePhase() {
+		return advicePhase;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IdentityEditHelperEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IdentityEditHelperEvent.java
index fe37084a3b4..60351c414ab 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IdentityEditHelperEvent.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IdentityEditHelperEvent.java
@@ -1,24 +1,24 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class IdentityEditHelperEvent extends AbstractIdentityEvent {

-

-

-	public IdentityEditHelperEvent(IEditCommandRequest req, IEditHelper editHelper) {

-		super(req, editHelper);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class IdentityEditHelperEvent extends AbstractIdentityEvent {
+
+
+	public IdentityEditHelperEvent(IEditCommandRequest req, IEditHelper editHelper) {
+		super(req, editHelper);
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/UnexecutableAdviceEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/UnexecutableAdviceEvent.java
index e6926a9c566..40ad5a889f7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/UnexecutableAdviceEvent.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/UnexecutableAdviceEvent.java
@@ -1,57 +1,57 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class UnexecutableAdviceEvent extends AbstractUnexecutableEvent implements IAdviceEvent {

-

-	private IEditHelperAdvice advice;

-

-	private IEditHelperAdvice[] advices;

-

-	private AdvicePhase advicePhase;

-

-	public UnexecutableAdviceEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, ICommand command, IEditHelperAdvice[] advices, AdvicePhase advicePhase) {

-		super(req, editHelper, command);

-		this.advice = advice;

-		this.advices = advices;

-		this.advicePhase = advicePhase;

-	}

-

-	/**

-	 * @return the advice

-	 */

-	@Override

-	public IEditHelperAdvice getAdvice() {

-		return advice;

-	}

-

-	/**

-	 * @return the advices

-	 */

-	@Override

-	public IEditHelperAdvice[] getAdvices() {

-		return advices;

-	}

-

-	/**

-	 * @return the advicePhase

-	 */

-	public AdvicePhase getAdvicePhase() {

-		return advicePhase;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class UnexecutableAdviceEvent extends AbstractUnexecutableEvent implements IAdviceEvent {
+
+	private IEditHelperAdvice advice;
+
+	private IEditHelperAdvice[] advices;
+
+	private AdvicePhase advicePhase;
+
+	public UnexecutableAdviceEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, ICommand command, IEditHelperAdvice[] advices, AdvicePhase advicePhase) {
+		super(req, editHelper, command);
+		this.advice = advice;
+		this.advices = advices;
+		this.advicePhase = advicePhase;
+	}
+
+	/**
+	 * @return the advice
+	 */
+	@Override
+	public IEditHelperAdvice getAdvice() {
+		return advice;
+	}
+
+	/**
+	 * @return the advices
+	 */
+	@Override
+	public IEditHelperAdvice[] getAdvices() {
+		return advices;
+	}
+
+	/**
+	 * @return the advicePhase
+	 */
+	public AdvicePhase getAdvicePhase() {
+		return advicePhase;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/UnexecutableEditHelperEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/UnexecutableEditHelperEvent.java
index 34c6cd2e729..466940b71c2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/UnexecutableEditHelperEvent.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/UnexecutableEditHelperEvent.java
@@ -1,24 +1,24 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-public class UnexecutableEditHelperEvent extends AbstractUnexecutableEvent {

-

-	public UnexecutableEditHelperEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {

-		super(req, editHelper, command);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+public class UnexecutableEditHelperEvent extends AbstractUnexecutableEvent {
+
+	public UnexecutableEditHelperEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {
+		super(req, editHelper, command);
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/ElementTypeSetConfigurationRegistry.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/ElementTypeSetConfigurationRegistry.java
index 151fd772b4f..9b8027227e2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/ElementTypeSetConfigurationRegistry.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/ElementTypeSetConfigurationRegistry.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,8 +8,7 @@
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
- *  Christian W. Damus - bug 459174
- *  Christian W. Damus - bug 467207
+ *  Christian W. Damus - bugs 459174, 467207, 485220
  *
  *****************************************************************************/
 package org.eclipse.papyrus.infra.elementtypesconfigurations.registries;
@@ -296,7 +295,7 @@ public class ElementTypeSetConfigurationRegistry {
 			for (ElementTypeSetConfiguration elementTypeSetConfiguration : elementTypeSetConfigurations.get(contexId).values()) {
 				TreeIterator<EObject> it = elementTypeSetConfiguration.eAllContents();
 				while (it.hasNext()) {
-					EObject element = (EObject) it.next();
+					EObject element = it.next();
 					if (element instanceof AdviceConfiguration) {
 						adviceToCheck.add((AdviceConfiguration) element);
 					}
@@ -308,7 +307,7 @@ public class ElementTypeSetConfigurationRegistry {
 		for (ElementTypeSetConfiguration elementTypeSetConfiguration : registrableElementTypeSetConfiguration) {
 			TreeIterator<EObject> it = elementTypeSetConfiguration.eAllContents();
 			while (it.hasNext()) {
-				EObject element = (EObject) it.next();
+				EObject element = it.next();
 				if (element instanceof AdviceConfiguration) {
 					adviceToCheck.add((AdviceConfiguration) element);
 
@@ -404,7 +403,7 @@ public class ElementTypeSetConfigurationRegistry {
 		for (ElementTypeSetConfiguration elementTypeSetConfiguration : elementTypeSetConfigurations.get(contextId).values()) {
 			TreeIterator<EObject> it = elementTypeSetConfiguration.eAllContents();
 			while (it.hasNext()) {
-				EObject element = (EObject) it.next();
+				EObject element = it.next();
 				if (element instanceof AdviceConfiguration) {
 					advices.add((AdviceConfiguration) element);
 				}
@@ -449,9 +448,12 @@ public class ElementTypeSetConfigurationRegistry {
 				Activator.log.debug("-  ClientContext the model should be registreted to: " + clientContextId);
 				Activator.log.debug("-  id of the container bundle: " + contributorID);
 			}
-			ElementTypeSetConfiguration set = getElementTypeSetConfiguration(modelPath, contributorID);
 
-			addElementTypeSetConfigurationToDefinitions(set, clientContextId, existingDefinitions);
+			ElementTypeSetConfiguration set = getElementTypeSetConfiguration(modelPath, contributorID);
+			if (set != null) {
+				// It will be null if the file was absent or malformed and so failed to load.
+				addElementTypeSetConfigurationToDefinitions(set, clientContextId, existingDefinitions);
+			}
 
 		}
 		return existingDefinitions;
@@ -493,36 +495,33 @@ public class ElementTypeSetConfigurationRegistry {
 		if (Platform.isFragment(bundle)) {
 			ElementTypeSetConfiguration configuration = getElementTypeSetConfigurationInBundle(modelPath, bundleId);
 			if (configuration == null) {
-				Activator.log.warn("Cannot find resource " + modelPath + " in bundle " + bundleId);
+				Activator.log.warn("Failed to load resource " + modelPath + " from bundle " + bundleId);
 			}
 			return configuration;
 		} else { // this is a plugin. Search in sub fragments, then in the plugin
-			Bundle[] fragments = Platform.getFragments(bundle);
-			// no fragment, so the file should be in the plugin itself
-			if (fragments == null) {
-				return getElementTypeSetConfigurationInBundle(modelPath, bundleId);
-			} else {
+			ElementTypeSetConfiguration elementTypeSetConfiguration = null;
 
-				ElementTypeSetConfiguration elementTypeSetConfiguration = null;
+			Bundle[] fragments = Platform.getFragments(bundle);
 
+			if (fragments != null) {
 				for (Bundle fragment : fragments) {
 					elementTypeSetConfiguration = getElementTypeSetConfigurationInBundle(modelPath, fragment.getSymbolicName());
 					if (elementTypeSetConfiguration != null) {
 						break;
 					}
 				}
+			} // else no fragments, so the file should be in the plugin, itself
 
-				if (elementTypeSetConfiguration == null) {
-					// not found in fragments. Look in the plugin itself
-					elementTypeSetConfiguration = getElementTypeSetConfigurationInBundle(modelPath, bundleId);
-				}
-
-				if (elementTypeSetConfiguration == null) {
-					Activator.log.warn("Cannot find resource " + modelPath + " in bundle " + bundleId);
-				}
+			if (elementTypeSetConfiguration == null) {
+				// not found in fragments. Look in the plugin itself
+				elementTypeSetConfiguration = getElementTypeSetConfigurationInBundle(modelPath, bundleId);
+			}
 
-				return elementTypeSetConfiguration;
+			if (elementTypeSetConfiguration == null) {
+				Activator.log.warn("Failed to load resource " + modelPath + " from bundle " + bundleId);
 			}
+
+			return elementTypeSetConfiguration;
 		}
 	}
 
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/about.html b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/about.html b/plugins/infra/org.eclipse.papyrus.infra.newchild/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.psf/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/org.eclipse.papyrus.infra.psf/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4759947300a..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.psf/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-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

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/about.html b/plugins/infra/org.eclipse.papyrus.infra.tools/about.html
deleted file mode 100644
index 209103075a7..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>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/infra/org.eclipse.papyrus.infra.ui.resources/.classpath b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4759947300a..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-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

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/about.html b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/about.html
deleted file mode 100644
index 209103075a7..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>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/infra/org.eclipse.papyrus.infra.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/org.eclipse.papyrus.infra.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 62a08f4494d..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

-org.eclipse.jdt.core.compiler.compliance=1.8

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.8

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/about.html b/plugins/infra/org.eclipse.papyrus.infra.ui/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

diff --git a/plugins/infra/pom.xml b/plugins/infra/pom.xml
new file mode 100644
index 00000000000..003f997e1ee
--- /dev/null
+++ b/plugins/infra/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.infra</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.plugins</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+	<name>Papyrus Infra</name>
+	<description>Container of the core APIs of the Papyrus editor and headless components.</description>
+
+	<modules>
+		<module>core</module>
+		<module>onefile</module>
+		<module>constraints</module>
+		<module>editor</module>
+		<module>emf</module>
+		<module>filters</module>
+		<module>properties</module>
+		<module>services</module>
+		<module>newchild</module>
+
+		<!-- These are not in a subdirectory because other refactorings are in progress -->
+		<module>org.eclipse.papyrus.infra.elementtypesconfigurations</module>
+		<module>org.eclipse.papyrus.infra.elementtypesconfigurations.edit</module>
+		<module>org.eclipse.papyrus.infra.elementtypesconfigurations.editor</module>
+		<module>org.eclipse.papyrus.infra.elementtypesconfigurations.emf</module>
+		<module>org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui</module>
+		<module>org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes</module>
+		<module>org.eclipse.papyrus.infra.elementtypesconfigurations.ui</module>
+
+		<module>viewpoints</module>
+		<module>nattable</module>
+
+		<!-- This is separate because it combines Table and Diagram Layer APIs -->
+		<module>nattable/org.eclipse.papyrus.infra.nattable.gmfdiag</module>
+
+		<module>ui</module>
+		<module>xtypes</module>
+		<module>misc</module>
+		<module>discovery</module>
+	</modules>
+</project>
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/pom.xml b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/pom.xml
index 1f1e99fb5df..facf33f1262 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/pom.xml
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-properties</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.properties.edit</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/pom.xml b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/pom.xml
index f5783dd9713..aa82b8bc856 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/pom.xml
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-properties</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.properties.editor</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.classpath b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.classpath
new file mode 100644
index 00000000000..eca7bdba8f0
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.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/JavaSE-1.8"/>
+	<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/properties/org.eclipse.papyrus.infra.properties.ui/.project b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.project
new file mode 100644
index 00000000000..10139af5ffd
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.properties.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/infra/properties/org.eclipse.papyrus.infra.properties.ui/.settings/org.eclipse.core.resources.prefs b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..f88d7da2697
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding//src/org/eclipse/papyrus/infra/properties/internal/ui/messages/messages.properties=ISO-8859-1
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..b3aa6d60f94
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..332d9bb892f
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,45 @@
+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.properties.internal.ui;x-internal:=true,
+ org.eclipse.papyrus.infra.properties.internal.ui.extensions;x-friends:="org.eclipse.papyrus.views.properties",
+ org.eclipse.papyrus.infra.properties.internal.ui.messages;x-internal:=true,
+ org.eclipse.papyrus.infra.properties.internal.ui.observable;x-internal:=true,
+ org.eclipse.papyrus.infra.properties.internal.ui.runtime;x-friends:="org.eclipse.papyrus.customization.properties,org.eclipse.papyrus.views.properties",
+ org.eclipse.papyrus.infra.properties.ui.creation,
+ org.eclipse.papyrus.infra.properties.ui.modelelement,
+ org.eclipse.papyrus.infra.properties.ui.preferences,
+ org.eclipse.papyrus.infra.properties.ui.providers,
+ org.eclipse.papyrus.infra.properties.ui.runtime,
+ org.eclipse.papyrus.infra.properties.ui.util,
+ org.eclipse.papyrus.infra.properties.ui.widgets,
+ org.eclipse.papyrus.infra.properties.ui.widgets.layout,
+ org.eclipse.papyrus.infra.properties.ui.xwt
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.6.0";visibility:=reexport,
+ org.eclipse.emf.databinding;bundle-version="1.2.0",
+ org.eclipse.core.runtime;bundle-version="3.6.0",
+ org.eclipse.core.resources;bundle-version="3.6.0",
+ org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.emf.edit;bundle-version="2.8.0",
+ org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
+ org.eclipse.xwt;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
+ org.eclipse.core.databinding.property;bundle-version="1.6.0"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Version: 1.2.0.qualifier
+Eclipse-BuddyPolicy: dependent
+Bundle-Activator: org.eclipse.papyrus.infra.properties.internal.ui.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.infra.properties.ui;singleton:=true
diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/about.html b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/about.html
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/about.html
@@ -1,28 +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>

+<!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/properties/org.eclipse.papyrus.infra.properties.ui/build.properties b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/build.properties
new file mode 100644
index 00000000000..800139464b5
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/build.properties
@@ -0,0 +1,14 @@
+#
+#Mon Sep 12 09:30:04 CEST 2011
+output..=bin/
+bin.includes = .,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               schema/,\
+               about.html,\
+               model/
+jars.compile.order=.
+src.includes = about.html
+source..=src/
+bin..=bin/
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi
new file mode 100644
index 00000000000..ce094a1c8a7
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi
@@ -0,0 +1,230 @@
+<?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="EMF Instance Of (Deprecated)"
+      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.EMFInstanceOfConstraint"/>
+  <constraintTypes
+      label="True Constraint (Deprecated)"
+      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.TrueConstraint"/>
+  <constraintTypes
+      label="EMF Query (Deprecated)"
+      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.EMFQueryConstraint"/>
+  <constraintTypes
+      label="Java Instance Of (Deprecated)"
+      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.JavaInstanceOf"/>
+  <constraintTypes
+      label="Java Query (Deprecated)"
+      constraintClass="org.eclipse.papyrus.infra.constraints.constraints.JavaQueryConstraint"/>
+  <modelElementFactories
+      name="EMF Factory"
+      factoryClass="org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElementFactory"/>
+  <modelElementFactories
+      name="Annotation Factory"
+      factoryClass="org.eclipse.papyrus.infra.properties.ui.modelelement.AnnotationModelElementFactory"/>
+  <modelElementFactories
+      name="Basic preferences Factory"
+      factoryClass="org.eclipse.papyrus.infra.properties.ui.modelelement.PreferencesModelElementFactory"/>
+  <widgetTypes
+      label="Label"
+      widgetClass="Label"/>
+  <widgetTypes
+      label="Text"
+      widgetClass="Text"/>
+  <widgetTypes
+      label="Button"
+      widgetClass="Button"/>
+  <propertyEditorTypes
+      label="StringEditor"
+      widgetClass="StringEditor"
+      namespace="//@namespaces.3"/>
+  <propertyEditorTypes
+      label="StringMultiline"
+      widgetClass="StringMultiline"
+      namespace="//@namespaces.3"/>
+  <propertyEditorTypes
+      label="StringLabel (Read-only)"
+      widgetClass="StringLabel"
+      namespace="//@namespaces.3"/>
+  <propertyEditorTypes
+      label="StringCombo"
+      widgetClass="StringCombo"
+      namespace="//@namespaces.3"/>
+  <propertyEditorTypes
+      label="FileSelector"
+      widgetClass="StringFileSelector"
+      namespace="//@namespaces.3"/>
+  <propertyEditorTypes
+      label="BooleanCombo"
+      widgetClass="BooleanCombo"
+      namespace="//@namespaces.3"
+      type="Boolean"/>
+  <propertyEditorTypes
+      label="BooleanCheckbox"
+      widgetClass="BooleanCheckbox"
+      namespace="//@namespaces.3"
+      type="Boolean"/>
+  <propertyEditorTypes
+      label="BooleanRadio"
+      widgetClass="BooleanRadio"
+      namespace="//@namespaces.3"
+      type="Boolean"/>
+  <propertyEditorTypes
+      label="BooleanToggle"
+      widgetClass="BooleanToggle"
+      namespace="//@namespaces.3"
+      type="Boolean"/>
+  <propertyEditorTypes
+      label="IntegerEditor"
+      widgetClass="IntegerEditor"
+      namespace="//@namespaces.3"
+      type="Integer"/>
+  <propertyEditorTypes
+      label="IntegerSpinner"
+      widgetClass="IntegerSpinner"
+      namespace="//@namespaces.3"
+      type="Integer"/>
+  <propertyEditorTypes
+      label="EnumCombo"
+      widgetClass="EnumCombo"
+      namespace="//@namespaces.3"
+      type="Enumeration"/>
+  <propertyEditorTypes
+      label="EnumRadio (No preview)"
+      widgetClass="EnumRadio"
+      namespace="//@namespaces.3"
+      type="Enumeration"/>
+  <propertyEditorTypes
+      label="ReferenceCombo"
+      widgetClass="ReferenceCombo"
+      namespace="//@namespaces.3"
+      type="Reference"/>
+  <propertyEditorTypes
+      label="ReferenceDialog"
+      widgetClass="ReferenceDialog"
+      namespace="//@namespaces.3"
+      type="Reference"/>
+  <propertyEditorTypes
+      label="ViewEditor"
+      widgetClass="ViewEditor"
+      namespace="//@namespaces.3"
+      type="Reference"
+      multiplicity="-1"/>
+  <propertyEditorTypes
+      label="ReferenceLabel (Read-only)"
+      widgetClass="ReferenceLabel"
+      namespace="//@namespaces.3"
+      type="Reference"/>
+  <propertyEditorTypes
+      label="MultiReference"
+      widgetClass="MultiReference"
+      namespace="//@namespaces.3"
+      type="Reference"
+      multiplicity="-1"/>
+  <propertyEditorTypes
+      label="MultiReferenceWithPropertyView"
+      widgetClass="MultiReferencePropertyEditorWithPropertyView"
+      namespace="//@namespaces.3"
+      type="Reference"
+      multiplicity="-1"/>
+  <propertyEditorTypes
+      label="MultiString"
+      widgetClass="MultiString"
+      namespace="//@namespaces.3"
+      multiplicity="-1"/>
+  <propertyEditorTypes
+      label="MultipleFileEditor"
+      widgetClass="MultiStringFile"
+      namespace="//@namespaces.3"
+      multiplicity="-1"/>
+  <propertyEditorTypes
+      label="MultiInteger"
+      widgetClass="MultiInteger"
+      namespace="//@namespaces.3"
+      type="Integer"
+      multiplicity="-1"/>
+  <propertyEditorTypes
+      label="InvalidWidget"
+      widgetClass="InvalidWidget"
+      namespace="//@namespaces.3"/>
+  <propertyEditorTypes
+      label="StringMultiline with References"
+      widgetClass="StringMultilineWithReferences"
+      namespace="//@namespaces.3"/>
+  <propertyEditorTypes
+      label="FloatEditor"
+      widgetClass="FloatEditor"
+      namespace="//@namespaces.3"/>
+  <propertyEditorTypes
+      label="DoubleEditor"
+      widgetClass="DoubleEditor"
+      namespace="//@namespaces.3"/>
+  <propertyEditorTypes
+      label="UnlimitedNaturalEditor"
+      widgetClass="UnlimitedNaturalEditor"
+      namespace="//@namespaces.3"/>
+  <propertyEditorTypes
+      label="Browse Path Button"
+      widgetClass="BrowseFilePropertyEditor"
+      namespace="//@namespaces.3"/>
+  <propertyEditorTypes
+      label="CompletionStyledTextMultiReference"
+      widgetClass="CompletionStyledTextMultiReference"
+      namespace="//@namespaces.3"
+      type="Reference"
+      multiplicity="-1"/>
+  <propertyEditorTypes
+      label="CompletionStyledTextReferenceDialog"
+      widgetClass="CompletionStyledTextReferenceDialog"
+      namespace="//@namespaces.3"
+      type="Reference"/>
+  <compositeWidgetTypes
+      label="Composite"
+      widgetClass="Composite"/>
+  <compositeWidgetTypes
+      label="Group"
+      widgetClass="Group"/>
+  <layoutTypes
+      label="GridLayout"
+      widgetClass="GridLayout"/>
+  <layoutTypes
+      label="FillLayout"
+      widgetClass="FillLayout"/>
+  <layoutTypes
+      label="RowLayout"
+      widgetClass="RowLayout"/>
+  <layoutTypes
+      label="PropertiesLayout"
+      widgetClass="PropertiesLayout"
+      namespace="//@namespaces.4"/>
+  <namespaces
+      prefix=""
+      name=""
+      value="http://www.eclipse.org/xwt/presentation"/>
+  <namespaces
+      prefix=""
+      name="x"
+      value="http://www.eclipse.org/xwt"/>
+  <namespaces
+      name="j"
+      value="java.lang"/>
+  <namespaces
+      name="ppe"
+      value="org.eclipse.papyrus.infra.properties.ui.widgets"/>
+  <namespaces
+      name="ppel"
+      value="org.eclipse.papyrus.infra.properties.ui.widgets.layout"/>
+  <namespaces
+      name="ppec"
+      value="org.eclipse.papyrus.infra.properties.ui.creation"/>
+  <miscClasses
+      label="EMF object factory"
+      class="EcorePropertyEditorFactory"
+      namespace="//@namespaces.5"/>
+  <miscClasses
+      label="Property view Edition factory"
+      class="PropertyEditorFactory"
+      namespace="//@namespaces.5"/>
+</environment:Environment>
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/plugin.properties b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/plugin.properties
new file mode 100644
index 00000000000..45b04f0585c
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/plugin.properties
@@ -0,0 +1,21 @@
+#############################################################################
+# Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#   CEA LIST - Initial API and implementation
+#   Christian W. Damus - bug 485220
+#############################################################################
+
+pluginName = Papyrus Properties Run-time
+providerName = Eclipse Modeling Project
+
+Bundle-Vendor = Eclipse Modeling Project
+page.name = Property views
+extension-point.context = Context
+
+pluginDescription=This plug-in contains the runtime elements for the property view framework, as well as a set of basic tools: basic property editors, EMF Data manipulation, ...
\ No newline at end of file
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/plugin.xml b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/plugin.xml
new file mode 100644
index 00000000000..2c1352e8ebc
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/plugin.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<!--
+  Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
+  
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+  
+  Contributors:
+    CEA LIST - Initial API and implementation
+    Christian W. Damus - bug 485220
+-->
+<plugin>
+   <extension-point id="context" name="%extension-point.context" schema="schema/context.exsd"/>
+   <extension-point id="labelprovider" name="labelprovider" schema="schema/labelprovider.exsd"/>
+   <extension-point id="configuration" name="Papyrus Properties Configuration Management" schema="schema/configuration.exsd"/>
+   
+   <extension
+         point="org.eclipse.emf.ecore.uri_mapping">
+      <mapping
+            source="pathmap://PPEResources/"
+            target="platform:/plugin/org.eclipse.papyrus.infra.properties.ui/model/">
+      </mapping>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.properties.environments">
+      <environment
+            environmentModel="model/Environment.xmi">
+      </environment>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.properties.ui.labelprovider">
+      <labelProvider
+            labelProvider="org.eclipse.papyrus.infra.ui.emf.providers.EMFFilteredLabelProvider"
+            priority="100">
+      </labelProvider>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">
+      <context
+            description="The properties view label provider context (Widgets)"
+            id="org.eclipse.papyrus.infra.properties.ui.labelProvider.context">
+      </context>
+      <context
+            description="The properties view label provider context (Header)"
+            id="org.eclipse.papyrus.infra.properties.ui.header.labelProvider.context">
+      </context>
+   </extension>
+   
+</plugin>
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/pom.xml b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/pom.xml
new file mode 100644
index 00000000000..14076b4f844
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-properties</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.properties.ui</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/schema/configuration.exsd b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/schema/configuration.exsd
new file mode 100644
index 00000000000..b8419825fe9
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/schema/configuration.exsd
@@ -0,0 +1,83 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.properties.ui" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.properties.ui" id="configuration" name="Papyrus Properties Configuration Management"/>
+      </appInfo>
+      <documentation>
+         Internal extension point for Properties UI configuration management.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element internal="true" />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="configurationManager"/>
+         </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="configurationManager">
+      <annotation>
+         <documentation>
+            Registers the product&apos;s provider of the configuration manager.  Only one configuration manager declared on the extension point will be loaded.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A class implementing the internal configuration manager provider protocol.
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.properties.internal.ui.runtime.IInternalConfigurationManager$Provider"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         2.0
+      </documentation>
+   </annotation>
+
+
+
+
+
+</schema>
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/schema/context.exsd b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/schema/context.exsd
new file mode 100644
index 00000000000..ba564029f8e
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/schema/context.exsd
@@ -0,0 +1,137 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.properties.ui" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.properties.ui" id="Context" name="Context"/>
+      </appInfo>
+      <documentation>
+         Extension point used to associate Contexts with preference pages in the Properties Framework.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="preferencePageBinding"/>
+         </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="preferencePageBinding">
+      <annotation>
+         <documentation>
+            Specifies a binding of a particular registered Properties context model to some preference page (usually different than the default Papyrus Properties View preference page).
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="context" type="string" use="required">
+            <annotation>
+               <documentation>
+                  References the Properties Context (by name) to associate with a preference page.  The name is used instead of the URI because that is what the enablement preferences use to identify contexts and it is how (temporarily) missing contexts are tracked.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="page" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Indicates the preference page in which to present the customization of the referenced properties context.
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="identifier" basedOn="org.eclipse.ui.preferencePages/page/@id"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         0.8.0
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         &lt;extension
+ point=&quot;org.eclipse.papyrus.infra.properties.ui.Context&quot;&gt;
+ &lt;context contextModel=&quot;Model/UML.xmi&quot;&gt;
+ &lt;/context&gt;
+&lt;/extension&gt;
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiinfo"/>
+      </appInfo>
+      <documentation>
+         There is no API associated with this extension point.
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         Sample Implementation :
+org.eclipse.papyrus.infra.properties.ui.uml
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         /*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/schema/labelprovider.exsd b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/schema/labelprovider.exsd
new file mode 100644
index 00000000000..fa42bbb084f
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/schema/labelprovider.exsd
@@ -0,0 +1,109 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.properties.ui" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.properties.ui" id="labelprovider" name="labelprovider"/>
+      </appInfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="labelProvider" 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="labelProvider">
+      <complexType>
+         <attribute name="labelProvider" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="priority" type="string" use="default" value="10">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </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/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/internal/ui/Activator.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/internal/ui/Activator.java
new file mode 100644
index 00000000000..5deb1637927
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/internal/ui/Activator.java
@@ -0,0 +1,121 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.internal.ui;
+
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.swt.graphics.Image;
+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.properties.ui"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/**
+	 * Log
+	 */
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+		super();
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(plugin);
+	}
+
+	@Override
+	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;
+	}
+
+	/**
+	 * Returns the image at the given path from this plugin
+	 *
+	 * @param path
+	 *            the path of the image to be displayed
+	 * @return The Image at the given location, or null if it couldn't be found
+	 */
+	public Image getImage(String path) {
+		return getImage(PLUGIN_ID, path);
+	}
+
+	/**
+	 * Returns the image from the given image descriptor
+	 *
+	 * @param pluginId
+	 *            The plugin in which the image is located
+	 * @param path
+	 *            The path to the image from the plugin
+	 * @return
+	 * 		The Image at the given location, or null if it couldn't be found
+	 */
+	public Image getImage(String pluginId, String path) {
+		final ImageRegistry registry = getImageRegistry();
+		String key = pluginId + "/" + path; //$NON-NLS-1$
+		Image image = registry.get(key);
+		if (image == null) {
+			registry.put(key, AbstractUIPlugin.imageDescriptorFromPlugin(pluginId, path));
+			image = registry.get(key);
+		}
+		return image;
+	}
+
+	/**
+	 * Returns the image from the given path
+	 *
+	 * @param imagePath
+	 *            The path of the image, in the form /<plug-in ID>/<path to the image>
+	 * @return
+	 * 		The Image at the given location, or null if none was found
+	 */
+	public Image getImageFromPlugin(String imagePath) {
+		if (imagePath.startsWith("/")) { //$NON-NLS-1$
+			String pluginId, path;
+			imagePath = imagePath.substring(1, imagePath.length());
+			pluginId = imagePath.substring(0, imagePath.indexOf("/")); //$NON-NLS-1$
+			path = imagePath.substring(imagePath.indexOf("/"), imagePath.length()); //$NON-NLS-1$
+			return getImage(pluginId, path);
+		} else {
+			return getImage(imagePath);
+		}
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/internal/ui/extensions/ContextBindingsExtensionPoint.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/internal/ui/extensions/ContextBindingsExtensionPoint.java
new file mode 100644
index 00000000000..41555718225
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/internal/ui/extensions/ContextBindingsExtensionPoint.java
@@ -0,0 +1,81 @@
+/*****************************************************************************
+ * Copyright (c) 2015, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - adds isVisible implementation
+ *  Christian W. Damus - bugs 469188, 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.internal.ui.extensions;
+
+import java.util.function.BiConsumer;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+
+/**
+ * Handles the extension point <tt>org.eclipse.papyrus.infra.properties.ui.context</tt>
+ * Registers the given Context preference page bindings.
+ *
+ * @author Camille Letavernier
+ */
+public class ContextBindingsExtensionPoint {
+
+
+	private static final String PREFPAGE_BINDING = "preferencePageBinding"; //$NON-NLS-1$
+
+	private static final String CONTEXT = "context"; //$NON-NLS-1$
+
+	private static final String PAGE = "page"; //$NON-NLS-1$
+
+	/** The extension id. */
+	private final String EXTENSION_ID = "org.eclipse.papyrus.infra.properties.ui.context"; //$NON-NLS-1$
+
+	/**
+	 * Constructor
+	 */
+	public ContextBindingsExtensionPoint(BiConsumer<String, String> bindingProcessor) {
+		super();
+
+		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+
+		for (IConfigurationElement e : config) {
+			try {
+				switch (e.getName()) {
+				case PREFPAGE_BINDING:
+					processPrefPageBinding(e, bindingProcessor);
+					break;
+				}
+			} catch (Exception ex) {
+				Activator.log.error(ex);
+			}
+		}
+	}
+
+	private void processPrefPageBinding(IConfigurationElement config, BiConsumer<String, String> bindingProcessor) {
+		boolean valid = true;
+
+		String context = config.getAttribute(CONTEXT);
+		if ((context == null) || context.isEmpty()) {
+			valid = false;
+			Activator.log.warn(String.format("Missing context name in preference page binding extension in plug-in %s", config.getContributor().getName()));
+		}
+
+		String page = config.getAttribute(PAGE);
+		if ((page == null) || page.isEmpty()) {
+			valid = false;
+			Activator.log.warn(String.format("Missing page ID in preference page binding extension in plug-in %s", config.getContributor().getName()));
+		}
+
+		if (valid) {
+			bindingProcessor.accept(context, page);
+		}
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/internal/ui/messages/Messages.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/internal/ui/messages/Messages.java
new file mode 100644
index 00000000000..febe5b0ada8
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/internal/ui/messages/Messages.java
@@ -0,0 +1,52 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.internal.ui.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * String externalisation for plug-in org.eclipse.papyrus.infra.properties.ui
+ *
+ * @author Camille Letavernier
+ */
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.properties.internal.ui.messages.messages"; //$NON-NLS-1$
+
+	public static String EcorePropertyEditorFactory_CreateANew;
+
+	public static String EditionDialog_CanNotFindview;
+
+	public static String EditionDialog_CreateANewElement;
+
+	public static String Preferences_ConflictWarning1;
+
+	public static String Preferences_ConflictWarning2;
+
+	public static String Preferences_ConflictWarningTitle;
+
+	public static String Preferences_Contexts;
+
+	public static String Preferences_Custom;
+
+	public static String Preferences_Plugin;
+
+	public static String PropertyEditorFactory_CreateANewElement;
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/internal/ui/messages/messages.properties b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/internal/ui/messages/messages.properties
new file mode 100644
index 00000000000..b5530c8e19c
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/internal/ui/messages/messages.properties
@@ -0,0 +1,10 @@
+EcorePropertyEditorFactory_CreateANew=Create a new 
+EditionDialog_CanNotFindview=Can not find view <%s>
+EditionDialog_CreateANewElement=Create a new Element
+Preferences_ConflictWarning1=Warning : When two sections with the same ID are displayed in the same property view, only the first of them is displayed. The following conflicts may occur : \n\n
+Preferences_ConflictWarning2=\nPlease note that if these sections apply to different elements, there won't be any conflict. Do you wish to continue ?
+Preferences_ConflictWarningTitle=Warning : Conflicts detected
+Preferences_Contexts=Contexts : 
+Preferences_Custom=custom
+Preferences_Plugin=plugin
+PropertyEditorFactory_CreateANewElement=Create a new element
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/internal/ui/observable/PreferencesObservableValue.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/internal/ui/observable/PreferencesObservableValue.java
new file mode 100644
index 00000000000..3641cc0e305
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/internal/ui/observable/PreferencesObservableValue.java
@@ -0,0 +1,63 @@
+/*****************************************************************************
+ * 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.properties.internal.ui.observable;
+
+import org.eclipse.core.databinding.observable.Diffs;
+import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
+
+
+public class PreferencesObservableValue extends AbstractObservableValue implements IPropertyChangeListener {
+
+	protected String key;
+
+	protected IPreferenceStore store;
+
+	public PreferencesObservableValue(String key, IPreferenceStore store) {
+		this.key = key;
+		this.store = store;
+		store.addPropertyChangeListener(this);
+	}
+
+	public Object getValueType() {
+		return String.class;
+	}
+
+	@Override
+	protected Object doGetValue() {
+		if (store.contains(key)) {
+			return store.getString(key);
+		}
+		return null;
+	}
+
+	@Override
+	protected void doSetValue(Object value) {
+		if (value instanceof String) {
+			store.setValue(key, (String) value);
+		}
+	}
+
+	public void propertyChange(PropertyChangeEvent event) {
+		if (event.getProperty().equals(key)) {
+			fireValueChange(Diffs.createValueDiff(event.getOldValue(), event.getNewValue()));
+		}
+	}
+
+	@Override
+	public void dispose() {
+		store.removePropertyChangeListener(this);
+		super.dispose();
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/internal/ui/runtime/ConfigurationConflict.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/internal/ui/runtime/ConfigurationConflict.java
new file mode 100644
index 00000000000..9deed35f476
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/internal/ui/runtime/ConfigurationConflict.java
@@ -0,0 +1,70 @@
+/*****************************************************************************
+ * Copyright (c) 2011, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * 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
+ *  Christian W. Damus - bug 482927
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.internal.ui.runtime;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+
+/**
+ * Represents a conflict in the applied Property view configurations
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class ConfigurationConflict {
+
+	/**
+	 * The ID of the section being in conflict
+	 */
+	public String sectionID;
+
+	/**
+	 * The list of contexts being in conflict
+	 */
+	public List<Context> conflictingContexts;
+
+	/**
+	 * Constructor.
+	 *
+	 * Creates a conflict descriptor for the given section ID
+	 *
+	 * @param sectionID
+	 *            The ID of the section being in conflict
+	 */
+	public ConfigurationConflict(String sectionID) {
+		conflictingContexts = new LinkedList<Context>();
+		this.sectionID = sectionID;
+	}
+
+	/**
+	 * Adds a conflicting context
+	 *
+	 * @param context
+	 */
+	public void addContext(Context context) {
+		conflictingContexts.add(context);
+	}
+
+	@Override
+	public String toString() {
+		String result = sectionID + " : "; //$NON-NLS-1$
+		for (Context context : conflictingContexts) {
+			result += context.getUserLabel() + ", "; //$NON-NLS-1$
+		}
+		return result.substring(0, result.length() - 2);
+	}
+
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/internal/ui/runtime/IInternalConfigurationManager.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/internal/ui/runtime/IInternalConfigurationManager.java
new file mode 100644
index 00000000000..6bcf7065bb1
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/internal/ui/runtime/IInternalConfigurationManager.java
@@ -0,0 +1,135 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - Factor out workspace storage for pluggable storage providers (CDO)
+ *  Christian W. Damus (CEA) - Support implicit enablement of prototypes of unavailable contexts (CDO)
+ *  Christian W. Damus - bugs 482930, 469188, 485220
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.properties.internal.ui.runtime;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.internal.ContextExtensionPoint;
+import org.eclipse.papyrus.infra.properties.ui.runtime.IConfigurationManager;
+
+/**
+ * Internal interface for manipulation of the Properties Run-time configuration.
+ */
+public interface IInternalConfigurationManager extends IConfigurationManager {
+
+	/**
+	 * Checks the conflicts between all applied {@linkplain #getEnabledContexts() enabled}) configurations
+	 * A Conflict may occur when two sections have the same ID : they can't
+	 * be displayed at the same time
+	 *
+	 * @return
+	 * 		The list of conflicts
+	 */
+	Collection<ConfigurationConflict> checkConflicts();
+
+	/**
+	 * Checks the conflicts between those of the specified configurations that are enabled.
+	 * A Conflict may occur when two sections have the same ID : they can't
+	 * be displayed at the same time.
+	 *
+	 * @param contexts
+	 *            a set of configurations to check for conflicts (amongst the subset of these
+	 *            that are actually {@linkplain #isEnabled(Context) enabled}
+	 * 
+	 * @return
+	 * 		The list of conflicts
+	 * 
+	 * @see #isEnabled(Context)
+	 */
+	Collection<ConfigurationConflict> checkConflicts(Collection<? extends Context> contexts);
+
+	/**
+	 * Enables a Context
+	 *
+	 * @param context
+	 *            The Context to enable
+	 * @param update
+	 *            If true, the constraint engine will be updated to handle the
+	 *            modification
+	 *            If false, you should call manually {@link #update()} to refresh
+	 *            the constraint engine
+	 *
+	 * @see #disableContext(Context, boolean)
+	 */
+	void enableContext(Context context, boolean update);
+
+	/**
+	 * Disable a Context.
+	 *
+	 * @param context
+	 *            The Context to disable
+	 * @param update
+	 *            If true, the constraint engine will be updated to handle the
+	 *            modification
+	 *            If false, you should call manually {@link #update()} to refresh
+	 *            the constraint engine
+	 * @see Preferences
+	 * @see #enableContext(Context, boolean)
+	 */
+	void disableContext(Context context, boolean update);
+
+	/**
+	 * Updates the constraint engine to handle changes in the contexts
+	 * activation
+	 */
+	void update();
+
+
+	/**
+	 * Programmatically register a new context to this ConfigurationManager.
+	 * Most of the time, new contexts should be registered through {@link ContextExtensionPoint}.
+	 * However, you can still call this method when creating a Context at runtime, programmatically
+	 * (Wizards, ...)
+	 * All {@link Context} should have unique names
+	 *
+	 * @param context
+	 *            The new context to register
+	 * @param apply
+	 *            Whether the context should be enabled or not
+	 *
+	 * @see ConfigurationManager#addContext(URI)
+	 */
+	void addContext(Context context, boolean apply);
+
+	/**
+	 * Refresh the given Context. This method should be called when a model is edited
+	 * at runtime, to re-load it from persistent storage.
+	 *
+	 * @param context
+	 *            A Context model to re-load
+	 */
+	void refresh(Context context);
+
+	/**
+	 * 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
+	 */
+	void deleteContext(Context context);
+
+	//
+	// Nested types
+	//
+
+	interface Provider {
+		IInternalConfigurationManager getConfigurationManager();
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/creation/CreateInDialog.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/creation/CreateInDialog.java
new file mode 100644
index 00000000000..da1d6f28280
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/creation/CreateInDialog.java
@@ -0,0 +1,180 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.creation;
+
+import java.util.Arrays;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.jface.dialogs.TrayDialog;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+import org.eclipse.papyrus.infra.properties.ui.widgets.layout.PropertiesLayout;
+import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
+import org.eclipse.papyrus.infra.widgets.editors.ReferenceDialog;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+
+
+public class CreateInDialog extends TrayDialog {
+
+	/**
+	 * The ContentProvider for browsing potential container EObjects
+	 */
+	protected IStaticContentProvider containerContentProvider;
+
+	/**
+	 * The ContentProvider for browsing potential containment EReferences.
+	 * The input of this content provider is the object selected through the
+	 * containerContentProvider
+	 */
+	protected IStaticContentProvider referenceContentProvider;
+
+	/**
+	 * The LabelProvider for displaying potential container EObjects
+	 */
+	protected ILabelProvider containerLabelProvider;
+
+	/**
+	 * The LabelProvider for displaying potential containment EReferences
+	 */
+	protected ILabelProvider referenceLabelProvider;
+
+	/**
+	 * This dialog's shell's title
+	 */
+	protected String title;
+
+	protected EObject container;
+
+	protected EReference containmentReference;
+
+	protected ReferenceDialog referenceDialog;
+
+	/**
+	 * The instance of object being created
+	 */
+	protected Object input;
+
+	public CreateInDialog(Shell parentShell, Object input) {
+		super(parentShell);
+		this.input = input;
+	}
+
+	@Override
+	public void create() {
+		super.create();
+		getShell().setText(title);
+		getShell().setImage(Activator.getDefault().getImage(org.eclipse.papyrus.infra.widgets.Activator.PLUGIN_ID, "icons/papyrus.png")); //$NON-NLS-1$
+		Label label = new Label(getDialogArea(), SWT.NONE);
+		label.setText("Choose the parent element for the new object:");
+		GridData data = new GridData(SWT.FILL, SWT.FILL, true, false);
+		data.horizontalIndent = 5;
+		data.verticalIndent = 5;
+		label.setLayoutData(data);
+
+		final ReferenceDialog containerDialog = new ReferenceDialog(getDialogArea(), SWT.NONE);
+		containerDialog.setLabel("Container : ");
+		containerDialog.setLabelProvider(containerLabelProvider);
+		containerDialog.setContentProvider(containerContentProvider);
+		containerDialog.setInput(input);
+
+		referenceDialog = new ReferenceDialog(getDialogArea(), SWT.NONE);
+		referenceDialog.setLabel("Reference : ");
+		referenceDialog.setLabelProvider(referenceLabelProvider);
+		referenceDialog.setContentProvider(referenceContentProvider);
+
+		containerDialog.addCommitListener(new ICommitListener() {
+
+			public void commit(AbstractEditor editor) {
+				container = (EObject) containerDialog.getValue();
+				referenceDialog.setInput(container);
+				referenceContentProvider.inputChanged(null, null, container);
+				if (referenceContentProvider.getElements().length == 0) {
+					referenceDialog.setValue(null);
+				} else if (referenceContentProvider.getElements().length == 1) {
+					referenceDialog.setValue(referenceContentProvider.getElements()[0]);
+				} else {
+					if (!Arrays.asList(referenceContentProvider.getElements()).contains(referenceDialog.getValue())) {
+						referenceDialog.setValue(null);
+					}
+				}
+				updateControls();
+			}
+		});
+
+		referenceDialog.addCommitListener(new ICommitListener() {
+
+			public void commit(AbstractEditor editor) {
+				containmentReference = (EReference) referenceDialog.getValue();
+				updateControls();
+			}
+		});
+
+		updateControls();
+		getShell().setSize(450, 180);
+	}
+
+	protected void updateControls() {
+		referenceDialog.setReadOnly(referenceContentProvider.getElements().length < 2);
+
+		if (container == null || containmentReference == null) {
+			getButton(OK).setEnabled(false);
+			return;
+		}
+
+		getButton(OK).setEnabled(container.eClass().getEAllReferences().contains(containmentReference));
+	}
+
+	@Override
+	protected Composite getDialogArea() {
+		return (Composite) super.getDialogArea();
+	}
+
+	public EObject getContainer() {
+		return container;
+	}
+
+	public EReference getContainmentReference() {
+		return containmentReference;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite composite = (Composite) super.createDialogArea(parent);
+		composite.setLayout(new PropertiesLayout(true));
+		return composite;
+	}
+
+	@Override
+	protected boolean isResizable() {
+		return true;
+	}
+
+	public void setProviders(IStaticContentProvider containerContentProvider, IStaticContentProvider referenceContentProvider, ILabelProvider containerLabelProvider, ILabelProvider referenceLabelProvider) {
+		this.containerContentProvider = containerContentProvider;
+		this.referenceContentProvider = referenceContentProvider;
+		this.containerLabelProvider = containerLabelProvider;
+		this.referenceLabelProvider = referenceLabelProvider;
+	}
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/creation/CreationContext.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/creation/CreationContext.java
new file mode 100644
index 00000000000..6f75e132c43
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/creation/CreationContext.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2014 CEA and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus (CEA) - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.properties.ui.creation;
+
+
+/**
+ * Encapsulation of the context within which the Properties view is creating a new element.
+ * Primarily, this context comprises the model element in which a new element is being created (whatever that means for the particular data model).
+ */
+public interface CreationContext {
+
+	/**
+	 * A null implementation of the context. It does nothing and provides no context.
+	 */
+	CreationContext NULL = new CreationContext() {
+
+		public void pushCreatedElement(Object newElement) {
+			// Pass
+		}
+
+		public void popCreatedElement(Object newElement) {
+			// Pass
+		}
+
+		public Object getCreationContextElement() {
+			return null;
+		}
+	};
+
+	/**
+	 * Obtains the model element in the context of which we are creating new model elements.
+	 *
+	 * @return the contextual model element, or {@code null} if unknown
+	 */
+	Object getCreationContextElement();
+
+	/**
+	 * Attaches this context to an element being newly created, in such a way (as appropriate to the particular data model) that
+	 * clients would be able to retrieve this context from that element.
+	 *
+	 * @param newElement
+	 *            an element being created within the scope of my {@linkplain #getCreationContextElement() creation context}
+	 */
+	void pushCreatedElement(Object newElement);
+
+	/**
+	 * Detaches this context from an newly created element for which we have completed its editing.
+	 *
+	 * @param newElement
+	 *            the newly created element
+	 */
+	void popCreatedElement(Object newElement);
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/creation/EcorePropertyEditorFactory.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/creation/EcorePropertyEditorFactory.java
new file mode 100644
index 00000000000..647339918e7
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/creation/EcorePropertyEditorFactory.java
@@ -0,0 +1,537 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 402525
+ *  Christian W. Damus (CEA) - bug 430077
+ *  Christian W. Damus (CEA) - bug 443497
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.creation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.infra.emf.utils.EClassNameComparator;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+import org.eclipse.papyrus.infra.properties.internal.ui.messages.Messages;
+import org.eclipse.papyrus.infra.properties.ui.providers.CreateInFeatureContentProvider;
+import org.eclipse.papyrus.infra.ui.emf.dialog.NestedEditingDialogContext;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
+
+
+/**
+ * A ReferenceFactory used to instantiate and edit EObjects.
+ * The specified nsUri and ClassName are used to instantiate the EObject.
+ * The matching {@link org.eclipse.papyrus.infra.properties.contexts.View}s from all
+ * applied {@link org.eclipse.papyrus.infra.properties.contexts.Context}s are used to
+ * display the right form to edit the EObject.
+ *
+ * If no EClass is specified, a list of all concrete subclasses of {@link #type} will be displayed before the instantiation.
+ *
+ * @author Camille Letavernier
+ */
+public class EcorePropertyEditorFactory extends PropertyEditorFactory {
+
+	/**
+	 * The (abstract) EClass to instantiate
+	 */
+	protected EClass type;
+
+	/**
+	 * The (concrete) EClass to instantiate
+	 * Should be a subclass of {@link #type}
+	 */
+	protected EClass eClass;
+
+	/**
+	 * The Namespace URI of the (concrete) EClass to instantiate
+	 */
+	protected String nsUri;
+
+	/**
+	 * The name of the (concrete) EClass to instantiate
+	 */
+	protected String className;
+
+	/**
+	 * The reference in which the object will be set.
+	 */
+	protected EReference referenceIn;
+
+	/**
+	 * The ContentProvider for browsing potential container EObjects
+	 */
+	protected IStaticContentProvider containerContentProvider;
+
+	/**
+	 * The ContentProvider for browsing potential containment EReferences.
+	 * The input of this content provider is the object selected through the
+	 * containerContentProvider
+	 */
+	protected CreateInFeatureContentProvider referenceContentProvider;
+
+	/**
+	 * The LabelProvider for displaying potential container EObjects
+	 */
+	protected ILabelProvider containerLabelProvider;
+
+	/**
+	 * The LabelProvider for displaying potential containment EReferences
+	 */
+	protected ILabelProvider referenceLabelProvider;
+
+	/**
+	 * Store information about where each object should be added on validation
+	 */
+	protected Map<EObject, CreateIn> createIn = new HashMap<EObject, CreateIn>();
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * The factory will be able to instantiate the given EClass
+	 *
+	 * @param type
+	 *            The type of EClass to instantiate when creating new EObjects.
+	 */
+	public EcorePropertyEditorFactory(EReference referenceIn) {
+		if (referenceIn == null) {
+			throw new IllegalArgumentException("The referenceIn parameter must be set"); //$NON-NLS-1$
+		}
+
+		this.referenceIn = referenceIn;
+		this.type = referenceIn.getEReferenceType();
+	}
+
+	/**
+	 * @return the nsUri of the EClass used by this factory to instantiate new EObjects
+	 * @see #getClassName
+	 */
+	public String getNsUri() {
+		return nsUri;
+	}
+
+	/**
+	 * @return the className of the EClass used by this factory to instantiate new EObjects
+	 * @see #getNsUri()
+	 */
+	public String getClassName() {
+		return className;
+	}
+
+	/**
+	 * Sets the nsUri of the EClass used by this factory to instantiate new EObjects
+	 *
+	 * @param nsUri
+	 * @see #getClassName
+	 */
+	public void setNsUri(String nsUri) {
+		this.nsUri = nsUri;
+		checkEClass();
+	}
+
+	/**
+	 * Sets the className of the EClass used by this factory to instantiate new EObjects
+	 *
+	 * @param className
+	 * @see #getNsUri()
+	 */
+	public void setClassName(String className) {
+		this.className = className;
+		checkEClass();
+	}
+
+	private void checkEClass() {
+		if (nsUri != null && className != null) {
+			EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(nsUri);
+			if (ePackage == null) {
+				Activator.log.warn("Cannot find the EPackage corresponding to URI " + nsUri); //$NON-NLS-1$
+				return;
+			}
+			eClass = (EClass) ePackage.getEClassifier(className);
+			if (eClass == null) {
+				Activator.log.warn("Cannot find the EClass " + className + " in the package " + nsUri); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean canCreateObject() {
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public final Object createObject(Control widget, Object context) {
+		Object result;
+
+		final ResourceSet previous = NestedEditingDialogContext.getInstance().push(context);
+
+		try {
+			result = doCreateObject(widget, context);
+		} finally {
+			NestedEditingDialogContext.getInstance().pop(previous);
+		}
+
+		return result;
+	}
+
+	protected Object doCreateObject(Control widget, Object context) {
+		Object instance;
+
+		if (referenceIn.isContainment()) {
+			instance = simpleCreateObject(widget);
+		} else {
+			instance = createObjectInDifferentContainer(widget);
+		}
+
+		return createObject(widget, context, instance);
+	}
+
+	@Override
+	protected Object doEdit(final Control widget, final Object source, final Set<View> views, final String dialogTitle) {
+		Object result;
+
+		try {
+			NestedEditingDialogContext.getInstance().enter();
+			try {
+				result = getOperationExecutor(source).execute(new Callable<Object>() {
+					public Object call() throws Exception {
+						return basicDoEdit(widget, source, views, dialogTitle);
+					}
+				}, dialogTitle);
+			} finally {
+				NestedEditingDialogContext.getInstance().exit();
+			}
+		} catch (OperationCanceledException e) {
+			if (!NestedEditingDialogContext.getInstance().isNested()) {
+				// Propagate to the caller if not in a nested edit dialog
+				throw e;
+			}
+
+			// Let the client think that there's nothing needing to be done, that the referenced object
+			// was edited "in place" instead of being replaced by some other object
+			result = null;
+		}
+
+		return result;
+	}
+
+	protected final Object basicDoEdit(Control widget, Object source, Set<View> views, String dialogTitle) {
+		return super.doEdit(widget, source, views, dialogTitle);
+	}
+
+	@Override
+	protected void handleEditCancelled(Control widget, Object source) {
+		throw new OperationCanceledException();
+	}
+
+	protected EObject simpleCreateObject(Control widget) {
+		EClass eClass = chooseEClass(widget);
+		if (eClass == null) {
+			return null;
+		}
+
+		EObject instance = eClass.getEPackage().getEFactoryInstance().create(eClass);
+		return instance;
+	}
+
+	protected EObject createObjectInDifferentContainer(Control widget) {
+		EObject instance = simpleCreateObject(widget);
+		if (instance == null) {
+			return null;
+		}
+
+		// Try to get the current resource set for a wide scope of places to put a new element
+		Object containerInput = NestedEditingDialogContext.getInstance().getResourceSet();
+		if (containerInput == null) {
+			// Only have the object that we've created for context
+			containerInput = instance;
+		}
+
+		containerContentProvider.inputChanged(null, null, containerInput);
+		referenceContentProvider.setType(instance.eClass());
+		CreateInDialog dialog = new CreateInDialog(widget.getShell(), instance);
+		dialog.setProviders(containerContentProvider, referenceContentProvider, containerLabelProvider, referenceLabelProvider);
+		dialog.setTitle(getCreationDialogTitle());
+		int result = dialog.open();
+		if (result != Window.OK) {
+			return null;
+		}
+		CreateIn createIn = new CreateIn();
+		createIn.createInObject = dialog.getContainer();
+		createIn.createInReference = dialog.getContainmentReference();
+		this.createIn.put(instance, createIn);
+
+		return instance;
+	}
+
+	/**
+	 * Gets the EClass to instantiate
+	 * If the {@link #eClass} has been specified, then it is returned.
+	 * Otherwise, displays a list of all valid concrete EClasses that
+	 * are subtypes of {@link #type}, from which the user can choose
+	 * the one to instantiate.
+	 *
+	 * @param widget
+	 *            The control used to open a selection list (if more than one EClass
+	 *            can be instantiated)
+	 * @return
+	 * 		The EClass to instantiate
+	 */
+	protected EClass chooseEClass(Control widget) {
+		if (eClass != null) {
+			return eClass;
+		}
+
+		List<EClass> availableClasses = getAvailableEClasses();
+		if (availableClasses.isEmpty()) {
+			return null;
+		}
+
+		if (availableClasses.size() == 1) {
+			this.className = availableClasses.get(0).getName();
+			return availableClasses.get(0);
+		}
+
+		final Menu menu = new Menu(widget);
+		for (EClass eClass : availableClasses) {
+			final MenuItem item = new MenuItem(menu, SWT.NONE);
+			item.setText(eClass.getName());
+			item.setData("eClass", eClass); //$NON-NLS-1$
+			item.addSelectionListener(new SelectionListener() {
+
+				public void widgetSelected(SelectionEvent e) {
+					EcorePropertyEditorFactory.this.eClass = (EClass) item.getData("eClass"); //$NON-NLS-1$
+				}
+
+				public void widgetDefaultSelected(SelectionEvent e) {
+					// Nothing
+				}
+
+			});
+		}
+
+		menu.setVisible(true);
+
+		// The menu is blocking the thread
+		Display display = widget.getDisplay();
+		while (menu.isVisible()) {
+			try {
+				if (!display.readAndDispatch()) {
+					display.sleep();
+				}
+			} catch (Throwable ex) {
+				Activator.log.error(ex);
+			}
+		}
+		if (!display.isDisposed()) {
+			display.update();
+		}
+
+		EClass eClass = this.eClass;
+		if (eClass != null) {
+			className = eClass.getName();
+		}
+		this.eClass = null;
+
+		return eClass;
+	}
+
+	/**
+	 * @return
+	 * 		The list of {@link EClass} that can be instantiated.
+	 *         This is the list of all concrete subclasses of {@link #type}
+	 */
+	protected List<EClass> getAvailableEClasses() {
+		List<EClass> availableEClasses = EMFHelper.getSubclassesOf(type, true);
+		Collections.sort(availableEClasses, new EClassNameComparator());
+		return availableEClasses;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Collection<Object> validateObjects(Collection<Object> objectsToValidate) {
+		if (!referenceIn.isContainment()) {
+			for (Object objectToValidate : objectsToValidate) {
+				// We add the object to the containment reference
+				// They will be automatically added to the edited reference
+				// (referenceIn) after this method returns
+				CreateIn creationInformation = this.createIn.get(objectToValidate);
+				if (creationInformation != null) {
+					creationInformation.createInObject.eSet(creationInformation.createInReference, objectToValidate);
+				} else {
+					Activator.log.warn("Unknown object : " + objectToValidate);
+				}
+			}
+		}
+
+		return objectsToValidate;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getCreationDialogTitle() {
+		return Messages.EcorePropertyEditorFactory_CreateANew + className;
+	}
+
+	@Override
+	public String getEditionDialogTitle(Object objectToEdit) {
+		if (objectToEdit instanceof EObject) {
+			return "Edit " + ((EObject) objectToEdit).eClass().getName();
+		}
+		return super.getEditionDialogTitle(objectToEdit);
+	}
+
+	/**
+	 * @return
+	 * 		The EClass that will be instantiated, or null if this hasn't been forced
+	 */
+	public EClass getEClass() {
+		return eClass;
+	}
+
+	protected class CreateIn {
+
+		/**
+		 * The (containment) reference in which the object will be created
+		 * May be the same or different from {@link #referenceIn}
+		 */
+		public EReference createInReference;
+
+		/**
+		 * The (container) EObject in which the object will be created
+		 */
+		public EObject createInObject;
+	}
+
+	/**
+	 * Sets the same label provider for both #referenceLabelProvider
+	 * and #containerLabelProvider
+	 *
+	 * @param labelProvider
+	 */
+	public void setLabelProvider(ILabelProvider labelProvider) {
+		setContainerLabelProvider(labelProvider);
+		setReferenceLabelProvider(labelProvider);
+	}
+
+	public void setReferenceLabelProvider(ILabelProvider labelProvider) {
+		this.referenceLabelProvider = labelProvider;
+	}
+
+	public void setContainerLabelProvider(ILabelProvider labelProvider) {
+		this.containerLabelProvider = labelProvider;
+	}
+
+	public void setContainerContentProvider(IStaticContentProvider contentProvider) {
+		this.containerContentProvider = contentProvider;
+	}
+
+	public void setReferenceContentProvider(CreateInFeatureContentProvider contentProvider) {
+		this.referenceContentProvider = contentProvider;
+	}
+
+	@Override
+	protected CreationContext getCreationContext(Object element) {
+		return (element instanceof EObject) ? getCreationContext((EObject) element, true) : super.getCreationContext(element);
+	}
+
+	/**
+	 * Gets the creation context providing the element in which a {@code modelElement} is being created.
+	 *
+	 * @param modelElement
+	 *            a model element that is currently being created and probably is, therefore, not yet attached to the model
+	 * @param demandCreate
+	 *            whether to create the context and implicitly attach it if it is not already attached. This is only appropriate in the case that the {@code modelElement} is the element in which context we are creating new elements
+	 *
+	 * @return the creation context, or {@code null} if none is currently attached and we did not elect to create it on demand
+	 */
+	public static CreationContext getCreationContext(EObject modelElement, boolean demandCreate) {
+		class EObjectCreationContext extends AdapterImpl implements CreationContext {
+
+			private EObject context;
+
+			private List<Object> createdElements = new ArrayList<Object>(2); // Anticipate small depth of dialog nesting
+
+			EObjectCreationContext(EObject context) {
+				this.context = context;
+				context.eAdapters().add(this);
+			}
+
+			@Override
+			public boolean isAdapterForType(Object type) {
+				return type == CreationContext.class;
+			}
+
+			public Object getCreationContextElement() {
+				return context;
+			}
+
+			public void popCreatedElement(Object newElement) {
+				if (createdElements.remove(newElement)) {
+					((Notifier) newElement).eAdapters().remove(this);
+
+					if (createdElements.isEmpty()) {
+						// Don't need this context adapter any more
+						context.eAdapters().remove(this);
+					}
+				}
+			}
+
+			public void pushCreatedElement(Object newElement) {
+				createdElements.add(newElement);
+				((Notifier) newElement).eAdapters().add(this);
+			}
+		}
+
+		CreationContext result = (CreationContext) EcoreUtil.getExistingAdapter(modelElement, CreationContext.class);
+		if ((result == null) && demandCreate) {
+			result = new EObjectCreationContext(modelElement);
+		}
+
+		return result;
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/creation/EditionDialog.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/creation/EditionDialog.java
new file mode 100644
index 00000000000..e5ce3412a69
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/creation/EditionDialog.java
@@ -0,0 +1,351 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 404874
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.creation;
+
+import java.io.IOException;
+import java.text.Collator;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.Section;
+import org.eclipse.papyrus.infra.properties.contexts.Tab;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+import org.eclipse.papyrus.infra.properties.internal.ui.messages.Messages;
+import org.eclipse.papyrus.infra.properties.ui.runtime.DefaultDisplayEngine;
+import org.eclipse.papyrus.infra.properties.ui.runtime.DisplayEngine;
+import org.eclipse.papyrus.infra.properties.ui.runtime.PropertiesRuntime;
+import org.eclipse.papyrus.infra.properties.ui.xwt.XWTSection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.dialogs.SelectionDialog;
+
+
+/**
+ * A dialog used to display an edition form for a given object.
+ * The form is described by the given {@link View}s
+ *
+ * @author Camille Letavernier
+ */
+// TODO : This dialog should use the Embedded Display Engine
+public class EditionDialog extends SelectionDialog {
+
+	private Set<View> views;
+
+	private Object input;
+
+	private Set<XWTSection> sections = new HashSet<XWTSection>();
+
+	private boolean cancelable = false;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param shell
+	 *            The shell in which the dialog will be opened
+	 * @param cancelable
+	 *            Whether the cancel button is active or not. The values are data-binded, ie.
+	 *            edited in real time, before the ok button is pressed. If the cancel button
+	 *            is active, callers are responsible for undoing the changes.
+	 */
+	protected EditionDialog(Shell shell, boolean cancelable) {
+		super(shell);
+		this.cancelable = cancelable;
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param shell
+	 *            The shell in which the dialog will be opened
+	 */
+	protected EditionDialog(Shell shell) {
+		this(shell, false);
+	}
+
+	@Override
+	public void create() {
+		super.create();
+		if (getShell().getText() == null || "".equals(getShell().getText())) { //$NON-NLS-1$
+			setTitle(Messages.EditionDialog_CreateANewElement);
+		}
+		getShell().setImage(Activator.getDefault().getImage("org.eclipse.papyrus.infra.widgets", "/icons/papyrus.png")); //$NON-NLS-1$ //$NON-NLS-2$
+		getShell().addDisposeListener(new DisposeListener() {
+
+			@Override
+			public void widgetDisposed(DisposeEvent e) {
+				dispose();
+			}
+
+		});
+
+		display();
+
+		// The values are data-binded, thus are edited in real time. It is not possible to cancel (However, Ctrl+Z should work)
+		getButton(IDialogConstants.CANCEL_ID).setEnabled(cancelable);
+	}
+
+	@Override
+	public Composite getDialogArea() {
+		return (Composite) super.getDialogArea();
+	}
+
+	/**
+	 * Sets the object being edited by this dialog
+	 *
+	 * @param input
+	 */
+	public void setInput(Object input) {
+		this.input = input;
+	}
+
+	/**
+	 * Sets the Views used to edit the input object
+	 *
+	 * @param views
+	 */
+	public void setViews(Set<View> views) {
+		this.views = views;
+	}
+
+	/**
+	 * Provide information about context and view, as well as the element for which the dialog
+	 * should be provided. It will call setViews in turn.
+	 *
+	 * @param contextName
+	 *            The name of the context
+	 * @param contextURI
+	 *            The URI of the context, tries to load context, if it has not been done yet
+	 * @param viewName
+	 *            The name of the view
+	 */
+	public void setViewData(String contextName, String viewName) {
+		setViewData(contextName, null, viewName);
+	}
+
+	/**
+	 * Provide information about context and view, as well as the element for which the dialog
+	 * should be provided.
+	 *
+	 * @param contextName
+	 *            The name of the context
+	 * @param contextURI
+	 *            The URI of the context. If the context is not available yet, the function uses this URI to load it.
+	 * @param viewName
+	 *            The name of the view
+	 */
+	public void setViewData(String contextName, URI contextURI, String viewName) {
+
+		Context context = PropertiesRuntime.getConfigurationManager().getContext(contextName);
+		if ((context == null) && (contextURI != null)) {
+			// might not have been loaded yet
+			loadFromURI(contextURI);
+			context = PropertiesRuntime.getConfigurationManager().getContext(contextName);
+		}
+
+		Set<View> views = new HashSet<View>();
+
+		if (context != null) {
+			for (View view : context.getViews()) {
+				if (view.getName().equals(viewName)) {
+					views.add(view);
+					break;
+				}
+			}
+		}
+		if (views.isEmpty()) {
+			throw new RuntimeException(String.format(Messages.EditionDialog_CanNotFindview, viewName));
+		}
+		setViews(views);
+	}
+
+	/**
+	 * Load the passed context into the configuration manager.
+	 */
+	protected void loadFromURI(URI uri) {
+		try {
+			PropertiesRuntime.getConfigurationManager().addContext(uri);
+		} catch (IOException io) {
+			Activator.log.error(io);
+		}
+	}
+
+	private void display() {
+		DisplayEngine display = new DefaultDisplayEngine();
+
+		IStructuredSelection selection = new StructuredSelection(input);
+
+		Composite parent = new Composite(getDialogArea(), SWT.NONE);
+		parent.setLayout(new FillLayout());
+		parent.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
+		getShell().setSize(600, 400);
+
+		final Set<Tab> tabsList = new LinkedHashSet<Tab>();
+
+		for (View view : views) {
+			for (Section section : view.getSections()) {
+				tabsList.add(section.getTab());
+			}
+		}
+
+		List<Tab> allTabs = new LinkedList<Tab>(tabsList);
+
+		Collections.sort(allTabs, new Comparator<Tab>() {
+
+			/**
+			 * compares two tabs each other
+			 *
+			 * @param tab1
+			 *            first tab to compare
+			 * @param tab2
+			 *            second tab to compare
+			 * @return a negative integer if the first tab should be placed before the second tab
+			 */
+			@Override
+			public int compare(Tab tab1, Tab tab2) {
+				int priority1 = getPriority(tab1);
+				int priority2 = getPriority(tab2);
+
+				if (priority1 < priority2) {
+					return -1;
+				}
+
+				if (priority1 > priority2) {
+					return 1;
+				}
+
+				// p1 == p2
+
+				priority1 = getXWTTabPriority(tab1);
+				priority2 = getXWTTabPriority(tab2);
+
+				if (priority1 < priority2) {
+					return -1;
+				}
+
+				if (priority1 > priority2) {
+					return 1;
+				}
+
+				// p1 == p2
+
+				String label1 = tab1.getLabel();
+				String label2 = tab2.getLabel();
+
+				return Collator.getInstance().compare(label1, label2);
+			}
+
+			private Tab getPreviousTab(Tab tab) {
+				Tab afterTab = tab.getAfterTab();
+				if (tabsList.contains(afterTab)) {
+					return afterTab;
+				}
+
+				// not found. Return null
+				return null;
+			}
+
+			private int getPriority(Tab tab) {
+				Tab previousTab = getPreviousTab(tab);
+				if (previousTab != null) {
+					return getPriority(previousTab) + 1;
+				}
+
+				return getXWTTabPriority(tab);
+			}
+
+			private int getXWTTabPriority(Tab tab) {
+				return tab.getPriority();
+			}
+
+		});
+
+		Map<Tab, Composite> tabs = new LinkedHashMap<Tab, Composite>();
+		if (allTabs.size() > 1) {
+			CTabFolder tabFolder = new CTabFolder(parent, SWT.BOTTOM);
+			tabFolder.setSelectionBackground(new Color[] { tabFolder.getDisplay().getSystemColor(SWT.COLOR_WHITE), tabFolder.getBackground() }, new int[] { 100 }, true);
+			tabFolder.setLayout(new FillLayout());
+			for (Tab tab : allTabs) {
+				CTabItem item = new CTabItem(tabFolder, SWT.NONE);
+				Composite tabControl = new Composite(tabFolder, SWT.NONE);
+				item.setControl(tabControl);
+				item.setText(tab.getLabel());
+				tabs.put(tab, tabControl);
+			}
+		} else if (!allTabs.isEmpty()) {
+			Tab tab = allTabs.get(0);
+			tabs.put(tab, parent);
+		}
+
+		for (View view : views) {
+			for (Section section : view.getSections()) {
+				XWTSection xwtSection = new XWTSection(section, view, display);
+				sections.add(xwtSection);
+
+				xwtSection.createControls(tabs.get(section.getTab()), null);
+				xwtSection.setInput(null, selection);
+				xwtSection.refresh();
+			}
+		}
+
+		getShell().pack();
+		Point size = getShell().getSize();
+		int minWidth = 600;
+		if (size.x < minWidth) {
+			size.x = minWidth;
+		}
+		getShell().setSize(size);
+	}
+
+	/**
+	 * Disposes this dialog
+	 */
+	public void dispose() {
+		for (XWTSection section : sections) {
+			section.dispose();
+		}
+		sections.clear();
+	}
+
+	@Override
+	protected void okPressed() {
+		// Bug 404874: Work-around for Mac platform, where finishing the dialog does not trigger
+		// focus-lost on the last edited control (which would commit its changes)
+		getOkButton().forceFocus();
+		super.okPressed();
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/creation/PropertyEditorFactory.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/creation/PropertyEditorFactory.java
new file mode 100644
index 00000000000..b06af100c97
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/creation/PropertyEditorFactory.java
@@ -0,0 +1,240 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 402525
+ *  Christian W. Damus (CEA) - bug 430077
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.creation;
+
+import java.util.Collection;
+import java.util.Set;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.infra.constraints.runtime.ConstraintEngine;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.internal.ui.messages.Messages;
+import org.eclipse.papyrus.infra.properties.ui.runtime.PropertiesRuntime;
+import org.eclipse.papyrus.infra.widgets.creation.IAtomicOperationExecutor;
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * A generic ReferenceValueFactory, which uses the Property View configurations
+ * to edit objects. For a given object, the factory uses the matching constraints
+ * to find the property views associated to the object, and displays these views
+ * in a Dialog.
+ * This factory cannot instantiate new objects. However, subclasses should override {@link #createObject(Control)} and {@link #canCreateObject()} to
+ * enable
+ * this behavior.
+ *
+ * @see org.eclipse.papyrus.infra.properties.ui.creation.EditionDialog
+ *
+ * @author Camille Letavernier
+ */
+public class PropertyEditorFactory implements ReferenceValueFactory {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public PropertyEditorFactory() {
+	}
+
+	/**
+	 * Return a null value. Implementors should override when object creation
+	 * needs to be supported. Implementors may rely on {@link #createObject(Control, Object)}
+	 *
+	 * @param widget
+	 *            The widget from which this method is called. May be used to retrieve the current shell
+	 * @param context
+	 *            The object being edited, in which context the new object is to be created and which will as a result have a reference to the new object.
+	 *            If there is no context object (creation of a free-floating object) or it cannot be determined, this may be {@code null}
+	 * @return
+	 * 		The newly created object
+	 *
+	 * @see ReferenceValueFactory#createObject(Control, Object)
+	 * @see #createObject(Control, Object, Object)
+	 */
+	@Override
+	public Object createObject(Control widget, Object context) {
+		return null;
+	}
+
+	/**
+	 * This class cannot instantiate objects. However, this method provides
+	 * a base implementation to be used by subclasses.
+	 *
+	 * Subclasses should instantiate the base object, which will then be
+	 * editable via a property dialog.
+	 *
+	 * @param widget
+	 *            The widget used to open the dialog
+	 * @param context
+	 *            The object being edited, in which context the new object is to be created and which will as a result have a reference to the new object.
+	 *            If there is no context object (creation of a free-floating object) or it cannot be determined, this may be {@code null}
+	 * @param source
+	 *            The created EObject. If null, nothing will happen
+	 * @return
+	 * 		The source EObject, which potential in-place modifications
+	 */
+	protected Object createObject(Control widget, Object context, Object source) {
+		if (source == null) {
+			return null;
+		}
+
+		IStructuredSelection selection = new StructuredSelection(source);
+
+		ConstraintEngine<View> constraintEngine = PropertiesRuntime.getConstraintEngine();
+		Set<View> views = constraintEngine.getDisplayUnits(selection);
+		if (!views.isEmpty()) {
+			CreationContext creationContext = getCreationContext(context);
+			creationContext.pushCreatedElement(source);
+			try {
+				return doEdit(widget, source, views, getCreationDialogTitle());
+			} finally {
+				creationContext.popCreatedElement(source);
+			}
+		}
+
+		return source;
+	}
+
+	/**
+	 * Get the creation context for the specified {@code element} in which we are creating a new model element.
+	 * This default implementation simply returns the {@linkplain CreationContext#NULL null implementation}.
+	 * Subclasses should provide implementation suitable to their data model.
+	 *
+	 * @param element
+	 *            an element in which context we are creating a new model element
+	 *
+	 * @return the encapsulated creation context (never {@code null})
+	 */
+	protected CreationContext getCreationContext(Object element) {
+		return CreationContext.NULL;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Collection<Object> validateObjects(Collection<Object> objectsToValidate) {
+		return objectsToValidate;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean canEdit() {
+		return true;
+	}
+
+	/**
+	 * Edits the given object via the matching Property view, if any
+	 * The editing Dialog is directly binded to the underlying object, which means that all modifications are applied
+	 * in real time, and cannot be undone (Except via the "Undo" command). The "Cancel" button is thus disabled.
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory#edit(org.eclipse.swt.widgets.Control, java.lang.Object)
+	 *
+	 * @param widget
+	 *            The widget calling the factory. The Dialog for editing the object will open in this widget's shell
+	 * @param source
+	 *            The object to edit
+	 */
+	@Override
+	public Object edit(Control widget, Object source) {
+		IStructuredSelection selection = new StructuredSelection(source);
+
+		ConstraintEngine<View> constraintEngine = PropertiesRuntime.getConstraintEngine();
+
+		Set<View> views = constraintEngine.getDisplayUnits(selection);
+		if (!views.isEmpty()) {
+			return doEdit(widget, source, views, getEditionDialogTitle(source));
+		}
+
+		return source;
+	}
+
+	protected Object doEdit(Control widget, Object source, Set<View> views, String dialogTitle) {
+		EditionDialog dialog = new EditionDialog(widget.getShell(), true);
+		dialog.setTitle(dialogTitle);
+		dialog.setViews(views);
+		dialog.setInput(source);
+
+		if (dialog.open() != Window.OK) {
+			handleEditCancelled(widget, source);
+			return null;
+		}
+
+		return source;
+	}
+
+	protected void handleEditCancelled(Control widget, Object source) {
+		// Pass
+	}
+
+	/**
+	 * The standard Property Editor Factory cannot instantiate new objects.
+	 * However, subclasses may override this method to return true if they
+	 * implement {@link #createObject(Control)}
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory#canCreateObject()
+	 *
+	 * @return
+	 * 		True if the factory can create a new instance
+	 */
+	@Override
+	public boolean canCreateObject() {
+		return false;
+	}
+
+	/**
+	 * @return
+	 * 		The title of the dialog used to edit the newly created instance
+	 *
+	 * @see #canCreateObject()
+	 * @see #createObject(Control)
+	 */
+	public String getCreationDialogTitle() {
+		return Messages.PropertyEditorFactory_CreateANewElement;
+	}
+
+	public String getEditionDialogTitle(Object objectToEdit) {
+		return "Edit an element";
+	}
+
+	/**
+	 * Obtains the most appropriate operation executor for the object being edited.
+	 *
+	 * @param context
+	 *            the object being edited
+	 * @return the executor to use to run operations (never {@code null})
+	 */
+	public IAtomicOperationExecutor getOperationExecutor(Object context) {
+		IAtomicOperationExecutor result;
+		if (context instanceof IAdaptable) {
+			result = ((IAdaptable) context).getAdapter(IAtomicOperationExecutor.class);
+		} else {
+			result = Platform.getAdapterManager().getAdapter(context, IAtomicOperationExecutor.class);
+		}
+
+		if (result == null) {
+			result = IAtomicOperationExecutor.DEFAULT;
+		}
+
+		return result;
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/AbstractEMFModelElementFactory.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/AbstractEMFModelElementFactory.java
new file mode 100644
index 00000000000..3553264e716
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/AbstractEMFModelElementFactory.java
@@ -0,0 +1,41 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.modelelement;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+
+/**
+ * A partial implementation of a ModelElementFactory for creating {@link EMFModelElement}s
+ *
+ * @author Camille Letavernier
+ *
+ */
+public abstract class AbstractEMFModelElementFactory<T extends EMFModelElement> extends AbstractModelElementFactory<T> {
+
+	@Override
+	protected void updateModelElement(T modelElement, Object newSourceElement) {
+		EObject eObject = EMFHelper.getEObject(newSourceElement);
+		if (eObject == null) {
+			throw new IllegalArgumentException("Cannot resolve EObject selection: " + newSourceElement);
+		}
+
+		updateEMFModelElement(modelElement, eObject);
+	}
+
+	public static void updateEMFModelElement(EMFModelElement modelElement, EObject newEObject) {
+		modelElement.source = newEObject;
+		modelElement.domain = EMFHelper.resolveEditingDomain(newEObject);
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/AbstractModelElement.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/AbstractModelElement.java
new file mode 100644
index 00000000000..ca41ce96107
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/AbstractModelElement.java
@@ -0,0 +1,235 @@
+/*****************************************************************************
+ * Copyright (c) 2011, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.modelelement;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.eclipse.core.databinding.observable.DisposeEvent;
+import org.eclipse.core.databinding.observable.IDisposeListener;
+import org.eclipse.core.databinding.observable.IObservable;
+import org.eclipse.core.databinding.validation.IValidator;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.properties.ui.creation.PropertyEditorFactory;
+import org.eclipse.papyrus.infra.tools.databinding.DelegatingObservable;
+import org.eclipse.papyrus.infra.tools.databinding.IDelegatingObservable;
+import org.eclipse.papyrus.infra.tools.databinding.ReferenceCountedObservable;
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.papyrus.infra.widgets.providers.EmptyContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.util.INameResolutionHelper;
+import org.eclipse.papyrus.infra.widgets.util.IPapyrusConverter;
+
+/**
+ * Provides a default implementation for ModelElement methods applied on the
+ * modelElement's properties.
+ *
+ * @author Camille Letavernier
+ */
+public abstract class AbstractModelElement implements ModelElement, IDataSourceListener {
+
+	/**
+	 * The DataSource owning this ModelElement
+	 */
+	protected DataSource dataSource;
+
+	private final Map<String, IObservable> observables = new HashMap<String, IObservable>();
+
+	private IDisposeListener observableDisposeListener;
+
+	AbstractModelElementFactory<AbstractModelElement> factory;
+
+	/**
+	 * Constructor.
+	 */
+	protected AbstractModelElement() {
+		super();
+	}
+
+	@SuppressWarnings("unchecked")
+	void setFactory(AbstractModelElementFactory<? extends AbstractModelElement> factory) {
+		this.factory = (AbstractModelElementFactory<AbstractModelElement>) factory;
+	}
+
+	public IStaticContentProvider getContentProvider(String propertyPath) {
+		return EmptyContentProvider.instance;
+	}
+
+	public ILabelProvider getLabelProvider(String propertyPath) {
+		return null;
+	}
+
+	public boolean isOrdered(String propertyPath) {
+		return true;
+	}
+
+	public boolean isUnique(String propertyPath) {
+		return false;
+	}
+
+	public boolean isMandatory(String propertyPath) {
+		return false;
+	}
+
+	public boolean isEditable(String propertyPath) {
+		return true;
+	}
+
+	public boolean forceRefresh(String propertyPath) {
+		return false;
+	}
+
+	public void setDataSource(DataSource source) {
+		if (this.dataSource != source) {
+			if (this.dataSource != null) {
+				this.dataSource.removeDataSourceListener(this);
+			}
+
+			this.dataSource = source;
+
+			if (this.dataSource != null) {
+				this.dataSource.addDataSourceListener(this);
+			}
+		}
+	}
+
+	public final void dataSourceChanged(DataSourceChangedEvent event) {
+		if (event.getDataSource() == dataSource) {
+			// The data source changed. Update for the new selection
+			IStructuredSelection selection = dataSource.getSelection();
+			if (selection.isEmpty()) {
+				factory.updateModelElement(this, null);
+			} else if (selection.size() == 1) {
+				factory.updateModelElement(this, selection.getFirstElement());
+			} else {
+				updateMultipleSelection(selection);
+			}
+
+			// Update our observables
+			for (Map.Entry<String, IObservable> next : observables.entrySet()) {
+				IDelegatingObservable wrapper = ((IDelegatingObservable) next.getValue());
+				wrapper.setDelegate(doGetObservable(next.getKey()));
+			}
+		}
+	}
+
+	void updateMultipleSelection(IStructuredSelection selection) {
+		throw new IllegalArgumentException("multiple selection"); //$NON-NLS-1$
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.properties.ui.modelelement.ModelElement#getValueFactory(java.lang.String)
+	 *
+	 * @param propertyPath
+	 * @return a default factory based on the property view configuration to
+	 *         edit objects, as if they were selected in an editor
+	 */
+	public ReferenceValueFactory getValueFactory(String propertyPath) {
+		return new PropertyEditorFactory();
+	}
+
+	public Object getDefaultValue(String propertyPath) {
+		return null;
+	}
+
+	public boolean getDirectCreation(String propertyPath) {
+		return false;
+	}
+
+	public final IObservable getObservable(String propertyPath) {
+		if (!observables.containsKey(propertyPath)) {
+			IObservable observable = doGetObservable(propertyPath);
+			if (observable != null) {
+				// Wrap it so that we may replace the delegate as needed
+				observable = DelegatingObservable.wrap(observable);
+				observable.addDisposeListener(getObservableDisposeListener());
+				ReferenceCountedObservable.Util.retain(observable);
+				observables.put(propertyPath, observable);
+			}
+		}
+		return observables.get(propertyPath);
+	}
+
+	/**
+	 * Creates the IObservable for the given propertyPath
+	 *
+	 * @param propertyPath
+	 *            The path of the property we want to observe
+	 * @return
+	 *         The new IObservable
+	 */
+	protected abstract IObservable doGetObservable(String propertyPath);
+
+	public void dispose() {
+		for (IObservable observable : observables.values()) {
+			if (observableDisposeListener != null) {
+				// Don't let the listener concurrently modify the map in case releasing triggers dispose
+				observable.removeDisposeListener(observableDisposeListener);
+			}
+
+			ReferenceCountedObservable.Util.release(observable);
+		}
+
+		observables.clear();
+		observableDisposeListener = null;
+	}
+
+	public IValidator getValidator(String propertyPath) {
+		return null;
+	}
+
+	private IDisposeListener getObservableDisposeListener() {
+		if (observableDisposeListener == null) {
+			observableDisposeListener = new IDisposeListener() {
+
+				public void handleDispose(DisposeEvent event) {
+					// Remove this property
+					for (Iterator<Map.Entry<String, IObservable>> entries = observables.entrySet().iterator(); entries.hasNext();) {
+						if (entries.next().getValue() == event.getObservable()) {
+							entries.remove();
+							break;
+						}
+					}
+				}
+			};
+		}
+
+		return observableDisposeListener;
+	}
+	
+	
+	/**
+	 * @see org.eclipse.papyrus.infra.properties.ui.modelelement.ModelElement#getNameResolutionHelper(java.lang.String)
+	 *
+	 * @param propertyPath
+	 * @return
+	 */
+	public INameResolutionHelper getNameResolutionHelper(String propertyPath) {
+		return null;
+	}
+
+	/**
+	 * 
+	 * @see org.eclipse.papyrus.infra.properties.ui.modelelement.ModelElement#getPapyrusConverter(java.lang.String)
+	 *
+	 * @param propertyPath
+	 * @return
+	 */
+	public IPapyrusConverter getPapyrusConverter(String propertyPath) {
+		return null;
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/AbstractModelElementFactory.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/AbstractModelElementFactory.java
new file mode 100644
index 00000000000..26838568c95
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/AbstractModelElementFactory.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2014 CEA and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus (CEA) - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.properties.ui.modelelement;
+
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+
+
+/**
+ * This is the AbstractModelElementFactory type. Enjoy.
+ */
+public abstract class AbstractModelElementFactory<T extends AbstractModelElement> implements ModelElementFactory {
+
+	protected AbstractModelElementFactory() {
+		super();
+	}
+
+	public final ModelElement createFromSource(Object sourceElement, DataContextElement context) {
+		AbstractModelElement result = doCreateFromSource(sourceElement, context);
+
+		if (result != null) {
+			result.setFactory(this);
+		}
+
+		return result;
+	}
+
+	protected abstract T doCreateFromSource(Object sourceElement, DataContextElement context);
+
+	protected abstract void updateModelElement(T modelElement, Object newSourceElement);
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/AnnotationModelElement.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/AnnotationModelElement.java
new file mode 100644
index 00000000000..a532ba13c60
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/AnnotationModelElement.java
@@ -0,0 +1,73 @@
+/*****************************************************************************
+ * Copyright (c) 2011, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 323802
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.modelelement;
+
+import org.eclipse.core.databinding.observable.IObservable;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.ui.emf.databinding.AnnotationObservableValue;
+
+/**
+ * A ModelElement for handling EAnnotations
+ *
+ * @author Camille Letavernier
+ */
+public class AnnotationModelElement extends AbstractModelElement {
+
+	/**
+	 * The EModelElement owning the represented EAnnotation
+	 */
+	protected EModelElement source;
+
+	/**
+	 * The editing domain on which the modification commands will be executed
+	 */
+	protected EditingDomain domain;
+
+	/**
+	 * The name of the annotation being represented
+	 */
+	protected String annotationName;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param source
+	 *            The EModelElement owning the EAnnotation that will be edited
+	 * @param domain
+	 *            The EditingDomain on which the commands will be executed
+	 * @param annotationName
+	 *            The name of the EAnnotation to edit. The EAnnotation doesn't need to exist yet
+	 */
+	public AnnotationModelElement(EModelElement source, EditingDomain domain, String annotationName) {
+		this.source = source;
+		this.domain = domain;
+		this.annotationName = annotationName;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public IObservable doGetObservable(String propertyPath) {
+		return new AnnotationObservableValue(source, domain, annotationName, propertyPath);
+	}
+
+	@Override
+	public boolean isEditable(String propertyPath) {
+		return !EMFHelper.isReadOnly(source);
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/AnnotationModelElementFactory.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/AnnotationModelElementFactory.java
new file mode 100644
index 00000000000..c799d042794
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/AnnotationModelElementFactory.java
@@ -0,0 +1,55 @@
+/*****************************************************************************
+ * Copyright (c) 2011, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.modelelement;
+
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+
+/**
+ * A ModelElementFactory for AnnotationModelElements
+ *
+ * @author Camille Letavernier
+ */
+public class AnnotationModelElementFactory extends AbstractModelElementFactory<AnnotationModelElement> {
+
+	@Override
+	protected AnnotationModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {
+		EObject source = EMFHelper.getEObject(sourceElement);
+		if (source == null) {
+			Activator.log.warn("Unable to resolve the selected element to an EObject"); //$NON-NLS-1$
+			return null;
+		}
+
+		if (!(source instanceof EModelElement)) {
+			Activator.log.warn("The selected element must be an EModelElement"); //$NON-NLS-1$
+		}
+
+		EditingDomain domain = EMFHelper.resolveEditingDomain(source);
+		return new AnnotationModelElement((EModelElement) source, domain, context.getName());
+	}
+
+	@Override
+	protected void updateModelElement(AnnotationModelElement modelElement, Object newSourceElement) {
+		EObject eObject = EMFHelper.getEObject(newSourceElement);
+		if (!(eObject instanceof EModelElement)) {
+			throw new IllegalArgumentException("Cannot resolve EModelElement selection: " + newSourceElement);
+		}
+		modelElement.source = (EModelElement) eObject;
+		modelElement.domain = EMFHelper.resolveEditingDomain(eObject);
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/CompositeModelElement.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/CompositeModelElement.java
new file mode 100644
index 00000000000..491043d012d
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/CompositeModelElement.java
@@ -0,0 +1,256 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.modelelement;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+
+import org.eclipse.core.databinding.observable.IObservable;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.tools.databinding.AggregatedObservable;
+import org.eclipse.papyrus.infra.tools.databinding.MultipleObservableValue;
+import org.eclipse.papyrus.infra.widgets.providers.EmptyContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+
+/**
+ * A ModelElement to handle MultiSelection property views.
+ * It is composed of standard ModelElement. The result of method
+ * calls are an aggregation of the results of the same method calls
+ * on each sub-element, when this makes sense (i.e. for booleans)
+ * When an aggregation is not possible, the result of the same method
+ * call on the first element is returned (e.g. for Content and Label providers)
+ *
+ * @author Camille Letavernier
+ */
+public class CompositeModelElement extends AbstractModelElement {
+
+	private final BoundModelElementFactory subModelElementFactory;
+
+
+	public CompositeModelElement(BoundModelElementFactory subModelElementFactory) {
+		super();
+
+		this.subModelElementFactory = subModelElementFactory;
+	}
+
+	@Override
+	public IObservable doGetObservable(String propertyPath) {
+
+		AggregatedObservable observableComposite = null;
+
+		for (ModelElement element : elements) {
+			IObservable observable = element.getObservable(propertyPath);
+
+			// Otherwise, we use a standard AggregatedComposite
+			if (observableComposite == null) {
+				if (observable instanceof AggregatedObservable) {
+					observableComposite = (AggregatedObservable) observable;
+				} else {
+					if (observable instanceof IObservableValue) {
+						observableComposite = new MultipleObservableValue().aggregate(observable);
+						if (observableComposite == null) {
+							return null;
+						}
+					} else {
+						return null; // The support for CompositeObservableList is too complicated.
+						// There are too many non-trivial choices (Union or Intersection display,
+						// unadapted behavior of MultipleValueEditors, ...)
+						// observableComposite = new MultipleObservableList();
+					}
+				}
+			} else {
+				if ((observableComposite = observableComposite.aggregate(observable)) == null) {
+					return null;
+				}
+			}
+		}
+
+		return observableComposite;
+	}
+
+	@Override
+	void updateMultipleSelection(IStructuredSelection selection) {
+		ListIterator<ModelElement> subElements = elements.listIterator();
+		Iterator<?> newSourceElements = selection.iterator();
+
+		// Re-use existing sub-elements, just updating them
+		while (newSourceElements.hasNext() && subElements.hasNext()) {
+			ModelElement nextSubElement = subElements.next();
+			if (nextSubElement instanceof AbstractModelElement) {
+				// Can reuse it
+				AbstractModelElement reusable = (AbstractModelElement) nextSubElement;
+				reusable.factory.updateModelElement(reusable, newSourceElements.next());
+			} else {
+				// Replace it
+				nextSubElement.dispose();
+
+				ModelElement newSubElement = subModelElementFactory.createModelElement(newSourceElements.next());
+				if (newSubElement != null) {
+					subElements.set(newSubElement);
+				} else {
+					// TODO: Report a warning?
+					subElements.remove();
+				}
+			}
+		}
+
+		// And create new ones if necessary
+		while (newSourceElements.hasNext()) {
+			ModelElement newSubElement = subModelElementFactory.createModelElement(newSourceElements.next());
+			if (newSubElement != null) {
+				subElements.add(newSubElement);
+			} // TODO: Else report a warning?
+		}
+
+		// And destroy any unneeded sub-elements
+		while (subElements.hasNext()) {
+			subElements.next().dispose();
+			subElements.remove();
+		}
+	}
+
+	/**
+	 * Adds a sub-model element to this CompositeModelElement
+	 *
+	 * @param element
+	 *            The sub-model element to be added
+	 */
+	public void addModelElement(ModelElement element) {
+		elements.add(element);
+	}
+
+	@Override
+	public IStaticContentProvider getContentProvider(String propertyPath) {
+		if (elements.isEmpty()) {
+			return EmptyContentProvider.instance;
+		}
+
+		return elements.get(0).getContentProvider(propertyPath);
+	}
+
+	@Override
+	public ILabelProvider getLabelProvider(String propertyPath) {
+		if (elements.isEmpty()) {
+			return null;
+		}
+
+		return elements.get(0).getLabelProvider(propertyPath);
+	}
+
+	@Override
+	public boolean isOrdered(String propertyPath) {
+		if (elements.isEmpty()) {
+			return false;
+		}
+
+		for (ModelElement element : elements) {
+			if (element.isOrdered(propertyPath)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	@Override
+	public boolean isUnique(String propertyPath) {
+		if (elements.isEmpty()) {
+			return false;
+		}
+
+		for (ModelElement element : elements) {
+			if (!element.isUnique(propertyPath)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	@Override
+	public boolean isMandatory(String propertyPath) {
+		if (elements.isEmpty()) {
+			return false;
+		}
+
+		for (ModelElement element : elements) {
+			if (!element.isMandatory(propertyPath)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	@Override
+	public boolean isEditable(String propertyPath) {
+		if (elements.isEmpty()) {
+			return false;
+		}
+
+		for (ModelElement element : elements) {
+			if (!element.isEditable(propertyPath)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	private List<ModelElement> elements = new LinkedList<ModelElement>();
+
+	@Override
+	public boolean forceRefresh(String propertyPath) {
+		if (elements.isEmpty()) {
+			return false;
+		}
+
+		for (ModelElement element : elements) {
+			if (element.forceRefresh(propertyPath)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	@Override
+	public Object getDefaultValue(String propertyPath) {
+		if (elements.isEmpty()) {
+			return null;
+		}
+		return elements.get(0).getDefaultValue(propertyPath);
+	}
+
+	public List<ModelElement> getSubElements() {
+		return elements;
+	}
+
+	//
+	// Nested types
+	//
+
+	/**
+	 * Protocol for a factory that a {@link CompositeModelElement} uses to create sub-elements for a multiple
+	 * selection. It binds all of the necessary context so that the only input is a selected source element.
+	 */
+	public interface BoundModelElementFactory {
+
+		ModelElement createModelElement(Object sourceElement);
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/DataSource.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/DataSource.java
new file mode 100644
index 00000000000..c34812a4b43
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/DataSource.java
@@ -0,0 +1,559 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *  Christian W. Damus - bug 455075
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.modelelement;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.eclipse.core.databinding.observable.ChangeEvent;
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.core.databinding.observable.IObservable;
+import org.eclipse.core.databinding.validation.IValidator;
+import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.LabelProviderChangedEvent;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.papyrus.infra.widgets.providers.EmptyContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.util.INameResolutionHelper;
+import org.eclipse.papyrus.infra.widgets.util.IPapyrusConverter;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * A DataSource is an object encapsulating one or more {@link ModelElement}s.
+ * It contains methods to resolve property paths, and forward the methods to
+ * the right ModelElement.
+ *
+ * For example, a UML class stereotyped with the SysML::Blocks::Block will have
+ * two ModelElements : one for UML, and one for the Block stereotype.
+ *
+ * It will be able to resolve paths such as UML:Class:name or
+ * SysML:Blocks:Block:isEncapsulated
+ *
+ * The methods such as isUnique, isEditable or getContentProvider will be
+ * delegated to the resolved ModelElement, with a truncated property path.
+ *
+ * For example, a call to DataSource#isEditable("UML:Class:name") will be
+ * forwarded to UMLModelElement#isEditable("name")
+ *
+ * @author Camille Letavernier
+ */
+public class DataSource implements IChangeListener {
+
+	private final ListenerList changeListeners = new ListenerList(ListenerList.IDENTITY);
+
+	private final ListenerList dataSourceListeners = new ListenerList(ListenerList.IDENTITY);
+
+	private View view;
+
+	private IStructuredSelection selection;
+
+	private Map<String, ModelElement> elements = new HashMap<String, ModelElement>();
+
+	/**
+	 * Constructs a new DataSource from the given view and selection
+	 *
+	 * @param realm
+	 * @param view
+	 * @param selection
+	 *
+	 * @see DataSourceFactory#createDataSourceFromSelection(IStructuredSelection, View)
+	 */
+	protected DataSource(View view, IStructuredSelection selection) {
+		this.view = view;
+		this.selection = selection;
+	}
+
+	/**
+	 * Return the instance of ModelElement associated to the given path
+	 *
+	 * @param propertyPath
+	 *            The propertyPath to lookup
+	 * @return
+	 *         The ModelElement associated to the given propertyPath
+	 */
+	public ModelElement getModelElement(String propertyPath) {
+		// ConfigurationManager.instance.getProperty(propertyPath)
+		String key = propertyPath.substring(0, propertyPath.lastIndexOf(":")); //$NON-NLS-1$
+		if (!elements.containsKey(key)) { // Try to resolve the modelElements on-the-fly
+			ModelElement element = DataSourceFactory.instance.getModelElementFromPropertyPath(this, propertyPath);
+			if (element == null) {
+				Activator.log.warn("Unable to find a ModelElement for " + propertyPath + ". Elements : " + elements); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+			elements.put(key, element);
+		}
+		return elements.get(key);
+	}
+
+	private String getLocalPropertyPath(String propertyPath) {
+		return propertyPath.substring(propertyPath.lastIndexOf(":") + 1); //$NON-NLS-1$
+	}
+
+	/**
+	 * Returns an IObservable corresponding to the given property path
+	 * The observable may be either an IObservableValue or an IObservableList
+	 * The call to this method is delegated to the corresponding ModelElement
+	 * The IObservable objects returned by this method may be shared by
+	 * many instances, which means they should not be disposed directly.
+	 * They will be disposed when this DataSource is disposed.
+	 *
+	 * @param propertyPath
+	 *            The property path for which we want to retrieve an ObservableValue
+	 * @return
+	 *         The IObservable corresponding to the given propertyPath
+	 */
+	public IObservable getObservable(String propertyPath) {
+		String localPropertyPath = getLocalPropertyPath(propertyPath);
+		ModelElement element = getModelElement(propertyPath);
+
+		if (element == null) {
+			return null;
+		}
+
+		IObservable observable = element.getObservable(localPropertyPath);
+		if (observable != null) {
+			observable.addChangeListener(this);
+		}
+
+		return observable;
+	}
+
+	@Override
+	public String toString() {
+		return "[DataSource] " + super.toString(); //$NON-NLS-1$
+	}
+
+	/**
+	 * Returns an IStaticContentProvider corresponding to the given property path
+	 * The call to this method is delegated to the corresponding ModelElement
+	 *
+	 * @param propertyPath
+	 *            The property path for which we want to retrieve a ContentProvider
+	 * @return
+	 *         The IStaticContentProvider corresponding to the given propertyPath
+	 */
+	public IStaticContentProvider getContentProvider(final String propertyPath) {
+		class Delegator extends EncapsulatedContentProvider implements IDataSourceListener {
+
+			{
+				createDelegate();
+				DataSource.this.addDataSourceListener(this);
+			}
+
+			@Override
+			public void dispose() {
+				disposeDelegate();
+				DataSource.this.removeDataSourceListener(this);
+			}
+
+			private void disposeDelegate() {
+				if (encapsulated != null) {
+					encapsulated.dispose();
+					encapsulated = null;
+				}
+
+				// If I had any temporary elements, then they cannot now be relevant
+				clearTemporaryElements();
+			}
+
+			private void createDelegate() {
+				encapsulate(doGetContentProvider(propertyPath));
+			}
+
+			public void dataSourceChanged(DataSourceChangedEvent event) {
+				disposeDelegate();
+				createDelegate();
+			}
+		}
+
+		return new Delegator();
+	}
+
+	protected IStaticContentProvider doGetContentProvider(String propertyPath) {
+		ModelElement element = getModelElement(propertyPath);
+		if (element == null) {
+			return EmptyContentProvider.instance;
+		}
+
+		String localPropertyPath = getLocalPropertyPath(propertyPath);
+		return element.getContentProvider(localPropertyPath);
+	}
+
+	/**
+	 * Returns an ILabelProvider corresponding to the given property path
+	 * The call to this method is delegated to the corresponding ModelElement
+	 *
+	 * @param propertyPath
+	 *            The property path for which we want to retrieve an ILabelProvider
+	 * @return
+	 *         The ILabelProvider corresponding to the given propertyPath
+	 */
+	public ILabelProvider getLabelProvider(final String propertyPath) {
+		class Delegator extends LabelProvider implements IDataSourceListener, ILabelProviderListener {
+			private ILabelProvider delegate;
+
+			private final CopyOnWriteArrayList<ILabelProviderListener> listeners = new CopyOnWriteArrayList<ILabelProviderListener>();
+
+			{
+				DataSource.this.addDataSourceListener(this);
+			}
+
+			@Override
+			public void dispose() {
+				disposeDelegate();
+				super.dispose();
+			}
+
+			private void disposeDelegate() {
+				if (delegate != null) {
+					delegate.removeListener(this);
+					delegate.dispose();
+					delegate = null;
+				}
+			}
+
+			public void dataSourceChanged(DataSourceChangedEvent event) {
+				disposeDelegate();
+			}
+
+			@Override
+			public void addListener(ILabelProviderListener listener) {
+				listeners.addIfAbsent(listener);
+			}
+
+			@Override
+			public void removeListener(ILabelProviderListener listener) {
+				listeners.remove(listener);
+			}
+
+			public void labelProviderChanged(LabelProviderChangedEvent event) {
+				if (!listeners.isEmpty()) {
+					LabelProviderChangedEvent forward = new LabelProviderChangedEvent(this, event.getElements());
+					for (ILabelProviderListener next : listeners) {
+						try {
+							next.labelProviderChanged(forward);
+						} catch (Exception e) {
+							Activator.log.error("Uncaught exception in label provider listener.", e); //$NON-NLS-1$
+						}
+					}
+				}
+			}
+
+			ILabelProvider getDelegate() {
+				if (delegate == null) {
+					delegate = doGetLabelProvider(propertyPath);
+					if (delegate == null) {
+						delegate = new LabelProvider();
+					}
+					delegate.addListener(this);
+				}
+
+				return delegate;
+			}
+
+			@Override
+			public Image getImage(Object element) {
+				return getDelegate().getImage(element);
+			}
+
+			@Override
+			public String getText(Object element) {
+				return getDelegate().getText(element);
+			}
+
+			@Override
+			public boolean isLabelProperty(Object element, String property) {
+				return getDelegate().isLabelProperty(element, property);
+			}
+		}
+
+		return new Delegator();
+	}
+
+	protected ILabelProvider doGetLabelProvider(String propertyPath) {
+		ModelElement element = getModelElement(propertyPath);
+		if (element == null) {
+			return null;
+		}
+		String localPropertyPath = getLocalPropertyPath(propertyPath);
+		return element.getLabelProvider(localPropertyPath);
+	}
+
+	/**
+	 * Adds a change listener to this DataSource. The listener will be notified
+	 * each time a change occurs on one of the IObservable produced by this DataSource
+	 *
+	 * @see DataSource#getObservable(String)
+	 * @param listener
+	 *            The Change listener
+	 */
+	public void addChangeListener(IChangeListener listener) {
+		changeListeners.add(listener);
+	}
+
+	/**
+	 * Removes a change listener from this DataSource.
+	 *
+	 * @param listener
+	 *            The listener to remove
+	 * @see DataSource#addChangeListener(IChangeListener)
+	 */
+	public void removeChangeListener(IChangeListener listener) {
+		changeListeners.remove(listener);
+	}
+
+	public void addDataSourceListener(IDataSourceListener listener) {
+		dataSourceListeners.add(listener);
+	}
+
+	public void removeDataSourceListener(IDataSourceListener listener) {
+		dataSourceListeners.remove(listener);
+	}
+
+	public void handleChange(ChangeEvent event) {
+		Object[] listeners = changeListeners.getListeners();
+		for (int i = 0; i < listeners.length; i++) {
+			try {
+				((IChangeListener) listeners[i]).handleChange(event);
+			} catch (Exception e) {
+				Activator.log.error("Uncaught exception in observable change listener.", e); //$NON-NLS-1$
+			}
+		}
+	}
+
+	protected void fireDataSourceChanged() {
+		Object[] listeners = dataSourceListeners.getListeners();
+		if (listeners.length > 0) {
+			DataSourceChangedEvent event = new DataSourceChangedEvent(this);
+			for (int i = 0; i < listeners.length; i++) {
+				try {
+					((IDataSourceListener) listeners[i]).dataSourceChanged(event);
+				} catch (Exception e) {
+					Activator.log.error("Uncaught exception in data-source listener.", e); //$NON-NLS-1$
+				}
+			}
+		}
+	}
+
+	/**
+	 * @return The view associated to this DataSource
+	 */
+	public View getView() {
+		return view;
+	}
+
+	/**
+	 * @return the selection associated to this DataSource
+	 */
+	public IStructuredSelection getSelection() {
+		return selection;
+	}
+
+	/**
+	 * @param selection
+	 *            the selection to set
+	 */
+	public void setSelection(IStructuredSelection selection) {
+		if (!selection.equals(this.selection)) {
+			this.selection = selection;
+
+			fireDataSourceChanged();
+		}
+	}
+
+	/**
+	 * @param propertyPath
+	 * @return
+	 *         true if the property represented by this propertyPath is ordered
+	 */
+	public boolean isOrdered(String propertyPath) {
+		ModelElement element = getModelElement(propertyPath);
+		if (element == null) {
+			return false;
+		}
+		return element.isOrdered(getLocalPropertyPath(propertyPath));
+	}
+
+	/**
+	 * @param propertyPath
+	 * @return
+	 *         true if the property represented by this propertyPath is unique
+	 */
+	public boolean isUnique(String propertyPath) {
+		ModelElement element = getModelElement(propertyPath);
+		if (element == null) {
+			return false;
+		}
+		return element.isUnique(getLocalPropertyPath(propertyPath));
+	}
+
+	/**
+	 * @param propertyPath
+	 * @return
+	 *         true if the property represented by this propertyPath is mandatory
+	 */
+	public boolean isMandatory(String propertyPath) {
+		ModelElement element = getModelElement(propertyPath);
+		if (element == null) {
+			return false;
+		}
+		return element.isMandatory(getLocalPropertyPath(propertyPath));
+	}
+
+	/**
+	 * @param propertyPath
+	 * @return
+	 *         true if the property represented by this propertyPath is editable
+	 */
+	public boolean isEditable(String propertyPath) {
+		ModelElement element = getModelElement(propertyPath);
+		if (element == null) {
+			return false;
+		}
+		return element.isEditable(getLocalPropertyPath(propertyPath));
+	}
+
+	/**
+	 * Returns true if the given property should be refresh each time a change
+	 * occurs in the property view. May help when the IObservable doesn't
+	 * catch some change events (For example, for some Ecore derived
+	 * properties).
+	 *
+	 * @param propertyPath
+	 * @return true if the refresh should be forced
+	 */
+	public boolean forceRefresh(String propertyPath) {
+		ModelElement element = getModelElement(propertyPath);
+		if (element == null) {
+			return false;
+		}
+		return element.forceRefresh(getLocalPropertyPath(propertyPath));
+	}
+
+	/**
+	 * Return the value factory associated to the given path. May be null
+	 *
+	 * @param propertyPath
+	 *            The property path to lookup
+	 * @return
+	 *         The factory used to edit and/or instantiate values for this property path
+	 */
+	public ReferenceValueFactory getValueFactory(String propertyPath) {
+		ModelElement element = getModelElement(propertyPath);
+		if (element == null) {
+			return null;
+		}
+		return element.getValueFactory(getLocalPropertyPath(propertyPath));
+	}
+
+	/**
+	 * Return the default value for the given property path
+	 *
+	 * @param propertyPath
+	 * @return
+	 *         The default value for the given property
+	 */
+	public Object getDefaultValue(String propertyPath) {
+		ModelElement element = getModelElement(propertyPath);
+		if (element == null) {
+			return null;
+		}
+		return element.getDefaultValue(getLocalPropertyPath(propertyPath));
+	}
+
+	/**
+	 * Indicates if the widget should use the direct creation.
+	 * The direct edition will disable the possibility to browse
+	 * existing elements when the "add" button is pressed.
+	 *
+	 * This is essentially relevant for containment references : this method
+	 * should return false if the widget should only allow creation of new
+	 * elements.
+	 *
+	 * @param propertyPath
+	 * @return
+	 *         True if the widget should use the direct edition option for the given property
+	 */
+	public boolean getDirectCreation(String propertyPath) {
+		ModelElement element = getModelElement(propertyPath);
+		if (element == null) {
+			return true;
+		}
+		return element.getDirectCreation(getLocalPropertyPath(propertyPath));
+	}
+
+	/**
+	 * Disposes this data source.
+	 * This will dispose all ModelElements and IObservable created by this DataSource
+	 */
+	public void dispose() {
+		for (ModelElement element : elements.values()) {
+			if (element != null) {
+				element.dispose();
+			}
+		}
+		elements.clear();
+	}
+
+	/**
+	 * return the IValidator for a property path
+	 *
+	 * @param propertyPath
+	 * @return
+	 */
+	public IValidator getValidator(String propertyPath) {
+		ModelElement element = getModelElement(propertyPath);
+		if (element == null) {
+			return null;
+		}
+		return element.getValidator(getLocalPropertyPath(propertyPath));
+	}
+
+	/**
+	 * return the NameResolutionHelper to use for completion
+	 * 
+	 * @param propertyPath
+	 * @return
+	 */
+	public INameResolutionHelper getNameResolutionHelper(String propertyPath) {
+		ModelElement element = getModelElement(propertyPath);
+		if (element == null) {
+			return null;
+		}
+		return element.getNameResolutionHelper(getLocalPropertyPath(propertyPath));
+	}
+	
+	/**
+	 * return the Papyrus Converter to convert the object to edit or display string and to find the object from a string
+	 * 
+	 * @param propertyPath
+	 * @return
+	 */
+	public IPapyrusConverter getPapyrusConverter(String propertyPath){
+		ModelElement element = getModelElement(propertyPath);
+		if (element == null) {
+			return null;
+		}
+		return element.getPapyrusConverter(getLocalPropertyPath(propertyPath));
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/DataSourceChangedEvent.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/DataSourceChangedEvent.java
new file mode 100644
index 00000000000..d358847911a
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/DataSourceChangedEvent.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2014 CEA and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus (CEA) - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.properties.ui.modelelement;
+
+import java.util.EventObject;
+
+
+/**
+ * This is the DataSourceChangedEvent type. Enjoy.
+ */
+public class DataSourceChangedEvent extends EventObject {
+
+	private static final long serialVersionUID = 1L;
+
+	DataSourceChangedEvent(DataSource source) {
+		super(source);
+	}
+
+	public DataSource getDataSource() {
+		return (DataSource) getSource();
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/DataSourceFactory.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/DataSourceFactory.java
new file mode 100644
index 00000000000..d2c69c49d7a
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/DataSourceFactory.java
@@ -0,0 +1,242 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 435103
+ *  Christian W. Damus (CEA) - bug 417409
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.modelelement;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextRoot;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.environment.ModelElementFactoryDescriptor;
+import org.eclipse.papyrus.infra.properties.ui.util.PropertiesUtil;
+import org.eclipse.papyrus.infra.properties.ui.xwt.XWTSection;
+import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
+import org.eclipse.papyrus.infra.widgets.Activator;
+
+/**
+ * A Factory to build and populate DataSource with the right ModelElements
+ *
+ * @author Camille Letavernier
+ */
+public class DataSourceFactory {
+
+	/**
+	 * Singleton instance for DataSourceFactory
+	 */
+	public static final DataSourceFactory instance = new DataSourceFactory();
+
+	/**
+	 * Creates a new DataSource from a selection and a view.
+	 *
+	 * @param selection
+	 *            The selection of Objects
+	 * @param view
+	 *            The view to display
+	 * @return The DataSource that can be passed to the DisplayEngine to display
+	 *         the view
+	 */
+	public DataSource createDataSourceFromSelection(IStructuredSelection selection, View view) {
+		SelectionEntry selectionEntry = new SelectionEntry(selection, view);
+
+		if (!sources.containsKey(selectionEntry)) {
+			DataSource source = new DataSource(view, selection);
+			sources.put(selectionEntry, source);
+		}
+
+		return sources.get(selectionEntry);
+	}
+
+	public void removeFromCache(IStructuredSelection selection, View view) {
+		if (selection == null || view == null) {
+			return;
+		}
+
+		SelectionEntry entry = new SelectionEntry(selection, view);
+		sources.remove(entry);
+	}
+
+	/**
+	 * Returns the ModelElement corresponding to the given propertyPath and
+	 * DataSource
+	 *
+	 * @param source
+	 *            The DataSource used to retrieved informations such as the View
+	 *            and the Selection
+	 * @param propertyPath
+	 *            The path describing the property for which we want a
+	 *            ModelElement
+	 * @return The matching modelElement
+	 */
+	public ModelElement getModelElementFromPropertyPath(DataSource source, String propertyPath) {
+		String key = propertyPath.substring(0, propertyPath.lastIndexOf(":")); //$NON-NLS-1$
+		for (Context context : PropertiesUtil.getDependencies(source.getView().getContext())) {
+			DataContextElement element = PropertiesUtil.getContextElementByQualifiedName(key, context.getDataContexts());
+			if (element != null) {
+				ModelElement modelElement = DataSourceFactory.instance.createModelElement(element, source.getSelection());
+				if (modelElement != null) {
+					modelElement.setDataSource(source);
+				}
+				return modelElement;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Creates a ModelElement from the given DataContextElement and Selection.
+	 *
+	 * @param contextElement
+	 *            The contextElement for which we are creating a ModelElement
+	 * @param selection
+	 *            The list of objects currently selected
+	 * @return The model element corresponding to the given contextElement and
+	 *         selection
+	 */
+	private ModelElement createModelElement(final DataContextElement contextElement, IStructuredSelection selection) {
+		if (selection.size() == 1) { // Single Selection
+			ModelElement modelElement = createFromSource(selection.getFirstElement(), contextElement);
+			return modelElement;
+		} else { // MultiSelection
+			// Bind the context element in a factory for the composite to create sub-elements
+			CompositeModelElement composite = new CompositeModelElement(new CompositeModelElement.BoundModelElementFactory() {
+
+				public ModelElement createModelElement(Object sourceElement) {
+					return createFromSource(sourceElement, contextElement);
+				}
+			});
+
+			Iterator<?> it = selection.iterator();
+			while (it.hasNext()) {
+				ModelElement element = createFromSource(it.next(), contextElement);
+				if (element != null) {
+					composite.addModelElement(element);
+				}
+			}
+
+			return composite;
+		}
+	}
+
+	/**
+	 * Retrieves the ModelElementFactory for the given DataContextElement. The
+	 * ModelElementFactory is declared by the DataContextRoot owning the given
+	 * DataContextElement
+	 *
+	 * @param context
+	 *            The DataContextElement for which we want to retrieve the
+	 *            ModelElementFactory
+	 * @return The ModelElementFactory corresponding to the given
+	 *         DataContextElement
+	 */
+	private ModelElementFactory getFactory(DataContextElement context) {
+		DataContextRoot rootPackage = getRootPackage(context);
+		ModelElementFactoryDescriptor factoryDescriptor = rootPackage.getModelElementFactory();
+
+		if (factoryDescriptor == null) {
+			Activator.log.warn("No ModelElementFactory is attached to DataContextElement " + getQualifiedName(context)); //$NON-NLS-1$
+			return null;
+		}
+		if (factoryDescriptor.eIsProxy()) {
+			Activator.log.warn("Unresolved reference to the ModelElementFactory: " + EcoreUtil.getURI(factoryDescriptor)); //$NON-NLS-1$
+			return null;
+		}
+
+		String factoryName = factoryDescriptor.getFactoryClass();
+		ModelElementFactory factory = ClassLoaderHelper.newInstance(factoryName, ModelElementFactory.class);
+
+		return factory;
+	}
+
+	private ModelElement createFromSource(Object source, DataContextElement context) {
+		ModelElementFactory factory = getFactory(context);
+
+		if (factory == null) {
+			return null;
+		}
+
+		return factory.createFromSource(source, context);
+	}
+
+	private DataContextRoot getRootPackage(DataContextElement context) {
+		if (context.getPackage() == null) {
+			return (DataContextRoot) context;
+		}
+		return getRootPackage(context.getPackage());
+	}
+
+	private String getQualifiedName(DataContextElement context) {
+		if (context.getPackage() == null) {
+			return context.getName();
+		}
+		return getQualifiedName(context.getPackage()) + ":" + context.getName(); //$NON-NLS-1$
+	}
+
+	/**
+	 * Singleton Constructor.
+	 */
+	private DataSourceFactory() {
+
+	}
+
+	private class SelectionEntry {
+
+		private IStructuredSelection selection;
+
+		private View view;
+
+		public SelectionEntry(IStructuredSelection selection, View view) {
+			if (selection == null) {
+				throw new IllegalArgumentException("The selection must not be null");
+			}
+			if (view == null) {
+				throw new IllegalArgumentException("The view must not be null");
+			}
+			this.selection = selection;
+			this.view = view;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (!(obj instanceof SelectionEntry)) {
+				return false;
+			}
+
+			SelectionEntry other = (SelectionEntry) obj;
+			return other.view.equals(view) && selection.equals(other.selection);
+		}
+
+		@Override
+		public int hashCode() {
+			return selection.hashCode() + view.hashCode();
+		}
+	}
+
+	/**
+	 * More than one {@link XWTSection} may share the same DataSource.
+	 * They all need to listen on the same source, so that they can correctly
+	 * refresh themselves. We maintain a cache for each Selection/View pair.
+	 *
+	 * The cache is cleaned when the sections are disposed.
+	 */
+	// TODO : More than one view can be displayed at the same time. The cache should only
+	// rely on a selection ; not on a selection-view pair.
+	// We may use a (ISelection, Context) key : the DataSource must be associated to a single context
+	private Map<SelectionEntry, DataSource> sources = new HashMap<SelectionEntry, DataSource>();
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/EMFModelElement.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/EMFModelElement.java
new file mode 100644
index 00000000000..98b3abf675b
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/EMFModelElement.java
@@ -0,0 +1,308 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 402525
+ *  Christian W. Damus (CEA) - bug 323802
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.modelelement;
+
+import org.eclipse.core.databinding.observable.IObservable;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.emf.databinding.EMFProperties;
+import org.eclipse.emf.databinding.FeaturePath;
+import org.eclipse.emf.ecore.EAttribute;
+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.edit.domain.EditingDomain;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResourceSet;
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+import org.eclipse.papyrus.infra.properties.ui.creation.EcorePropertyEditorFactory;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList;
+import org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableValue;
+import org.eclipse.papyrus.infra.ui.emf.dialog.NestedEditingDialogContext;
+import org.eclipse.papyrus.infra.ui.emf.providers.EMFContentProvider;
+import org.eclipse.papyrus.infra.ui.emf.providers.EMFLabelProvider;
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+
+/**
+ * A ModelElement to manipulate EMF objects.
+ * This ModelElement uses EMFProperties to retrieve Observables when there
+ * is no Editing Domain, and {@link EMFObservableValue} / {@link EMFObservableList} when
+ * an Editing domain is available
+ *
+ * @author Camille Letavernier
+ */
+public class EMFModelElement extends AbstractModelElement {
+
+	/**
+	 * The EObject manipulated by this ModelElement
+	 */
+	protected EObject source;
+
+	/**
+	 * The Editing Domain of the EObject for this ModelElement
+	 */
+	protected EditingDomain domain;
+
+	/**
+	 *
+	 * Constructs a new EMFModelElement for the given EObject
+	 *
+	 * @param source
+	 */
+	public EMFModelElement(EObject source) {
+		this(source, null);
+	}
+
+	/**
+	 *
+	 * Constructs a new EMFModelElement for the given EObject and Editing Domain
+	 *
+	 * @param source
+	 * @param domain
+	 */
+	public EMFModelElement(EObject source, EditingDomain domain) {
+		this.source = source;
+		this.domain = domain;
+	}
+
+	/**
+	 * @return the EditingDomain for this ModelElement
+	 */
+	public EditingDomain getDomain() {
+		return domain;
+	}
+
+	/**
+	 * @return the EObject for this ModelElement
+	 */
+	public EObject getSource() {
+		return source;
+	}
+
+	@Override
+	protected IObservable doGetObservable(String propertyPath) {
+		FeaturePath featurePath = getFeaturePath(propertyPath);
+		EStructuralFeature feature = getFeature(propertyPath);
+		if (feature == null) {
+			return null;
+		}
+
+		if (feature.getUpperBound() != 1) {
+			IObservableList list = domain == null ? EMFProperties.list(featurePath).observe(source) : new EMFObservableList(EMFProperties.list(featurePath).observe(source), domain, getSource(featurePath), feature);
+			return list;
+		}
+
+		IObservableValue value = domain == null ? EMFProperties.value(featurePath).observe(source) : new EMFObservableValue(getSource(featurePath), feature, domain);
+		return value;
+	}
+
+	/**
+	 * Returns the last EObject by following the given featurePath from the {@link #source} EObject
+	 * The last feature of the featurePath can be used to retrieve value from the returned EObject
+	 *
+	 * @param featurePath
+	 * @return the EObject found by resolving to the given FeaturePath
+	 */
+	public EObject getSource(FeaturePath featurePath) {
+		EObject currentSource = source;
+		EStructuralFeature[] features = featurePath.getFeaturePath();
+		for (int i = 0; i < features.length - 1; i++) {
+			currentSource = (EObject) currentSource.eGet(features[i]);
+		}
+		return currentSource;
+	}
+
+	/**
+	 * Returns the feature represented by the given FeaturePath
+	 *
+	 * @param featurePath
+	 * @return
+	 *         The last feature obtained by navigating the feature path
+	 */
+	public EStructuralFeature getFeature(FeaturePath featurePath) {
+		EStructuralFeature[] features = featurePath.getFeaturePath();
+		return features[features.length - 1];
+	}
+
+	/**
+	 * Returns the feature represented by the given propertyPath.
+	 *
+	 * @param propertyPath
+	 *            The property path may contain one or more dots to navigate the properties (e.g. : feature1.feature2.feature3)
+	 * @return
+	 *         The last feature obtained by resolving the full property path
+	 */
+	public EStructuralFeature getFeature(String propertyPath) {
+		FeaturePath featurePath = getFeaturePath(propertyPath);
+		return getFeature(featurePath);
+	}
+
+	/**
+	 * Returns the featurePath corresponding to the given propertyPath
+	 *
+	 * @param propertyPath
+	 *            The property path may contain one or more dots to navigate the properties (e.g. : feature1.feature2.feature3)
+	 * @return
+	 *         The featurePath corresponding to the given propertyPath
+	 */
+	public FeaturePath getFeaturePath(String propertyPath) {
+		String[] featureNames = propertyPath.split("\\."); //$NON-NLS-1$
+		EStructuralFeature[] features = new EStructuralFeature[featureNames.length];
+
+		int i = 0;
+		EClass currentClass = source.eClass();
+		for (String featureName : featureNames) {
+			EStructuralFeature feature = currentClass.getEStructuralFeature(featureName);
+			features[i++] = feature;
+			if (i < featureNames.length) {
+				if (feature instanceof EReference) {
+					EReference reference = (EReference) feature;
+					EClassifier type = reference.getEType();
+					if (type instanceof EClass) {
+						currentClass = (EClass) type;
+						continue;
+					}
+				}
+
+				Activator.log.warn("Cannot find feature path " + propertyPath + " for EClass " + source.eClass()); //$NON-NLS-1$ //$NON-NLS-2$
+				return null;
+			}
+		}
+
+		return FeaturePath.fromList(features);
+	}
+
+	@Override
+	public IStaticContentProvider getContentProvider(String propertyPath) {
+		FeaturePath featurePath = getFeaturePath(propertyPath);
+		EStructuralFeature feature = getFeature(featurePath);
+		if (feature != null) {
+			return new EMFContentProvider(getSource(featurePath), feature);
+		}
+		return super.getContentProvider(propertyPath);
+	}
+
+	@Override
+	public ILabelProvider getLabelProvider(String propertyPath) {
+		try {
+			LabelProviderService lpSvc = (source.eResource() != null) //
+			? ServiceUtilsForEObject.getInstance().getService(LabelProviderService.class, source) //
+					: ServiceUtilsForResourceSet.getInstance().getService(LabelProviderService.class, NestedEditingDialogContext.getInstance().getResourceSet());
+			return lpSvc.getLabelProvider();
+		} catch (ServiceException ex) {
+			// The service registry isn't always present in the properties view. Don't log an error and use a standard label provider
+			return new EMFLabelProvider();
+		}
+	}
+
+	@Override
+	public boolean isOrdered(String propertyPath) {
+		EStructuralFeature feature = getFeature(propertyPath);
+		if (feature == null) {
+			return true;
+		}
+		return feature.isOrdered();
+	}
+
+	@Override
+	public boolean isUnique(String propertyPath) {
+		EStructuralFeature feature = getFeature(propertyPath);
+		if (feature == null) {
+			return false;
+		}
+		return feature.isUnique();
+	}
+
+	@Override
+	public boolean isMandatory(String propertyPath) {
+		EStructuralFeature feature = getFeature(propertyPath);
+		if (feature == null) {
+			return false;
+		}
+
+		return EMFHelper.isRequired(feature);
+	}
+
+	@Override
+	public final boolean isEditable(String propertyPath) {
+		return isFeatureEditable(propertyPath) && isElementEditable();
+	}
+
+	protected boolean isFeatureEditable(String propertyPath) {
+		EStructuralFeature feature = getFeature(propertyPath);
+		if (feature == null) {
+			return false;
+		}
+		return feature.isChangeable();
+	}
+
+	protected boolean isElementEditable() {
+		return !EMFHelper.isReadOnly(source);
+	}
+
+	@Override
+	public boolean forceRefresh(String propertyPath) {
+		EStructuralFeature feature = getFeature(propertyPath);
+		if (feature == null) {
+			return false;
+		}
+		return feature.isDerived();
+	}
+
+	@Override
+	public ReferenceValueFactory getValueFactory(String propertyPath) {
+		EStructuralFeature feature = getFeature(propertyPath);
+		if (feature != null) {
+			if (feature instanceof EReference) {
+				EReference reference = (EReference) feature;
+				if (reference.isContainment()) {
+					return new EcorePropertyEditorFactory(reference);
+				}
+			}
+		}
+
+		return super.getValueFactory(propertyPath);
+	}
+
+	@Override
+	public Object getDefaultValue(String propertyPath) {
+		EStructuralFeature feature = getFeature(propertyPath);
+		if (feature == null) {
+			return null;
+		}
+		return feature.getDefaultValue();
+	}
+
+	@Override
+	public boolean getDirectCreation(String propertyPath) {
+		EStructuralFeature feature = getFeature(propertyPath);
+		if (feature == null) {
+			return false;
+		}
+
+		if (feature instanceof EAttribute) {
+			return false;
+		}
+
+		return ((EReference) feature).isContainment();
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/EMFModelElementFactory.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/EMFModelElementFactory.java
new file mode 100644
index 00000000000..202ae3587bc
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/EMFModelElementFactory.java
@@ -0,0 +1,41 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.modelelement;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+
+/**
+ * A ModelElementFactory for creating {@link EMFModelElement}s
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class EMFModelElementFactory extends AbstractEMFModelElementFactory<EMFModelElement> {
+
+	@Override
+	protected EMFModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {
+		EObject source = EMFHelper.getEObject(sourceElement);
+		if (source == null) {
+			Activator.log.warn("Unable to resolve the selected element to an EObject"); //$NON-NLS-1$
+			return null;
+		}
+
+		EditingDomain domain = EMFHelper.resolveEditingDomain(source);
+		return new EMFModelElement(source, domain);
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/IDataSourceListener.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/IDataSourceListener.java
new file mode 100644
index 00000000000..c03e8cdef95
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/IDataSourceListener.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2014 CEA and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus (CEA) - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.properties.ui.modelelement;
+
+import java.util.EventListener;
+
+import org.eclipse.core.databinding.observable.IObservable;
+
+
+/**
+ * A listener protocol for changes to a {@link DataSource} (especially its selection). Data sources are not {@linkplain IObservable observables} because that would confuse the XWT bindings framework.
+ *
+ * @see DataSource
+ * @see DataSource#addDataSourceListener(IDataSourceListener)
+ */
+public interface IDataSourceListener extends EventListener {
+
+	void dataSourceChanged(DataSourceChangedEvent event);
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/ModelElement.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/ModelElement.java
new file mode 100644
index 00000000000..0da61ff117e
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/ModelElement.java
@@ -0,0 +1,188 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.modelelement;
+
+import org.eclipse.core.databinding.observable.IObservable;
+import org.eclipse.core.databinding.validation.IValidator;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.papyrus.infra.widgets.providers.EmptyContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.util.INameResolutionHelper;
+import org.eclipse.papyrus.infra.widgets.util.IPapyrusConverter;
+
+/**
+ * An interface representing Model Elements. A ModelElement is associated to a
+ * DataContextElement, and should provide access to all properties for a given
+ * object, though the mean of {@link IObservable}s. It should also be able to
+ * provide informations about each property, such as a ContentProvider for
+ * references.
+ *
+ * @author Camille Letavernier
+ */
+public interface ModelElement {
+
+	/**
+	 * Returns an IObservable for the given propertyPath. The IObservable
+	 * may be either an IObservableValue or an IObservableList.
+	 * The IObservable objects returned by this method may be shared by
+	 * many instances, which means they should not be disposed directly.
+	 * They will be disposed when this ModelElement is disposed.
+	 *
+	 * @param propertyPath
+	 *            The property for which we need an IObservable
+	 * @return
+	 *         The IObservable corresponding to the given propertyPath
+	 */
+	public IObservable getObservable(String propertyPath);
+
+	/**
+	 * Returns an IStaticContentProvider for the given propertyPath. The
+	 * returned value should not be null. If there is no content provider,
+	 * use {@link EmptyContentProvider#instance}
+	 *
+	 * @param propertyPath
+	 *            The name of the property for which we want a Content provider
+	 * @return
+	 *         The IStaticContentProvider containing the available values for
+	 *         the given property
+	 */
+	public IStaticContentProvider getContentProvider(String propertyPath);
+
+	/**
+	 * Returns an ILabelProvider for the given propertypath, or null if
+	 * a default LabelProvider should be used.
+	 *
+	 * @param propertyPath
+	 * @return
+	 *         the LabelProvider for the given path
+	 */
+	public ILabelProvider getLabelProvider(String propertyPath);
+
+	/**
+	 * Returns true if the given property should be ordered. Only relevant
+	 * for Collection properties.
+	 *
+	 * @param propertyPath
+	 * @return
+	 *         true is the property should be ordered
+	 */
+	public boolean isOrdered(String propertyPath);
+
+	/**
+	 * Returns true if the elements from the given property should be unique.
+	 * Only relevant for Colleciton properties.
+	 *
+	 * @param propertyPath
+	 * @return
+	 *         true if the elements should be unique
+	 */
+	public boolean isUnique(String propertyPath);
+
+	/**
+	 * Returns true if the given property is Mandatory.
+	 *
+	 * @param propertyPath
+	 * @return true if the property is mandatory
+	 */
+	public boolean isMandatory(String propertyPath);
+
+	/**
+	 * Returns true if the given property is editable.
+	 *
+	 * @param propertyPath
+	 * @return true if the given property is editable.
+	 */
+	public boolean isEditable(String propertyPath);
+
+	/**
+	 * Returns true if the given property should be refreshed each time a
+	 * change occurs in the property view. This may help when the IObservable
+	 * doesn't catch some change events (For example, for some Ecore derived
+	 * properties).
+	 *
+	 * @param propertyPath
+	 * @return true if the refresh should be forced
+	 */
+	public boolean forceRefresh(String propertyPath);
+
+	/**
+	 * Sets the DataSource associated to this model element
+	 *
+	 * @param source
+	 *            The DataSource to associate to this model element
+	 */
+	public void setDataSource(DataSource source);
+
+	/**
+	 * @param propertyPath
+	 *            the propertyPath to lookup
+	 * @return the default factory used to handle operations such as object
+	 *         creation or edition, or null if these operations are not supported.
+	 *         This factory will typically be used by Multiple value editors, to
+	 *         create or edit a single entry.
+	 */
+	public ReferenceValueFactory getValueFactory(String propertyPath);
+
+	/**
+	 * @param propertyPath
+	 * @return The default value for the property
+	 */
+	public Object getDefaultValue(String propertyPath);
+
+	/**
+	 * Indicates if the widget should be use the direct creation.
+	 * The direct edition will disable the possibility to browse
+	 * existing elements when the "add" button is pressed.
+	 *
+	 * This is essentially relevant for containment references : this method
+	 * should return false if the widget should only allow creation of new
+	 * elements.
+	 *
+	 * @param propertyPath
+	 * @return True if the widget should use the direct edition option for the given property
+	 *
+	 */
+	public boolean getDirectCreation(String propertyPath);
+
+	/**
+	 * Disposes this ModelElement
+	 * All created IObservable will be disposed
+	 */
+	public void dispose();
+
+
+	/**
+	 * return the Validator of a given String propertyPath
+	 *
+	 * @param propertyPath
+	 * @return
+	 */
+	public IValidator getValidator(String propertyPath);
+
+	/**
+	 * return the INameResolutionHelper to use for completion
+	 * 
+	 * @param propertyPath
+	 * @return
+	 */
+	public INameResolutionHelper getNameResolutionHelper(String propertyPath);
+
+	/**
+	 * return the Papyrus Converter to convert the object to edit or display string and to find the object from a string
+	 * 
+	 * @param localPropertyPath
+	 * @return
+	 */
+	public IPapyrusConverter getPapyrusConverter(String localPropertyPath);
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/ModelElementFactory.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/ModelElementFactory.java
new file mode 100644
index 00000000000..ab98e9038c2
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/ModelElementFactory.java
@@ -0,0 +1,42 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.modelelement;
+
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+
+/**
+ * An interface representing ModelElementFactories.
+ * ModelElementFactories are meant to be instantiated reflectively, thus should
+ * always provide a 0-arg constructor.
+ *
+ * @author Camille Letavernier
+ */
+public interface ModelElementFactory {
+
+	/**
+	 * Creates a new ModelElement for given Object and DataContextElement
+	 *
+	 * @param sourceElement
+	 *            The Object for which we need to build a ModelElement. Note that this element
+	 *            comes directly from the Eclipse selection, and may need to be adapted to get
+	 *            the actual semantic object (e.g. sourceElement may be a GMF EditPart, and needs
+	 *            to be adapted to retrieve the EObject). The factory is responsible for resolving
+	 *            the semantic object in such a case.
+	 * @param context
+	 *            The DataContextElement containing the properties that the Property View framework
+	 *            is susceptible to ask for.
+	 * @return
+	 *         The ModelElement corresponding to the sourceElement
+	 */
+	public ModelElement createFromSource(Object sourceElement, DataContextElement context);
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/PreferencesModelElement.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/PreferencesModelElement.java
new file mode 100644
index 00000000000..b17c70cf199
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/PreferencesModelElement.java
@@ -0,0 +1,37 @@
+/*****************************************************************************
+ * 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.properties.ui.modelelement;
+
+import org.eclipse.core.databinding.observable.IObservable;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.internal.ui.observable.PreferencesObservableValue;
+import org.eclipse.ui.preferences.ScopedPreferenceStore;
+
+
+public class PreferencesModelElement extends AbstractModelElement {
+
+	protected DataContextElement context;
+
+	protected IPreferenceStore store;
+
+	public PreferencesModelElement(DataContextElement context) {
+		this.context = context;
+		store = new ScopedPreferenceStore(InstanceScope.INSTANCE, context.getName());
+	}
+
+	@Override
+	protected IObservable doGetObservable(String propertyPath) {
+		return new PreferencesObservableValue(propertyPath, store);
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/PreferencesModelElementFactory.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/PreferencesModelElementFactory.java
new file mode 100644
index 00000000000..11d635a85d0
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/PreferencesModelElementFactory.java
@@ -0,0 +1,31 @@
+/*****************************************************************************
+ * Copyright (c) 2012, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.modelelement;
+
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+
+
+public class PreferencesModelElementFactory extends AbstractModelElementFactory<PreferencesModelElement> {
+
+	@Override
+	protected PreferencesModelElement doCreateFromSource(Object sourceElement, DataContextElement context) {
+		return new PreferencesModelElement(context);
+	}
+
+	@Override
+	protected void updateModelElement(PreferencesModelElement modelElement, Object newSourceElement) {
+		//The is nothing to update. We use the DataContextElement to retrieve the proper PreferenceStore, and it shouldn't have changed.
+		//We don't care about the current selection
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/preferences/Preferences.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/preferences/Preferences.java
new file mode 100644
index 00000000000..470884ada7b
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/preferences/Preferences.java
@@ -0,0 +1,268 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * 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
+ *  Christian W. Damus - bug 482930
+ *  Christian W. Damus - bug 482927
+ *  Christian W. Damus - bug 469188
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.preferences;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExecutableExtension;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.internal.ui.messages.Messages;
+import org.eclipse.papyrus.infra.properties.internal.ui.runtime.ConfigurationConflict;
+import org.eclipse.papyrus.infra.properties.internal.ui.runtime.IInternalConfigurationManager;
+import org.eclipse.papyrus.infra.properties.ui.runtime.IConfigurationManager;
+import org.eclipse.papyrus.infra.properties.ui.runtime.PropertiesRuntime;
+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.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+/**
+ * The PreferencePage for the Papyrus Property View. Offers an UI to enable or disable
+ * property view contexts.
+ *
+ * @author Camille Letavernier
+ */
+public class Preferences extends PreferencePage implements IWorkbenchPreferencePage, IExecutableExtension {
+
+	private String id;
+
+	@Override
+	public void init(IWorkbench workbench) {
+		// Nothing
+	}
+
+	/**
+	 * Queries my unique identifier as configured on the extension point.
+	 * 
+	 * @return my unique identifier
+	 */
+	public final String getID() {
+		return id;
+	}
+
+	@Override
+	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
+		this.id = config.getAttribute("id"); //$NON-NLS-1$
+	}
+
+	@Override
+	protected Control createContents(Composite parent) {
+		Composite self = new Composite(parent, SWT.NONE);
+		self.setLayout(new GridLayout(1, false));
+		self.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+		createHeaderContents(self);
+
+		Label label = new Label(self, SWT.NONE);
+		label.setText(Messages.Preferences_Contexts);
+
+		final IConfigurationManager configurationManager = PropertiesRuntime.getConfigurationManager();
+
+		List<Context> sortedContexts = configurationManager.getContextsForPreferencePage(getID()).stream()
+				.sorted(contextOrdering())
+				.collect(Collectors.toList());
+
+		for (Context context : sortedContexts) {
+			boolean applied = configurationManager.isApplied(context);
+			Button checkbox = new Button(self, SWT.CHECK);
+			checkbox.setText(getLabel(context));
+			checkbox.setSelection(applied);
+			final Context theContext = context;
+			contextState.setContextState(theContext, applied);
+
+			checkbox.addSelectionListener(new SelectionListener() {
+
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					contextState.setContextState(theContext, ((Button) e.widget).getSelection());
+				}
+
+				@Override
+				public void widgetDefaultSelected(SelectionEvent e) {
+					// Nothing
+				}
+
+			});
+
+			checkboxes.put(context, checkbox);
+		}
+
+		createFooterContents(self);
+
+		contextState.snapshot();
+		return null;
+	}
+
+	/**
+	 * Overridden by subclasses to create optional header content above the
+	 * list of context check-boxes.
+	 * 
+	 * @param parent
+	 *            the parent composite
+	 */
+	protected void createHeaderContents(Composite parent) {
+		// Pass
+	}
+
+	/**
+	 * Overridden by subclasses to create optional footer content below the
+	 * list of context check-boxes.
+	 * 
+	 * @param parent
+	 *            the parent composite
+	 */
+	protected void createFooterContents(Composite parent) {
+		// Pass
+	}
+
+	protected Comparator<? super Context> contextOrdering() {
+		return Comparator.comparingInt(this::getCategory).thenComparing(
+				Comparator.comparing(Context::getUserLabel));
+	}
+
+	protected int getCategory(Context context) {
+		IConfigurationManager mgr = PropertiesRuntime.getConfigurationManager();
+		return mgr.isCustomizable(context)
+				? mgr.isPlugin(context) ? 0 : 1
+				: 1000;
+	}
+
+	@Override
+	public boolean performOk() {
+		return contextState.saveContext() && super.performOk();
+	}
+
+	@Override
+	public void performApply() {
+		contextState.saveContext();
+	}
+
+	@Override
+	public void performDefaults() {
+		IConfigurationManager mgr = PropertiesRuntime.getConfigurationManager();
+		for (Context context : mgr.getContexts()) {
+			boolean applied = mgr.isAppliedByDefault(context);
+			Button checkbox = checkboxes.get(context);
+			if (checkbox != null) {
+				checkbox.setSelection(applied);
+				contextState.setContextState(context, applied);
+			}
+		}
+	}
+
+	private String getLabel(Context context) {
+		String qualifier;
+
+		if (PropertiesRuntime.getConfigurationManager().isPlugin(context)) {
+			qualifier = Messages.Preferences_Plugin;
+		} else if (PropertiesRuntime.getConfigurationManager().isMissing(context)) {
+			qualifier = "missing";
+		} else {
+			qualifier = Messages.Preferences_Custom;
+		}
+
+		return String.format("%s (%s)", context.getUserLabel(), qualifier); //$NON-NLS-1$
+	}
+
+	private final ContextState contextState = new ContextState();
+
+	private Map<Context, Button> checkboxes = new HashMap<Context, Button>();
+
+	private class ContextState {
+
+		private Map<Context, Boolean> contexts = new HashMap<>();
+
+		private Map<Context, Boolean> snapshot;
+
+		ContextState() {
+			super();
+		}
+
+		void snapshot() {
+			snapshot = new HashMap<>(contexts);
+		}
+
+		public void setContextState(Context context, boolean applied) {
+			contexts.put(context, applied);
+		}
+
+		public boolean saveContext() {
+			IInternalConfigurationManager mgr = (IInternalConfigurationManager) PropertiesRuntime.getConfigurationManager();
+			for (Entry<Context, Boolean> entry : contexts.entrySet()) {
+				if (entry.getValue()) {
+					mgr.enableContext(entry.getKey(), false);
+				} else {
+					mgr.disableContext(entry.getKey(), false);
+				}
+			}
+
+			mgr.update();
+
+			Set<Context> delta = getChangedContexts();
+			if (!delta.isEmpty()) {
+				Collection<ConfigurationConflict> conflicts = mgr.checkConflicts(delta);
+
+				if (!conflicts.isEmpty()) {
+					String errorMessage = Messages.Preferences_ConflictWarning1;
+					for (ConfigurationConflict conflict : conflicts) {
+						errorMessage += conflict.toString() + "\n"; //$NON-NLS-1$
+					}
+					errorMessage += Messages.Preferences_ConflictWarning2;
+
+					MessageDialog dialog = new MessageDialog(getShell(), Messages.Preferences_ConflictWarningTitle, null, errorMessage, MessageDialog.WARNING,
+							new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL },
+							1);
+					int result = dialog.open();
+					if (result != 0) {
+						return false;
+					}
+				}
+
+				snapshot();
+			}
+
+			return true;
+		}
+
+		Set<Context> getChangedContexts() {
+			return (snapshot == null)
+					? contexts.keySet()
+					: snapshot.keySet().stream()
+							.filter(c -> !Objects.equals(snapshot.get(c), contexts.get(c)))
+							.collect(Collectors.toSet());
+		}
+	}
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/ContainerContentProvider.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/ContainerContentProvider.java
new file mode 100644
index 00000000000..cf39358ea50
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/ContainerContentProvider.java
@@ -0,0 +1,60 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.providers;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.ui.emf.providers.strategy.SemanticEMFContentProvider;
+
+public class ContainerContentProvider extends SemanticEMFContentProvider {
+
+	protected EClass type;
+
+	protected Object input;
+
+	public ContainerContentProvider(EObject source, EReference reference) {
+		super(source.eResource().getResourceSet());
+		type = (EClass) reference.getEType();
+	}
+
+	@Override
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		super.inputChanged(viewer, oldInput, newInput);
+		this.input = newInput;
+		if (newInput instanceof EObject) {
+			this.type = ((EObject) newInput).eClass();
+		}
+	}
+
+	@Override
+	public boolean isValidValue(Object value) {
+		Object adaptedValue = getAdaptedValue(value);
+		if (adaptedValue instanceof EObject) {
+			// We cannot create objects in a read-only object
+			if (EMFHelper.isReadOnly((EObject) adaptedValue)) {
+				return false;
+			}
+
+			// We need at least one valid containment reference to store this
+			// type of object
+			for (EReference reference : ((EObject) adaptedValue).eClass().getEAllReferences()) {
+				if (reference.isContainment() && EMFHelper.isSubclass(this.type, reference.getEReferenceType())) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/CreateInFeatureContentProvider.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/CreateInFeatureContentProvider.java
new file mode 100644
index 00000000000..2b6e29987f6
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/CreateInFeatureContentProvider.java
@@ -0,0 +1,27 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.providers;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+
+
+public interface CreateInFeatureContentProvider extends IStaticContentProvider, IStructuredContentProvider {
+
+	/**
+	 * Sets the type of feature we're looking for
+	 *
+	 * @param type
+	 */
+	public void setType(EClass type);
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/EncapsulatedComboViewer.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/EncapsulatedComboViewer.java
new file mode 100644
index 00000000000..6e0f6aa3375
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/EncapsulatedComboViewer.java
@@ -0,0 +1,47 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.providers;
+
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+
+@Deprecated
+public class EncapsulatedComboViewer extends ComboViewer {
+
+	public EncapsulatedComboViewer(ComboViewer viewer) {
+		super(viewer.getCCombo());
+		if (viewer.getContentProvider() != null) {
+			super.setContentProvider(viewer.getContentProvider());
+		}
+		if (viewer.getInput() != null) {
+			super.setInput(viewer.getInput());
+		}
+		if (viewer.getLabelProvider() != null) {
+			super.setLabelProvider(viewer.getLabelProvider());
+		}
+		if (viewer.getFilters() != null) {
+			super.setFilters(viewer.getFilters());
+		}
+	}
+
+	@Override
+	public void setFilters(ViewerFilter[] filters) {
+		for (ViewerFilter filter : filters) {
+			addFilter(filter);
+		}
+	}
+
+	@Override
+	public void addFilter(ViewerFilter filter) {
+		super.addFilter(new EncapsulatedViewerFilter(filter));
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/EncapsulatedViewerFilter.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/EncapsulatedViewerFilter.java
new file mode 100644
index 00000000000..a9447ae4182
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/EncapsulatedViewerFilter.java
@@ -0,0 +1,36 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.providers;
+
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.papyrus.infra.widgets.providers.UnchangedObject;
+import org.eclipse.papyrus.infra.widgets.providers.UnsetObject;
+
+
+public class EncapsulatedViewerFilter extends ViewerFilter {
+
+	private ViewerFilter viewerFilter;
+
+	public EncapsulatedViewerFilter(ViewerFilter encapsulated) {
+		this.viewerFilter = encapsulated;
+	}
+
+	@Override
+	public boolean select(Viewer viewer, Object parentElement, Object element) {
+		if (element == UnsetObject.instance || element == UnchangedObject.instance) {
+			return true;
+		}
+		return viewerFilter.select(viewer, parentElement, element);
+	}
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/FeatureContentProvider.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/FeatureContentProvider.java
new file mode 100644
index 00000000000..ddeebb7d4e4
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/FeatureContentProvider.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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.providers;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+
+public class FeatureContentProvider implements CreateInFeatureContentProvider {
+
+	private EClass type;
+
+	// private Viewer viewer;
+
+	private Object input;
+
+	public FeatureContentProvider(EClass type) {
+		this.type = type;
+	}
+
+	public void setType(EClass type) {
+		this.type = type;
+	}
+
+	public void dispose() {
+		// Nothing
+	}
+
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		// this.viewer = viewer;
+		this.input = newInput;
+	}
+
+	public Object[] getElements() {
+		return getElements(input);
+	}
+
+	public Object[] getElements(Object inputElement) {
+		EObject inputEObject = EMFHelper.getEObject(input);
+		if (inputEObject == null) {
+			return new Object[0];
+		}
+		List<Object> elements = new LinkedList<Object>();
+		for (EReference reference : inputEObject.eClass().getEAllReferences()) {
+			if (reference.isContainment()) {
+				if (EMFHelper.isSubclass(type, reference.getEReferenceType())) {
+					elements.add(reference);
+				}
+			}
+		}
+		return elements.toArray();
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/PropertiesHeaderLabelProvider.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/PropertiesHeaderLabelProvider.java
new file mode 100644
index 00000000000..e65df2d93d1
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/PropertiesHeaderLabelProvider.java
@@ -0,0 +1,55 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.properties.ui.providers;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.papyrus.infra.services.labelprovider.service.impl.LabelProviderServiceImpl;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * An extensible LabelProvider for the Properties View header. It is based
+ * on the papyrus {@link LabelProviderService}
+ *
+ * @author Camille Letavernier
+ */
+public class PropertiesHeaderLabelProvider extends LabelProvider {
+
+
+	private final ILabelProvider delegate;
+
+	/**
+	 * The {@link LabelProviderService} Context
+	 */
+	public final static String PROPERTIES_HEADER_CONTEXT = "org.eclipse.papyrus.infra.properties.ui.header.labelProvider.context";
+
+	public PropertiesHeaderLabelProvider() {
+		LabelProviderService labelProviderService = new LabelProviderServiceImpl();
+		delegate = labelProviderService.getLabelProvider(PROPERTIES_HEADER_CONTEXT);
+	}
+
+	@Override
+	public String getText(Object element) {
+		return delegate.getText(element);
+	}
+
+	@Override
+	public Image getImage(Object element) {
+		return delegate.getImage(element);
+	}
+
+	@Override
+	public void dispose() {
+		delegate.dispose();
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/SelectionLabelProvider.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/SelectionLabelProvider.java
new file mode 100644
index 00000000000..eb79db1f085
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/SelectionLabelProvider.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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.providers;
+
+import java.util.Collection;
+import java.util.TreeMap;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+import org.eclipse.papyrus.infra.services.labelprovider.service.ExtensibleLabelProvider;
+import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;
+
+/**
+ * A class for providing labels for a selected element.
+ * This label provider dispatchs the calls to the label providers
+ * registered through an extension point, according to the given selection
+ *
+ * @author Camille Letavernier
+ *
+ * @deprecated Use PropertiesHeaderLabelProvider instead
+ */
+@Deprecated
+public class SelectionLabelProvider extends ExtensibleLabelProvider {
+
+	public static final String EXTENSION_ID = "org.eclipse.papyrus.infra.properties.ui.labelprovider"; //$NON-NLS-1$
+
+	public static final String LABEL_PROVIDER_PROPERTY = "labelProvider"; //$NON-NLS-1$
+
+	public static final String PRIORITY_PROPERTY = "priority"; //$NON-NLS-1$
+
+	protected final TreeMap<Integer, Collection<IFilteredLabelProvider>> labelProviders = new TreeMap<Integer, Collection<IFilteredLabelProvider>>();
+
+	public SelectionLabelProvider() {
+		super();
+		readExtensionPoint();
+	}
+
+	protected void readExtensionPoint() {
+		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
+
+		for (IConfigurationElement e : config) {
+			try {
+				final IFilteredLabelProvider provider = (IFilteredLabelProvider) e.createExecutableExtension(LABEL_PROVIDER_PROPERTY);
+				final int priority = Integer.parseInt(e.getAttribute(PRIORITY_PROPERTY));
+				registerProvider(priority, provider);
+			} catch (Exception ex) {
+				Activator.log.error("Cannot load the label provider : " + e.getAttribute(LABEL_PROVIDER_PROPERTY), ex);
+			}
+		}
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/XWTCompliantMaskProvider.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/XWTCompliantMaskProvider.java
new file mode 100644
index 00000000000..23c749b4bad
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/XWTCompliantMaskProvider.java
@@ -0,0 +1,31 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.providers;
+
+import org.eclipse.papyrus.infra.properties.ui.widgets.MaskProvider;
+
+/**
+ * Given the way the XWT files are parsed, the MaskProvider is passed to its
+ * parent before being fully initialized.
+ *
+ * This interface enables a MaskProvider to notify its parent when it is ready,
+ * so that the parent is forced to wait for its MaskProvider to be ready before
+ * it can call any method on it.
+ *
+ * @author Camille Letavernier
+ */
+public interface XWTCompliantMaskProvider extends MaskProvider {
+
+	public void addMaskProviderListener(XWTCompliantMaskProviderListener listener);
+
+	public void removeMaskProviderListener(XWTCompliantMaskProviderListener listener);
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/XWTCompliantMaskProviderListener.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/XWTCompliantMaskProviderListener.java
new file mode 100644
index 00000000000..15614c01573
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/providers/XWTCompliantMaskProviderListener.java
@@ -0,0 +1,23 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.providers;
+
+/**
+ *
+ * @author Camille Letavernier
+ *
+ * @see XWTCompliantMaskProvider
+ */
+public interface XWTCompliantMaskProviderListener {
+
+	public void notifyReady(XWTCompliantMaskProvider provider);
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/ConfigurationManagerRegistry.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/ConfigurationManagerRegistry.java
new file mode 100644
index 00000000000..f7d0c8c4ee2
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/ConfigurationManagerRegistry.java
@@ -0,0 +1,257 @@
+/*****************************************************************************
+ * Copyright (c) 2016 Christian W. Damus and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.properties.ui.runtime;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+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.ResourceSet;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.Property;
+import org.eclipse.papyrus.infra.properties.environment.CompositeWidgetType;
+import org.eclipse.papyrus.infra.properties.environment.LayoutType;
+import org.eclipse.papyrus.infra.properties.environment.Namespace;
+import org.eclipse.papyrus.infra.properties.environment.PropertyEditorType;
+import org.eclipse.papyrus.infra.properties.environment.StandardWidgetType;
+import org.eclipse.papyrus.infra.properties.environment.Type;
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+import org.eclipse.papyrus.infra.properties.internal.ui.runtime.ConfigurationConflict;
+import org.eclipse.papyrus.infra.properties.internal.ui.runtime.IInternalConfigurationManager;
+
+/**
+ * Registry of configuration manager implementations.
+ */
+class ConfigurationManagerRegistry {
+
+	ConfigurationManagerRegistry() {
+		super();
+	}
+
+	IInternalConfigurationManager getConfigurationManager() {
+		IInternalConfigurationManager result = null;
+
+		for (IConfigurationElement config : Platform.getExtensionRegistry().getConfigurationElementsFor(Activator.PLUGIN_ID, "configuration")) { //$NON-NLS-1$
+			switch (config.getName()) {
+			case "configurationManager": //$NON-NLS-1$
+				try {
+					if (result == null) {
+						result = createConfigurationManager(config);
+					} else {
+						Activator.log.warn("Multiple configuration managers installed. Ignoring implementation provided by " + config.getContributor().getName()); //$NON-NLS-1$
+					}
+				} catch (Exception e) {
+					Activator.log.error("Invalid configuration manager extension.", e); //$NON-NLS-1$
+				}
+
+				break;
+			}
+		}
+
+		if (result == null) {
+			result = createNullConfigurationManager();
+		}
+
+		return result;
+	}
+
+	private IInternalConfigurationManager createConfigurationManager(IConfigurationElement config) throws Exception {
+		IInternalConfigurationManager.Provider provider = (IInternalConfigurationManager.Provider) config.createExecutableExtension("class"); //$NON-NLS-1$
+		IInternalConfigurationManager result = provider.getConfigurationManager();
+
+		if (result == null) {
+			Activator.log.error("Extension does not provide a configuration manger in contributor " + config.getContributor().getName(), null); //$NON-NLS-1$
+		}
+
+		return result;
+	}
+
+	private IInternalConfigurationManager createNullConfigurationManager() {
+		Activator.log.error("No configuration manager is installed.  The properties UI will not function.", null); //$NON-NLS-1$
+
+		return new IInternalConfigurationManager() {
+
+			private ViewConstraintEngine constraintEngine;
+
+			@Override
+			public boolean isPlugin(Context context) {
+				return false;
+			}
+
+			@Override
+			public boolean isMissing(Context context) {
+				return true;
+			}
+
+			@Override
+			public boolean isEnabled(Context context) {
+				return false;
+			}
+
+			@Override
+			public boolean isCustomizable(Context propertyViewConfiguration) {
+				return false;
+			}
+
+			@Override
+			public Boolean isAppliedByDefault(Context context) {
+				return Boolean.FALSE;
+			}
+
+			@Override
+			public boolean isApplied(Context context) {
+				return false;
+			}
+
+			@Override
+			public ResourceSet getResourceSet() {
+				return null;
+			}
+
+			@Override
+			public Property getProperty(String propertyPath, Context context) {
+				return null;
+			}
+
+			@Override
+			public Namespace getNamespaceByName(String name) {
+				return null;
+			}
+
+			@Override
+			public Collection<Context> getMissingContexts() {
+				return Collections.emptySet();
+			}
+
+			@Override
+			public Collection<Context> getEnabledContexts() {
+				return Collections.emptySet();
+			}
+
+			@Override
+			public StandardWidgetType getDefaultWidgetType() {
+				return null;
+			}
+
+			@Override
+			public LayoutType getDefaultLayoutType() {
+				return null;
+			}
+
+			@Override
+			public PropertyEditorType getDefaultEditorType(Property property) {
+				return null;
+			}
+
+			@Override
+			public PropertyEditorType getDefaultEditorType(Type propertyType, boolean multiple) {
+				return null;
+			}
+
+			@Override
+			public CompositeWidgetType getDefaultCompositeType() {
+				return null;
+			}
+
+			@Override
+			public Collection<Context> getCustomizableContexts() {
+				return Collections.emptySet();
+			}
+
+			@Override
+			public List<Context> getContextsForPreferencePage(String page) {
+				return Collections.emptyList();
+			}
+
+			@Override
+			public Collection<Context> getContexts() {
+				return Collections.emptySet();
+			}
+
+			@Override
+			public Context getContext(String contextName) {
+				return null;
+			}
+
+			@Override
+			public Context getContext(URI uri) throws IOException {
+				throw new IOException("Properties configuration manager is unavailable"); //$NON-NLS-1$
+			}
+
+			@Override
+			public ViewConstraintEngine getConstraintEngine() {
+				if (constraintEngine == null) {
+					constraintEngine = new ViewConstraintEngineImpl(this);
+				}
+
+				return constraintEngine;
+			}
+
+			@Override
+			public Set<Namespace> getBaseNamespaces() {
+				return Collections.emptySet();
+			}
+
+			@Override
+			public void addContext(URI uri) throws IOException {
+				throw new IOException("Properties configuration manager is unavailable"); //$NON-NLS-1$
+			}
+
+			@Override
+			public void update() {
+				// Pass
+			}
+
+			@Override
+			public void refresh(Context context) {
+				// Pass
+			}
+
+			@Override
+			public void enableContext(Context context, boolean update) {
+				// Pass
+			}
+
+			@Override
+			public void disableContext(Context context, boolean update) {
+				// Pass
+			}
+
+			@Override
+			public void deleteContext(Context context) {
+				// Pass
+			}
+
+			@Override
+			public Collection<ConfigurationConflict> checkConflicts(Collection<? extends Context> contexts) {
+				return Collections.emptySet();
+			}
+
+			@Override
+			public Collection<ConfigurationConflict> checkConflicts() {
+				return Collections.emptySet();
+			}
+
+			@Override
+			public void addContext(Context context, boolean apply) {
+				// Pass
+			}
+		};
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/DefaultDisplayEngine.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/DefaultDisplayEngine.java
new file mode 100644
index 00000000000..d7453d4cc20
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/DefaultDisplayEngine.java
@@ -0,0 +1,406 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - Use URIs to support non-URL-compatible storage (CDO)
+ *  Christian W. Damus (CEA) - bug 417409
+ *  Christian W. Damus (CEA) - bug 444227
+ *  Christian W. Damus - bug 450478
+ *  Christian W. Damus - bug 454536
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.runtime;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.properties.catalog.PropertiesURIHandler;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.Section;
+import org.eclipse.papyrus.infra.properties.contexts.Tab;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.DataSource;
+import org.eclipse.papyrus.infra.properties.ui.util.EMFURLStreamHandler;
+import org.eclipse.papyrus.infra.properties.ui.xwt.XWTTabDescriptor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.views.properties.tabbed.ITabDescriptor;
+import org.eclipse.xwt.DefaultLoadingContext;
+import org.eclipse.xwt.ILoadingContext;
+import org.eclipse.xwt.IXWTLoader;
+import org.eclipse.xwt.XWT;
+
+/**
+ * A default implementation for {@link DisplayEngine}
+ *
+ * @author Camille Letavernier
+ */
+public class DefaultDisplayEngine implements DisplayEngine {
+
+	private ILoadingContext loadingContext = new DefaultLoadingContext(getClass().getClassLoader());
+
+	private Map<String, XWTTabDescriptor> currentTabs = new HashMap<String, XWTTabDescriptor>();
+
+	private TabModel<DataSource> displayedSections = new TabModel<DataSource>();
+
+	private TabModel<Control> controls = new TabModel<Control>();
+
+	private boolean allowDuplicate;
+
+	private Object xmlCache;
+
+	/**
+	 * Constructs a new DisplayEnginet that doesn't allow the duplication of sections
+	 */
+	public DefaultDisplayEngine() {
+		this(false);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param allowDuplicate
+	 *            If false, two calls of {@link #createSection(Composite, Section, DataSource)} with the same
+	 *            section will display the section only once : only the first call is taken into account
+	 *            The main property view doesn't allow duplication, to avoid redundancy when two views link to
+	 *            the same section.
+	 */
+	public DefaultDisplayEngine(boolean allowDuplicate) {
+		this.allowDuplicate = allowDuplicate;
+	}
+
+	@Override
+	public List<ITabDescriptor> getTabDescriptors(Set<View> views) {
+		Map<String, XWTTabDescriptor> result = new LinkedHashMap<String, XWTTabDescriptor>();
+
+		Set<String> selectedSections = new HashSet<String>();
+
+		for (View view : views) {
+			for (Section section : view.getSections()) {
+				if (selectedSections.contains(section.getName())) {
+					continue;
+				}
+
+				Tab tab = section.getTab();
+
+				if (tab == null) {
+					Activator.log.warn("Null tab for " + section); //$NON-NLS-1$
+					continue;
+				}
+
+				XWTTabDescriptor descriptor;
+
+				if (result.containsKey(tab.getId())) {
+					descriptor = result.get(tab.getId());
+				} else {
+					descriptor = new XWTTabDescriptor(tab);
+					result.put(tab.getId(), descriptor);
+				}
+
+				descriptor.addSection(section, view, this);
+				selectedSections.add(section.getName());
+			}
+		}
+
+		for (Map.Entry<String, XWTTabDescriptor> next : result.entrySet()) {
+			XWTTabDescriptor existing = currentTabs.get(next.getKey());
+			if ((existing != null) && !existing.equals(next.getValue())) {
+				// Will have to rebuild this tab
+				disposeControls(next.getKey());
+			}
+		}
+
+		currentTabs = result;
+
+		return new ArrayList<ITabDescriptor>(result.values());
+	}
+
+	/**
+	 * Disposes the controls created by this DisplayEngine for the specified section.
+	 * This should not dispose the engine itself, which can be reused.
+	 */
+	protected void disposeControls(Section section) {
+		Control control = controls.remove(section);
+		if (control != null) {
+			control.dispose();
+		}
+
+		DataSource dataSource = displayedSections.remove(section);
+		if (dataSource != null) {
+			dataSource.dispose();
+		}
+	}
+
+	/**
+	 * Disposes the controls created by this DisplayEngine for the specified tab ID.
+	 * This should not dispose the engine itself, which can be reused.
+	 */
+	protected void disposeControls(String tabID) {
+		for (Control control : this.controls.remove(tabID)) {
+			control.dispose();
+		}
+
+		for (DataSource dataSource : displayedSections.remove(tabID)) {
+			dataSource.dispose();
+		}
+	}
+
+	protected void disposeControls() {
+		for (String next : new ArrayList<String>(controls.tabIDs())) {
+			disposeControls(next);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void dispose() {
+		disposeControls();
+	}
+
+	/**
+	 * Invalidates any caches that I may have because the displayed property UI contexts, constraints, or views have
+	 * changed in some way.
+	 */
+	public void invalidate() {
+		// Forget the cached XML property definitions because they may have changed
+		xmlCache = null;
+	}
+
+	@Override
+	public Control createSection(Composite parent, Section section, DataSource source) {
+		if (source == null) {
+			return null;
+		}
+
+		DataSource existing = getDataSource(section);
+		if (!allowDuplicate && (existing != null)) {
+			if (isUnloaded(existing) || conflictingArity(existing.getSelection(), source.getSelection())) {
+				// If it's a left-over from an unloaded resource, then rebuild the properties UI because
+				// element-browser widgets and other things may remember the previous (now invalid)
+				// resource-set context. Also, cannot reuse a multiple-selection data source for
+				// single-selection and vice-versa
+				disposeControls(section);
+			} else {
+				// Update the data source and fire the bindings
+				existing.setSelection(source.getSelection());
+
+				return null;
+			}
+		}
+
+		Control control = createSection(parent, section, loadXWTFile(section), source);
+
+		addDataSource(section, source);
+
+		if (control != null) {
+			addControl(section, control);
+		}
+
+		return control;
+	}
+
+	protected DataSource getDataSource(Section section) {
+		return displayedSections.get(section);
+	}
+
+	/**
+	 * Queries whether any object selected in a data source is unloaded (now an EMF proxy object).
+	 *
+	 * @param dataSource
+	 *            a data source
+	 * @return whether it contains an unloaded model element
+	 */
+	protected boolean isUnloaded(DataSource dataSource) {
+		boolean result = false;
+
+		for (Iterator<?> iter = dataSource.getSelection().iterator(); !result && iter.hasNext();) {
+			EObject next = EMFHelper.getEObject(iter.next());
+			result = (next != null) && next.eIsProxy();
+		}
+
+		return result;
+	}
+
+	protected boolean conflictingArity(IStructuredSelection selection1, IStructuredSelection selection2) {
+		return (selection1.size() <= 1) != (selection2.size() <= 1);
+	}
+
+	/**
+	 * Adds a new {@code dataSource} for a property {@code section}.
+	 *
+	 * @return the previously-recorded data source, if any, for this {@code section} which has now been displaced
+	 */
+	protected DataSource addDataSource(Section section, DataSource dataSource) {
+		return displayedSections.put(section, dataSource);
+	}
+
+	protected void addControl(final Section section, Control control) {
+		controls.put(section, control);
+
+		control.addDisposeListener(new DisposeListener() {
+
+			@Override
+			public void widgetDisposed(DisposeEvent e) {
+				// Perhaps the tabbed properties view is disposing a tab that is not shown by the new selection
+				displayedSections.remove(section);
+				controls.remove(section);
+			}
+		});
+	}
+
+	@Override
+	public void refreshSection(Composite parent, Section section, DataSource source) {
+		for (Control control : parent.getChildren()) {
+			control.dispose();
+		}
+
+		Control control = createSection(parent, section, loadXWTFile(section), source);
+
+		addDataSource(section, source);
+
+		if (control != null) {
+			addControl(section, control);
+		}
+	}
+
+	@Override
+	public Control createSection(Composite parent, Section section, URI sectionFile, DataSource source) {
+		if (sectionFile == null) {
+			sectionFile = loadXWTFile(section);
+			if (sectionFile == null) {
+				return null;
+			}
+		}
+
+		ILoadingContext xwtContext = XWT.getLoadingContext();
+		XWT.setLoadingContext(loadingContext);
+
+		Control control = null;
+
+		try {
+			ResourceSet rset = section.eResource().getResourceSet();
+			URL url = new URL(null, sectionFile.toString(), new EMFURLStreamHandler(rset.getURIConverter()));
+
+			Map<String, Object> options = new HashMap<String, Object>();
+			options.put(IXWTLoader.CONTAINER_PROPERTY, parent);
+			options.put(IXWTLoader.DATACONTEXT_PROPERTY, source);
+			options.put(IXWTLoader.XML_CACHE_PROPERTY, (xmlCache != null) ? xmlCache : Boolean.TRUE);
+			control = (Control) XWT.loadWithOptions(url, options);
+			xmlCache = options.get(IXWTLoader.XML_CACHE_PROPERTY);
+
+			if (control != null) {
+				control.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+				addControl(section, control);
+			}
+		} catch (Exception ex) {
+			Activator.log.error("Error while loading " + section.getSectionFile(), ex); //$NON-NLS-1$
+			disposeControls(section.getTab().getId());
+			Label label = new Label(parent, SWT.NONE);
+			label.setText("An error occured in the property view. The file " + section.getSectionFile() + " could not be loaded"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		layout(parent);
+
+		XWT.setLoadingContext(xwtContext);
+
+		return control;
+	}
+
+	private URI loadXWTFile(Section section) {
+		EObject tab = section.eContainer();
+		Context context = (Context) tab.eContainer();
+		if (context.eResource() == null) {
+			context = PropertiesRuntime.getConfigurationManager().getContext(context.getName());
+			Activator.log.warn("No resource for Context : " + context + " ; refreshing the model"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+
+		URI sectionURI = URI.createURI(section.getSectionFile());
+		URI baseURI = context.eResource().getURI();
+		if (PropertiesURIHandler.PROPERTIES_SCHEME.equals(baseURI.scheme())) {
+			PropertiesURIHandler handler = new PropertiesURIHandler();
+			baseURI = handler.getConvertedURI(baseURI);
+		}
+		sectionURI = sectionURI.resolve(baseURI);
+
+		return sectionURI;
+	}
+
+	private void layout(Composite parent) {
+		parent.getParent().getParent().layout();
+		parent.getParent().layout();
+		parent.layout();
+	}
+
+	@Override
+	public void removeSection(Composite parent) {
+		for (Control control : parent.getChildren()) {
+			control.dispose();
+		}
+		layout(parent);
+	}
+
+	/**
+	 * Creates a proxy for a {@code section} that makes it distinct from other occurrences of the same section, according to some
+	 * arbitrary {@code disciminator}.
+	 *
+	 * @param section
+	 *            a section to be repeated with unique discriminators
+	 * @param discriminator
+	 *            this {@code section}'s discriminator value
+	 *
+	 * @return the proxy instance combining the identity of the {@code section} with its unique {@code discriminator}
+	 */
+	public static Section discriminate(Section section, Object discriminator) {
+		if (section == null) {
+			throw new IllegalArgumentException("null section");
+		}
+		if (discriminator == null) {
+			throw new IllegalArgumentException("null discriminator");
+		}
+		if (SectionDiscriminator.isDiscriminated(section)) {
+			throw new IllegalArgumentException("section already has a discriminator");
+		}
+
+		return SectionDiscriminator.discriminate(section, discriminator);
+	}
+
+	/**
+	 * Obtains the discriminator for a {@code section} proxy, if it is a proxy.
+	 *
+	 * @param section
+	 *            a section that is repeated with unique discriminators
+	 * @return this {@code section}'s discriminator value, or {@code null} if it is a singleton (non-proxy) section
+	 */
+	public static Object getDiscriminator(Section section) {
+		if (section == null) {
+			throw new IllegalArgumentException("null section");
+		}
+
+		return SectionDiscriminator.getDiscriminator(section);
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/DisplayEngine.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/DisplayEngine.java
new file mode 100644
index 00000000000..f15b31d59f4
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/DisplayEngine.java
@@ -0,0 +1,103 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - Use URIs to support non-URL-compatible storage (CDO)
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.runtime;
+
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.infra.properties.contexts.Section;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.DataSource;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.views.properties.tabbed.ITabDescriptor;
+
+/**
+ * An interface representing a Display Engine.
+ * A Display Engine is responsible for displaying {@link Section}s in a given Composite.
+ * It is also responsible for retrieving the {@link ITabDescriptor}s for a given set of {@link View}s
+ *
+ * @author Camille Letavernier
+ */
+public interface DisplayEngine {
+
+	/**
+	 * Returns a list of ITabDescriptors for the given set of Views.
+	 * The list of tabs is retrieved by navigating the views' sections
+	 *
+	 * @param views
+	 *            The views from which to retrieve the tab descriptors
+	 * @return
+	 *         The tab descriptors corresponding to the given views
+	 */
+	public List<ITabDescriptor> getTabDescriptors(Set<View> views);
+
+	/**
+	 * Displays the section in the given parent Composite, and binds the widgets
+	 * to the given DataSource.
+	 *
+	 * @param parent
+	 *            The Composite widget in which the section is displayed
+	 * @param section
+	 *            The section to display
+	 * @param source
+	 *            The DataSource to bind to the section's widgets.
+	 * @return
+	 *         The generated Control
+	 */
+	public Control createSection(Composite parent, Section section, DataSource source);
+
+	/**
+	 * Displays the section in the given parent Composite. The section is loaded from
+	 * the given URL instead of the section's sectionFile.
+	 *
+	 * @param parent
+	 *            The Composite widget in which the section is displayed. Should not be null
+	 * @param section
+	 *            The section to display. Should not be null
+	 * @param sectionFile
+	 *            The URI replacing the section's sectionFile. If null, the section's sectionFile will
+	 *            be used
+	 * @param source
+	 *            The DataSource to bind to the section's widgets. May be null.
+	 * @return
+	 *         The generated Control
+	 */
+	public Control createSection(Composite parent, Section section, URI sectionFile, DataSource source);
+
+	/**
+	 * Refresh the given section.
+	 *
+	 * @param parent
+	 *            The Composite in which the section should be displayed.
+	 * @param section
+	 *            The section to display.
+	 * @param source
+	 *            The DataSource to bind to the section's widgets.
+	 */
+	public void refreshSection(Composite parent, Section section, DataSource source);
+
+	/**
+	 * Dispose the section's contents.
+	 *
+	 * @param self
+	 *            The Composite containing the section's Control.
+	 */
+	public void removeSection(Composite self);
+
+	/**
+	 * Disposes this display engine
+	 */
+	public void dispose();
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/EmbeddedDisplayEngine.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/EmbeddedDisplayEngine.java
new file mode 100644
index 00000000000..3819ef53204
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/EmbeddedDisplayEngine.java
@@ -0,0 +1,239 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.runtime;
+
+import java.text.Collator;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.papyrus.infra.properties.contexts.Section;
+import org.eclipse.papyrus.infra.properties.contexts.Tab;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.ui.xwt.XWTSection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.ISection;
+
+/**
+ * A Property View display engine which can be embedded in a composite
+ *
+ * @author Camille Letavernier
+ */
+public class EmbeddedDisplayEngine extends DefaultDisplayEngine implements SelectionListener {
+
+	private String lastTabId;
+
+	/**
+	 * The displayed CTabFolder
+	 * May be null
+	 */
+	protected CTabFolder currentFolder;
+
+	protected Composite self;
+
+	/**
+	 * The currently displayed sections
+	 */
+	protected Set<ISection> displayedSections = new HashSet<ISection>();
+
+	/**
+	 *
+	 * @param views
+	 * @param parent
+	 * @param selection
+	 * @param style
+	 *            SWT.BOTTOM or SWT.TOP (Tabs' position)
+	 */
+	public void display(Set<? extends View> views, Composite parent, ISelection selection, int style) {
+		disposeControls();
+
+		self = new Composite(parent, SWT.NONE);
+
+		self.setLayout(new FillLayout());
+
+		final Set<Tab> tabsList = new LinkedHashSet<Tab>();
+
+		for (View view : views) {
+			for (Section section : view.getSections()) {
+				tabsList.add(section.getTab());
+			}
+		}
+
+		List<Tab> allTabs = new LinkedList<Tab>(tabsList);
+
+		Collections.sort(allTabs, new Comparator<Tab>() {
+
+			/**
+			 * compares two tabs each other
+			 *
+			 * @param tab1
+			 *            first tab to compare
+			 * @param tab2
+			 *            second tab to compare
+			 * @return a negative integer if the first tab should be placed before the second tab
+			 */
+			public int compare(Tab tab1, Tab tab2) {
+				int priority1 = getPriority(tab1);
+				int priority2 = getPriority(tab2);
+
+				if (priority1 < priority2) {
+					return -1;
+				}
+
+				if (priority1 > priority2) {
+					return 1;
+				}
+
+				// p1 == p2
+
+				priority1 = getXWTTabPriority(tab1);
+				priority2 = getXWTTabPriority(tab2);
+
+				if (priority1 < priority2) {
+					return -1;
+				}
+
+				if (priority1 > priority2) {
+					return 1;
+				}
+
+				// p1 == p2
+
+				String label1 = tab1.getLabel();
+				String label2 = tab2.getLabel();
+
+				return Collator.getInstance().compare(label1, label2);
+			}
+
+			private Tab getPreviousTab(Tab tab) {
+				Tab afterTab = tab.getAfterTab();
+				if (tabsList.contains(afterTab)) {
+					return afterTab;
+				}
+
+				// not found. Return null
+				return null;
+			}
+
+			private int getPriority(Tab tab) {
+				Tab previousTab = getPreviousTab(tab);
+				if (previousTab != null) {
+					return getPriority(previousTab) + 1;
+				}
+
+				return getXWTTabPriority(tab);
+			}
+
+			private int getXWTTabPriority(Tab tab) {
+				return tab.getPriority();
+			}
+
+		});
+
+		Map<Tab, Composite> tabs = new LinkedHashMap<Tab, Composite>();
+
+		if (allTabs.size() > 1) {
+			CTabItem selectedTab = null;
+
+			currentFolder = new CTabFolder(self, style);
+			currentFolder.setSelectionBackground(new Color[] { currentFolder.getDisplay().getSystemColor(SWT.COLOR_WHITE), currentFolder.getBackground() }, new int[] { 100 }, true);
+			currentFolder.setLayout(new FillLayout());
+			for (Tab tab : allTabs) {
+				CTabItem item = new CTabItem(currentFolder, SWT.NONE);
+				Composite tabControl = new Composite(currentFolder, SWT.NONE);
+				item.setControl(tabControl);
+				item.setText(tab.getLabel());
+				item.setData("id", tab.getId()); //$NON-NLS-1$
+				if (tab.getId().equals(lastTabId)) {
+					selectedTab = item;
+				}
+				tabs.put(tab, tabControl);
+			}
+			currentFolder.addSelectionListener(this);
+
+
+			if (selectedTab == null) {
+				selectedTab = currentFolder.getItem(0);
+			}
+
+			currentFolder.setSelection(selectedTab);
+		} else if (!allTabs.isEmpty()) {
+			Tab tab = allTabs.get(0);
+			tabs.put(tab, self);
+		} else {
+			return;
+		}
+
+		for (View view : views) {
+			for (Section section : view.getSections()) {
+				XWTSection xwtSection = new XWTSection(section, view, this);
+
+				xwtSection.createControls(tabs.get(section.getTab()), null);
+				xwtSection.setInput(null, selection);
+				xwtSection.refresh();
+
+				displayedSections.add(xwtSection);
+			}
+		}
+
+		self.layout();
+	}
+
+	@Override
+	protected void disposeControls() {
+		super.disposeControls();
+		if (self != null) {
+			self.dispose();
+			self = null;
+			currentFolder = null;
+		}
+
+		// if(currentFolder != null) {
+		// currentFolder.dispose();
+		// currentFolder = null;
+		// }
+
+		for (ISection section : displayedSections) {
+			section.dispose();
+		}
+	}
+
+	public void widgetSelected(SelectionEvent e) {
+		if (e.widget instanceof CTabFolder) {
+			CTabFolder folder = (CTabFolder) e.widget;
+			CTabItem lastTab = folder.getSelection();
+			Object lastId = lastTab.getData("id"); //$NON-NLS-1$
+			if (lastId != null && lastId instanceof String) {
+				lastTabId = (String) lastId;
+			}
+		}
+	}
+
+	public void widgetDefaultSelected(SelectionEvent e) {
+		// Nothing
+	}
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/IConfigurationManager.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/IConfigurationManager.java
new file mode 100644
index 00000000000..609a68a236e
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/IConfigurationManager.java
@@ -0,0 +1,211 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - Factor out workspace storage for pluggable storage providers (CDO)
+ *  Christian W. Damus (CEA) - Support implicit enablement of prototypes of unavailable contexts (CDO)
+ *  Christian W. Damus - bugs 482930, 469188, 485220
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.properties.ui.runtime;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.Property;
+import org.eclipse.papyrus.infra.properties.environment.CompositeWidgetType;
+import org.eclipse.papyrus.infra.properties.environment.LayoutType;
+import org.eclipse.papyrus.infra.properties.environment.Namespace;
+import org.eclipse.papyrus.infra.properties.environment.PropertyEditorType;
+import org.eclipse.papyrus.infra.properties.environment.StandardWidgetType;
+import org.eclipse.papyrus.infra.properties.environment.Type;
+import org.eclipse.papyrus.infra.properties.internal.ContextExtensionPoint;
+
+
+/**
+ * Central API of the Property View framework. It lists the available environments and contexts,
+ * and is responsible for Enabling or Disabling contexts programmatically.
+ *
+ * All {@link Context}s should have unique names.
+ *
+ * @author Camille Letavernier
+ */
+public interface IConfigurationManager {
+
+	/**
+	 * Tests if a Context is enabled.
+	 *
+	 * @param context
+	 * @return
+	 * 		true if the given context is enabled.
+	 */
+	boolean isApplied(Context context);
+
+	Boolean isAppliedByDefault(Context context);
+
+	/**
+	 * @return the list of <strong>enabled</strong> contexts
+	 */
+	Collection<Context> getEnabledContexts();
+
+	/**
+	 * Queries whether a given context is {@linkplain #getEnabledContexts() enabled}.
+	 * 
+	 * @param context
+	 *            a context
+	 * @return whether it is currently enabled
+	 * 
+	 * @see #getEnabledContexts()
+	 */
+	boolean isEnabled(Context context);
+
+	/**
+	 * Tests if a Context is a plugin context. plugin contexts
+	 * are registered through {@link ContextExtensionPoint} and are
+	 * read-only.
+	 *
+	 * @param context
+	 * @return
+	 * 		True if the context comes from a plugin, and is thus read-only
+	 */
+	boolean isPlugin(Context context);
+
+	/**
+	 * 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
+	 * @return whether it represents a missing context
+	 */
+	boolean isMissing(Context context);
+
+	/**
+	 * Loads a Context from the given URI. The model is loaded in the {@link ConfigurationManager}'s resourceSet
+	 *
+	 * @param uri
+	 *            The URI from which the Context is loaded
+	 * @return
+	 * 		The loaded context
+	 * @throws IOException
+	 *             If the URI doesn't represent a valid Context model
+	 */
+	Context getContext(URI uri) throws IOException;
+
+	/**
+	 * Returns the context from the given context name
+	 *
+	 * @param contextName
+	 *            The name of the context to retrieve
+	 * @return
+	 * 		The context corresponding to the given name
+	 */
+	Context getContext(String contextName);
+
+	/**
+	 * Returns all the known contexts, even if they are not applied
+	 * To get only applied contexts, see {@link #getEnabledContexts()}
+	 *
+	 * @return All known contexts
+	 */
+	Collection<Context> getContexts();
+
+	/**
+	 * Returns all the known customizable contexts.
+	 *
+	 * @return All known contexts
+	 *
+	 * @see {@link #getEnabledContexts()}
+	 */
+	Collection<Context> getCustomizableContexts();
+
+	/**
+	 * Obtains proxies (not the EMF kind) for all contexts that the system knows about
+	 * but are currently unavailable.
+	 *
+	 * @return the current collection of missing contexts
+	 */
+	Collection<Context> getMissingContexts();
+
+	/**
+	 * @return the default implementation of CompositeWidgetType
+	 */
+	CompositeWidgetType getDefaultCompositeType();
+
+	/**
+	 * @return the default implementation of LayoutType
+	 */
+	LayoutType getDefaultLayoutType();
+
+	/**
+	 * @return the default implementation of StandardWidgetType
+	 */
+	StandardWidgetType getDefaultWidgetType();
+
+	/**
+	 * @param propertyType
+	 * @param multiple
+	 * @return the default implementation of PropertyEditorType for the given property Type
+	 *         and multiplicity
+	 */
+	PropertyEditorType getDefaultEditorType(Type propertyType, boolean multiple);
+
+	/**
+	 * Returns the default XWT namespaces
+	 *
+	 * @return the default XWT namespaces
+	 */
+	Set<Namespace> getBaseNamespaces();
+
+	/**
+	 * @param name
+	 * @return
+	 * 		The namespace corresponding to the given name
+	 */
+	Namespace getNamespaceByName(String name);
+
+	/**
+	 * @param property
+	 * @return
+	 * 		the default PropertyEditorType for the given Property
+	 */
+	PropertyEditorType getDefaultEditorType(Property property);
+
+	/**
+	 * Retrieves the Property object associated to the propertyPath in the given context
+	 *
+	 * @param propertyPath
+	 * @param context
+	 * @return
+	 * 		The property associated to the given propertyPath
+	 */
+	Property getProperty(String propertyPath, Context context);
+
+	/**
+	 * Returns the ResourceSet associated to the ConfigurationManager,
+	 * ie. the ResourceSet containing all Environments and Contexts
+	 *
+	 * @return
+	 */
+	ResourceSet getResourceSet();
+
+	boolean isCustomizable(Context propertyViewConfiguration);
+
+	ViewConstraintEngine getConstraintEngine();
+
+	List<Context> getContextsForPreferencePage(String page);
+
+	void addContext(URI uri) throws IOException;
+
+}
\ No newline at end of file
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/PropertiesRuntime.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/PropertiesRuntime.java
new file mode 100644
index 00000000000..1594341270b
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/PropertiesRuntime.java
@@ -0,0 +1,52 @@
+/*****************************************************************************
+ * Copyright (c) 2016 Christian W. Damus and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.properties.ui.runtime;
+
+import org.eclipse.papyrus.infra.constraints.runtime.ConstraintEngine;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+
+/**
+ * Access to core Properties UI run-time services.
+ */
+public class PropertiesRuntime {
+
+	private static final IConfigurationManager configManager = new ConfigurationManagerRegistry().getConfigurationManager();
+
+	/**
+	 * Not instantiable by clients.
+	 */
+	private PropertiesRuntime() {
+		super();
+	}
+
+	/**
+	 * Obtains the Papyrus Properties Configuration Manager. The result will never be null
+	 * but, if no suitable instance of the configuration manager API is installed, the
+	 * result will be a useless configuration manager that provides no configurations at all.
+	 * 
+	 * @return the configuration manager
+	 */
+	public static IConfigurationManager getConfigurationManager() {
+		return configManager;
+	}
+
+	/**
+	 * Obtains the {@linkplain #getConfigurationManager() configuration manager}'s constraint engine.
+	 * 
+	 * @return the constraint engine
+	 */
+	public static ConstraintEngine<View> getConstraintEngine() {
+		return getConfigurationManager().getConstraintEngine();
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/SectionDiscriminator.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/SectionDiscriminator.java
new file mode 100644
index 00000000000..f10c6cfc92f
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/SectionDiscriminator.java
@@ -0,0 +1,108 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.properties.ui.runtime;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.papyrus.infra.properties.contexts.Section;
+
+/**
+ * A proxy for {@link Section}s that distinguishes multiple occurrences of the same instance via an arbitrary discriminator.
+ */
+class SectionDiscriminator implements InvocationHandler {
+	private static final Class<?>[] PROXY_INTERFACES = { Section.class, EObject.class, InternalEObject.class };
+
+	private final Section section;
+	private final Object discriminator;
+
+	SectionDiscriminator(Section section, Object discriminator) {
+		this.section = section;
+		this.discriminator = discriminator;
+	}
+
+	static Section discriminate(Section section, Object discriminator) {
+		return (Section) Proxy.newProxyInstance(section.getClass().getClassLoader(), PROXY_INTERFACES, new SectionDiscriminator(section, discriminator));
+	}
+
+	static Object getDiscriminator(Section section) {
+		Object result = null;
+
+		if (Proxy.isProxyClass(section.getClass())) {
+			InvocationHandler handler = Proxy.getInvocationHandler(section);
+			if (handler instanceof SectionDiscriminator) {
+				result = ((SectionDiscriminator) handler).discriminator;
+			}
+		}
+
+		return result;
+	}
+
+	static boolean isDiscriminated(Section section) {
+		boolean result = false;
+
+		if ((section != null) && Proxy.isProxyClass(section.getClass())) {
+			InvocationHandler handler = Proxy.getInvocationHandler(section);
+			result = handler instanceof SectionDiscriminator;
+		}
+
+		return result;
+	}
+
+	public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+		Object result = null;
+
+		if (method.getDeclaringClass() == Object.class) {
+			// Don't delegate equals(), hashCode(), and monitor protocol
+			if (method.getName().equals("equals")) { //$NON-NLS-1$
+				if ((args[0] != null) && Proxy.isProxyClass(args[0].getClass())) {
+					result = this.equals(Proxy.getInvocationHandler(args[0]));
+				} else {
+					result = proxy == args[0];
+				}
+			} else if (method.getName().equals("hashCode")) { //$NON-NLS-1$
+				result = this.hashCode();
+			} else {
+				result = method.invoke(this, args);
+			}
+		} else {
+			result = method.invoke(section, args);
+		}
+
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		boolean result = obj == this;
+		if (!result && (obj instanceof SectionDiscriminator)) {
+			SectionDiscriminator other = (SectionDiscriminator) obj;
+			result = other.section == this.section && other.discriminator.equals(this.discriminator);
+		}
+		return result;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + discriminator.hashCode();
+		result = prime * result + section.hashCode();
+		return result;
+	}
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/TabModel.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/TabModel.java
new file mode 100644
index 00000000000..bc65c45e809
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/TabModel.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2014 CEA and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus (CEA) - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.properties.ui.runtime;
+
+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.papyrus.infra.properties.contexts.Section;
+
+
+/**
+ * An encapsulation of the hierarchical tab structure of the property sheets managed by a {@link DisplayEngine}.
+ * It supports distinction of repeated {@code Section}s via proxies that combine section instances with
+ * arbitrary {@linkplain SectionDiscriminator discriminators}.
+ */
+class TabModel<V> {
+
+	private final Map<Path, V> model = new HashMap<Path, V>();
+
+	TabModel() {
+		super();
+	}
+
+	public Set<String> tabIDs() {
+		Set<String> result = new HashSet<String>();
+
+		for (Path next : model.keySet()) {
+			result.add(next.tabID);
+		}
+
+		return Collections.unmodifiableSet(result);
+	}
+
+	public V get(Section section) {
+		return model.get(new Path(section));
+	}
+
+	public V get(String tabID, String sectionID) {
+		return model.get(new Path(tabID, sectionID));
+	}
+
+	public Collection<V> get(String tabID) {
+		List<V> result = new ArrayList<V>(4);
+
+		Path key = new Path(tabID);
+		for (Map.Entry<Path, V> next : model.entrySet()) {
+			if (next.getKey().equals(key)) {
+				result.add(next.getValue());
+			}
+		}
+
+		return Collections.unmodifiableList(result);
+	}
+
+	public V put(Section section, V value) {
+		return model.put(new Path(section), value);
+	}
+
+	public V put(String tabID, String sectionID, V value) {
+		return model.put(new Path(tabID, sectionID), value);
+	}
+
+	public V remove(Section section) {
+		return model.remove(new Path(section));
+	}
+
+	public V remove(String tabID, String sectionID) {
+		return model.remove(new Path(tabID, sectionID));
+	}
+
+	public Collection<V> remove(String tabID) {
+		List<V> result = new ArrayList<V>(4);
+
+		Path key = new Path(tabID);
+		for (V next = model.remove(key); next != null; next = model.remove(key)) {
+			result.add(next);
+		}
+
+		return Collections.unmodifiableList(result);
+	}
+
+	public Collection<V> clear() {
+		List<V> result = new ArrayList<V>(model.values());
+
+		model.clear();
+
+		return Collections.unmodifiableList(result);
+	}
+
+	@Override
+	public String toString() {
+		return String.format("TabModel%s", model.toString()); //$NON-NLS-1$
+	}
+
+	//
+	// Nested types
+	//
+
+	final static class Path {
+
+		// Do not intern this string! Deliberately constructing a new String instance
+		private static final String WILDCARD = new String("*"); //$NON-NLS-1$
+
+		final String tabID;
+
+		final String sectionID;
+
+		final Object discriminator;
+
+		Path(String tabID, String sectionID, Object discriminator) {
+			checkWildcard(tabID);
+			checkWildcard(sectionID);
+
+			this.tabID = tabID;
+			this.sectionID = sectionID;
+			this.discriminator = (discriminator == null) ? WILDCARD : discriminator;
+		}
+
+		Path(String tabID, String sectionID) {
+			this(tabID, sectionID, WILDCARD);
+		}
+
+		/**
+		 * Create a wildcard path for all sections in a tab.
+		 */
+		Path(String tabID) {
+			checkWildcard(tabID);
+
+			this.tabID = tabID;
+			this.sectionID = WILDCARD;
+			this.discriminator = WILDCARD;
+		}
+
+		/**
+		 * Create a path for a specific section.
+		 */
+		Path(Section section) {
+			this(section.getTab().getId(), section.getName(), SectionDiscriminator.getDiscriminator(section));
+		}
+
+		static void checkWildcard(String id) {
+			// Deliberately testing for identity of non-interned string
+			if ((id == null) || (id == WILDCARD)) {
+				throw new IllegalArgumentException("Attempt to create a wildcard path explicitly"); //$NON-NLS-1$
+			}
+		}
+
+		@Override
+		public String toString() {
+			return String.format("(%s, %s)", tabID, sectionID); //$NON-NLS-1$
+		}
+
+		@Override
+		public int hashCode() {
+			// This isn't great for hash-map performance, but wildcards have to have the same hash as the keys they
+			// match, otherwise using them to access the map won't work
+			return tabID.hashCode();
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj) {
+				return true;
+			}
+			if (!(obj instanceof Path)) {
+				return false;
+			}
+
+			Path other = (Path) obj;
+			return equals(tabID, other.tabID) && equals(sectionID, other.sectionID) && equals(discriminator, other.discriminator);
+		}
+
+		private static boolean equals(Object anID, Object anotherID) {
+			// Deliberately testing for identity of non-interned string
+			return (anID == WILDCARD) || (anotherID == WILDCARD) || anID.equals(anotherID);
+		}
+
+	}
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/ViewConstraintEngine.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/ViewConstraintEngine.java
new file mode 100644
index 00000000000..d8f32115fe7
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/ViewConstraintEngine.java
@@ -0,0 +1,28 @@
+/*****************************************************************************
+ * 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.infra.properties.ui.runtime;
+
+import java.util.Set;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.papyrus.infra.constraints.runtime.ConstraintEngine;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+
+
+public interface ViewConstraintEngine extends ConstraintEngine<View> {
+
+	public Set<View> getViews(final ISelection forSelection);
+
+	public void addContext(final Context context);
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/ViewConstraintEngineImpl.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/ViewConstraintEngineImpl.java
new file mode 100644
index 00000000000..e6ef500dce2
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/runtime/ViewConstraintEngineImpl.java
@@ -0,0 +1,64 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.runtime;
+
+import java.util.Collection;
+import java.util.Set;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.runtime.DefaultConstraintEngine;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+
+/**
+ * The implementation for ViewConstraintEngine
+ *
+ * @author Camille Letavernier
+ */
+public class ViewConstraintEngineImpl extends DefaultConstraintEngine<View> implements ViewConstraintEngine {
+
+	private final IConfigurationManager configManager;
+
+	public ViewConstraintEngineImpl(IConfigurationManager configManager) {
+		super(View.class);
+
+		this.configManager = configManager;
+	}
+
+	@Override
+	public synchronized void refresh() {
+		constraints.clear();
+		Collection<Context> contexts = configManager.getEnabledContexts();
+		for (Context context : contexts) {
+			addContext(context);
+		}
+
+		fireConstraintsChanged();
+	}
+
+	@Override
+	public void addContext(final Context context) {
+		for (View view : context.getViews()) {
+			for (ConstraintDescriptor descriptor : view.getConstraints()) {
+				addConstraint(descriptor);
+			}
+		}
+	}
+
+	@Override
+	public Set<View> getViews(final ISelection forSelection) {
+		return getDisplayUnits(forSelection);
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/util/EMFURLStreamHandler.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/util/EMFURLStreamHandler.java
new file mode 100644
index 00000000000..0dce764eafb
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/util/EMFURLStreamHandler.java
@@ -0,0 +1,147 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.properties.ui.util;
+
+import static org.eclipse.emf.ecore.resource.ContentHandler.CHARSET_PROPERTY;
+import static org.eclipse.emf.ecore.resource.ContentHandler.CONTENT_TYPE_PROPERTY;
+import static org.eclipse.emf.ecore.resource.ContentHandler.OPTION_REQUESTED_PROPERTIES;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.URIConverter;
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+
+
+/**
+ * An URL stream handler to use to encapsulate an EMF {@link URI} in a Java {@link URL}.
+ */
+public class EMFURLStreamHandler extends URLStreamHandler {
+
+	private final URIConverter uriConverter;
+
+	public EMFURLStreamHandler(URIConverter uriConverter) {
+		super();
+
+		this.uriConverter = uriConverter;
+	}
+
+	@Override
+	protected URLConnection openConnection(URL u) throws IOException {
+		return new EMFURLConnection(u, uriConverter);
+	}
+
+	//
+	// Nested types
+	//
+
+	private static class EMFURLConnection extends URLConnection {
+
+		private final URIConverter uriConverter;
+
+		private final URI uri;
+
+		private Map<String, ?> contentDescription;
+
+		private boolean connected;
+
+		private InputStream input;
+
+		protected EMFURLConnection(URL url, URIConverter uriConverter) {
+			super(url);
+
+			this.uriConverter = uriConverter;
+
+			this.uri = URI.createURI(url.toExternalForm(), true);
+		}
+
+		@Override
+		public void connect() throws IOException {
+			if (!connected) {
+				try {
+					input = uriConverter.getURIHandler(uri).createInputStream(uri, createInputStreamOptions());
+					connected = true;
+				} catch (Exception e) {
+					throw new IOException("Failed to connect: " + e.getMessage());
+				}
+			}
+		}
+
+		@Override
+		public String getContentEncoding() {
+			return (String) getContentDescription().get(CHARSET_PROPERTY);
+		}
+
+		@Override
+		public String getContentType() {
+			return (String) getContentDescription().get(CONTENT_TYPE_PROPERTY);
+		}
+
+		@Override
+		public int getContentLength() {
+			return -1;
+		}
+
+		@Override
+		public boolean getDoInput() {
+			return true;
+		}
+
+		@Override
+		public boolean getDoOutput() {
+			return false;
+		}
+
+		@Override
+		public InputStream getInputStream() throws IOException {
+			if (!connected) {
+				connect();
+			}
+
+			return input;
+		}
+
+		private Map<String, ?> getContentDescription() {
+			if (contentDescription == null) {
+				try {
+					contentDescription = uriConverter.getURIHandler(uri).contentDescription(uri, getContentDescriptionOptions());
+				} catch (IOException e) {
+					Activator.log.error(e);
+					contentDescription = Collections.emptyMap();
+				}
+			}
+
+			return contentDescription;
+		}
+
+		private Map<Object, Object> createInputStreamOptions() {
+			Map<Object, Object> result = new java.util.HashMap<Object, Object>();
+			result.put(URIConverter.OPTION_RESPONSE, new java.util.HashMap<Object, Object>());
+			return result;
+		}
+
+		private Map<?, ?> getContentDescriptionOptions() {
+			Set<String> requestedProperties = new java.util.HashSet<String>();
+			requestedProperties.add(CONTENT_TYPE_PROPERTY);
+			requestedProperties.add(CHARSET_PROPERTY);
+
+			return Collections.singletonMap(OPTION_REQUESTED_PROPERTIES, requestedProperties);
+		}
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/util/PropertiesDisplayHelper.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/util/PropertiesDisplayHelper.java
new file mode 100644
index 00000000000..56dfbd1af78
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/util/PropertiesDisplayHelper.java
@@ -0,0 +1,125 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.util;
+
+import java.util.Collection;
+import java.util.Set;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.infra.constraints.runtime.ConstraintEngine;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.ui.runtime.DisplayEngine;
+import org.eclipse.papyrus.infra.properties.ui.runtime.EmbeddedDisplayEngine;
+import org.eclipse.papyrus.infra.properties.ui.runtime.PropertiesRuntime;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * Helper class for displaying an embedded Properties View for
+ * a selection in a specific composite
+ *
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class PropertiesDisplayHelper {
+
+	/**
+	 * Displays the properties view associated to the selection in the given Composite
+	 *
+	 * @param selection
+	 * @param parent
+	 *
+	 * @return The display engine used to build the view. Must be disposed by caller
+	 */
+	public static DisplayEngine display(Object selection, Composite parent) {
+		return display(PropertiesRuntime.getConstraintEngine(), buildSelection(selection), parent);
+	}
+
+	/**
+	 * Displays the properties view associated to the selection in the given Composite
+	 *
+	 * @param selection
+	 * @param parent
+	 *
+	 * @return The display engine used to build the view. Must be disposed by caller
+	 */
+	public static DisplayEngine display(Collection<?> selection, Composite parent) {
+		return display(PropertiesRuntime.getConstraintEngine(), buildSelection(selection), parent);
+	}
+
+	/**
+	 * Displays the properties view associated to the selection in the given Composite
+	 *
+	 * The views are computed based on the given ConstraintEngine
+	 *
+	 * @param selection
+	 * @param parent
+	 * @param constraints
+	 *
+	 * @return The display engine used to build the view. Must be disposed by caller
+	 */
+	public static DisplayEngine display(ConstraintEngine<? extends View> constraints, Object selection, Composite parent) {
+		return display(constraints, buildSelection(selection), parent);
+	}
+
+	/**
+	 * Displays the properties view associated to the selection in the given Composite
+	 *
+	 * The views are computed based on the given ConstraintEngine
+	 *
+	 * @param selection
+	 * @param parent
+	 * @param constraints
+	 *
+	 * @return The display engine used to build the view. Must be disposed by caller
+	 */
+	public static DisplayEngine display(ConstraintEngine<? extends View> constraints, Collection<?> selection, Composite parent) {
+		return display(constraints, buildSelection(selection), parent);
+	}
+
+	/**
+	 * Displays the properties view associated to the selection in the given Composite
+	 *
+	 * The views are computed based on the given ConstraintEngine
+	 *
+	 * @param selection
+	 * @param parent
+	 * @param constraints
+	 *
+	 * @return The display engine used to build the view. Must be disposed by caller
+	 */
+	public static DisplayEngine display(ConstraintEngine<? extends View> constraints, ISelection selection, Composite parent) {
+		EmbeddedDisplayEngine display = new EmbeddedDisplayEngine();
+
+		Set<? extends View> views = constraints.getDisplayUnits(selection);
+
+		// Composite self = new Composite(parent, SWT.BORDER);
+		// self.setLayout(new GridLayout(1, false));
+
+		display.display(views, parent, selection, SWT.NONE);
+
+		return display;
+	}
+
+	private static IStructuredSelection buildSelection(Collection<?> elements) {
+		return new StructuredSelection(elements);
+	}
+
+	private static IStructuredSelection buildSelection(Object element) {
+		return new StructuredSelection(element);
+	}
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/util/PropertiesUtil.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/util/PropertiesUtil.java
new file mode 100644
index 00000000000..c9147c1045d
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/util/PropertiesUtil.java
@@ -0,0 +1,303 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.util;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextPackage;
+import org.eclipse.papyrus.infra.properties.contexts.Property;
+import org.eclipse.papyrus.infra.properties.environment.Namespace;
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+
+/**
+ * A Helper class for miscellaneous elements of the Property view framework
+ *
+ * @author Camille Letavernier
+ */
+public class PropertiesUtil {
+
+	/**
+	 * @param source
+	 * @return
+	 *         the given String with the first letter capitalized
+	 */
+	public static String firstToUpper(String source) {
+		if (source.length() == 0) {
+			return source;
+		}
+		return source.substring(0, 1).toUpperCase() + source.substring(1);
+	}
+
+	/**
+	 * @param source
+	 * @return
+	 *         the given String with the first letter lowered
+	 */
+	public static String firstToLower(String source) {
+		if (source.length() == 0) {
+			return source;
+		}
+		return source.substring(0, 1).toLowerCase() + source.substring(1);
+	}
+
+	/**
+	 * Returns the formatted label of the property
+	 *
+	 * @param property
+	 * @return
+	 */
+	public static String getLabel(Property property) {
+		if (property.getLabel() == null || property.getLabel().trim().equals("")) {
+			return getLabel(property.getName());
+		}
+
+		return property.getLabel();
+	}
+
+	/**
+	 * @param variableName
+	 * @return
+	 *         A formatted version of the given variable name
+	 */
+	public static String getLabel(String variableName) {
+		// "CamelCase" to "Natural case"
+		String formattedValue = variableName;
+
+		// replace fooBar by foo Bar
+		formattedValue = formattedValue.replaceAll("([a-z])([A-Z])", "$1 $2"); //$NON-NLS-1$ //$NON-NLS-2$
+
+		// replace FOOAndBar by FOO And Bar
+		formattedValue = formattedValue.replaceAll("([A-Z]+)([A-Z])([a-z])", "$1 $2$3"); //$NON-NLS-1$ //$NON-NLS-2$
+
+		// Capitalize the first word and lower the other ones : foo Bar -> Foo bar
+		// Keep the upper case for acronyms FOO Bar -> FOO bar
+		String[] words = formattedValue.split("\\s+"); //$NON-NLS-1$
+		formattedValue = firstToUpper(words[0]);
+		for (int i = 1; i < words.length; i++) {
+			formattedValue += " "; //$NON-NLS-1$
+			if (words[i].matches("^[A-Z]{2,}")) { //$NON-NLS-1$
+				formattedValue += words[i];
+			} else {
+				formattedValue += firstToLower(words[i]);
+			}
+		}
+
+		Activator.log.debug("\"" + formattedValue + "\""); //$NON-NLS-1$ //$NON-NLS-2$
+		return formattedValue;
+	}
+
+	/**
+	 * Tests if the given value is equal to the namespace's value
+	 *
+	 * @param namespace
+	 * @param value
+	 * @return
+	 *         True if they are equal
+	 */
+	public static boolean namespaceEquals(Namespace namespace, String value) {
+		if (namespace == null) {
+			return value == null || value.trim().equals(""); //$NON-NLS-1$
+		} else {
+			return namespace.getValue().equals(value);
+		}
+	}
+
+	/**
+	 * Tests if the given name is equal to the namespace's name
+	 *
+	 * @param namespace
+	 * @param name
+	 * @return
+	 *         True if they are equal
+	 */
+	public static boolean namespaceEqualsByName(Namespace namespace, String name) {
+		if (namespace == null) {
+			return name == null || name.trim().equals(""); //$NON-NLS-1$
+		} else {
+			return namespace.getName().equals(name);
+		}
+	}
+
+	/**
+	 * Return the full value of the namespace declaration
+	 * e.g. clr-namespace:org.eclipse.papyrus.infra.properties.ui
+	 *
+	 * @param namespace
+	 *            The namespace we want to prefix
+	 * @return
+	 *         The prefixed namespace
+	 */
+	public static String getPrefixedValue(Namespace namespace) {
+		String prefixedValue = ""; //$NON-NLS-1$
+		if (namespace.getPrefix() != null && !namespace.getPrefix().trim().equals("")) { //$NON-NLS-1$
+			prefixedValue = namespace.getPrefix() + ":"; //$NON-NLS-1$
+		}
+		prefixedValue += namespace.getValue();
+
+		return prefixedValue;
+	}
+
+	/**
+	 * Return the full name of the namespace declaration
+	 * e.g. xmlns:ppe
+	 *
+	 * @param namespace
+	 *            The namespace for which we want to get the qualified name
+	 * @return
+	 *         The namespace's qualified name
+	 */
+	public static String getQualifiedName(Namespace namespace) {
+		if (namespace.getName() == null || namespace.getName().trim().equals("")) { //$NON-NLS-1$
+			return "xmlns"; //$NON-NLS-1$
+		} else {
+			return "xmlns:" + namespace.getName(); //$NON-NLS-1$
+		}
+	}
+
+	/**
+	 * Retrieve the DataContextElement matching the given qualifiedName.
+	 *
+	 * @param qualifiedName
+	 *            The fully qualified name of the DataContextElement. The separator is ":"
+	 *            e.g. : UML:NamedElement
+	 * @param fromContextElements
+	 *            The collection of DataContextElements in which the method should look
+	 * @return
+	 *         The matching DataContextElement, or null if none was found
+	 */
+	public static DataContextElement getContextElementByQualifiedName(String qualifiedName, Collection<? extends DataContextElement> fromContextElements) {
+		int index = qualifiedName.indexOf(":"); //$NON-NLS-1$
+		if (index >= 0) {
+			String name = qualifiedName.substring(0, index);
+			qualifiedName = qualifiedName.substring(qualifiedName.indexOf(":") + 1, qualifiedName.length()); //$NON-NLS-1$
+			for (DataContextElement contextElement : fromContextElements) {
+				if (contextElement instanceof DataContextPackage && contextElement.getName().equals(name)) {
+					DataContextElement result = getContextElementByQualifiedName(qualifiedName, ((DataContextPackage) contextElement).getElements());
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		} else {
+			for (DataContextElement element : fromContextElements) {
+				if (element.getName().equals(qualifiedName)) {
+					return element;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the list of Context on which the given context depends, directly
+	 * or indirectly
+	 *
+	 * @param context
+	 *            The context for which we want to retrieve the list of dependencies
+	 * @return
+	 *         The list of Contexts on which the given context depends
+	 */
+	public static List<Context> getDependencies(Context context) {
+		List<Context> result = new LinkedList<Context>();
+		if (context == null) {
+			return result;
+		}
+
+		result.add(context);
+		findDependencies(context, result);
+		return result;
+	}
+
+	private static void findDependencies(Context context, List<Context> result) {
+		for (Context dependency : context.getDependencies()) {
+			if (!result.contains(dependency)) {
+				result.add(dependency);
+				findDependencies(dependency, result);
+			}
+		}
+	}
+
+	/**
+	 * Returns the set of DataContextElement containing the whole inheritance hierarchy
+	 * for the given source DataContextElements
+	 *
+	 * @param source
+	 *            The collection of DataContextElements for which we want to retrieve all inherited elements
+	 * @return
+	 *         All DataContextElements inherited (Directly or indirectly) by at least one of the source
+	 *         context elements
+	 */
+	public static Set<DataContextElement> getAllContextElements(Collection<DataContextElement> source) {
+		Set<DataContextElement> result = new HashSet<DataContextElement>();
+		getAllContextElements(source, result);
+		return result;
+	}
+
+	private static void getAllContextElements(Collection<DataContextElement> source, Set<DataContextElement> result) {
+		for (DataContextElement element : source) {
+			if (!result.contains(element)) {
+				result.add(element);
+				getAllContextElements(element.getSupertypes(), result);
+			}
+		}
+	}
+
+	/**
+	 * A util method to make big strings fit in a restricted amount of space,
+	 * such as a tooltip. The method will add new lines in the string at
+	 * a regular interval.
+	 *
+	 * @param string
+	 *            The string to split
+	 * @param maxCharPerLine
+	 *            The maximum number of characters per line in the resulting string
+	 * @return
+	 *         The split string
+	 */
+	public static String resizeString(String string, int maxCharPerLine) {
+		if (string == null || string.trim().length() <= maxCharPerLine) {
+			return string.trim();
+		}
+
+		String[] stringChunks = string.split("\n|\r|\r\n|\n\r"); //$NON-NLS-1$
+
+		List<String> chunks = new LinkedList<String>();
+
+		for (String chunk : stringChunks) {
+			chunk = chunk.trim();
+			if (chunk.length() > maxCharPerLine) {
+				Matcher matcher = Pattern.compile("(.{0," + maxCharPerLine + "}\\b\\p{Punct}?)").matcher(chunk); //$NON-NLS-1$ //$NON-NLS-2$
+				while (matcher.find()) {
+					String group = matcher.group(1);
+					chunks.add(group);
+				}
+			} else {
+				chunks.add(chunk);
+			}
+		}
+
+		String result = ""; //$NON-NLS-1$
+		for (String chunk : chunks) {
+			result += chunk.trim() + "\n"; //$NON-NLS-1$
+		}
+
+		return result.trim();
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/AbstractPropertyEditor.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/AbstractPropertyEditor.java
new file mode 100644
index 00000000000..898a610c48b
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/AbstractPropertyEditor.java
@@ -0,0 +1,663 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * 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
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *  Christian W. Damus (CEA) - bug 443417
+ *  Christian W. Damus (CEA) - bug 444227
+ *  Christian W. Damus - bug 469188
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.core.databinding.observable.ChangeEvent;
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.core.databinding.observable.IObservable;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.validation.IValidator;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.Property;
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.DataSource;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.DataSourceChangedEvent;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.IDataSourceListener;
+import org.eclipse.papyrus.infra.properties.ui.runtime.PropertiesRuntime;
+import org.eclipse.papyrus.infra.properties.ui.util.PropertiesUtil;
+import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
+import org.eclipse.papyrus.infra.widgets.editors.AbstractListEditor;
+import org.eclipse.papyrus.infra.widgets.editors.AbstractValueEditor;
+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.widgets.Control;
+
+
+/**
+ * An Abstract class to factorize code for PropertyEditors. PropertyEditors are
+ * <strong>not</strong> required to extend this class, but could benefit from
+ * its methods.
+ *
+ * @author Camille Letavernier
+ */
+public abstract class AbstractPropertyEditor implements IChangeListener, CustomizablePropertyEditor {
+
+	/**
+	 * The qualified propertyPath. Represents the property edited by this widget
+	 */
+	protected String propertyPath; // Format : "DataContextElement:propertyName"
+
+	/**
+	 * The DataSource representing the semantic objects
+	 */
+	protected DataSource input;
+
+	private IDataSourceListener dataSourceListener;
+
+	protected boolean readOnly = false;
+
+	protected boolean isEditable = true;
+
+	/**
+	 * The SWT Widget (For list properties only)
+	 */
+	protected AbstractListEditor listEditor;
+
+	/**
+	 * The SWT Widget (For single values only)
+	 */
+	protected AbstractValueEditor valueEditor;
+
+	/**
+	 * The IObservableList representing the semantic property
+	 * (For list properties only)
+	 */
+	protected IObservableList observableList;
+
+	/**
+	 * The IObservableValue representing the semantic property
+	 * (For single values only)
+	 */
+	protected IObservableValue observableValue;
+
+
+	protected IValidator modelValidator;
+
+	protected IConverter targetToModelConverter;
+
+	/**
+	 * Indicates if the editor's label should be displayed
+	 */
+	protected boolean showLabel = true;
+
+	/**
+	 * The custom label used by this editor. If set, it replaces the property's default label
+	 */
+	protected String customLabel;
+
+	/**
+	 * The maximum number of characters per line for wrapping descriptions
+	 */
+	public static int descriptionMaxCharPerLine = 200;
+
+	/**
+	 * Constructor.
+	 * When using this constructor, you should explicitly call the #setEditor method.
+	 */
+	protected AbstractPropertyEditor() {
+	}
+
+	/**
+	 * Constructor. Constructs a new PropertyEditor with the given ListEditor
+	 *
+	 * @param editor
+	 */
+	protected AbstractPropertyEditor(AbstractListEditor editor) {
+		setEditor(editor);
+	}
+
+	/**
+	 * Constructor. Constructs a new PropertyEditor with the given ValueEditor
+	 *
+	 * @param editor
+	 */
+	protected AbstractPropertyEditor(AbstractValueEditor editor) {
+		setEditor(editor);
+	}
+
+	/**
+	 * Sets the ListEditor for this PropertyEditor
+	 *
+	 * @param editor
+	 */
+	protected void setEditor(AbstractListEditor editor) {
+		this.listEditor = editor;
+		addDisposeListener(editor);
+	}
+
+	/**
+	 * Sets the ValueEditor for this PropertyEditor
+	 *
+	 * @param editor
+	 */
+	protected void setEditor(AbstractValueEditor editor) {
+		this.valueEditor = editor;
+		addDisposeListener(editor);
+	}
+
+	private void addDisposeListener(AbstractEditor editor) {
+		editor.addDisposeListener(new DisposeListener() {
+
+			@Override
+			public void widgetDisposed(DisposeEvent e) {
+				if (input != null) {
+					input.removeChangeListener(AbstractPropertyEditor.this);
+				}
+			}
+		});
+	}
+
+	/**
+	 * Checks if this editor has all the input needed to do the dataBinding.
+	 * As this editor can be instantiated through the XWT Framework, which is
+	 * based on an XML parser, there is no determinism in the order in which
+	 * the parameters are set.
+	 */
+	protected void checkInput() {
+		if (propertyPath != null && input != null) {
+			isEditable = input.isEditable(propertyPath);
+			try {
+				doBinding();
+			} catch (Exception ex) {
+				// TODO : Handle the exception here. Display something ?
+				Activator.log.error(ex);
+			}
+
+			if (getInputObservable() instanceof ICommitListener && getEditor() != null) {
+				getEditor().addCommitListener((ICommitListener) getInputObservable());
+			}
+
+			updateLabel();
+			updateDescription();
+		}
+	}
+
+	/**
+	 * Binds the AbstractEditor (Either List or Value editor) to the semantic element
+	 */
+	protected void doBinding() {
+		if (listEditor != null) {
+			IObservableList inputObservableList = getInputObservableList();
+
+			if (inputObservableList != null) {
+				listEditor.setModelObservable(inputObservableList);
+			}
+
+		} else if (valueEditor != null) {
+			IObservableValue inputObservableValue = getInputObservableValue();
+
+			if (inputObservableValue != null) {
+				valueEditor.setStrategies();
+
+
+
+				IValidator modelVal = getValidator();
+				if (modelVal != null) {
+
+					valueEditor.setModelValidator(modelVal);
+				}
+				valueEditor.setModelObservable(inputObservableValue);
+
+
+
+
+			}
+		}
+
+		boolean isReadOnly = getReadOnly();
+		applyReadOnly(isReadOnly);
+
+		if (input.forceRefresh(propertyPath)) {
+			input.addChangeListener(this);
+		}
+	}
+
+	/**
+	 * Applies the readOnly state to the editor
+	 *
+	 * @param readOnly
+	 *            Indicates if this widget should be read-only
+	 */
+	protected void applyReadOnly(boolean readOnly) {
+		AbstractEditor editor = getEditor();
+		if ((editor != null) && !editor.isDisposed()) {
+			editor.setReadOnly(readOnly);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	// TODO : This method handles a change on the DataSource. This should not be a ChangeEvent, as the DataSource is not an IObservable
+	// This method should be changed, and the source of the event should be checked (Otherwise, it cannot be extended).
+	// TODO : Remove the "final" modifier to let subclasses extend this behavior,
+	// when the source of the event is checked. Until then, it is not safe to override this method
+	@Override
+	public final void handleChange(ChangeEvent event) {
+		// Handle the "forceRefresh" behavior when the input DataSource sends a ChangeEvent
+		AbstractEditor editor = getEditor();
+		if (editor != null) {
+			editor.refreshValue();
+
+			// And refresh the read-only state
+			isEditable = input.isEditable(propertyPath);
+			applyReadOnly(getReadOnly());
+		}
+	}
+
+	/**
+	 * Sets the property path for this PropertyEditor.
+	 * The propertyPath elements should be separated by ":"
+	 * e.g. UML:NamedElement:name
+	 *
+	 * @param path
+	 */
+	@Override
+	public void setProperty(String path) {
+		propertyPath = path;
+		checkInput();
+		updateLabel();
+		updateDescription();
+	}
+
+	/**
+	 * Updates the label for this PropertyEditor.
+	 */
+	public void updateLabel() {
+		String label = getLabel();
+		// if(input != null && propertyPath != null && input.isMandatory(propertyPath)) {
+		// label += " *"; //$NON-NLS-1$
+		// }
+
+		updateLabel(label);
+	}
+
+	/**
+	 * Updates the label for this PropertyEditor.
+	 */
+	public void updateLabel(String label) {
+		if (showLabel) {
+			if (valueEditor != null) {
+				valueEditor.setLabel(label);
+			} else if (listEditor != null) {
+				listEditor.setLabel(label);
+			}
+		}
+	}
+
+	/**
+	 * @return the property path for this Property editor.
+	 */
+	@Override
+	public String getProperty() {
+		return propertyPath;
+	}
+
+	/**
+	 * Sets the input DataSource for this Property editor.
+	 *
+	 * @param input
+	 */
+	@Override
+	public void setInput(DataSource input) {
+		final DataSource oldInput = this.input;
+		if (input != oldInput) {
+			if (oldInput != null) {
+				unhookDataSourceListener(oldInput);
+			}
+
+			this.input = input;
+
+			if (input != null) {
+				hookDataSourceListener(input);
+			}
+
+			// Only do this after attaching our listener so that it will be ahead of
+			// any ModelElements created for properties
+			checkInput();
+		}
+	}
+
+	protected void unhookDataSourceListener(DataSource oldInput) {
+		oldInput.removeDataSourceListener(getDataSourceListener());
+	}
+
+	protected void hookDataSourceListener(DataSource newInput) {
+		newInput.addDataSourceListener(getDataSourceListener());
+	}
+
+	/**
+	 * @return the input DataSource for this Property editor
+	 */
+	@Override
+	public DataSource getInput() {
+		return input;
+	}
+
+	/**
+	 * @return the formatted property name for this Property Editor
+	 */
+	protected String getLabel() {
+		if (customLabel != null) {
+			return customLabel;
+		}
+
+		Property property = getModelProperty();
+		if (property == null || property.getLabel() == null || property.getLabel().trim().equals("")) { //$NON-NLS-1$
+			return PropertiesUtil.getLabel(getLocalPropertyPath());
+		}
+
+		return property.getLabel();
+	}
+
+	/**
+	 * Updates the description for this PropertyEditor.
+	 * The description is the widget's ToolTipText
+	 */
+	protected void updateDescription() {
+		String description = ""; //$NON-NLS-1$
+		Property property = getModelProperty();
+
+		if (property != null) {
+			description = property.getDescription();
+		}
+
+		// Append the propertyPath to the description
+		if (description == null || description.trim().equals("")) { //$NON-NLS-1$
+			description = getLocalPropertyPath();
+		} else {
+			description = PropertiesUtil.resizeString(description, descriptionMaxCharPerLine);
+			description = getLocalPropertyPath() + ": " + description;
+		}
+
+
+		updateDescription(description);
+	}
+
+	/**
+	 * Updates the description for this PropertyEditor.
+	 * The description is the widget's ToolTipText
+	 */
+	protected void updateDescription(String description) {
+		if (valueEditor != null) {
+			valueEditor.setToolTipText(description);
+		} else if (listEditor != null) {
+
+			listEditor.setToolTipText(description);
+		}
+	}
+
+	/**
+	 * Finds the property associated to the Editor's {@link #propertyPath}
+	 *
+	 * @return The property associated to the Editor's {@link #propertyPath}
+	 */
+	protected Property getModelProperty() {
+		if (propertyPath == null) {
+			return null;
+		}
+		Context context = getContext();
+
+		return PropertiesRuntime.getConfigurationManager().getProperty(propertyPath, context);
+	}
+
+	private Context getContext() {
+		if (input == null) {
+			return null;
+		} else {
+			return input.getView().getContext();
+		}
+	}
+
+	/**
+	 * Marks this editor as readOnly
+	 *
+	 * @param readOnly
+	 */
+	@Override
+	public void setReadOnly(boolean readOnly) {
+		this.readOnly = readOnly;
+		if (getEditor() != null) {
+			getEditor().setReadOnly(getReadOnly());
+		}
+	}
+
+	/**
+	 * @return the AbstractEditor for this PropertyEditor
+	 */
+	public AbstractEditor getEditor() {
+		return valueEditor == null ? listEditor : valueEditor;
+	}
+
+	/**
+	 * Tests if this editor is read-only
+	 *
+	 * @return
+	 * 		True if this editor is read-only
+	 */
+	@Override
+	public boolean getReadOnly() {
+		boolean result = readOnly || !isEditable || getInputObservable() == null;
+		return result;
+	}
+
+	/**
+	 * @return the IObservableList for this propertyEditor, or null if it is not
+	 *         available
+	 */
+	protected IObservableList getInputObservableList() {
+		if (observableList == null) {
+			try {
+				observableList = (IObservableList) input.getObservable(propertyPath);
+			} catch (Exception ex) {
+				Activator.log.error("Cannot find a valid IObservableList for " + propertyPath, ex); //$NON-NLS-1$
+			}
+		}
+
+		return observableList;
+	}
+
+	/**
+	 * @return the IObservableValue for this propertyEditor, or null if it is not
+	 *         available
+	 */
+	protected IObservableValue getInputObservableValue() {
+		if (observableValue == null) {
+			try {
+				observableValue = (IObservableValue) input.getObservable(propertyPath);
+			} catch (Exception ex) {
+				Activator.log.error("Cannot find a valid IObservableValue for " + propertyPath, ex); //$NON-NLS-1$
+			}
+		}
+
+		return observableValue;
+	}
+
+	/**
+	 * Returns the IObservable for this propertyEditor, or null if it is
+	 * not available
+	 *
+	 * @return The IObservable associated to this propertyEditor
+	 */
+	protected IObservable getInputObservable() {
+		if (input == null || propertyPath == null) {
+			return null;
+		}
+
+		if (listEditor != null) {
+			return getInputObservableList();
+		}
+		if (valueEditor != null) {
+			return getInputObservableValue();
+		}
+		return null;
+	}
+
+	/**
+	 * @return the last segment of the property path (Which is the property name)
+	 */
+	protected String getLocalPropertyPath() {
+		return propertyPath.substring(propertyPath.lastIndexOf(":") + 1); //$NON-NLS-1$
+	}
+
+	/**
+	 * Sets the editor's Layout Data
+	 *
+	 * @param data
+	 */
+	public void setLayoutData(Object data) {
+		if (getEditor() != null) {
+			getEditor().setLayoutData(data);
+		}
+	}
+
+	/**
+	 * Returns the editor's Layout Data
+	 *
+	 * @return
+	 * 		The editor's layout data
+	 */
+	public Object getLayoutData() {
+		return getEditor() == null ? null : getEditor().getLayoutData();
+	}
+
+	/**
+	 * Indicates whether the editor's label should be displayed or not
+	 *
+	 * @param showLabel
+	 */
+	@Override
+	public void setShowLabel(boolean showLabel) {
+		AbstractEditor editor = getEditor();
+		this.showLabel = showLabel;
+		if (editor != null) {
+			editor.setDisplayLabel(showLabel);
+		}
+	}
+
+	/**
+	 * Indicates whether the editor's label is displayed or not
+	 *
+	 * @return
+	 * 		true if the label should be displayed
+	 */
+	@Override
+	public boolean getShowLabel() {
+		return this.showLabel;
+	}
+
+	/**
+	 * Sets the label for this editor. The label will replace the property's
+	 * default label
+	 *
+	 * @param customLabel
+	 *            The label to use with this property editor
+	 */
+	@Override
+	public void setCustomLabel(String customLabel) {
+		this.customLabel = customLabel;
+		updateLabel();
+	}
+
+	/**
+	 * @return the custom label used by this property editor. May be null
+	 */
+	@Override
+	public String getCustomLabel() {
+		return this.customLabel;
+	}
+
+	/**
+	 * @return the Control defined by this Property Editor
+	 */
+	public Control getControl() {
+		if (valueEditor == null) {
+			return listEditor;
+		}
+		return valueEditor;
+	}
+
+	/**
+	 * @return the IValidator for this property editor
+	 */
+
+	public IValidator getValidator() {
+		if (modelValidator == null) {
+			try {
+				modelValidator = input.getValidator(propertyPath);
+			} catch (Exception ex) {
+				Activator.log.error("Cannot find a valid Validator for " + propertyPath, ex); //$NON-NLS-1$
+
+			}
+		}
+
+		return modelValidator;
+	}
+
+	private IDataSourceListener getDataSourceListener() {
+		if (dataSourceListener == null) {
+			dataSourceListener = new IDataSourceListener() {
+
+				@Override
+				public void dataSourceChanged(DataSourceChangedEvent event) {
+					// The data source's selection changed. Update my validator or clear it if now there is none
+					IObservableValue observable = AbstractPropertyEditor.this.observableValue;
+
+					if (observable != null) {
+						if ((modelValidator != null) && (valueEditor != null) && !valueEditor.isDisposed()) {
+							modelValidator = null;
+
+							// First, clear the validator to disable validation
+							valueEditor.setStrategies();
+							valueEditor.setModelValidator(null);
+
+							// Then re-enable to later when ready for user input
+							observable.getRealm().asyncExec(new Runnable() {
+
+								@Override
+								public void run() {
+									if ((valueEditor != null) && !valueEditor.isDisposed()) {
+										valueEditor.setStrategies();
+										valueEditor.setModelValidator(getValidator());
+									}
+								}
+							});
+						}
+
+						// And refresh the read-only state
+						if ((propertyPath != null) && (input != null)) {
+							observable.getRealm().asyncExec(new Runnable() {
+
+								@Override
+								public void run() {
+									isEditable = input.isEditable(propertyPath);
+									applyReadOnly(getReadOnly());
+								}
+							});
+						}
+					}
+				}
+			};
+		}
+
+		return dataSourceListener;
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/BooleanCheckbox.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/BooleanCheckbox.java
new file mode 100644
index 00000000000..842b118c2ea
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/BooleanCheckbox.java
@@ -0,0 +1,36 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A PropertyEditor for editing booleans through a CheckBox
+ *
+ * @see org.eclipse.papyrus.infra.widgets.editors.BooleanCheckbox
+ *
+ * @author Camille Letavernier
+ */
+public class BooleanCheckbox extends AbstractPropertyEditor {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 */
+	public BooleanCheckbox(Composite parent, int style) {
+		super(new org.eclipse.papyrus.infra.widgets.editors.BooleanCheckbox(parent, style));
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/BooleanCombo.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/BooleanCombo.java
new file mode 100644
index 00000000000..adc527e488e
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/BooleanCombo.java
@@ -0,0 +1,37 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A PropertyEditor for editing booleans through a ComboBox
+ *
+ * @see org.eclipse.papyrus.infra.widgets.editors.BooleanCombo
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class BooleanCombo extends AbstractPropertyEditor {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 */
+	public BooleanCombo(Composite parent, int style) {
+		super(new org.eclipse.papyrus.infra.widgets.editors.BooleanCombo(parent, style));
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/BooleanRadio.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/BooleanRadio.java
new file mode 100644
index 00000000000..dc4a5395f27
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/BooleanRadio.java
@@ -0,0 +1,38 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A PropertyEditor for editing booleans with two Radio buttons
+ *
+ * @see org.eclipse.papyrus.infra.widgets.editors.BooleanRadio
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class BooleanRadio extends AbstractPropertyEditor {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 */
+	public BooleanRadio(Composite parent, int style) {
+		super(new org.eclipse.papyrus.infra.widgets.editors.BooleanRadio(parent, style));
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/BooleanToggle.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/BooleanToggle.java
new file mode 100644
index 00000000000..746b77ccaca
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/BooleanToggle.java
@@ -0,0 +1,98 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+
+
+/**
+ * A Widget for editing Booleans. The widget is a button with two states.
+ * The button can have either an image or a text
+ *
+ * @author Camille Letavernier
+ */
+public class BooleanToggle extends AbstractPropertyEditor {
+
+	private org.eclipse.papyrus.infra.widgets.editors.BooleanToggle toggle;
+
+	private String imagePath;
+
+	private String text;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The parent in which the widget will be created
+	 * @param style
+	 */
+	public BooleanToggle(Composite parent, int style) {
+		toggle = createBooleanToggle(parent, style);
+		setEditor(toggle);
+	}
+
+	/**
+	 * Creates the boolean toggle.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 * @return the boolean toggle.
+	 */
+	protected org.eclipse.papyrus.infra.widgets.editors.BooleanToggle createBooleanToggle(Composite parent, int style) {
+		return new org.eclipse.papyrus.infra.widgets.editors.BooleanToggle(parent, style);
+	}
+
+	/**
+	 * Sets this button's text
+	 *
+	 * @param text
+	 */
+	public void setText(String text) {
+		toggle.setText(this.text = text);
+	}
+
+	/**
+	 * Return this button's text
+	 *
+	 * @return this button's text
+	 */
+	public String getText() {
+		return text;
+	}
+
+	/**
+	 * Sets this button's image
+	 *
+	 * @param imagePath
+	 *            The path to the image, in the form /<plug-in>/<path>
+	 */
+	public void setImage(String imagePath) {
+		this.imagePath = imagePath;
+		Image image = Activator.getDefault().getImageFromPlugin(imagePath);
+		toggle.setImage(image);
+	}
+
+	/**
+	 * Returns the path to this editor's image
+	 *
+	 * @return
+	 *         The path to this editor's image
+	 */
+	public String getImage() {
+		return imagePath;
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/BrowseFilePropertyEditor.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/BrowseFilePropertyEditor.java
new file mode 100644
index 00000000000..4e37e2cb8ec
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/BrowseFilePropertyEditor.java
@@ -0,0 +1,175 @@
+/*****************************************************************************
+ * 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:
+ *	Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.papyrus.infra.widgets.editors.BrowseFileEditor;
+import org.eclipse.swt.widgets.Composite;
+
+
+/**
+ * Property editor for attribute that need a file selection.
+ * Its display have unique button with an associated menu to choice where file comes frome.
+ */
+public class BrowseFilePropertyEditor extends AbstractPropertyEditor {
+
+	/** The browse file editor. */
+	private BrowseFileEditor browseFileEditor = null;
+
+	/** The filtered extensions This should be a 1-1 mapping with {@link #filterNames}. */
+	protected String[] filterExtensions = null;
+
+	/**
+	 * The name of the filters.
+	 * This should be a 1-1 mapping with {@link #filterExtensions}
+	 */
+	protected String[] filterNames = null;
+
+	/** Enables the "browse workspace" feature. */
+	protected boolean allowWorkspace = true;
+
+	/** Enables the "browse file system" feature. */
+	protected boolean allowFileSystem = true;
+
+	/**
+	 * Instantiates a new browse file property editor.
+	 *
+	 * @param parent
+	 *            the parent
+	 * @param style
+	 *            the style
+	 */
+	public BrowseFilePropertyEditor(Composite parent, int style) {
+		browseFileEditor = createBrowseFileEditor(parent, style);
+		super.setEditor(browseFileEditor);
+	}
+
+	/**
+	 * Set label to browse button.
+	 *
+	 * @param buttonLabel
+	 *            Label to set
+	 */
+	public void setButtonLabel(String buttonLabel) {
+		browseFileEditor.setButtonLabel(buttonLabel);
+	}
+
+
+	/**
+	 * @return Label of browse button
+	 */
+	public String getButtonLabel() {
+		return browseFileEditor.getButtonLabel();
+	}
+
+	/**
+	 * Creates the browse file editor.
+	 *
+	 * @param parent
+	 *            the parent
+	 * @param style
+	 *            the style
+	 * @return the browse file editor
+	 */
+	private BrowseFileEditor createBrowseFileEditor(Composite parent, int style) {
+
+		return new BrowseFileEditor(parent, style);
+	}
+
+	/**
+	 * Sets the filter extensions.
+	 *
+	 * @param filterExtensions
+	 *            the new filter extensions
+	 */
+	public void setFilterExtensions(String[] filterExtensions) {
+		this.filterExtensions = filterExtensions;
+		checkFilters();
+	}
+
+	/**
+	 * Gets the filter extensions.
+	 *
+	 * @return the filter extensions
+	 */
+	public String[] getFilterExtensions() {
+		return this.filterExtensions;
+	}
+
+	/**
+	 * Sets the filter names.
+	 *
+	 * @param filterNames
+	 *            the new filter names
+	 */
+	public void setFilterNames(String[] filterNames) {
+		this.filterNames = filterNames;
+		checkFilters();
+	}
+
+	/**
+	 * Gets the filter names.
+	 *
+	 * @return the filter names
+	 */
+	public String[] getFilterNames() {
+		return this.filterNames;
+	}
+
+	/**
+	 * Checks if the filters are valid.
+	 */
+	protected void checkFilters() {
+		if (filterExtensions != null && filterNames != null) {
+			browseFileEditor.setFilters(filterExtensions, filterNames);
+		}
+	}
+
+	/**
+	 * Indicates whether the editor should allow browsing the workspace or not.
+	 *
+	 * @param allowWorkspace
+	 *            the new allow workspace
+	 */
+	public void setAllowWorkspace(boolean allowWorkspace) {
+		this.allowWorkspace = allowWorkspace;
+		browseFileEditor.setAllowWorkspace(allowWorkspace);
+	}
+
+	/**
+	 * Gets the allow workspace.
+	 *
+	 * @return true if the editor can browse the workspace
+	 */
+	public boolean getAllowWorkspace() {
+		return allowWorkspace;
+	}
+
+	/**
+	 * Indicates whether the editor should allow browsing the file system or not.
+	 *
+	 * @param allowFileSystem
+	 *            the new allow file system
+	 */
+	public void setAllowFileSystem(boolean allowFileSystem) {
+		this.allowFileSystem = allowFileSystem;
+		browseFileEditor.setAllowFileSystem(allowFileSystem);
+	}
+
+	/**
+	 * Gets the allow file system.
+	 *
+	 * @return true if the editor can browse the fileSystem
+	 */
+	public boolean getAllowFileSystem() {
+		return allowFileSystem;
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/CompletionStyledTextMultiReference.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/CompletionStyledTextMultiReference.java
new file mode 100644
index 00000000000..0761956873a
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/CompletionStyledTextMultiReference.java
@@ -0,0 +1,65 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.papyrus.infra.widgets.editors.CompletionStyledTextMultipleReferenceEditor;
+import org.eclipse.papyrus.infra.widgets.editors.MultipleReferenceEditor;
+import org.eclipse.papyrus.infra.widgets.util.ISetPapyrusConverter;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A PropertyEditor for editing multiple references in a List
+ *
+ * @see org.eclipse.papyrus.widgets.editors.BooleanCheckbox
+ *
+ * @author Camille Letavernier
+ */
+public class CompletionStyledTextMultiReference extends MultiReference {
+
+	/**
+	 * 
+	 * Constructor.
+	 *
+	 * @param parent
+	 * @param style
+	 */
+	public CompletionStyledTextMultiReference(Composite parent, int style) {
+		super(parent, style);
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.properties.ui.widgets.MultiReference#createMultipleReferenceEditor(org.eclipse.swt.widgets.Composite, int)
+	 *
+	 * @param parent
+	 * @param style
+	 * @return
+	 */
+	@Override
+	protected MultipleReferenceEditor createMultipleReferenceEditor(Composite parent, int style) {
+		return new CompletionStyledTextMultipleReferenceEditor(parent, style);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.properties.ui.widgets.MultiReference#doBinding()
+	 *
+	 */
+	@Override
+	protected void doBinding() {
+		if (editor instanceof ISetPapyrusConverter) {
+			((ISetPapyrusConverter) editor).setPapyrusConverter(input.getPapyrusConverter(propertyPath));
+		}
+		super.doBinding();
+	}
+
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/CompletionStyledTextReferenceDialog.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/CompletionStyledTextReferenceDialog.java
new file mode 100644
index 00000000000..a13b64bc544
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/CompletionStyledTextReferenceDialog.java
@@ -0,0 +1,109 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.util.IPapyrusConverter;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * @author VL222926
+ *
+ */
+public class CompletionStyledTextReferenceDialog extends AbstractPropertyEditor {
+
+	/**
+	 * The ReferenceDialog widget
+	 */
+	protected org.eclipse.papyrus.infra.widgets.editors.CompletionStyledTextReferenceDialog editor;
+
+	/**
+	 * The ValueFactory used to create or edit Objects directly from
+	 * this editor
+	 */
+	protected ReferenceValueFactory factory;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 */
+	public CompletionStyledTextReferenceDialog(Composite parent, int style) {
+		editor = createReferenceDialog(parent, style);
+		setEditor(editor);
+	}
+
+	/**
+	 * Creates the reference dialog.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 * @return the reference dialog.
+	 */
+	protected org.eclipse.papyrus.infra.widgets.editors.CompletionStyledTextReferenceDialog createReferenceDialog(Composite parent, int style) {
+		return new org.eclipse.papyrus.infra.widgets.editors.CompletionStyledTextReferenceDialog(parent, style);
+	}
+
+	/**
+	 * 
+	 * @see org.eclipse.papyrus.infra.properties.ui.widgets.AbstractPropertyEditor#doBinding()
+	 *
+	 */
+	@Override
+	protected void doBinding() {
+
+		IStaticContentProvider provider = input.getContentProvider(propertyPath);
+		editor.setLabelProvider(input.getLabelProvider(propertyPath));
+		editor.setContentProvider(provider);
+		editor.setDirectCreation(input.getDirectCreation(propertyPath));
+		editor.setMandatory(input.isMandatory(propertyPath));
+		if (factory == null) { // Use the default factory from the DataSource
+			editor.setValueFactory(input.getValueFactory(propertyPath));
+		} else { // Use the factory explicitly specified
+			editor.setValueFactory(factory);
+		}
+		IPapyrusConverter parser = input.getPapyrusConverter(propertyPath);
+		if (parser != null) {
+			editor.setPapyrusConverter(parser);
+
+		}
+		super.doBinding();
+	}
+
+	/**
+	 * Sets the ValueFactory used to create or edit Objects directly from
+	 * this editor
+	 *
+	 * @param factory
+	 */
+	public void setFactory(ReferenceValueFactory factory) {
+		this.factory = factory;
+		editor.setValueFactory(factory);
+	}
+
+	/**
+	 * @return The ValueFactory used to create or edit Objects directly from
+	 *         this editor
+	 */
+	public ReferenceValueFactory getFactory() {
+		return factory;
+	}
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/CustomizablePropertyEditor.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/CustomizablePropertyEditor.java
new file mode 100644
index 00000000000..d31dcfb63e1
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/CustomizablePropertyEditor.java
@@ -0,0 +1,44 @@
+/*****************************************************************************
+ * 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.infra.properties.ui.widgets;
+
+import org.eclipse.papyrus.infra.properties.ui.modelelement.DataSource;
+
+/**
+ * The inteface to be implemented by all PropertyEditors
+ *
+ * @author Camille Letavernier
+ *
+ */
+public interface CustomizablePropertyEditor {
+
+	public DataSource getInput();
+
+	public void setInput(DataSource input);
+
+	public String getProperty();
+
+	public void setProperty(String property);
+
+	public boolean getShowLabel();
+
+	public void setShowLabel(boolean showLabel);
+
+	public String getCustomLabel();
+
+	public void setCustomLabel(String customLabel);
+
+	public void setReadOnly(boolean readOnly);
+
+	public boolean getReadOnly();
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/DoubleEditor.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/DoubleEditor.java
new file mode 100644
index 00000000000..9b4dd044edf
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/DoubleEditor.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:
+ *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A PropertyEditor for editing Doubles through a Text field
+ *
+ * @see org.eclipse.papyrus.infra.widgets.editors.DoubleEditor
+ *
+ * @author Camille Letavernier
+ */
+public class DoubleEditor extends AbstractPropertyEditor {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 */
+	public DoubleEditor(Composite parent, int style) {
+		super(new org.eclipse.papyrus.infra.widgets.editors.DoubleEditor(parent, style));
+	}
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/EnumCombo.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/EnumCombo.java
new file mode 100644
index 00000000000..46f2812c1c1
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/EnumCombo.java
@@ -0,0 +1,58 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A PropertyEditor for editing enumerations through a ComboBox
+ *
+ * @see org.eclipse.papyrus.infra.widgets.editors.BooleanCheckbox
+ *
+ * @author Camille Letavernier
+ */
+public class EnumCombo extends AbstractPropertyEditor {
+
+	/**
+	 * The EnumCombo widget
+	 */
+	protected org.eclipse.papyrus.infra.widgets.editors.EnumCombo enumCombo;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 */
+	public EnumCombo(Composite parent, int style) {
+		super(new org.eclipse.papyrus.infra.widgets.editors.EnumCombo(parent, style));
+		enumCombo = (org.eclipse.papyrus.infra.widgets.editors.EnumCombo) valueEditor;
+	}
+
+	/**
+	 * @Problem : The different options come from input.
+	 *          When we don't have an input (e.g. : during preview),
+	 *          we don't have the different values, and we can't
+	 *          display the correct preview.
+	 * @TODO : Retrieve the values from the DataContext if possible.
+	 */
+	@Override
+	protected void doBinding() {
+		enumCombo.setProviders(input.getContentProvider(propertyPath), input.getLabelProvider(propertyPath));
+
+		enumCombo.setUnsettable(!input.isMandatory(propertyPath));
+
+		super.doBinding();
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/EnumRadio.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/EnumRadio.java
new file mode 100644
index 00000000000..7d495d4d3e6
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/EnumRadio.java
@@ -0,0 +1,76 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A PropertyEditor for editing booleans with radio buttons.
+ * This Editor should only be used with Enums which have only
+ * a small amount of values.
+ *
+ * @see org.eclipse.papyrus.infra.widgets.editors.EnumRadio
+ *
+ * @author Camille Letavernier
+ */
+public class EnumRadio extends AbstractPropertyEditor {
+
+	/**
+	 * The EnumRadio widget
+	 */
+	protected org.eclipse.papyrus.infra.widgets.editors.EnumRadio enumRadio;
+
+	private int numColumns = -1;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 */
+	public EnumRadio(Composite parent, int style) {
+		super(new org.eclipse.papyrus.infra.widgets.editors.EnumRadio(parent, style));
+		enumRadio = (org.eclipse.papyrus.infra.widgets.editors.EnumRadio) valueEditor;
+	}
+
+	/**
+	 * Sets the maximum number of columns for this editor. The radio values
+	 * will be distributed according to this number
+	 *
+	 * @param numColumns
+	 */
+	public void setNumColumns(int numColumns) {
+		this.numColumns = numColumns;
+		enumRadio.setNumColumns(numColumns);
+	}
+
+	/**
+	 * Return the maximum number of columns for this editor
+	 *
+	 * @return
+	 *         The number of columns for this editor
+	 */
+	public int getNumColumns() {
+		return numColumns;
+	}
+
+	@Override
+	protected void doBinding() {
+		enumRadio.setProviders(input.getContentProvider(propertyPath), input.getLabelProvider(propertyPath));
+
+		// enumRadio.setUnsettable(! input.isMandatory(propertyPath));
+
+		super.doBinding();
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/FloatEditor.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/FloatEditor.java
new file mode 100644
index 00000000000..f0b163f56cf
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/FloatEditor.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:
+ *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A PropertyEditor for editing floats through a Text field
+ *
+ * @see org.eclipse.papyrus.infra.widgets.editors.FloatEditor
+ *
+ * @author Camille Letavernier
+ */
+public class FloatEditor extends AbstractPropertyEditor {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 */
+	public FloatEditor(Composite parent, int style) {
+		super(new org.eclipse.papyrus.infra.widgets.editors.FloatEditor(parent, style));
+	}
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/IntegerEditor.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/IntegerEditor.java
new file mode 100644
index 00000000000..694d5c20413
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/IntegerEditor.java
@@ -0,0 +1,36 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A PropertyEditor for editing integers through a Text field
+ *
+ * @see org.eclipse.papyrus.infra.widgets.editors.IntegerEditor
+ *
+ * @author Camille Letavernier
+ */
+public class IntegerEditor extends AbstractPropertyEditor {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 */
+	public IntegerEditor(Composite parent, int style) {
+		super(new org.eclipse.papyrus.infra.widgets.editors.IntegerEditor(parent, style));
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/IntegerMask.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/IntegerMask.java
new file mode 100644
index 00000000000..2b06d00312c
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/IntegerMask.java
@@ -0,0 +1,73 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.papyrus.infra.properties.ui.providers.XWTCompliantMaskProvider;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A widget to edit mask-based Integer values
+ * The integer value is interpreted as a list of boolean values
+ * The widget cannot use more than 32 masks
+ *
+ * @author Camille Letavernier
+ */
+@Deprecated
+public class IntegerMask extends InvalidWidget {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which this widget will be created
+	 * @param style
+	 */
+	public IntegerMask(Composite parent, int style) {
+		super(parent, style);
+	}
+
+	/**
+	 * @return the number of columns for this editor
+	 *
+	 */
+	public int getNumColumns() {
+		return 0;
+	}
+
+	/**
+	 * Sets the number of columns for this editor. The mask checkboxes will be
+	 * distributed according to this number
+	 *
+	 * @param numColumns
+	 */
+	public void setNumColumns(int numColumns) {
+		//
+	}
+
+	/**
+	 * Sets the MaskProvider for this editor
+	 *
+	 * @param provider
+	 */
+	public void setMaskProvider(XWTCompliantMaskProvider provider) {
+		//
+	}
+
+	/**
+	 *
+	 * @return the MaskProvider associated to this editor
+	 */
+	public XWTCompliantMaskProvider getMaskProvider() {
+		return null;
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/IntegerSpinner.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/IntegerSpinner.java
new file mode 100644
index 00000000000..ab08ffed887
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/IntegerSpinner.java
@@ -0,0 +1,105 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A widget for editing Integer values with a SWT Spinner
+ *
+ * @author Camille Letavernier
+ *
+ * @see org.eclipse.papyrus.infra.widgets.editors.IntegerSpinner
+ * @see org.eclipse.swt.widgets.Spinner
+ */
+public class IntegerSpinner extends AbstractPropertyEditor {
+
+	private org.eclipse.papyrus.infra.widgets.editors.IntegerSpinner spinner;
+
+	private int minimum = 0, maximum = 100, increment = 1;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 * @param style
+	 */
+	public IntegerSpinner(Composite parent, int style) {
+		spinner = createIntegerSpinner(parent, style);
+		spinner.setMinimum(minimum);
+		spinner.setMaximum(maximum);
+		spinner.setIncrement(increment);
+		setEditor(spinner);
+	}
+
+	/**
+	 * Creates the integer spinner.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 * @return the integer spinner.
+	 */
+	protected org.eclipse.papyrus.infra.widgets.editors.IntegerSpinner createIntegerSpinner(Composite parent, int style) {
+		return new org.eclipse.papyrus.infra.widgets.editors.IntegerSpinner(parent, style);
+	}
+
+	/**
+	 * @return the minimum value for the spinner
+	 */
+	public int getMinimum() {
+		return minimum;
+	}
+
+	/**
+	 * @param minimum
+	 *            the minimum value for the spinner
+	 */
+	public void setMinimum(int minimum) {
+		this.minimum = minimum;
+		spinner.setMinimum(minimum);
+	}
+
+	/**
+	 * @return the maximum value for the spinner
+	 */
+	public int getMaximum() {
+		return maximum;
+	}
+
+	/**
+	 * @param maximum
+	 *            the maximum value for the spinner
+	 */
+	public void setMaximum(int maximum) {
+		this.maximum = maximum;
+		spinner.setMaximum(maximum);
+	}
+
+	/**
+	 * @return the increment value for the spinner
+	 */
+	public int getIncrement() {
+		return increment;
+	}
+
+	/**
+	 * @param increment
+	 *            the increment value for the spinner
+	 */
+	public void setIncrement(int increment) {
+		this.increment = increment;
+		spinner.setIncrement(increment);
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/InvalidWidget.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/InvalidWidget.java
new file mode 100644
index 00000000000..89cee91ad48
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/InvalidWidget.java
@@ -0,0 +1,62 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+import org.eclipse.papyrus.infra.widgets.editors.StringLabel;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A class for displaying invalid widgets without raising Java errors
+ * The widget will display an error, and may display the property label
+ * if it is available
+ *
+ * @author Camille Letavernier
+ */
+public class InvalidWidget extends AbstractPropertyEditor {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The Composite in which the editor will be created
+	 * @param style
+	 *            The style to apply to the editor
+	 */
+	public InvalidWidget(Composite parent, int style) {
+		super();
+		StringLabel editor = createStringLabel(parent, style);
+		setEditor(editor);
+
+		editor.getValueLabel().setText("Property view Error : invalid widget type"); //$NON-NLS-1$
+		editor.getValueLabel().setImage(Activator.getDefault().getImage("icons/error.gif")); //$NON-NLS-1$
+	}
+
+	/**
+	 * Creates the string label.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 * @return the string label.
+	 */
+	protected StringLabel createStringLabel(Composite parent, int style) {
+		return new StringLabel(parent, style);
+	}
+
+	@Override
+	public void doBinding() {
+		// Skip to avoid the binding between the property's value and the CLabel
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MaskProvider.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MaskProvider.java
new file mode 100644
index 00000000000..32d260d9201
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MaskProvider.java
@@ -0,0 +1,29 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import java.util.Map;
+
+/**
+ * An interface for providing Masks for editing mask-based integer values
+ *
+ * @author Camille Letavernier
+ *
+ * @see StringMask
+ */
+public interface MaskProvider {
+
+	/**
+	 * @return the list of masks and their String descriptions
+	 */
+	public Map<String, String> getMasks();
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MultiDouble.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MultiDouble.java
new file mode 100644
index 00000000000..50fc47e9807
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MultiDouble.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:
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+
+
+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
+import org.eclipse.papyrus.infra.widgets.editors.MultipleDoubleEditor;
+import org.eclipse.swt.widgets.Composite;
+
+public class MultiDouble extends AbstractPropertyEditor {
+
+	/**
+	 * The MultipleDoubleEditor widget
+	 */
+	protected MultipleDoubleEditor editor;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 */
+	public MultiDouble(Composite parent, int style) {
+		editor = createMultipleDoubleEditor(parent, style);
+		super.setEditor(editor);
+	}
+
+	/**
+	 * Creates the multiple double editor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 * @return the multiple double editor.
+	 */
+	protected MultipleDoubleEditor createMultipleDoubleEditor(Composite parent, int style) {
+		return new MultipleDoubleEditor(parent, style);
+	}
+
+	@Override
+	protected void doBinding() {
+		editor.setOrdered(input.isOrdered(propertyPath));
+		editor.setUnique(input.isUnique(propertyPath));
+
+		if (getInputObservableList() instanceof ICommitListener) {
+			editor.addCommitListener((ICommitListener) getInputObservableList());
+		}
+
+		super.doBinding();
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MultiInteger.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MultiInteger.java
new file mode 100644
index 00000000000..e3e85dfc340
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MultiInteger.java
@@ -0,0 +1,69 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
+import org.eclipse.papyrus.infra.widgets.editors.MultipleIntegerEditor;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A PropertyEditor for editing multiple integers in a List
+ *
+ * @see org.eclipse.papyrus.widgets.editors.MultipleIntegerEditor
+ *
+ * @author Camille Letavernier
+ */
+public class MultiInteger extends AbstractPropertyEditor {
+
+	/**
+	 * The MultipleIntegerEditor widget
+	 */
+	protected MultipleIntegerEditor editor;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 */
+	public MultiInteger(Composite parent, int style) {
+		editor = createMultipleIntegerEditor(parent, style);
+		super.setEditor(editor);
+	}
+
+	/**
+	 * Creates the multiple integer editor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 * @return the multiple integer editor.
+	 */
+	protected MultipleIntegerEditor createMultipleIntegerEditor(Composite parent, int style) {
+		return new MultipleIntegerEditor(parent, style);
+	}
+
+	@Override
+	protected void doBinding() {
+		editor.setOrdered(input.isOrdered(propertyPath));
+		editor.setUnique(input.isUnique(propertyPath));
+
+		if (getInputObservableList() instanceof ICommitListener) {
+			editor.addCommitListener((ICommitListener) getInputObservableList());
+		}
+
+		super.doBinding();
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MultiReference.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MultiReference.java
new file mode 100644
index 00000000000..f367c9730a3
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MultiReference.java
@@ -0,0 +1,106 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
+import org.eclipse.papyrus.infra.widgets.editors.MultipleReferenceEditor;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A PropertyEditor for editing multiple references in a List
+ *
+ * @see org.eclipse.papyrus.widgets.editors.BooleanCheckbox
+ *
+ * @author Camille Letavernier
+ */
+public class MultiReference extends AbstractPropertyEditor {
+
+	/**
+	 * The MultipleReferenceEditor widget
+	 */
+	protected MultipleReferenceEditor editor;
+
+	/**
+	 * The ReferenceValueFactory allowing creation and direct editing of values
+	 */
+	protected ReferenceValueFactory factory;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 */
+	public MultiReference(Composite parent, int style) {
+		editor = createMultipleReferenceEditor(parent, style);
+		super.setEditor(editor);
+	}
+
+	/**
+	 * Creates the reference editor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 * @return The reference editor
+	 */
+	protected MultipleReferenceEditor createMultipleReferenceEditor(Composite parent, int style) {
+		return new MultipleReferenceEditor(parent, style);
+	}
+
+	@Override
+	protected void doBinding() {
+		IStaticContentProvider contentProvider = input.getContentProvider(propertyPath);
+		ILabelProvider labelProvider = input.getLabelProvider(propertyPath);
+
+		if (getInputObservableList() instanceof ICommitListener) {
+			editor.addCommitListener((ICommitListener) getInputObservableList());
+		}
+
+		editor.setProviders(contentProvider, labelProvider);
+		editor.setOrdered(input.isOrdered(propertyPath));
+		editor.setUnique(input.isUnique(propertyPath));
+		if (factory == null) {
+			editor.setFactory(input.getValueFactory(propertyPath));
+		} else {
+			editor.setFactory(factory);
+		}
+		editor.setDirectCreation(input.getDirectCreation(propertyPath));
+
+		super.doBinding();
+	}
+
+	/**
+	 * Sets the {@link ReferenceValueFactory} for this Editor. The factory
+	 * allows creation and direct edition of objects.
+	 *
+	 * @param factory
+	 */
+	public void setFactory(ReferenceValueFactory factory) {
+		this.factory = factory;
+		editor.setFactory(factory);
+	}
+
+	/**
+	 * @return the {@link ReferenceValueFactory} used by this editor
+	 */
+	public ReferenceValueFactory getFactory() {
+		return factory;
+	}
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MultiReferenceEditorWithPropertyView.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MultiReferenceEditorWithPropertyView.java
new file mode 100644
index 00000000000..13b79835819
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MultiReferenceEditorWithPropertyView.java
@@ -0,0 +1,169 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import java.util.Set;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.ui.runtime.EmbeddedDisplayEngine;
+import org.eclipse.papyrus.infra.properties.ui.runtime.PropertiesRuntime;
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.papyrus.infra.widgets.editors.AbstractListEditor;
+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
+import org.eclipse.papyrus.infra.widgets.editors.MultipleReferenceEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+
+public class MultiReferenceEditorWithPropertyView extends AbstractListEditor implements ISelectionChangedListener {
+
+	protected MultipleReferenceEditor multiReferenceEditor;
+
+	protected Composite propertiesComposite;
+
+	protected EmbeddedDisplayEngine displayEngine = new EmbeddedDisplayEngine();
+
+	public MultiReferenceEditorWithPropertyView(Composite parent, int style) {
+		super(parent, style);
+		// parent.setBackground(getDisplay().getSystemColor(SWT.COLOR_RED));
+		((GridLayout) getLayout()).numColumns++;
+
+		multiReferenceEditor = createMultipleReferenceEditor(style);
+		multiReferenceEditor.addSelectionChangedListener(this);
+		multiReferenceEditor.setLayoutData(new GridData(SWT.BEGINNING, SWT.FILL, false, true));
+
+		propertiesComposite = new Composite(this, style);
+		propertiesComposite.setLayout(new FillLayout());
+		propertiesComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+	}
+
+	/**
+	 * Creates the multi reference editor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 * @return the multi reference editor.
+	 */
+	protected MultipleReferenceEditor createMultipleReferenceEditor(int style) {
+		return new MultipleReferenceEditor(this, style);
+	}
+
+	@Override
+	public GridData getDefaultLayoutData() {
+		GridData data = super.getDefaultLayoutData();
+		data.grabExcessVerticalSpace = true;
+		data.grabExcessHorizontalSpace = true;
+		data.verticalAlignment = SWT.FILL;
+		return data;
+	}
+
+	@Override
+	public Object getEditableType() {
+		return Object.class;
+	}
+
+	@Override
+	public void setReadOnly(boolean readOnly) {
+		multiReferenceEditor.setReadOnly(readOnly);
+		propertiesComposite.setEnabled(!readOnly);
+	}
+
+	@Override
+	public boolean isReadOnly() {
+		return multiReferenceEditor.isReadOnly();
+	}
+
+	@Override
+	public void setToolTipText(String text) {
+		multiReferenceEditor.setToolTipText(text);
+	}
+
+	@Override
+	public void setLabel(String label) {
+		multiReferenceEditor.setLabel(label);
+	}
+
+	public void setOrdered(boolean ordered) {
+		multiReferenceEditor.setOrdered(ordered);
+	}
+
+	public void setUnique(boolean unique) {
+		multiReferenceEditor.setUnique(unique);
+	}
+
+	@Override
+	public void setModelObservable(IObservableList modelObservable) {
+		multiReferenceEditor.setModelObservable(modelObservable);
+
+		// If the properties view of the first element contains a recursive view, we may have a StackOverFlow here.
+		// Do not force the initial selection.
+
+		// if(!modelObservable.isEmpty()) {
+		// multiReferenceEditor.getViewer().setSelection(new StructuredSelection(modelObservable.get(0)));
+		// }
+	}
+
+	@Override
+	public void dispose() {
+		super.dispose();
+		multiReferenceEditor.removeSelectionChangedListener(this);
+	}
+
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		ISelection selection = event.getSelection();
+
+		Set<View> views = PropertiesRuntime.getConstraintEngine().getDisplayUnits(selection);
+		displayEngine.display(views, propertiesComposite, selection, SWT.NONE);
+		this.layout();
+		propertiesComposite.layout();
+
+		// TODO : How can we force the property view layout ?
+		// In the tabbed property view, we need to go up to the 4th parent
+		getParent().layout(); // This one works in the embedded editor
+
+		// In the Eclipse Tabbed Property View, we need to go this far...
+		getParent().getParent().getParent().getParent().layout();
+	}
+
+	public void setFactory(ReferenceValueFactory valueFactory) {
+		multiReferenceEditor.setFactory(valueFactory);
+	}
+
+	public void setDirectCreation(boolean directCreation) {
+		multiReferenceEditor.setDirectCreation(directCreation);
+	}
+
+	public void setLabelProvider(ILabelProvider labelProvider) {
+		multiReferenceEditor.setLabelProvider(labelProvider);
+	}
+
+	@Override
+	public void addCommitListener(ICommitListener commitListener) {
+		multiReferenceEditor.addCommitListener(commitListener);
+	}
+
+	@Override
+	public void changeColorField() {
+		// TODO Auto-generated method stub
+
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MultiReferencePropertyEditorWithPropertyView.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MultiReferencePropertyEditorWithPropertyView.java
new file mode 100644
index 00000000000..df9d8305401
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MultiReferencePropertyEditorWithPropertyView.java
@@ -0,0 +1,62 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
+import org.eclipse.swt.widgets.Composite;
+
+
+public class MultiReferencePropertyEditorWithPropertyView extends AbstractPropertyEditor {
+
+	protected MultiReferenceEditorWithPropertyView editor;
+
+	public MultiReferencePropertyEditorWithPropertyView(Composite parent, int style) {
+		editor = createMultiReferenceEditorWithPropertyView(parent, style);
+		setEditor(editor);
+	}
+
+	/**
+	 * Creates the multi reference editor with property view.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 * @return the multi reference editor with property view.
+	 */
+	protected MultiReferenceEditorWithPropertyView createMultiReferenceEditorWithPropertyView(Composite parent, int style) {
+		return new MultiReferenceEditorWithPropertyView(parent, style);
+	}
+
+	@Override
+	protected void doBinding() {
+		// IStaticContentProvider contentProvider = input.getContentProvider(propertyPath);
+		ILabelProvider labelProvider = input.getLabelProvider(propertyPath);
+
+		if (getInputObservableList() instanceof ICommitListener) {
+			editor.addCommitListener((ICommitListener) getInputObservableList());
+		}
+
+		if (labelProvider != null) {
+			editor.setLabelProvider(labelProvider);
+		}
+
+		editor.setOrdered(input.isOrdered(propertyPath));
+		editor.setUnique(input.isUnique(propertyPath));
+
+		editor.setFactory(input.getValueFactory(propertyPath));
+		editor.setDirectCreation(input.getDirectCreation(propertyPath));
+
+		super.doBinding();
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MultiString.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MultiString.java
new file mode 100644
index 00000000000..c6751cb8869
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MultiString.java
@@ -0,0 +1,90 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
+import org.eclipse.papyrus.infra.widgets.editors.MultipleStringEditor;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A PropertyEditor for editing multiple strings in a list
+ *
+ * @see org.eclipse.papyrus.infra.widgets.editors.MultipleStringEditor
+ *
+ * @author Camille Letavernier
+ */
+public class MultiString extends AbstractPropertyEditor {
+
+	/**
+	 * The MultipleStringEditor widget
+	 */
+	protected MultipleStringEditor editor;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 */
+	public MultiString(Composite parent, int style) {
+		editor = createMultipleStringEditor(parent, style);
+		super.setEditor(editor);
+	}
+
+	/**
+	 * Creates the multiple string editor
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 * @return the multiple string editor.
+	 */
+	protected MultipleStringEditor createMultipleStringEditor(Composite parent, int style) {
+		return new MultipleStringEditor(parent, style);
+	}
+
+	@Override
+	protected void doBinding() {
+		editor.setOrdered(input.isOrdered(propertyPath));
+		editor.setUnique(input.isUnique(propertyPath));
+		editor.setDirectCreation(input.getDirectCreation(propertyPath));
+		ReferenceValueFactory factory = input.getValueFactory(propertyPath);
+		if (factory != null) {
+			editor.setFactory(input.getValueFactory(propertyPath));
+		}
+
+		IStaticContentProvider provider = input.getContentProvider(propertyPath);
+		if (provider != null) {
+			editor.setContentProvider(provider);
+		}
+
+		if (getInputObservableList() instanceof ICommitListener) {
+			editor.addCommitListener((ICommitListener) getInputObservableList());
+		}
+
+		super.doBinding();
+	}
+
+	/**
+	 *
+	 * @return the ListViewer associated to this editor
+	 */
+	public TreeViewer getViewer() {
+		return editor.getViewer();
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MultiStringFile.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MultiStringFile.java
new file mode 100644
index 00000000000..4e09f5186d3
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/MultiStringFile.java
@@ -0,0 +1,99 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
+import org.eclipse.papyrus.infra.widgets.editors.MultipleStringFileEditor;
+import org.eclipse.swt.widgets.Composite;
+
+
+public class MultiStringFile extends AbstractPropertyEditor {
+
+	public MultipleStringFileEditor editor;
+
+	/**
+	 * The filtered extensions
+	 * This should be a 1-1 mapping with {@link #filterNames}
+	 */
+	protected String[] filterExtensions;
+
+	/**
+	 * The name of the filters.
+	 * This should be a 1-1 mapping with {@link #filterExtensions}
+	 */
+	protected String[] filterNames;
+
+	public MultiStringFile(Composite parent, int style) {
+		editor = createMultipleStringFileEditor(parent, style);
+		setEditor(editor);
+	}
+
+	/**
+	 * Creates the multiple string file editor
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 * @return the multiple string file editor.
+	 */
+	protected MultipleStringFileEditor createMultipleStringFileEditor(Composite parent, int style) {
+		return new MultipleStringFileEditor(parent, style);
+	}
+
+	@Override
+	protected void doBinding() {
+		editor.setOrdered(input.isOrdered(propertyPath));
+		editor.setUnique(input.isUnique(propertyPath));
+
+		if (getInputObservableList() instanceof ICommitListener) {
+			editor.addCommitListener((ICommitListener) getInputObservableList());
+		}
+
+		super.doBinding();
+	}
+
+	/**
+	 *
+	 * @param filterExtensions
+	 */
+	public void setFilterExtensions(String[] filterExtensions) {
+		this.filterExtensions = filterExtensions;
+		checkFilters();
+	}
+
+	public String[] getFilterExtensions() {
+		return this.filterExtensions;
+	}
+
+	/**
+	 *
+	 * @param filterNames
+	 */
+	public void setFilterNames(String[] filterNames) {
+		this.filterNames = filterNames;
+		checkFilters();
+	}
+
+	public String[] getFilterNames() {
+		return this.filterNames;
+	}
+
+	/**
+	 * Checks if the filters are valid
+	 */
+	protected void checkFilters() {
+		if (filterExtensions != null && filterNames != null) {
+			editor.setFilters(filterExtensions, filterNames);
+		}
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/ReferenceCombo.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/ReferenceCombo.java
new file mode 100644
index 00000000000..edcfb132f77
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/ReferenceCombo.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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.HierarchicToFlatContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.TreeToFlatContentProvider;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A PropertyEditor for editing references through a ComboBox
+ *
+ * @see org.eclipse.papyrus.infra.widgets.editors.ReferenceCombo
+ *
+ * @author Camille Letavernier
+ */
+public class ReferenceCombo extends AbstractPropertyEditor {
+
+	/**
+	 * The ReferenceCombo widget
+	 */
+	protected org.eclipse.papyrus.infra.widgets.editors.ReferenceCombo combo;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 */
+	public ReferenceCombo(Composite parent, int style) {
+		combo = new org.eclipse.papyrus.infra.widgets.editors.ReferenceCombo(parent, style);
+		super.setEditor(combo);
+	}
+
+	@Override
+	protected void doBinding() {
+		IStaticContentProvider contentProvider = input.getContentProvider(propertyPath);
+		if (contentProvider instanceof IHierarchicContentProvider) {
+			contentProvider = new HierarchicToFlatContentProvider((IHierarchicContentProvider) contentProvider);
+			// combo.setViewer(new EncapsulatedComboViewer(combo.getViewer()));
+		} else if (contentProvider instanceof ITreeContentProvider) {
+			contentProvider = new TreeToFlatContentProvider((ITreeContentProvider) contentProvider);
+			// combo.setViewer(new EncapsulatedComboViewer(combo.getViewer()));
+		}
+
+		ILabelProvider labelProvider = input.getLabelProvider(propertyPath);
+
+		combo.setProviders(contentProvider, labelProvider);
+		combo.setUnsettable(!input.isMandatory(propertyPath));
+
+		super.doBinding();
+	}
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/ReferenceDialog.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/ReferenceDialog.java
new file mode 100644
index 00000000000..3bcf73e4267
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/ReferenceDialog.java
@@ -0,0 +1,99 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A PropertyEditor for editing references through a Dialog
+ *
+ * @see org.eclipse.papyrus.infra.widgets.editors.ReferenceDialog
+ *
+ * @author Camille Letavernier
+ */
+public class ReferenceDialog extends AbstractPropertyEditor {
+
+	/**
+	 * The ReferenceDialog widget
+	 */
+	protected org.eclipse.papyrus.infra.widgets.editors.ReferenceDialog editor;
+
+	/**
+	 * The ValueFactory used to create or edit Objects directly from
+	 * this editor
+	 */
+	protected ReferenceValueFactory factory;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 */
+	public ReferenceDialog(Composite parent, int style) {
+		editor = createReferenceDialog(parent, style);
+		setEditor(editor);
+	}
+
+	/**
+	 * Creates the reference dialog.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 * @return the reference dialog.
+	 */
+	protected org.eclipse.papyrus.infra.widgets.editors.ReferenceDialog createReferenceDialog(Composite parent, int style) {
+		return new org.eclipse.papyrus.infra.widgets.editors.ReferenceDialog(parent, style);
+	}
+
+	@Override
+	protected void doBinding() {
+		IStaticContentProvider provider = input.getContentProvider(propertyPath);
+		editor.setLabelProvider(input.getLabelProvider(propertyPath));
+		editor.setContentProvider(provider);
+		editor.setDirectCreation(input.getDirectCreation(propertyPath));
+		editor.setMandatory(input.isMandatory(propertyPath));
+		if (factory == null) { // Use the default factory from the DataSource
+			editor.setValueFactory(input.getValueFactory(propertyPath));
+		} else { // Use the factory explicitly specified
+			editor.setValueFactory(factory);
+		}
+
+		super.doBinding();
+	}
+
+	/**
+	 * Sets the ValueFactory used to create or edit Objects directly from
+	 * this editor
+	 *
+	 * @param factory
+	 */
+	public void setFactory(ReferenceValueFactory factory) {
+		this.factory = factory;
+		editor.setValueFactory(factory);
+	}
+
+	/**
+	 * @return The ValueFactory used to create or edit Objects directly from
+	 *         this editor
+	 */
+	public ReferenceValueFactory getFactory() {
+		return factory;
+	}
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/ReferenceLabel.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/ReferenceLabel.java
new file mode 100644
index 00000000000..cdf487cb721
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/ReferenceLabel.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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.widgets.editors.StringLabel;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A property editor to display a reference's value as a CLabel, filled
+ * via a LabelProvider
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class ReferenceLabel extends AbstractPropertyEditor {
+
+	private StringLabel editor;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 * @param style
+	 */
+	public ReferenceLabel(Composite parent, int style) {
+		editor = createReferenceLabel(parent, style);
+		setEditor(editor);
+	}
+
+	/**
+	 * Creates the string label.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 * @return the string label.
+	 */
+	protected StringLabel createReferenceLabel(Composite parent, int style) {
+		return new StringLabel(parent, style);
+	}
+
+	@Override
+	public void doBinding() {
+		ILabelProvider labelProvider = input.getLabelProvider(propertyPath);
+		if (labelProvider != null) {
+			editor.setLabelProvider(labelProvider);
+		}
+
+		super.doBinding();
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringCombo.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringCombo.java
new file mode 100644
index 00000000000..2169fc50521
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringCombo.java
@@ -0,0 +1,68 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A Property Editor for editing a String with an editable combo.
+ * The combo proposes a set of default values.
+ *
+ * @author Camille Letavernier
+ */
+public class StringCombo extends AbstractPropertyEditor {
+
+	/**
+	 * The StringCombo widget used by this property editor
+	 */
+	protected org.eclipse.papyrus.infra.widgets.editors.StringCombo editor;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 * @param style
+	 */
+	public StringCombo(Composite parent, int style) {
+		editor = createStringCombo(parent, style);
+		super.setEditor(editor);
+	}
+
+	/**
+	 * Creates the string combo dialog.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 * @return the string combo dialog.
+	 */
+	protected org.eclipse.papyrus.infra.widgets.editors.StringCombo createStringCombo(Composite parent, int style) {
+		return new org.eclipse.papyrus.infra.widgets.editors.StringCombo(parent, style);
+	}
+
+	@Override
+	public void doBinding() {
+		IStaticContentProvider contentProvider = input.getContentProvider(propertyPath);
+		editor.setContentProvider(contentProvider);
+		editor.setUnsettable(!input.isMandatory(propertyPath));
+
+		ILabelProvider labelProvider = input.getLabelProvider(propertyPath);
+		if (labelProvider != null) {
+			editor.setLabelProvider(labelProvider);
+		}
+		super.doBinding();
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringEditor.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringEditor.java
new file mode 100644
index 00000000000..acee3cf7f0e
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringEditor.java
@@ -0,0 +1,36 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A PropertyEditor for editing strings through a Text field
+ *
+ * @see org.eclipse.papyrus.infra.widgets.editors.StringEditor
+ *
+ * @author Camille Letavernier
+ */
+public class StringEditor extends AbstractPropertyEditor {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 */
+	public StringEditor(Composite parent, int style) {
+		super(new org.eclipse.papyrus.infra.widgets.editors.StringEditor(parent, style));
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringEditorWithReferences.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringEditorWithReferences.java
new file mode 100644
index 00000000000..b9b90fd9021
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringEditorWithReferences.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:
+ *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.infra.emf.utils.TextReferencesHelper;
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+import org.eclipse.papyrus.infra.widgets.editors.TreeSelectorDialog;
+import org.eclipse.papyrus.infra.widgets.providers.EmptyContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+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.Button;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A StringEditor with support for inserting references to EObjects (Via a TextReferenceHelper)
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class StringEditorWithReferences extends org.eclipse.papyrus.infra.widgets.editors.StringEditor implements SelectionListener {
+
+	protected Composite buttonsBar;
+
+	protected Button insertReferenceButton;
+
+	protected IStaticContentProvider referenceContentProvider = EmptyContentProvider.instance;
+
+	protected ILabelProvider labelProvider = new LabelProvider();
+
+	protected TextReferencesHelper referenceHelper;
+
+	public StringEditorWithReferences(Composite parent, int style) {
+		super(parent, style | SWT.MULTI);
+		setLayout(new GridLayout(2, false));
+		createButtonsBar(this);
+	}
+
+	@Override
+	protected GridData getDefaultLayoutData() {
+		GridData defaultData = super.getDefaultLayoutData();
+		defaultData.horizontalSpan = 2;
+		return defaultData;
+	}
+
+	protected void createButtonsBar(Composite wrapper) {
+		buttonsBar = new Composite(wrapper, SWT.NONE);
+		GridLayout buttonsBarLayout = new GridLayout(1, true);
+
+		buttonsBarLayout.marginWidth = 0;
+		buttonsBarLayout.marginHeight = 0;
+
+		buttonsBar.setLayout(buttonsBarLayout);
+		buttonsBar.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
+		buttonsBar.moveAbove(label);
+		createButtons(buttonsBar);
+	}
+
+	protected void createButtons(Composite buttonsBar) {
+		createInsertReferenceButton(buttonsBar);
+	}
+
+	protected void createInsertReferenceButton(Composite buttonsBar) {
+		insertReferenceButton = new Button(buttonsBar, SWT.PUSH);
+		insertReferenceButton.setToolTipText("Insert a dynamic reference to an Element");
+		insertReferenceButton.setImage(org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage("/icons/hyperlink_16x16.gif")); //$NON-NLS-1$
+		insertReferenceButton.addSelectionListener(this);
+		insertReferenceButton.setLayoutData(new GridData(SWT.END, SWT.BEGINNING, true, false));
+	}
+
+	public void setReferenceBrowserContentProvider(IStaticContentProvider provider) {
+		this.referenceContentProvider = provider;
+	}
+
+	public void setTextReferencesHelper(TextReferencesHelper helper) {
+		this.referenceHelper = helper;
+	}
+
+	public void widgetSelected(SelectionEvent e) {
+		if (e.widget == insertReferenceButton) {
+			insertReferenceAction();
+		}
+	}
+
+	protected void insertReferenceAction() {
+		if (referenceHelper == null) {
+			// The widget is not properly set. We cannot handle references
+			Activator.log.warn("This widget is not properly configured. It cannot handle reference insertion");
+			return;
+		}
+
+		TreeSelectorDialog dialog = new TreeSelectorDialog(getShell());
+
+		dialog.setContentProvider(new EncapsulatedContentProvider(referenceContentProvider));
+		dialog.setLabelProvider(labelProvider);
+
+		if (dialog.open() == Window.OK) {
+			Object[] result = dialog.getResult();
+			if (result.length == 0) {
+				return;
+			}
+
+			Object resultElement = result[0];
+			if (!(resultElement instanceof EObject)) {
+				return;
+			}
+
+			EObject objectToReference = (EObject) resultElement;
+
+			String currentText = text.getText();
+			int caretPosition = text.getCaretPosition();
+
+			String newText = referenceHelper.insertReference(objectToReference, currentText, caretPosition);
+			if (newText.length() == currentText.length()) {
+				return;
+			}
+
+			int caretShift = newText.length() - currentText.length();
+			int newCaretPosition = caretPosition + caretShift;
+
+			// This should not happen with the standard ReferenceHelper as it is supposed to insert additional text into the current text
+			// However, some ReferenceHelper implementations might replace the current text
+			if (newCaretPosition < 0) {
+				newCaretPosition = 0;
+			}
+
+			if (newCaretPosition > newText.length()) {
+				newCaretPosition = newText.length();
+			}
+
+			text.setText(newText);
+			text.setFocus();
+			text.setSelection(newCaretPosition);
+			commit();
+		}
+	}
+
+	public void widgetDefaultSelected(SelectionEvent e) {
+		// Nothing
+	}
+
+	public void setLabelProvider(ILabelProvider labelProvider) {
+		this.labelProvider = labelProvider;
+	}
+
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringFileSelector.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringFileSelector.java
new file mode 100644
index 00000000000..aa2bb9dd01f
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringFileSelector.java
@@ -0,0 +1,146 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A Widget for selecting Files on the workspace or on the file system.
+ * The widgets only edits String values : it uses the path of the files
+ *
+ * @author Camille Letavernier
+ */
+public class StringFileSelector extends AbstractPropertyEditor {
+
+	/**
+	 * The StringFileSelector widget used by this property editor
+	 */
+	protected org.eclipse.papyrus.infra.widgets.editors.StringFileSelector selector;
+
+	/**
+	 * The filtered extensions
+	 * This should be a 1-1 mapping with {@link #filterNames}
+	 */
+	protected String[] filterExtensions;
+
+	/**
+	 * The name of the filters.
+	 * This should be a 1-1 mapping with {@link #filterExtensions}
+	 */
+	protected String[] filterNames;
+
+	/**
+	 * Enables the "browse workspace" feature
+	 */
+	protected boolean allowWorkspace = true;
+
+	/**
+	 * Enables the "browse file system" feature
+	 */
+	protected boolean allowFileSystem = true;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 * @param style
+	 */
+	public StringFileSelector(Composite parent, int style) {
+		selector = createSelector(parent, style);
+		super.setEditor(selector);
+	}
+
+	/**
+	 * Creates the selector
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 * @return the selector
+	 */
+	protected org.eclipse.papyrus.infra.widgets.editors.StringFileSelector createSelector(Composite parent, int style) {
+		return new org.eclipse.papyrus.infra.widgets.editors.StringFileSelector(parent, style);
+	}
+
+	/**
+	 *
+	 * @param filterExtensions
+	 */
+	public void setFilterExtensions(String[] filterExtensions) {
+		this.filterExtensions = filterExtensions;
+		checkFilters();
+	}
+
+	public String[] getFilterExtensions() {
+		return this.filterExtensions;
+	}
+
+	/**
+	 *
+	 * @param filterNames
+	 */
+	public void setFilterNames(String[] filterNames) {
+		this.filterNames = filterNames;
+		checkFilters();
+	}
+
+	public String[] getFilterNames() {
+		return this.filterNames;
+	}
+
+	/**
+	 * Checks if the filters are valid
+	 */
+	protected void checkFilters() {
+		if (filterExtensions != null && filterNames != null) {
+			selector.setFilters(filterExtensions, filterNames);
+		}
+	}
+
+	/**
+	 * Indicates whether the editor should allow browsing the workspace or not
+	 *
+	 * @param allowWorkspace
+	 */
+	public void setAllowWorkspace(boolean allowWorkspace) {
+		this.allowWorkspace = allowWorkspace;
+		selector.setAllowWorkspace(allowWorkspace);
+	}
+
+	/**
+	 *
+	 * @return true if the editor can browse the workspace
+	 */
+	public boolean getAllowWorkspace() {
+		return allowWorkspace;
+	}
+
+	/**
+	 * Indicates whether the editor should allow browsing the file system or not
+	 *
+	 * @param allowFileSystem
+	 */
+	public void setAllowFileSystem(boolean allowFileSystem) {
+		this.allowFileSystem = allowFileSystem;
+		selector.setAllowFileSystem(allowFileSystem);
+	}
+
+	/**
+	 *
+	 * @return true if the editor can browse the fileSystem
+	 */
+	public boolean getAllowFileSystem() {
+		return allowFileSystem;
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringFileSelectorEMF.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringFileSelectorEMF.java
new file mode 100644
index 00000000000..da526765234
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringFileSelectorEMF.java
@@ -0,0 +1,58 @@
+/*****************************************************************************
+ * 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.infra.properties.ui.widgets;
+
+import java.io.File;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.infra.emf.utils.EMFFileUtil;
+import org.eclipse.papyrus.infra.widgets.editors.StringFileSelector;
+import org.eclipse.swt.widgets.Composite;
+
+
+public class StringFileSelectorEMF extends StringFileSelector {
+
+	public StringFileSelectorEMF(Composite parent, int style) {
+		super(parent, style);
+	}
+
+	@Override
+	protected void setResult(IFile file) {
+		text.setText(EMFFileUtil.getPath(file));
+		notifyChange();
+	}
+
+	@Override
+	protected void setResult(File file) {
+		setResult(file.getAbsolutePath());
+	}
+
+	@Override
+	protected void setResult(String path) {
+		URI uri = URI.createFileURI(path);
+		text.setText(uri.toString());
+		notifyChange();
+	}
+
+	// @Override
+	protected IFile getIFile(String path) {
+		return EMFFileUtil.getIFile(path);
+	}
+
+	// @Override
+	protected File getFile(String path) {
+		return EMFFileUtil.getFile(path);
+	}
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringLabel.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringLabel.java
new file mode 100644
index 00000000000..c193c5c9b94
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringLabel.java
@@ -0,0 +1,61 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A PropertyEditor for displaying strings as a CLabel
+ * This editor is read-only
+ *
+ * @see org.eclipse.papyrus.infra.widgets.editors.StringLabel
+ *
+ * @author Camille Letavernier
+ */
+public class StringLabel extends AbstractPropertyEditor {
+
+	private org.eclipse.papyrus.infra.widgets.editors.StringLabel editor;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 */
+	public StringLabel(Composite parent, int style) {
+		editor = createStringLabel(parent, style);
+		setEditor(editor);
+	}
+
+	/**
+	 * Creates the string label dialog.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 * @return The string label dialog.
+	 */
+	protected org.eclipse.papyrus.infra.widgets.editors.StringLabel createStringLabel(Composite parent, int style) {
+		return new org.eclipse.papyrus.infra.widgets.editors.StringLabel(parent, style);
+	}
+
+	@Override
+	protected void doBinding() {
+		ILabelProvider labelProvider = input.getLabelProvider(propertyPath);
+		editor.setLabelProvider(labelProvider);
+		super.doBinding();
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringMask.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringMask.java
new file mode 100644
index 00000000000..271a62662a1
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringMask.java
@@ -0,0 +1,114 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.papyrus.infra.properties.ui.providers.XWTCompliantMaskProvider;
+import org.eclipse.papyrus.infra.properties.ui.providers.XWTCompliantMaskProviderListener;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A widget to edit mask-based Integer values
+ * The integer value is interpreted as a list of boolean values
+ * The widget cannot use more than 32 masks
+ *
+ * @author Camille Letavernier
+ */
+public class StringMask extends AbstractPropertyEditor implements XWTCompliantMaskProviderListener {
+
+	private org.eclipse.papyrus.infra.widgets.editors.StringMask editor;
+
+	private XWTCompliantMaskProvider maskProvider;
+
+	private boolean maskProviderReady = false;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which this widget will be created
+	 * @param style
+	 */
+	public StringMask(Composite parent, int style) {
+		editor = createStringMask(parent, style);
+		setEditor(editor);
+	}
+
+	/**
+	 * Creates the integer mask.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 * @return the integer mask.
+	 */
+	protected org.eclipse.papyrus.infra.widgets.editors.StringMask createStringMask(Composite parent, int style) {
+		return new org.eclipse.papyrus.infra.widgets.editors.StringMask(parent, style);
+	}
+
+	@Override
+	protected void checkInput() {
+		if (maskProvider != null && maskProviderReady) {
+			super.checkInput();
+		}
+	}
+
+	/**
+	 * @return the number of columns for this editor
+	 *
+	 */
+	public int getNumColumns() {
+		return editor.getNumColumns();
+	}
+
+	/**
+	 * Sets the number of columns for this editor. The mask checkboxes will be
+	 * distributed according to this number
+	 *
+	 * @param numColumns
+	 */
+	public void setNumColumns(int numColumns) {
+		editor.setNumColumns(numColumns);
+	}
+
+	/**
+	 * Sets the MaskProvider for this editor
+	 *
+	 * @param provider
+	 */
+	public void setMaskProvider(XWTCompliantMaskProvider provider) {
+		if (this.maskProvider != null) {
+			maskProvider.removeMaskProviderListener(this);
+		}
+
+		maskProviderReady = false;
+		this.maskProvider = provider;
+		provider.addMaskProviderListener(this);
+		checkInput();
+	}
+
+	/**
+	 *
+	 * @return the MaskProvider associated to this editor
+	 */
+	public XWTCompliantMaskProvider getMaskProvider() {
+		return maskProvider;
+	}
+
+	public void notifyReady(XWTCompliantMaskProvider provider) {
+		this.maskProviderReady = true;
+		editor.setMasks(maskProvider.getMasks());
+		provider.removeMaskProviderListener(this);
+		checkInput();
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringMultiline.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringMultiline.java
new file mode 100644
index 00000000000..51a5dc3578a
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringMultiline.java
@@ -0,0 +1,38 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A PropertyEditor for editing multiline strings through a Text field
+ *
+ * @see org.eclipse.papyrus.infra.widgets.editors.StringEditor
+ *
+ * @author Camille Letavernier
+ */
+public class StringMultiline extends AbstractPropertyEditor {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 */
+	public StringMultiline(Composite parent, int style) {
+		super(new org.eclipse.papyrus.infra.widgets.editors.StringEditor(parent, style | SWT.MULTI | SWT.V_SCROLL | SWT.WRAP));
+	}
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringMultilineWithReferences.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringMultilineWithReferences.java
new file mode 100644
index 00000000000..87a30a6816e
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/StringMultilineWithReferences.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:
+ *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.emf.utils.TextReferencesHelper;
+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.DropTarget;
+import org.eclipse.swt.dnd.DropTargetEvent;
+import org.eclipse.swt.dnd.DropTargetListener;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ *
+ * A StringMultiline property editor with support for TextReferences
+ *
+ * @author Camille Letavernier
+ *
+ * @see {@link org.eclipse.papyrus.infra.emf.utils.TextReferencesHelper}
+ */
+public class StringMultilineWithReferences extends AbstractPropertyEditor {
+
+	protected TextReferencesHelper textReferencesHelper;
+
+	protected StringEditorWithReferences editor;
+
+	public void setTextReferencesHelper(TextReferencesHelper helper) {
+		this.textReferencesHelper = helper;
+		editor.setTextReferencesHelper(helper);
+		installDropListener();
+	}
+
+	@Override
+	protected void doBinding() {
+		super.doBinding();
+		IStaticContentProvider provider = input.getContentProvider(propertyPath);
+		if (provider != null) {
+			editor.setReferenceBrowserContentProvider(provider);
+		}
+
+		if (getInputObservableValue() instanceof ICommitListener) {
+			editor.addCommitListener((ICommitListener) getInputObservableValue());
+		}
+	}
+
+	public StringMultilineWithReferences(Composite parent, int style) {
+		super();
+		setEditor(editor = new StringEditorWithReferences(parent, style));
+	}
+
+	protected void installDropListener() {
+		DropTarget target = new DropTarget(getStringEditor().getText(), DND.DROP_LINK);
+		LocalSelectionTransfer selectionTransfer = LocalSelectionTransfer.getTransfer();
+		target.setTransfer(new Transfer[] { selectionTransfer });
+		target.addDropListener(new DropTargetListener() {
+
+			public void dropAccept(DropTargetEvent event) {
+			}
+
+			public void drop(DropTargetEvent event) {
+				IStructuredSelection dropSelection = getSelection(event);
+				if (dropSelection == null) {
+					return;
+				}
+
+				Iterator<?> selectionIterator = dropSelection.iterator();
+
+				Text textWidget = getStringEditor().getText();
+				String textToEdit = textWidget.getText();
+				int caretPosition = textWidget.getCaretPosition();
+				while (selectionIterator.hasNext()) {
+					EObject selectedEObject = EMFHelper.getEObject(selectionIterator.next());
+					if (selectedEObject == null) {
+						continue;
+					}
+					textToEdit = textReferencesHelper.insertReference(selectedEObject, textToEdit, caretPosition);
+				}
+
+				textWidget.setText(textToEdit);
+				getStringEditor().setFocus();
+			}
+
+			public void dragOver(DropTargetEvent event) {
+				verifyDrop(event);
+			}
+
+			public void dragOperationChanged(DropTargetEvent event) {
+				verifyDrop(event);
+			}
+
+			public void dragLeave(DropTargetEvent event) {
+			}
+
+			public void dragEnter(DropTargetEvent event) {
+				verifyDrop(event);
+			}
+
+			private void verifyDrop(DropTargetEvent event) {
+				IStructuredSelection selection = getSelection(event);
+				if (isValidSelection(selection)) {
+					event.feedback = DND.FEEDBACK_INSERT_AFTER;
+					event.detail = DND.DROP_LINK;
+				} else {
+					event.detail = DND.DROP_NONE;
+				}
+			}
+
+			private IStructuredSelection getSelection(DropTargetEvent event) {
+				if (!(event.getSource() instanceof DropTarget)) {
+					return null;
+				}
+
+				DropTarget target = (DropTarget) event.getSource();
+
+				for (Transfer transfer : target.getTransfer()) {
+					if (transfer instanceof LocalSelectionTransfer) {
+						LocalSelectionTransfer selectionTransfer = (LocalSelectionTransfer) transfer;
+						ISelection selection = selectionTransfer.getSelection();
+						if (selection instanceof IStructuredSelection) {
+							return (IStructuredSelection) selection;
+						}
+					}
+				}
+
+				return null;
+			}
+
+			private boolean isValidSelection(IStructuredSelection dropSelection) {
+				if (textReferencesHelper == null) {
+					return false;
+				}
+				if (dropSelection.isEmpty()) {
+					return false;
+				}
+
+				IStructuredSelection structuredSelection = dropSelection;
+				Iterator<?> selectionIterator = structuredSelection.iterator();
+				while (selectionIterator.hasNext()) {
+					EObject selectedElement = EMFHelper.getEObject(selectionIterator.next());
+					if (selectedElement == null) {
+						return false;
+					}
+				}
+
+				return true;
+			}
+		});
+	}
+
+	protected org.eclipse.papyrus.infra.widgets.editors.StringEditor getStringEditor() {
+		return (org.eclipse.papyrus.infra.widgets.editors.StringEditor) valueEditor;
+	}
+
+	protected void setContentProvider(IStaticContentProvider provider) {
+		editor.setReferenceBrowserContentProvider(provider);
+	}
+
+	protected void setLabelProvider(ILabelProvider labelProvider) {
+		editor.setLabelProvider(labelProvider);
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/UnlimitedNaturalEditor.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/UnlimitedNaturalEditor.java
new file mode 100644
index 00000000000..160fc1b4454
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/UnlimitedNaturalEditor.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:
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Initial API and implementation
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.swt.widgets.Composite;
+
+public class UnlimitedNaturalEditor extends AbstractPropertyEditor {
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 */
+	public UnlimitedNaturalEditor(Composite parent, int style) {
+		super(new org.eclipse.papyrus.infra.widgets.editors.UnlimitedNaturalEditor(parent, style));
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/ViewEditor.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/ViewEditor.java
new file mode 100644
index 00000000000..193572fb0fa
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/ViewEditor.java
@@ -0,0 +1,415 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 443417
+ *  Christian W. Damus (CEA) - bug 444227
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.databinding.observable.IObservable;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.Section;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.DataSource;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.DataSourceChangedEvent;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.IDataSourceListener;
+import org.eclipse.papyrus.infra.properties.ui.runtime.DefaultDisplayEngine;
+import org.eclipse.papyrus.infra.properties.ui.runtime.DisplayEngine;
+import org.eclipse.papyrus.infra.properties.ui.runtime.PropertiesRuntime;
+import org.eclipse.papyrus.infra.properties.ui.widgets.layout.PropertiesLayout;
+import org.eclipse.papyrus.infra.properties.ui.xwt.XWTSection;
+import org.eclipse.papyrus.infra.tools.databinding.IMultipleObservableValue;
+import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.ScrollBar;
+
+/**
+ * An Editor for displaying a whole property {@link View} on a sub-object.
+ * If the property is a list, there will be one view per element in the list.
+ *
+ * The view's tabs will be ignored : the sections are embedded in the caller's
+ * tab.
+ */
+public class ViewEditor extends AbstractPropertyEditor {
+
+	private String viewPath;
+
+	private Composite self;
+
+	private Map<Section, EditorSection> sections = new HashMap<Section, EditorSection>();
+
+	private DisplayEngine displayEngine;
+
+	private IDataSourceListener dataSourceListener;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 */
+	public ViewEditor(Composite parent, int style) {
+		self = new Composite(parent, SWT.NONE);
+		PropertiesLayout layout = new PropertiesLayout(1, true);
+		layout.horizontalSpacing = 0;
+		layout.marginWidth = 0;
+		self.setLayout(layout);
+
+		addDisposeListener(self);
+	}
+
+	private void addDisposeListener(Control control) {
+		control.addDisposeListener(new DisposeListener() {
+
+			@Override
+			public void widgetDisposed(DisposeEvent e) {
+				disposeDisplayEngine();
+			}
+		});
+	}
+
+	private void disposeDisplayEngine() {
+		if (displayEngine != null) {
+			displayEngine.dispose();
+			displayEngine = null;
+			sections.clear();
+		}
+	}
+
+	@Override
+	public void checkInput() {
+		if (propertyPath != null && input != null && viewPath != null) {
+			display();
+		}
+	}
+
+	@Override
+	protected void unhookDataSourceListener(DataSource oldInput) {
+		oldInput.removeDataSourceListener(getDataSourceListener());
+		super.unhookDataSourceListener(oldInput);
+	}
+
+	@Override
+	protected void hookDataSourceListener(DataSource newInput) {
+		super.hookDataSourceListener(newInput);
+		newInput.addDataSourceListener(getDataSourceListener());
+	}
+
+	private IDataSourceListener getDataSourceListener() {
+		if (dataSourceListener == null) {
+			dataSourceListener = new IDataSourceListener() {
+
+				@Override
+				public void dataSourceChanged(DataSourceChangedEvent event) {
+					// The data source's selection changed. Re-display our nested sections, if appropriate
+					if ((self != null) && !self.isDisposed()) {
+						self.getDisplay().asyncExec(new Runnable() {
+
+							@Override
+							public void run() {
+								if (!self.isDisposed()) {
+									checkInput();
+								}
+							}
+						});
+					}
+				}
+			};
+		}
+
+		return dataSourceListener;
+	}
+
+	/**
+	 * Sets the number of columns for this editor. If the property is a list,
+	 * there will be one view per element in the list : these views will be
+	 * distributed in the given number of columns.
+	 *
+	 * @param numColumns
+	 */
+	public void setNumColumns(int numColumns) {
+		((PropertiesLayout) self.getLayout()).numColumns = numColumns;
+	}
+
+	/**
+	 * @return the number of columns for this editor.
+	 */
+	public int getNumColumns() {
+		return ((PropertiesLayout) self.getLayout()).numColumns;
+	}
+
+	/**
+	 * Sets the view for this editor. The view is represented by its viewPath, which is
+	 * of form ContextName:ViewName
+	 * e.g. : UML:Class
+	 * The Context should be registered in the ConfigurationManager
+	 *
+	 * @param viewPath
+	 *            The path of the view used to display the given property
+	 */
+	public void setView(String viewPath) {
+		this.viewPath = viewPath;
+		checkInput();
+	}
+
+	/**
+	 * @return the qualified name of the view associated to this editor
+	 */
+	public String getView() {
+		return viewPath;
+	}
+
+	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 = PropertiesRuntime.getConfigurationManager().getContext(contextName);
+		for (View view : context.getViews()) {
+			if (view.getName().equals(viewName)) {
+				return view;
+			}
+		}
+		return null;
+	}
+
+	private void display() {
+		View view = resolveView();
+
+		if (view == null) {
+			Activator.log.warn("Unabled to resolve view : " + viewPath); //$NON-NLS-1$
+			return;
+		}
+
+		IObservable observable = getInputObservable();
+		if (observable == null) {
+			return;
+		}
+
+		if (displayEngine == null) {
+			displayEngine = new DefaultDisplayEngine(false);
+		}
+
+		// We need to be able to repeat sections, so use an arbitrary discriminator to
+		// present the same section multiple times as distinct sections
+		int index = 0;
+		if (observable instanceof IObservableValue) {
+			IObservableValue observableValue = (IObservableValue) observable;
+			if (observableValue instanceof IMultipleObservableValue) {
+				IMultipleObservableValue multipleObservable = (IMultipleObservableValue) observableValue;
+				display(displayEngine, multipleObservable.getObservedValues(), view, index++);
+			} else {
+				Object value = observableValue.getValue();
+				display(displayEngine, value, view, index++);
+			}
+		} else if (observable instanceof IObservableList) {
+			IObservableList observableList = (IObservableList) observable;
+			for (Object value : observableList) {
+				display(displayEngine, value, view, index++);
+			}
+		}
+
+		// Any repeated sections that we had created for a previous selection and no longer need must be destroyed
+		purgeUnusedSections(index);
+
+		// A hack to force the containing scroll pane, if any (we expect to have one in the property sheet), to
+		// recompute its client area and scrollbars
+		for (Composite next = self; (next != null); next = next.getParent()) {
+			if (next.getParent() instanceof ScrolledComposite) {
+				final ScrolledComposite scrolled = (ScrolledComposite) next.getParent();
+				next.layout();
+				scrolled.layout();
+				scrolled.getDisplay().asyncExec(new Runnable() {
+
+					@Override
+					public void run() {
+						if (scrolled.isDisposed()) {
+							return;
+						}
+						resizeScrolledComposite(scrolled);
+					}
+				});
+			}
+		}
+
+		updateControls();
+	}
+
+	private void purgeUnusedSections(int maxDiscriminator) {
+		for (Iterator<Section> iter = sections.keySet().iterator(); iter.hasNext();) {
+			Section section = iter.next();
+			Object discriminator = DefaultDisplayEngine.getDiscriminator(section);
+			if ((discriminator instanceof Number) && (((Number) discriminator).intValue() >= maxDiscriminator)) {
+				sections.get(section).dispose();
+				iter.remove();
+			}
+		}
+	}
+
+	/**
+	 * Recompute the size of a {@code scrolled} composite's client area and adjust its scroll bars accordingly.
+	 *
+	 * @param scrolled
+	 *            a scrolled composite to force to adapt to a new layout
+	 */
+	private void resizeScrolledComposite(ScrolledComposite scrolled) {
+		Point sizeConstraint = scrolled.getContent().getSize();
+		sizeConstraint = scrolled.getContent().computeSize(SWT.DEFAULT, SWT.DEFAULT);
+		scrolled.setMinSize(sizeConstraint);
+
+		Rectangle clientArea = scrolled.getClientArea();
+
+		ScrollBar vbar = scrolled.getVerticalBar();
+		if (vbar != null) {
+			vbar.setPageIncrement(clientArea.height - 5);
+		}
+
+		ScrollBar hbar = scrolled.getHorizontalBar();
+		if (hbar != null) {
+			hbar.setPageIncrement(clientArea.width - 5);
+		}
+	}
+
+	/**
+	 * Displays the given view in the display engine, with the given object.
+	 *
+	 * @param display
+	 *            The Display engine used to display the view. It should allow duplication,
+	 *            as for list properties, the same section will be displayed for each element
+	 *            in the list.
+	 * @param data
+	 *            The raw object for which we are displaying the view.
+	 * @param view
+	 *            The view to display
+	 */
+	protected void display(DisplayEngine display, Object data, View view, Object discriminator) {
+		display(display, Collections.singletonList(data), view, discriminator);
+	}
+
+	/**
+	 * Displays the given view in the display engine, with the given object.
+	 *
+	 * @param display
+	 *            The Display engine used to display the view. It should allow duplication,
+	 *            as for list properties, the same section will be displayed for each element
+	 *            in the list.
+	 * @param selectedElements
+	 *            The list of objects for which we are displaying the view
+	 * @param view
+	 *            The view to display
+	 */
+	protected void display(DisplayEngine display, List<Object> selectedElements, View view, Object discriminator) {
+		for (Section section : view.getSections()) {
+			// Distinguish this occurrence of the section
+			section = DefaultDisplayEngine.discriminate(section, discriminator);
+
+			EditorSection editorSection = sections.get(section);
+			if (editorSection == null) {
+				editorSection = new EditorSection(new XWTSection(section, view, display));
+				sections.put(section, editorSection);
+			}
+
+			ISelection selection = new StructuredSelection(selectedElements);
+
+			editorSection.setInput(selection);
+		}
+	}
+
+	/**
+	 * Updates the displayed widgets to mark them as readOnly if needed.
+	 */
+	protected void updateControls() {
+		for (Control container : self.getChildren()) {
+			// TODO : Browse recursively ?
+			if (container instanceof Composite) {
+				for (Control control : ((Composite) container).getChildren()) {
+					if (control instanceof AbstractEditor) {
+						AbstractEditor editor = (AbstractEditor) control;
+						editor.setReadOnly(getReadOnly() || editor.isReadOnly());
+					}
+				}
+			}
+		}
+
+		self.setEnabled(!getReadOnly());
+	}
+
+	@Override
+	protected IObservable getInputObservable() {
+		// Override the generic behavior: ViewEditor doesn't rely on an AbstractEditor
+		return input.getObservable(propertyPath);
+	}
+
+	@Override
+	public void setReadOnly(boolean readOnly) {
+		super.setReadOnly(readOnly);
+		updateControls();
+	}
+
+	@Override
+	protected void doBinding() {
+		// Nothing to do here
+	}
+
+	@Override
+	public Control getControl() {
+		return self;
+	}
+
+	//
+	// Nested types
+	//
+
+	/**
+	 * An encapsulation of an XWT section with the composite that contains it within the {@link ViewEditor}'s parent composite.
+	 */
+	private class EditorSection {
+		private final XWTSection xwt;
+		private final Composite sectionComposite;
+
+		EditorSection(XWTSection xwt) {
+			this.xwt = xwt;
+			this.sectionComposite = new Composite(self, SWT.NONE);
+
+			xwt.createControls(sectionComposite, null);
+		}
+
+		void dispose() {
+			if (!sectionComposite.isDisposed()) {
+				xwt.dispose();
+				sectionComposite.dispose();
+			}
+		}
+
+		void setInput(ISelection selection) {
+			xwt.setInput(null, selection);
+			xwt.refresh();
+		}
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/XWTStringFileSelectorEMF.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/XWTStringFileSelectorEMF.java
new file mode 100644
index 00000000000..d83afe860ea
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/XWTStringFileSelectorEMF.java
@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets;
+
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A Widget for selecting Files on the workspace or on the file system.
+ * The widgets only edits String values : it uses the path of the files
+ *
+ * @author Camille Letavernier
+ */
+public class XWTStringFileSelectorEMF extends StringFileSelector {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 * @param style
+	 */
+	public XWTStringFileSelectorEMF(Composite parent, int style) {
+		super(parent, style);
+	}
+
+	/**
+	 * Creates the selector
+	 *
+	 * @param parent
+	 *            The composite in which the widget will be displayed
+	 * @param style
+	 *            The style for the widget
+	 * @return the selector
+	 */
+	@Override
+	protected StringFileSelectorEMF createSelector(Composite parent, int style) {
+		return new StringFileSelectorEMF(parent, style);
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/layout/GridData.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/layout/GridData.java
new file mode 100644
index 00000000000..95c7248ef18
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/layout/GridData.java
@@ -0,0 +1,651 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 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 (org.eclipse.swt.layout.GridData)
+ *     Camille Letavernier (CEA LIST) camille.letavernier@cea.fr
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets.layout;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * <code>GridData</code> is the layout data object associated with <code>GridLayout</code>. To set a <code>GridData</code> object into a
+ * control, you use the <code>Control.setLayoutData(Object)</code> method.
+ * <p>
+ * There are two ways to create a <code>GridData</code> object with certain fields set. The first is to set the fields directly, like this:
+ *
+ * <pre>
+ * GridData gridData = new GridData();
+ * gridData.horizontalAlignment = GridData.FILL;
+ * gridData.grabExcessHorizontalSpace = true;
+ * button1.setLayoutData(gridData);
+ *
+ * gridData = new GridData();
+ * gridData.horizontalAlignment = GridData.FILL;
+ * gridData.verticalAlignment = GridData.FILL;
+ * gridData.grabExcessHorizontalSpace = true;
+ * gridData.grabExcessVerticalSpace = true;
+ * gridData.horizontalSpan = 2;
+ * button2.setLayoutData(gridData);
+ * </pre>
+ *
+ * The second is to take advantage of <code>GridData</code> convenience constructors, for example:
+ *
+ * <pre>
+ * button1.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+ * button2.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
+ * </pre>
+ *
+ * </p>
+ * <p>
+ * NOTE: Do not reuse <code>GridData</code> objects. Every control in a <code>Composite</code> that is managed by a <code>GridLayout</code> must have a unique <code>GridData</code> object. If the layout data for a control in a <code>GridLayout</code> is null
+ * at layout time, a unique <code>GridData</code> object is created for it.
+ * </p>
+ *
+ * @see PropertiesLayout
+ * @see Control#setLayoutData
+ * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @see org.eclipse.swt.layout.GridData
+ */
+public final class GridData {
+
+	/**
+	 * verticalAlignment specifies how controls will be positioned
+	 * vertically within a cell.
+	 *
+	 * The default value is CENTER.
+	 *
+	 * Possible values are:
+	 * <ul>
+	 * <li>SWT.BEGINNING (or SWT.TOP): Position the control at the top of the cell</li>
+	 * <li>SWT.CENTER: Position the control in the vertical center of the cell</li>
+	 * <li>SWT.END (or SWT.BOTTOM): Position the control at the bottom of the cell</li>
+	 * <li>SWT.FILL: Resize the control to fill the cell vertically</li>
+	 * </ul>
+	 */
+	public int verticalAlignment = CENTER;
+
+	/**
+	 * horizontalAlignment specifies how controls will be positioned
+	 * horizontally within a cell.
+	 *
+	 * The default value is BEGINNING.
+	 *
+	 * Possible values are:
+	 * <ul>
+	 * <li>SWT.BEGINNING (or SWT.LEFT): Position the control at the left of the cell</li>
+	 * <li>SWT.CENTER: Position the control in the horizontal center of the cell</li>
+	 * <li>SWT.END (or SWT.RIGHT): Position the control at the right of the cell</li>
+	 * <li>SWT.FILL: Resize the control to fill the cell horizontally</li>
+	 * </ul>
+	 */
+	public int horizontalAlignment = BEGINNING;
+
+	/**
+	 * widthHint specifies the preferred width in pixels. This value
+	 * is the wHint passed into Control.computeSize(int, int, boolean)
+	 * to determine the preferred size of the control.
+	 *
+	 * The default value is SWT.DEFAULT.
+	 *
+	 * @see Control#computeSize(int, int, boolean)
+	 */
+	public int widthHint = SWT.DEFAULT;
+
+	/**
+	 * heightHint specifies the preferred height in pixels. This value
+	 * is the hHint passed into Control.computeSize(int, int, boolean)
+	 * to determine the preferred size of the control.
+	 *
+	 * The default value is SWT.DEFAULT.
+	 *
+	 * @see Control#computeSize(int, int, boolean)
+	 */
+	public int heightHint = SWT.DEFAULT;
+
+	/**
+	 * horizontalIndent specifies the number of pixels of indentation
+	 * that will be placed along the left side of the cell.
+	 *
+	 * The default value is 0.
+	 */
+	public int horizontalIndent = 0;
+
+	/**
+	 * verticalIndent specifies the number of pixels of indentation
+	 * that will be placed along the top side of the cell.
+	 *
+	 * The default value is 0.
+	 *
+	 * @since 3.1
+	 */
+	public int verticalIndent = 0;
+
+	/**
+	 * horizontalSpan specifies the number of column cells that the control
+	 * will take up.
+	 *
+	 * The default value is 1.
+	 */
+	public int horizontalSpan = 1;
+
+	/**
+	 * verticalSpan specifies the number of row cells that the control
+	 * will take up.
+	 *
+	 * The default value is 1.
+	 */
+	public int verticalSpan = 1;
+
+	/**
+	 * <p>
+	 * grabExcessHorizontalSpace specifies whether the width of the cell changes depending on the size of the parent Composite. If grabExcessHorizontalSpace is <code>true</code>, the following rules apply to the width of the cell:
+	 * </p>
+	 * <ul>
+	 * <li>If extra horizontal space is available in the parent, the cell will grow to be wider than its preferred width. The new width will be "preferred width + delta" where delta is the extra horizontal space divided by the number of grabbing columns.</li>
+	 * <li>If there is not enough horizontal space available in the parent, the cell will shrink until it reaches its minimum width as specified by GridData.minimumWidth. The new width will be the maximum of "minimumWidth" and "preferred width - delta", where
+	 * delta is the amount of space missing divided by the number of grabbing columns.</li>
+	 * <li>If the parent is packed, the cell will be its preferred width as specified by GridData.widthHint.</li>
+	 * <li>If the control spans multiple columns and there are no other grabbing controls in any of the spanned columns, the last column in the span will grab the extra space. If there is at least one other grabbing control in the span, the grabbing will be
+	 * spread over the columns already marked as grabExcessHorizontalSpace.</li>
+	 * </ul>
+	 *
+	 * <p>
+	 * The default value is false.
+	 * </p>
+	 *
+	 * @see GridData#minimumWidth
+	 * @see GridData#widthHint
+	 */
+	public boolean grabExcessHorizontalSpace = false;
+
+	/**
+	 * <p>
+	 * grabExcessVerticalSpace specifies whether the height of the cell changes depending on the size of the parent Composite. If grabExcessVerticalSpace is <code>true</code>, the following rules apply to the height of the cell:
+	 * </p>
+	 * <ul>
+	 * <li>If extra vertical space is available in the parent, the cell will grow to be taller than its preferred height. The new height will be "preferred height + delta" where delta is the extra vertical space divided by the number of grabbing rows.</li>
+	 * <li>If there is not enough vertical space available in the parent, the cell will shrink until it reaches its minimum height as specified by GridData.minimumHeight. The new height will be the maximum of "minimumHeight" and "preferred height - delta",
+	 * where delta is the amount of space missing divided by the number of grabbing rows.</li>
+	 * <li>If the parent is packed, the cell will be its preferred height as specified by GridData.heightHint.</li>
+	 * <li>If the control spans multiple rows and there are no other grabbing controls in any of the spanned rows, the last row in the span will grab the extra space. If there is at least one other grabbing control in the span, the grabbing will be spread over
+	 * the rows already marked as grabExcessVerticalSpace.</li>
+	 * </ul>
+	 *
+	 * <p>
+	 * The default value is false.
+	 * </p>
+	 *
+	 * @see GridData#minimumHeight
+	 * @see GridData#heightHint
+	 */
+	public boolean grabExcessVerticalSpace = false;
+
+	/**
+	 * minimumWidth specifies the minimum width in pixels. This value
+	 * applies only if grabExcessHorizontalSpace is true. A value of
+	 * SWT.DEFAULT means that the minimum width will be the result
+	 * of Control.computeSize(int, int, boolean) where wHint is
+	 * determined by GridData.widthHint.
+	 *
+	 * The default value is 0.
+	 *
+	 * @since 3.1
+	 * @see Control#computeSize(int, int, boolean)
+	 * @see GridData#widthHint
+	 */
+	public int minimumWidth = 0;
+
+	/**
+	 * minimumHeight specifies the minimum height in pixels. This value
+	 * applies only if grabExcessVerticalSpace is true. A value of
+	 * SWT.DEFAULT means that the minimum height will be the result
+	 * of Control.computeSize(int, int, boolean) where hHint is
+	 * determined by GridData.heightHint.
+	 *
+	 * The default value is 0.
+	 *
+	 * @since 3.1
+	 * @see Control#computeSize(int, int, boolean)
+	 * @see GridData#heightHint
+	 */
+	public int minimumHeight = 0;
+
+	/**
+	 * exclude informs the layout to ignore this control when sizing
+	 * and positioning controls. If this value is <code>true</code>,
+	 * the size and position of the control will not be managed by the
+	 * layout. If this value is <code>false</code>, the size and
+	 * position of the control will be computed and assigned.
+	 *
+	 * The default value is <code>false</code>.
+	 *
+	 * @since 3.1
+	 */
+	public boolean exclude = false;
+
+	/**
+	 * Value for horizontalAlignment or verticalAlignment.
+	 * Position the control at the top or left of the cell.
+	 * Not recommended. Use SWT.BEGINNING, SWT.TOP or SWT.LEFT instead.
+	 */
+	public static final int BEGINNING = SWT.BEGINNING;
+
+	/**
+	 * Value for horizontalAlignment or verticalAlignment.
+	 * Position the control in the vertical or horizontal center of the cell
+	 * Not recommended. Use SWT.CENTER instead.
+	 */
+	public static final int CENTER = 2;
+
+	/**
+	 * Value for horizontalAlignment or verticalAlignment.
+	 * Position the control at the bottom or right of the cell
+	 * Not recommended. Use SWT.END, SWT.BOTTOM or SWT.RIGHT instead.
+	 */
+	public static final int END = 3;
+
+	/**
+	 * Value for horizontalAlignment or verticalAlignment.
+	 * Resize the control to fill the cell horizontally or vertically.
+	 * Not recommended. Use SWT.FILL instead.
+	 */
+	public static final int FILL = SWT.FILL;
+
+	/**
+	 * Style bit for <code>new GridData(int)</code>.
+	 * Position the control at the top of the cell.
+	 * Not recommended. Use <code>new GridData(int, SWT.BEGINNING, boolean, boolean)</code> instead.
+	 */
+	public static final int VERTICAL_ALIGN_BEGINNING = 1 << 1;
+
+	/**
+	 * Style bit for <code>new GridData(int)</code> to position the
+	 * control in the vertical center of the cell.
+	 * Not recommended. Use <code>new GridData(int, SWT.CENTER, boolean, boolean)</code> instead.
+	 */
+	public static final int VERTICAL_ALIGN_CENTER = 1 << 2;
+
+	/**
+	 * Style bit for <code>new GridData(int)</code> to position the
+	 * control at the bottom of the cell.
+	 * Not recommended. Use <code>new GridData(int, SWT.END, boolean, boolean)</code> instead.
+	 */
+	public static final int VERTICAL_ALIGN_END = 1 << 3;
+
+	/**
+	 * Style bit for <code>new GridData(int)</code> to resize the
+	 * control to fill the cell vertically.
+	 * Not recommended. Use <code>new GridData(int, SWT.FILL, boolean, boolean)</code> instead
+	 */
+	public static final int VERTICAL_ALIGN_FILL = 1 << 4;
+
+	/**
+	 * Style bit for <code>new GridData(int)</code> to position the
+	 * control at the left of the cell.
+	 * Not recommended. Use <code>new GridData(SWT.BEGINNING, int, boolean, boolean)</code> instead.
+	 */
+	public static final int HORIZONTAL_ALIGN_BEGINNING = 1 << 5;
+
+	/**
+	 * Style bit for <code>new GridData(int)</code> to position the
+	 * control in the horizontal center of the cell.
+	 * Not recommended. Use <code>new GridData(SWT.CENTER, int, boolean, boolean)</code> instead.
+	 */
+	public static final int HORIZONTAL_ALIGN_CENTER = 1 << 6;
+
+	/**
+	 * Style bit for <code>new GridData(int)</code> to position the
+	 * control at the right of the cell.
+	 * Not recommended. Use <code>new GridData(SWT.END, int, boolean, boolean)</code> instead.
+	 */
+	public static final int HORIZONTAL_ALIGN_END = 1 << 7;
+
+	/**
+	 * Style bit for <code>new GridData(int)</code> to resize the
+	 * control to fill the cell horizontally.
+	 * Not recommended. Use <code>new GridData(SWT.FILL, int, boolean, boolean)</code> instead.
+	 */
+	public static final int HORIZONTAL_ALIGN_FILL = 1 << 8;
+
+	/**
+	 * Style bit for <code>new GridData(int)</code> to resize the
+	 * control to fit the remaining horizontal space.
+	 * Not recommended. Use <code>new GridData(int, int, true, boolean)</code> instead.
+	 */
+	public static final int GRAB_HORIZONTAL = 1 << 9;
+
+	/**
+	 * Style bit for <code>new GridData(int)</code> to resize the
+	 * control to fit the remaining vertical space.
+	 * Not recommended. Use <code>new GridData(int, int, boolean, true)</code> instead.
+	 */
+	public static final int GRAB_VERTICAL = 1 << 10;
+
+	/**
+	 * Style bit for <code>new GridData(int)</code> to resize the
+	 * control to fill the cell vertically and to fit the remaining
+	 * vertical space.
+	 * FILL_VERTICAL = VERTICAL_ALIGN_FILL | GRAB_VERTICAL
+	 * Not recommended. Use <code>new GridData(int, SWT.FILL, boolean, true)</code> instead.
+	 */
+	public static final int FILL_VERTICAL = VERTICAL_ALIGN_FILL | GRAB_VERTICAL;
+
+	/**
+	 * Style bit for <code>new GridData(int)</code> to resize the
+	 * control to fill the cell horizontally and to fit the remaining
+	 * horizontal space.
+	 * FILL_HORIZONTAL = HORIZONTAL_ALIGN_FILL | GRAB_HORIZONTAL
+	 * Not recommended. Use <code>new GridData(SWT.FILL, int, true, boolean)</code> instead.
+	 */
+	public static final int FILL_HORIZONTAL = HORIZONTAL_ALIGN_FILL | GRAB_HORIZONTAL;
+
+	/**
+	 * Style bit for <code>new GridData(int)</code> to resize the
+	 * control to fill the cell horizontally and vertically and
+	 * to fit the remaining horizontal and vertical space.
+	 * FILL_BOTH = FILL_VERTICAL | FILL_HORIZONTAL
+	 * Not recommended. Use <code>new GridData(SWT.FILL, SWT.FILL, true, true)</code> instead.
+	 */
+	public static final int FILL_BOTH = FILL_VERTICAL | FILL_HORIZONTAL;
+
+	protected int cacheWidth = -1, cacheHeight = -1;
+
+	protected int defaultWhint, defaultHhint, defaultWidth = -1, defaultHeight = -1;
+
+	public int currentWhint, currentHhint, currentWidth = -1, currentHeight = -1;
+
+	/**
+	 * Constructs a new instance of GridData using
+	 * default values.
+	 */
+	public GridData() {
+		super();
+	}
+
+	/**
+	 * Constructs a new instance based on the GridData style.
+	 * This constructor is not recommended.
+	 *
+	 * @param style
+	 *            the GridData style
+	 */
+	public GridData(int style) {
+		super();
+		if ((style & VERTICAL_ALIGN_BEGINNING) != 0) {
+			verticalAlignment = BEGINNING;
+		}
+		if ((style & VERTICAL_ALIGN_CENTER) != 0) {
+			verticalAlignment = CENTER;
+		}
+		if ((style & VERTICAL_ALIGN_FILL) != 0) {
+			verticalAlignment = FILL;
+		}
+		if ((style & VERTICAL_ALIGN_END) != 0) {
+			verticalAlignment = END;
+		}
+		if ((style & HORIZONTAL_ALIGN_BEGINNING) != 0) {
+			horizontalAlignment = BEGINNING;
+		}
+		if ((style & HORIZONTAL_ALIGN_CENTER) != 0) {
+			horizontalAlignment = CENTER;
+		}
+		if ((style & HORIZONTAL_ALIGN_FILL) != 0) {
+			horizontalAlignment = FILL;
+		}
+		if ((style & HORIZONTAL_ALIGN_END) != 0) {
+			horizontalAlignment = END;
+		}
+		grabExcessHorizontalSpace = (style & GRAB_HORIZONTAL) != 0;
+		grabExcessVerticalSpace = (style & GRAB_VERTICAL) != 0;
+	}
+
+	/**
+	 * Constructs a new instance of GridData according to the parameters.
+	 *
+	 * @param horizontalAlignment
+	 *            how control will be positioned horizontally within a cell,
+	 *            one of: SWT.BEGINNING (or SWT.LEFT), SWT.CENTER, SWT.END (or SWT.RIGHT), or SWT.FILL
+	 * @param verticalAlignment
+	 *            how control will be positioned vertically within a cell,
+	 *            one of: SWT.BEGINNING (or SWT.TOP), SWT.CENTER, SWT.END (or SWT.BOTTOM), or SWT.FILL
+	 * @param grabExcessHorizontalSpace
+	 *            whether cell will be made wide enough to fit the remaining horizontal space
+	 * @param grabExcessVerticalSpace
+	 *            whether cell will be made high enough to fit the remaining vertical space
+	 *
+	 * @since 3.0
+	 */
+	public GridData(int horizontalAlignment, int verticalAlignment, boolean grabExcessHorizontalSpace, boolean grabExcessVerticalSpace) {
+		this(horizontalAlignment, verticalAlignment, grabExcessHorizontalSpace, grabExcessVerticalSpace, 1, 1);
+	}
+
+	/**
+	 * Constructs a new instance of GridData according to the parameters.
+	 *
+	 * @param horizontalAlignment
+	 *            how control will be positioned horizontally within a cell,
+	 *            one of: SWT.BEGINNING (or SWT.LEFT), SWT.CENTER, SWT.END (or SWT.RIGHT), or SWT.FILL
+	 * @param verticalAlignment
+	 *            how control will be positioned vertically within a cell,
+	 *            one of: SWT.BEGINNING (or SWT.TOP), SWT.CENTER, SWT.END (or SWT.BOTTOM), or SWT.FILL
+	 * @param grabExcessHorizontalSpace
+	 *            whether cell will be made wide enough to fit the remaining horizontal space
+	 * @param grabExcessVerticalSpace
+	 *            whether cell will be made high enough to fit the remaining vertical space
+	 * @param horizontalSpan
+	 *            the number of column cells that the control will take up
+	 * @param verticalSpan
+	 *            the number of row cells that the control will take up
+	 *
+	 * @since 3.0
+	 */
+	public GridData(int horizontalAlignment, int verticalAlignment, boolean grabExcessHorizontalSpace, boolean grabExcessVerticalSpace, int horizontalSpan, int verticalSpan) {
+		super();
+		this.horizontalAlignment = horizontalAlignment;
+		this.verticalAlignment = verticalAlignment;
+		this.grabExcessHorizontalSpace = grabExcessHorizontalSpace;
+		this.grabExcessVerticalSpace = grabExcessVerticalSpace;
+		this.horizontalSpan = horizontalSpan;
+		this.verticalSpan = verticalSpan;
+	}
+
+	/**
+	 * Constructs a new instance of GridData according to the parameters.
+	 * A value of SWT.DEFAULT indicates that no minimum width or
+	 * no minimum height is specified.
+	 *
+	 * @param width
+	 *            a minimum width for the column
+	 * @param height
+	 *            a minimum height for the row
+	 *
+	 * @since 3.0
+	 */
+	public GridData(int width, int height) {
+		super();
+		this.widthHint = width;
+		this.heightHint = height;
+	}
+
+	/**
+	 * Creates a new Properties GridData from a SWT GridData
+	 *
+	 * @param layoutData
+	 *            The SWT GridData to copy
+	 */
+	public GridData(org.eclipse.swt.layout.GridData layoutData) {
+		this.exclude = layoutData.exclude;
+		this.grabExcessHorizontalSpace = layoutData.grabExcessHorizontalSpace;
+		this.grabExcessVerticalSpace = layoutData.grabExcessVerticalSpace;
+		this.heightHint = layoutData.heightHint;
+		this.horizontalAlignment = layoutData.horizontalAlignment;
+		this.horizontalIndent = layoutData.horizontalIndent;
+		this.horizontalSpan = layoutData.horizontalSpan;
+		this.minimumHeight = layoutData.minimumHeight;
+		this.minimumWidth = layoutData.minimumWidth;
+		this.verticalAlignment = layoutData.verticalAlignment;
+		this.verticalIndent = layoutData.verticalIndent;
+		this.verticalSpan = layoutData.verticalSpan;
+		this.widthHint = layoutData.widthHint;
+
+	}
+
+	protected void computeSize(Control control, int wHint, int hHint, boolean flushCache) {
+		if (cacheWidth != -1 && cacheHeight != -1) {
+			return;
+		}
+		if (wHint == this.widthHint && hHint == this.heightHint) {
+			if (defaultWidth == -1 || defaultHeight == -1 || wHint != defaultWhint || hHint != defaultHhint) {
+				Point size = control.computeSize(wHint, hHint, flushCache);
+				defaultWhint = wHint;
+				defaultHhint = hHint;
+				defaultWidth = size.x;
+				defaultHeight = size.y;
+			}
+			cacheWidth = defaultWidth;
+			cacheHeight = defaultHeight;
+			return;
+		}
+		if (currentWidth == -1 || currentHeight == -1 || wHint != currentWhint || hHint != currentHhint) {
+			Point size = control.computeSize(wHint, hHint, flushCache);
+			currentWhint = wHint;
+			currentHhint = hHint;
+			currentWidth = size.x;
+			currentHeight = size.y;
+		}
+		cacheWidth = currentWidth;
+		cacheHeight = currentHeight;
+	}
+
+	protected void flushCache() {
+		cacheWidth = cacheHeight = -1;
+		defaultWidth = defaultHeight = -1;
+		currentWidth = currentHeight = -1;
+	}
+
+	protected String getName() {
+		String string = getClass().getName();
+		int index = string.lastIndexOf('.');
+		if (index == -1) {
+			return string;
+		}
+		return string.substring(index + 1, string.length());
+	}
+
+	/**
+	 * Returns a string containing a concise, human-readable
+	 * description of the receiver.
+	 *
+	 * @return a string representation of the GridData object
+	 */
+	@Override
+	public String toString() {
+		String hAlign = ""; //$NON-NLS-1$
+		switch (horizontalAlignment) {
+		case SWT.FILL:
+			hAlign = "SWT.FILL"; //$NON-NLS-1$
+			break;
+		case SWT.BEGINNING:
+			hAlign = "SWT.BEGINNING"; //$NON-NLS-1$
+			break;
+		case SWT.LEFT:
+			hAlign = "SWT.LEFT"; //$NON-NLS-1$
+			break;
+		case SWT.END:
+			hAlign = "SWT.END"; //$NON-NLS-1$
+			break;
+		case END:
+			hAlign = "GridData.END"; //$NON-NLS-1$
+			break;
+		case SWT.RIGHT:
+			hAlign = "SWT.RIGHT"; //$NON-NLS-1$
+			break;
+		case SWT.CENTER:
+			hAlign = "SWT.CENTER"; //$NON-NLS-1$
+			break;
+		case CENTER:
+			hAlign = "GridData.CENTER"; //$NON-NLS-1$
+			break;
+		default:
+			hAlign = "Undefined " + horizontalAlignment; //$NON-NLS-1$
+			break;
+		}
+		String vAlign = ""; //$NON-NLS-1$
+		switch (verticalAlignment) {
+		case SWT.FILL:
+			vAlign = "SWT.FILL"; //$NON-NLS-1$
+			break;
+		case SWT.BEGINNING:
+			vAlign = "SWT.BEGINNING"; //$NON-NLS-1$
+			break;
+		case SWT.TOP:
+			vAlign = "SWT.TOP"; //$NON-NLS-1$
+			break;
+		case SWT.END:
+			vAlign = "SWT.END"; //$NON-NLS-1$
+			break;
+		case END:
+			vAlign = "GridData.END"; //$NON-NLS-1$
+			break;
+		case SWT.BOTTOM:
+			vAlign = "SWT.BOTTOM"; //$NON-NLS-1$
+			break;
+		case SWT.CENTER:
+			vAlign = "SWT.CENTER"; //$NON-NLS-1$
+			break;
+		case CENTER:
+			vAlign = "GridData.CENTER"; //$NON-NLS-1$
+			break;
+		default:
+			vAlign = "Undefined " + verticalAlignment; //$NON-NLS-1$
+			break;
+		}
+		String string = getName() + " {"; //$NON-NLS-1$
+		string += "horizontalAlignment=" + hAlign + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		if (horizontalIndent != 0) {
+			string += "horizontalIndent=" + horizontalIndent + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (horizontalSpan != 1) {
+			string += "horizontalSpan=" + horizontalSpan + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (grabExcessHorizontalSpace) {
+			string += "grabExcessHorizontalSpace=" + grabExcessHorizontalSpace + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (widthHint != SWT.DEFAULT) {
+			string += "widthHint=" + widthHint + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (minimumWidth != 0) {
+			string += "minimumWidth=" + minimumWidth + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		string += "verticalAlignment=" + vAlign + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		if (verticalIndent != 0) {
+			string += "verticalIndent=" + verticalIndent + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (verticalSpan != 1) {
+			string += "verticalSpan=" + verticalSpan + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (grabExcessVerticalSpace) {
+			string += "grabExcessVerticalSpace=" + grabExcessVerticalSpace + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (heightHint != SWT.DEFAULT) {
+			string += "heightHint=" + heightHint + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (minimumHeight != 0) {
+			string += "minimumHeight=" + minimumHeight + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (exclude) {
+			string += "exclude=" + exclude + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		string = string.trim();
+		string += "}"; //$NON-NLS-1$
+		return string;
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/layout/PropertiesLayout.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/layout/PropertiesLayout.java
new file mode 100644
index 00000000000..67f76691729
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/layout/PropertiesLayout.java
@@ -0,0 +1,961 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 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 (org.eclipse.swt.layout.GridLayout)
+ *		Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Default values for GridData
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.widgets.layout;
+
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Layout;
+import org.eclipse.swt.widgets.Scrollable;
+
+/**
+ * Layout based on {@link org.eclipse.swt.layout.GridLayout} This layout is basically the same as GridLayout, except for default values (Especially
+ * the default GridData)
+ * If an element doesn't have a GridData, a default one is created, which takes as much horizontal space as possible.
+ * The goal is to enable a nice layout for the Property View, without requiring each Control to have an explicit GridData
+ * However, explicit GridData are still supported.
+ *
+ * Instances of this class lay out the control children of a <code>Composite</code> in a grid.
+ * <p>
+ * <code>GridLayout</code> has a number of configuration fields, and the controls it lays out can have an associated layout data object, called <code>GridData</code>. The power of <code>GridLayout</code> lies in the ability to configure <code>GridData</code>
+ * for each control in the layout.
+ * </p>
+ * <p>
+ * The following code creates a shell managed by a <code>GridLayout</code> with 3 columns:
+ *
+ * <pre>
+ * Display display = new Display();
+ * Shell shell = new Shell(display);
+ * GridLayout gridLayout = new GridLayout();
+ * gridLayout.numColumns = 3;
+ * shell.setLayout(gridLayout);
+ * </pre>
+ *
+ * The <code>numColumns</code> field is the most important field in a <code>GridLayout</code>. Widgets are laid out in columns from left to right, and a new row is created when <code>numColumns</code> + 1 controls are added to the <code>Composite<code>.
+ * </p>
+ *
+ * @see GridData
+ * @see <a href="http://www.eclipse.org/swt/snippets/#gridlayout">GridLayout snippets</a>
+ * @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: LayoutExample</a>
+ * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @see org.eclipse.swt.layout.GridLayout
+ */
+public class PropertiesLayout extends Layout {
+
+	/**
+	 * numColumns specifies the number of cell columns in the layout.
+	 * If numColumns has a value less than 1, the layout will not
+	 * set the size and position of any controls.
+	 *
+	 * The default value is 1.
+	 */
+	public int numColumns = 1;
+
+	/**
+	 * The adjusted number of columns
+	 * If the number of controls is lower than the number of columns,
+	 * some columns will be removed to let these controls take all
+	 * the available space
+	 * GridData#horizontalSpan is taken into account
+	 */
+	private int adjustedNumColumns = 1;
+
+	/**
+	 * makeColumnsEqualWidth specifies whether all columns in the layout
+	 * will be forced to have the same width.
+	 *
+	 * The default value is true.
+	 */
+	public boolean makeColumnsEqualWidth = true;
+
+	/**
+	 * marginWidth specifies the number of pixels of horizontal margin
+	 * that will be placed along the left and right edges of the layout.
+	 *
+	 * The default value is 5.
+	 */
+	public int marginWidth = 5;
+
+	/**
+	 * marginHeight specifies the number of pixels of vertical margin
+	 * that will be placed along the top and bottom edges of the layout.
+	 *
+	 * The default value is 0.
+	 */
+	public int marginHeight = 0;
+
+	/**
+	 * marginLeft specifies the number of pixels of horizontal margin
+	 * that will be placed along the left edge of the layout.
+	 *
+	 * The default value is 0.
+	 *
+	 * @since 3.1
+	 */
+	public int marginLeft = 0;
+
+	/**
+	 * marginTop specifies the number of pixels of vertical margin
+	 * that will be placed along the top edge of the layout.
+	 *
+	 * The default value is 0.
+	 *
+	 * @since 3.1
+	 */
+	public int marginTop = 0;
+
+	/**
+	 * marginRight specifies the number of pixels of horizontal margin
+	 * that will be placed along the right edge of the layout.
+	 *
+	 * The default value is 0.
+	 *
+	 * @since 3.1
+	 */
+	public int marginRight = 0;
+
+	/**
+	 * marginBottom specifies the number of pixels of vertical margin
+	 * that will be placed along the bottom edge of the layout.
+	 *
+	 * The default value is 0.
+	 *
+	 * @since 3.1
+	 */
+	public int marginBottom = 0;
+
+	/**
+	 * horizontalSpacing specifies the number of pixels between the right
+	 * edge of one cell and the left edge of its neighbouring cell to
+	 * the right.
+	 *
+	 * The default value is 5.
+	 */
+	public int horizontalSpacing = 5;
+
+	/**
+	 * verticalSpacing specifies the number of pixels between the bottom
+	 * edge of one cell and the top edge of its neighbouring cell underneath.
+	 *
+	 * The default value is 0.
+	 */
+	public int verticalSpacing = 0;
+
+	/**
+	 * Constructs a new instance of this class.
+	 */
+	public PropertiesLayout() {
+		this(false);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param useMargins
+	 *            If false, there won't be any margin. If true, default margins
+	 *            will be used
+	 */
+	public PropertiesLayout(boolean useMargins) {
+		if (!useMargins) {
+			marginHeight = 0;
+			marginWidth = 0;
+		}
+	}
+
+	/**
+	 * Constructs a new instance of this class given the
+	 * number of columns, and whether or not the columns
+	 * should be forced to have the same width.
+	 * If numColumns has a value less than 1, the layout will not
+	 * set the size and position of any controls.
+	 *
+	 * @param numColumns
+	 *            the number of columns in the grid
+	 * @param makeColumnsEqualWidth
+	 *            whether or not the columns will have equal width
+	 *
+	 * @since 2.0
+	 */
+	public PropertiesLayout(int numColumns, boolean makeColumnsEqualWidth) {
+		this(numColumns, makeColumnsEqualWidth, false);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param numColumns
+	 *            the number of columns in the grid
+	 * @param makeColumnsEqualWidth
+	 *            whether or not the columns will have equal width
+	 * @param useMargins
+	 *            If false, there won't be any margin. If true, default margins
+	 *            will be used
+	 */
+	public PropertiesLayout(int numColumns, boolean makeColumnsEqualWidth, boolean useMargins) {
+		this(useMargins);
+		this.numColumns = numColumns;
+		this.makeColumnsEqualWidth = makeColumnsEqualWidth;
+	}
+
+	@Override
+	protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) {
+		Point size = layout(composite, false, 0, 0, wHint, hHint, flushCache);
+		if (wHint != SWT.DEFAULT) {
+			size.x = wHint;
+		}
+		if (hHint != SWT.DEFAULT) {
+			size.y = hHint;
+		}
+		return size;
+	}
+
+	@Override
+	protected boolean flushCache(Control control) {
+		GridData data = getLayoutData(control);
+		if (data != null) {
+			data.flushCache();
+		}
+		return true;
+	}
+
+	protected GridData getData(Control[][] grid, int row, int column, int rowCount, int columnCount, boolean first) {
+		Control control = grid[row][column];
+		if (control != null) {
+			GridData data = getLayoutData(control);
+			int hSpan = Math.max(1, Math.min(data.horizontalSpan, columnCount));
+			int vSpan = Math.max(1, data.verticalSpan);
+			int i = first ? row + vSpan - 1 : row - vSpan + 1;
+			int j = first ? column + hSpan - 1 : column - hSpan + 1;
+			if (0 <= i && i < rowCount) {
+				if (0 <= j && j < columnCount) {
+					if (control == grid[i][j]) {
+						return data;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	protected void layout(Composite composite, boolean flushCache) {
+		Rectangle rect = composite.getClientArea();
+		layout(composite, true, rect.x, rect.y, rect.width, rect.height, flushCache);
+	}
+
+	/**
+	 * Removes columns when there are less controls than columns,
+	 * to take all the available space
+	 *
+	 * @param composite
+	 */
+	protected void adjustColumns(Composite composite) {
+		int numChildren = composite.getChildren().length;
+		adjustedNumColumns = numColumns;
+
+		if (numChildren < numColumns) {
+			int totalColumns = 0;
+
+			for (Control child : composite.getChildren()) {
+				GridData data = getLayoutData(child);
+				totalColumns += data.horizontalSpan;
+			}
+
+			if (totalColumns < numColumns) {
+				adjustedNumColumns = totalColumns;
+			}
+		}
+
+		if (adjustedNumColumns < 1) {
+			adjustedNumColumns = 1;
+		}
+	}
+
+	protected Point layout(Composite composite, boolean move, int x, int y, int width, int height, boolean flushCache) {
+		adjustColumns(composite);
+
+		Control[] children = composite.getChildren();
+		int count = 0;
+
+		for (int i = 0; i < children.length; i++) {
+			Control control = children[i];
+			GridData data = getLayoutData(control);
+			if (data == null || !data.exclude) {
+				children[count++] = children[i];
+			}
+		}
+
+		if (count == 0) {
+			return new Point(marginLeft + marginWidth * 2 + marginRight, marginTop + marginHeight * 2 + marginBottom);
+		}
+		for (int i = 0; i < count; i++) {
+			Control child = children[i];
+			GridData data = getLayoutData(child);
+			if (data == null) {
+				child.setLayoutData(data = new GridData());
+			}
+			if (flushCache) {
+				data.flushCache();
+			}
+			data.computeSize(child, data.widthHint, data.heightHint, flushCache);
+			if (data.grabExcessHorizontalSpace && data.minimumWidth > 0) {
+				if (data.cacheWidth < data.minimumWidth) {
+					int trim = 0;
+					// TEMPORARY CODE
+					if (child instanceof Scrollable) {
+						Rectangle rect = ((Scrollable) child).computeTrim(0, 0, 0, 0);
+						trim = rect.width;
+					} else {
+						trim = child.getBorderWidth() * 2;
+					}
+					data.cacheWidth = data.cacheHeight = SWT.DEFAULT;
+					data.computeSize(child, Math.max(0, data.minimumWidth - trim), data.heightHint, false);
+				}
+			}
+			if (data.grabExcessVerticalSpace && data.minimumHeight > 0) {
+				data.cacheHeight = Math.max(data.cacheHeight, data.minimumHeight);
+			}
+		}
+
+		/* Build the grid */
+		int row = 0, column = 0, rowCount = 0, columnCount = adjustedNumColumns;
+		Control[][] grid = new Control[4][columnCount];
+		for (int i = 0; i < count; i++) {
+			Control child = children[i];
+			GridData data = getLayoutData(child);
+			int hSpan = Math.max(1, Math.min(data.horizontalSpan, columnCount));
+			int vSpan = Math.max(1, data.verticalSpan);
+			while (true) {
+				int lastRow = row + vSpan;
+				if (lastRow >= grid.length) {
+					Control[][] newGrid = new Control[lastRow + 4][columnCount];
+					System.arraycopy(grid, 0, newGrid, 0, grid.length);
+					grid = newGrid;
+				}
+				if (grid[row] == null) {
+					grid[row] = new Control[columnCount];
+				}
+				while (column < columnCount && grid[row][column] != null) {
+					column++;
+				}
+				int endCount = column + hSpan;
+				if (endCount <= columnCount) {
+					int index = column;
+					while (index < endCount && grid[row][index] == null) {
+						index++;
+					}
+					if (index == endCount) {
+						break;
+					}
+					column = index;
+				}
+				if (column + hSpan >= columnCount) {
+					column = 0;
+					row++;
+				}
+			}
+			for (int j = 0; j < vSpan; j++) {
+				if (grid[row + j] == null) {
+					grid[row + j] = new Control[columnCount];
+				}
+				for (int k = 0; k < hSpan; k++) {
+					grid[row + j][column + k] = child;
+				}
+			}
+			rowCount = Math.max(rowCount, row + vSpan);
+			column += hSpan;
+		}
+
+		/* Column widths */
+		int availableWidth = width - horizontalSpacing * (columnCount - 1) - (marginLeft + marginWidth * 2 + marginRight);
+		int expandCount = 0;
+		int[] widths = new int[columnCount];
+		int[] minWidths = new int[columnCount];
+		boolean[] expandColumn = new boolean[columnCount];
+		for (int j = 0; j < columnCount; j++) {
+			for (int i = 0; i < rowCount; i++) {
+				GridData data = getData(grid, i, j, rowCount, columnCount, true);
+				if (data != null) {
+					int hSpan = Math.max(1, Math.min(data.horizontalSpan, columnCount));
+					if (hSpan == 1) {
+						int w = data.cacheWidth + data.horizontalIndent;
+						widths[j] = Math.max(widths[j], w);
+						if (data.grabExcessHorizontalSpace) {
+							if (!expandColumn[j]) {
+								expandCount++;
+							}
+							expandColumn[j] = true;
+						}
+						if (!data.grabExcessHorizontalSpace || data.minimumWidth != 0) {
+							w = !data.grabExcessHorizontalSpace || data.minimumWidth == SWT.DEFAULT ? data.cacheWidth : data.minimumWidth;
+							w += data.horizontalIndent;
+							minWidths[j] = Math.max(minWidths[j], w);
+						}
+					}
+				}
+			}
+			for (int i = 0; i < rowCount; i++) {
+				GridData data = getData(grid, i, j, rowCount, columnCount, false);
+				if (data != null) {
+					int hSpan = Math.max(1, Math.min(data.horizontalSpan, columnCount));
+					if (hSpan > 1) {
+						int spanWidth = 0, spanMinWidth = 0, spanExpandCount = 0;
+						for (int k = 0; k < hSpan; k++) {
+							spanWidth += widths[j - k];
+							spanMinWidth += minWidths[j - k];
+							if (expandColumn[j - k]) {
+								spanExpandCount++;
+							}
+						}
+						if (data.grabExcessHorizontalSpace && spanExpandCount == 0) {
+							expandCount++;
+							expandColumn[j] = true;
+						}
+						int w = data.cacheWidth + data.horizontalIndent - spanWidth - (hSpan - 1) * horizontalSpacing;
+						if (w > 0) {
+							if (makeColumnsEqualWidth) {
+								int equalWidth = (w + spanWidth) / hSpan;
+								int remainder = (w + spanWidth) % hSpan, last = -1;
+								for (int k = 0; k < hSpan; k++) {
+									widths[last = j - k] = Math.max(equalWidth, widths[j - k]);
+								}
+								if (last > -1) {
+									widths[last] += remainder;
+								}
+							} else {
+								if (spanExpandCount == 0) {
+									widths[j] += w;
+								} else {
+									int delta = w / spanExpandCount;
+									int remainder = w % spanExpandCount, last = -1;
+									for (int k = 0; k < hSpan; k++) {
+										if (expandColumn[j - k]) {
+											widths[last = j - k] += delta;
+										}
+									}
+									if (last > -1) {
+										widths[last] += remainder;
+									}
+								}
+							}
+						}
+						if (!data.grabExcessHorizontalSpace || data.minimumWidth != 0) {
+							w = !data.grabExcessHorizontalSpace || data.minimumWidth == SWT.DEFAULT ? data.cacheWidth : data.minimumWidth;
+							w += data.horizontalIndent - spanMinWidth - (hSpan - 1) * horizontalSpacing;
+							if (w > 0) {
+								if (spanExpandCount == 0) {
+									minWidths[j] += w;
+								} else {
+									int delta = w / spanExpandCount;
+									int remainder = w % spanExpandCount, last = -1;
+									for (int k = 0; k < hSpan; k++) {
+										if (expandColumn[j - k]) {
+											minWidths[last = j - k] += delta;
+										}
+									}
+									if (last > -1) {
+										minWidths[last] += remainder;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		if (makeColumnsEqualWidth) {
+			int minColumnWidth = 0;
+			int columnWidth = 0;
+			for (int i = 0; i < columnCount; i++) {
+				minColumnWidth = Math.max(minColumnWidth, minWidths[i]);
+				columnWidth = Math.max(columnWidth, widths[i]);
+			}
+			columnWidth = width == SWT.DEFAULT || expandCount == 0 ? columnWidth : Math.max(minColumnWidth, availableWidth / columnCount);
+			for (int i = 0; i < columnCount; i++) {
+				expandColumn[i] = expandCount > 0;
+				widths[i] = columnWidth;
+			}
+		} else {
+			if (width != SWT.DEFAULT && expandCount > 0) {
+				int totalWidth = 0;
+				for (int i = 0; i < columnCount; i++) {
+					totalWidth += widths[i];
+				}
+				int c = expandCount;
+				int delta = (availableWidth - totalWidth) / c;
+				int remainder = (availableWidth - totalWidth) % c;
+				int last = -1;
+				while (totalWidth != availableWidth) {
+					for (int j = 0; j < columnCount; j++) {
+						if (expandColumn[j]) {
+							if (widths[j] + delta > minWidths[j]) {
+								widths[last = j] = widths[j] + delta;
+							} else {
+								widths[j] = minWidths[j];
+								expandColumn[j] = false;
+								c--;
+							}
+						}
+					}
+					if (last > -1) {
+						widths[last] += remainder;
+					}
+
+					for (int j = 0; j < columnCount; j++) {
+						for (int i = 0; i < rowCount; i++) {
+							GridData data = getData(grid, i, j, rowCount, columnCount, false);
+							if (data != null) {
+								int hSpan = Math.max(1, Math.min(data.horizontalSpan, columnCount));
+								if (hSpan > 1) {
+									if (!data.grabExcessHorizontalSpace || data.minimumWidth != 0) {
+										int spanWidth = 0, spanExpandCount = 0;
+										for (int k = 0; k < hSpan; k++) {
+											spanWidth += widths[j - k];
+											if (expandColumn[j - k]) {
+												spanExpandCount++;
+											}
+										}
+										int w = !data.grabExcessHorizontalSpace || data.minimumWidth == SWT.DEFAULT ? data.cacheWidth : data.minimumWidth;
+										w += data.horizontalIndent - spanWidth - (hSpan - 1) * horizontalSpacing;
+										if (w > 0) {
+											if (spanExpandCount == 0) {
+												widths[j] += w;
+											} else {
+												int delta2 = w / spanExpandCount;
+												int remainder2 = w % spanExpandCount, last2 = -1;
+												for (int k = 0; k < hSpan; k++) {
+													if (expandColumn[j - k]) {
+														widths[last2 = j - k] += delta2;
+													}
+												}
+												if (last2 > -1) {
+													widths[last2] += remainder2;
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+					if (c == 0) {
+						break;
+					}
+					totalWidth = 0;
+					for (int i = 0; i < columnCount; i++) {
+						totalWidth += widths[i];
+					}
+					delta = (availableWidth - totalWidth) / c;
+					remainder = (availableWidth - totalWidth) % c;
+					last = -1;
+				}
+			}
+		}
+
+		/* Wrapping */
+		GridData[] flush = null;
+		int flushLength = 0;
+		if (width != SWT.DEFAULT) {
+			for (int j = 0; j < columnCount; j++) {
+				for (int i = 0; i < rowCount; i++) {
+					GridData data = getData(grid, i, j, rowCount, columnCount, false);
+					if (data != null) {
+						if (data.heightHint == SWT.DEFAULT) {
+							Control child = grid[i][j];
+							// TEMPORARY CODE
+							int hSpan = Math.max(1, Math.min(data.horizontalSpan, columnCount));
+							int currentWidth = 0;
+							for (int k = 0; k < hSpan; k++) {
+								currentWidth += widths[j - k];
+							}
+							currentWidth += (hSpan - 1) * horizontalSpacing - data.horizontalIndent;
+							if ((currentWidth != data.cacheWidth && data.horizontalAlignment == SWT.FILL) || (data.cacheWidth > currentWidth)) {
+								int trim = 0;
+								if (child instanceof Scrollable) {
+									Rectangle rect = ((Scrollable) child).computeTrim(0, 0, 0, 0);
+									trim = rect.width;
+								} else {
+									trim = child.getBorderWidth() * 2;
+								}
+								data.cacheWidth = data.cacheHeight = SWT.DEFAULT;
+								data.computeSize(child, Math.max(0, currentWidth - trim), data.heightHint, false);
+								if (data.grabExcessVerticalSpace && data.minimumHeight > 0) {
+									data.cacheHeight = Math.max(data.cacheHeight, data.minimumHeight);
+								}
+								if (flush == null) {
+									flush = new GridData[count];
+								}
+								flush[flushLength++] = data;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		/* Row heights */
+		int availableHeight = height - verticalSpacing * (rowCount - 1) - (marginTop + marginHeight * 2 + marginBottom);
+		expandCount = 0;
+		int[] heights = new int[rowCount];
+		int[] minHeights = new int[rowCount];
+		boolean[] expandRow = new boolean[rowCount];
+		for (int i = 0; i < rowCount; i++) {
+			for (int j = 0; j < columnCount; j++) {
+				GridData data = getData(grid, i, j, rowCount, columnCount, true);
+				if (data != null) {
+					int vSpan = Math.max(1, Math.min(data.verticalSpan, rowCount));
+					if (vSpan == 1) {
+						int h = data.cacheHeight + data.verticalIndent;
+						heights[i] = Math.max(heights[i], h);
+						if (data.grabExcessVerticalSpace) {
+							if (!expandRow[i]) {
+								expandCount++;
+							}
+							expandRow[i] = true;
+						}
+						if (!data.grabExcessVerticalSpace || data.minimumHeight != 0) {
+							h = !data.grabExcessVerticalSpace || data.minimumHeight == SWT.DEFAULT ? data.cacheHeight : data.minimumHeight;
+							h += data.verticalIndent;
+							minHeights[i] = Math.max(minHeights[i], h);
+						}
+					}
+				}
+			}
+			for (int j = 0; j < columnCount; j++) {
+				GridData data = getData(grid, i, j, rowCount, columnCount, false);
+				if (data != null) {
+					int vSpan = Math.max(1, Math.min(data.verticalSpan, rowCount));
+					if (vSpan > 1) {
+						int spanHeight = 0, spanMinHeight = 0, spanExpandCount = 0;
+						for (int k = 0; k < vSpan; k++) {
+							spanHeight += heights[i - k];
+							spanMinHeight += minHeights[i - k];
+							if (expandRow[i - k]) {
+								spanExpandCount++;
+							}
+						}
+						if (data.grabExcessVerticalSpace && spanExpandCount == 0) {
+							expandCount++;
+							expandRow[i] = true;
+						}
+						int h = data.cacheHeight + data.verticalIndent - spanHeight - (vSpan - 1) * verticalSpacing;
+						if (h > 0) {
+							if (spanExpandCount == 0) {
+								heights[i] += h;
+							} else {
+								int delta = h / spanExpandCount;
+								int remainder = h % spanExpandCount, last = -1;
+								for (int k = 0; k < vSpan; k++) {
+									if (expandRow[i - k]) {
+										heights[last = i - k] += delta;
+									}
+								}
+								if (last > -1) {
+									heights[last] += remainder;
+								}
+							}
+						}
+						if (!data.grabExcessVerticalSpace || data.minimumHeight != 0) {
+							h = !data.grabExcessVerticalSpace || data.minimumHeight == SWT.DEFAULT ? data.cacheHeight : data.minimumHeight;
+							h += data.verticalIndent - spanMinHeight - (vSpan - 1) * verticalSpacing;
+							if (h > 0) {
+								if (spanExpandCount == 0) {
+									minHeights[i] += h;
+								} else {
+									int delta = h / spanExpandCount;
+									int remainder = h % spanExpandCount, last = -1;
+									for (int k = 0; k < vSpan; k++) {
+										if (expandRow[i - k]) {
+											minHeights[last = i - k] += delta;
+										}
+									}
+									if (last > -1) {
+										minHeights[last] += remainder;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		if (height != SWT.DEFAULT && expandCount > 0) {
+			int totalHeight = 0;
+			for (int i = 0; i < rowCount; i++) {
+				totalHeight += heights[i];
+			}
+			int c = expandCount;
+			int delta = (availableHeight - totalHeight) / c;
+			int remainder = (availableHeight - totalHeight) % c;
+			int last = -1;
+			while (totalHeight != availableHeight) {
+				for (int i = 0; i < rowCount; i++) {
+					if (expandRow[i]) {
+						if (heights[i] + delta > minHeights[i]) {
+							heights[last = i] = heights[i] + delta;
+						} else {
+							heights[i] = minHeights[i];
+							expandRow[i] = false;
+							c--;
+						}
+					}
+				}
+				if (last > -1) {
+					heights[last] += remainder;
+				}
+
+				for (int i = 0; i < rowCount; i++) {
+					for (int j = 0; j < columnCount; j++) {
+						GridData data = getData(grid, i, j, rowCount, columnCount, false);
+						if (data != null) {
+							int vSpan = Math.max(1, Math.min(data.verticalSpan, rowCount));
+							if (vSpan > 1) {
+								if (!data.grabExcessVerticalSpace || data.minimumHeight != 0) {
+									int spanHeight = 0, spanExpandCount = 0;
+									for (int k = 0; k < vSpan; k++) {
+										spanHeight += heights[i - k];
+										if (expandRow[i - k]) {
+											spanExpandCount++;
+										}
+									}
+									int h = !data.grabExcessVerticalSpace || data.minimumHeight == SWT.DEFAULT ? data.cacheHeight : data.minimumHeight;
+									h += data.verticalIndent - spanHeight - (vSpan - 1) * verticalSpacing;
+									if (h > 0) {
+										if (spanExpandCount == 0) {
+											heights[i] += h;
+										} else {
+											int delta2 = h / spanExpandCount;
+											int remainder2 = h % spanExpandCount, last2 = -1;
+											for (int k = 0; k < vSpan; k++) {
+												if (expandRow[i - k]) {
+													heights[last2 = i - k] += delta2;
+												}
+											}
+											if (last2 > -1) {
+												heights[last2] += remainder2;
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+				if (c == 0) {
+					break;
+				}
+				totalHeight = 0;
+				for (int i = 0; i < rowCount; i++) {
+					totalHeight += heights[i];
+				}
+				delta = (availableHeight - totalHeight) / c;
+				remainder = (availableHeight - totalHeight) % c;
+				last = -1;
+			}
+		}
+
+		/* Position the controls */
+		if (move) {
+			int gridY = y + marginTop + marginHeight;
+			for (int i = 0; i < rowCount; i++) {
+				int gridX = x + marginLeft + marginWidth;
+				for (int j = 0; j < columnCount; j++) {
+					GridData data = getData(grid, i, j, rowCount, columnCount, true);
+					if (data != null) {
+						int hSpan = Math.max(1, Math.min(data.horizontalSpan, columnCount));
+						int vSpan = Math.max(1, data.verticalSpan);
+						int cellWidth = 0, cellHeight = 0;
+						for (int k = 0; k < hSpan; k++) {
+							cellWidth += widths[j + k];
+						}
+						for (int k = 0; k < vSpan; k++) {
+							cellHeight += heights[i + k];
+						}
+						cellWidth += horizontalSpacing * (hSpan - 1);
+						int childX = gridX + data.horizontalIndent;
+						int childWidth = Math.min(data.cacheWidth, cellWidth);
+						switch (data.horizontalAlignment) {
+						case SWT.CENTER:
+						case GridData.CENTER:
+							childX += Math.max(0, (cellWidth - data.horizontalIndent - childWidth) / 2);
+							break;
+						case SWT.RIGHT:
+						case SWT.END:
+						case GridData.END:
+							childX += Math.max(0, cellWidth - data.horizontalIndent - childWidth);
+							break;
+						case SWT.FILL:
+							childWidth = cellWidth - data.horizontalIndent;
+							break;
+						}
+						cellHeight += verticalSpacing * (vSpan - 1);
+						int childY = gridY + data.verticalIndent;
+						int childHeight = Math.min(data.cacheHeight, cellHeight);
+						switch (data.verticalAlignment) {
+						case SWT.CENTER:
+						case GridData.CENTER:
+							childY += Math.max(0, (cellHeight - data.verticalIndent - childHeight) / 2);
+							break;
+						case SWT.BOTTOM:
+						case SWT.END:
+						case GridData.END:
+							childY += Math.max(0, cellHeight - data.verticalIndent - childHeight);
+							break;
+						case SWT.FILL:
+							childHeight = cellHeight - data.verticalIndent;
+							break;
+						}
+						Control child = grid[i][j];
+						if (child != null) {
+							child.setBounds(childX, childY, childWidth, childHeight);
+						}
+					}
+					gridX += widths[j] + horizontalSpacing;
+				}
+				gridY += heights[i] + verticalSpacing;
+			}
+		}
+
+		// clean up cache
+		for (int i = 0; i < flushLength; i++) {
+			flush[i].cacheWidth = flush[i].cacheHeight = -1;
+		}
+
+		int totalDefaultWidth = 0;
+		int totalDefaultHeight = 0;
+		for (int i = 0; i < columnCount; i++) {
+			totalDefaultWidth += widths[i];
+		}
+		for (int i = 0; i < rowCount; i++) {
+			totalDefaultHeight += heights[i];
+		}
+		totalDefaultWidth += horizontalSpacing * (columnCount - 1) + marginLeft + marginWidth * 2 + marginRight;
+		totalDefaultHeight += verticalSpacing * (rowCount - 1) + marginTop + marginHeight * 2 + marginBottom;
+		return new Point(totalDefaultWidth, totalDefaultHeight);
+	}
+
+	protected String getName() {
+		String string = getClass().getName();
+		int index = string.lastIndexOf('.');
+		if (index == -1) {
+			return string;
+		}
+		return string.substring(index + 1, string.length());
+	}
+
+	/**
+	 * Returns a string containing a concise, human-readable
+	 * description of the receiver.
+	 *
+	 * @return a string representation of the layout
+	 */
+	@Override
+	public String toString() {
+		String string = getName() + " {"; //$NON-NLS-1$
+		if (numColumns != 1) {
+			string += "numColumns=" + numColumns + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (makeColumnsEqualWidth) {
+			string += "makeColumnsEqualWidth=" + makeColumnsEqualWidth + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (marginWidth != 0) {
+			string += "marginWidth=" + marginWidth + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (marginHeight != 0) {
+			string += "marginHeight=" + marginHeight + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (marginLeft != 0) {
+			string += "marginLeft=" + marginLeft + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (marginRight != 0) {
+			string += "marginRight=" + marginRight + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (marginTop != 0) {
+			string += "marginTop=" + marginTop + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (marginBottom != 0) {
+			string += "marginBottom=" + marginBottom + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (horizontalSpacing != 0) {
+			string += "horizontalSpacing=" + horizontalSpacing + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (verticalSpacing != 0) {
+			string += "verticalSpacing=" + verticalSpacing + " "; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		string = string.trim();
+		string += "}"; //$NON-NLS-1$
+		return string;
+	}
+
+	protected GridData getLayoutData(Control control) {
+		Object layoutData = control.getLayoutData();
+
+		GridData data = null;
+		if (layoutData == null) { // We create a new default GridData
+			data = createDefaultLayoutData();
+		} else if (layoutData instanceof org.eclipse.swt.layout.GridData) { // We convert it to our own GridData class (For visibility matters)
+			data = new GridData((org.eclipse.swt.layout.GridData) layoutData);
+		} else if (layoutData instanceof GridData) {
+			data = (GridData) layoutData;
+		} else {
+			data = createDefaultLayoutData();
+			Activator.log.warn("Unknown LayoutData : " + layoutData); //$NON-NLS-1$
+		}
+
+		control.setLayoutData(data);
+
+		return data;
+	}
+
+	protected GridData createDefaultLayoutData() {
+		return new GridData(SWT.FILL, SWT.BEGINNING, true, false);
+	}
+
+	/**
+	 * Sets the number of columns for this layout
+	 *
+	 * @param numColumns
+	 */
+	public void setNumColumns(int numColumns) {
+		this.numColumns = numColumns;
+	}
+
+	/**
+	 *
+	 * @return the number of columns for this layout
+	 */
+	public int getNumColumns() {
+		return numColumns;
+	}
+
+	/**
+	 * Indicates if all columns should have the same width
+	 *
+	 * @param makeColumnsEqualWidth
+	 */
+	public void setMakeColumnsEqualWidth(boolean makeColumnsEqualWidth) {
+		this.makeColumnsEqualWidth = makeColumnsEqualWidth;
+	}
+
+	/**
+	 *
+	 * @return true if all columns should have the same width
+	 */
+	public boolean getMakeColumnsEqualWidth() {
+		return makeColumnsEqualWidth;
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/xwt/XWTSection.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/xwt/XWTSection.java
new file mode 100644
index 00000000000..71c403b7e36
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/xwt/XWTSection.java
@@ -0,0 +1,247 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bugs 435420, 417409
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.xwt;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.core.databinding.observable.ChangeEvent;
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
+import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
+import org.eclipse.papyrus.infra.constraints.runtime.ConstraintFactory;
+import org.eclipse.papyrus.infra.properties.contexts.Section;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.DataSource;
+import org.eclipse.papyrus.infra.properties.ui.modelelement.DataSourceFactory;
+import org.eclipse.papyrus.infra.properties.ui.runtime.DisplayEngine;
+import org.eclipse.papyrus.infra.widgets.editors.EditorParentComposite;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.views.properties.tabbed.AbstractPropertySection;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+/**
+ * An Implementation of ISection for the TabbedPropertyView framework.
+ * The XWTSection uses an XWT File to display the SWT Controls, and
+ * a DataSource for DataBinding
+ *
+ * @author Camille Letavernier
+ */
+public class XWTSection extends AbstractPropertySection implements IChangeListener {
+
+	private Section section;
+
+	private DataSource source;
+
+	private View view;
+
+	private Composite self;
+
+	private DisplayEngine display;
+
+	private Set<Constraint> constraints;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param section
+	 *            The Section object containing the Metadata for the XWTSection
+	 * @param view
+	 *            The view this section belongs to
+	 * @param display
+	 *            The display engine that will generate the SWT Controls
+	 */
+	public XWTSection(Section section, View view, DisplayEngine display) {
+		this.section = section;
+		this.view = view;
+		this.display = display;
+	}
+
+	@Override
+	public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+		self = new EditorParentComposite(parent, SWT.NONE);
+
+		GridLayout layout = new GridLayout(1, false);
+		layout.marginHeight = 0;
+		layout.marginWidth = 0;
+		self.setLayout(layout);
+
+		layout = new GridLayout(1, false);
+		layout.verticalSpacing = 0;
+		layout.marginHeight = 0;
+		layout.marginWidth = 5;
+		parent.setLayout(layout);
+
+		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
+		self.setLayoutData(data);
+
+		self.setBackground(parent.getBackground());
+		self.setBackgroundMode(SWT.INHERIT_DEFAULT);
+	}
+
+	@Override
+	public void setInput(IWorkbenchPart part, ISelection selection) {
+		if (selection == getSelection()) {
+			return;
+		}
+
+		// Sets the initial input, *or* changes the input for the same view : we need to clean the cache
+		DataSourceFactory.instance.removeFromCache(getSelection(), view);
+
+		super.setInput(part, selection);
+
+		if (selection instanceof IStructuredSelection) {
+			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
+
+			setSource(DataSourceFactory.instance.createDataSourceFromSelection(structuredSelection, view));
+		}
+	}
+
+	private void setSource(DataSource source) {
+		final DataSource oldSource = this.source;
+
+		if (oldSource != source) {
+			if (oldSource != null) {
+				oldSource.removeChangeListener(this);
+			}
+
+			this.source = source;
+
+			if (section.getConstraints().size() > 0) {
+				source.addChangeListener(this);
+			}
+		}
+	}
+
+	/**
+	 * Displays the section
+	 *
+	 * @param refresh
+	 *            If true, and the section has already been displayed, the controls will be
+	 *            regenerated. If false, the section will only be displayed if it hasn't been
+	 *            displayed yet, or if the display engine allows duplication of sections
+	 */
+	public void display(boolean refresh) {
+		if (self.isDisposed()) {
+			Activator.log.debug("Error : widget is disposed"); //$NON-NLS-1$
+			dispose();
+			return;
+		}
+
+		if (!isApplied()) {
+			hide();
+			return;
+		}
+
+		self.setRedraw(false); // Avoid flickering during refresh
+		if (refresh) {
+			display.refreshSection(self, section, source);
+		} else {
+			display.createSection(self, section, source);
+		}
+		self.setRedraw(true);
+	}
+
+	private void hide() {
+		display.removeSection(self);
+	}
+
+	@Override
+	public void refresh() {
+		display(false);
+	}
+
+	/**
+	 * Tests if this section is applied. A section is applied if it doesn't have
+	 * any constraint, or if at least one of its constraints match the current selection
+	 *
+	 * @return
+	 * 		True if the section should be displayed
+	 */
+	protected boolean isApplied() {
+		if (getConstraints().isEmpty()) {
+			return true;
+		}
+
+		ISelection selection = getSelection();
+		List<?> selectionList = ((IStructuredSelection) selection).toList();
+
+		// Return true only if at least one constraint matches the selection
+
+		for (Constraint constraint : getConstraints()) {
+			if (constraint.match(selectionList)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	protected Set<Constraint> getConstraints() {
+		if (constraints == null) {
+			constraints = new HashSet<Constraint>();
+			for (ConstraintDescriptor constraintDescriptor : section.getConstraints()) {
+				Constraint constraint = ConstraintFactory.getInstance().createFromModel(constraintDescriptor);
+				if (constraint != null) {
+					constraints.add(constraint);
+				}
+			}
+		}
+
+		return constraints;
+	}
+
+	@Override
+	public void dispose() {
+		// Dispose the DataSource
+		if (source != null) {
+			source.removeChangeListener(this);
+			source.dispose();
+		}
+
+		// Dispose the SWT Composite
+		if (self != null) {
+			self.dispose();
+		}
+
+		// Clean the DataSource cache
+		DataSourceFactory.instance.removeFromCache(getSelection(), view);
+		super.dispose();
+	}
+
+	@Override
+	public IStructuredSelection getSelection() {
+		return (IStructuredSelection) super.getSelection();
+	}
+
+	@Override
+	public String toString() {
+		return "XWTSection : " + section.getName(); //$NON-NLS-1$
+	}
+
+	@Override
+	public void handleChange(ChangeEvent event) {
+		display(true);
+	}
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/xwt/XWTSectionDescriptor.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/xwt/XWTSectionDescriptor.java
new file mode 100644
index 00000000000..d2e703d25a5
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/xwt/XWTSectionDescriptor.java
@@ -0,0 +1,109 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.xwt;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.papyrus.infra.properties.contexts.Section;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.ui.runtime.DisplayEngine;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.views.properties.tabbed.AbstractSectionDescriptor;
+import org.eclipse.ui.views.properties.tabbed.ISection;
+
+/**
+ * An XWTSectionDescriptor contains Metadata for the XWTSection.
+ * It is similar to the {@link Section} class, but in the TabbedPropertyView context.
+ *
+ * @author Camille Letavernier
+ */
+public class XWTSectionDescriptor extends AbstractSectionDescriptor {
+
+	private Section section;
+
+	private View view;
+
+	private DisplayEngine display;
+
+	/**
+	 *
+	 * Constructs a new XWTSectionDescriptor from the given section and view.
+	 * The XWTSections will be displayed in the given DisplayEngine.
+	 *
+	 * @param section
+	 *            The Section model object containing the section metadata
+	 * @param view
+	 *            The view the section belongs to
+	 * @param display
+	 *            The display engine that will be used to display the XWTSection
+	 */
+	public XWTSectionDescriptor(Section section, View view, DisplayEngine display) {
+		this.section = section;
+		this.view = view;
+		this.display = display;
+	}
+
+	public String getId() {
+		return section.getName();
+	}
+
+	public ISection getSectionClass() {
+		return new XWTSection(section, view, display);
+	}
+
+	public String getTargetTab() {
+		return section.getTab().getId();
+	}
+
+	@Override
+	public String toString() {
+		return "Section " + getId(); //$NON-NLS-1$
+	}
+
+	@Override
+	public boolean appliesTo(IWorkbenchPart part, ISelection selection) {
+		return true;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + System.identityHashCode(display);
+		result = prime * result + System.identityHashCode(section);
+		result = prime * result + System.identityHashCode(view);
+		return result;
+	}
+
+	/**
+	 * XWT section descriptors are equal if they have the same (identical) references to the section and view from the property-sheet model
+	 * and are associated with the same display engine.
+	 */
+	@Override
+	public boolean equals(Object obj) {
+		boolean result;
+
+		if (this == obj) {
+			result = true;
+		} else if ((obj == null) || (obj.getClass() != this.getClass())) {
+			result = false;
+		} else {
+			XWTSectionDescriptor other = (XWTSectionDescriptor) obj;
+
+			result = (other.section == this.section) && (other.view == this.view) && (other.display == this.display);
+		}
+
+		return result;
+	}
+
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/xwt/XWTTabDescriptor.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/xwt/XWTTabDescriptor.java
new file mode 100644
index 00000000000..ae84d71ddaa
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/xwt/XWTTabDescriptor.java
@@ -0,0 +1,144 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.xwt;
+
+import java.util.List;
+
+import org.eclipse.papyrus.infra.properties.contexts.Section;
+import org.eclipse.papyrus.infra.properties.contexts.Tab;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+import org.eclipse.papyrus.infra.properties.ui.runtime.DisplayEngine;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.views.properties.tabbed.AbstractTabDescriptor;
+
+/**
+ * A Tab descriptor implementation for the TabbedPropertyView.
+ * The property view is described by XWT files.
+ *
+ * @author Camille Letavernier
+ */
+public class XWTTabDescriptor extends AbstractTabDescriptor {
+
+	private Tab tab;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param tab
+	 *            The Tab model object containing the Metadata for the tab
+	 */
+	public XWTTabDescriptor(Tab tab) {
+		this.tab = tab;
+	}
+
+	/**
+	 * Adds a section to this tab
+	 *
+	 * @param section
+	 *            The Section model object
+	 * @param view
+	 *            The View model object to which the section belongs
+	 * @param display
+	 *            The display engine that will be used to display the section
+	 */
+	@SuppressWarnings("unchecked")
+	public void addSection(Section section, View view, DisplayEngine display) {
+		super.getSectionDescriptors().add(new XWTSectionDescriptor(section, view, display));
+	}
+
+	public String getCategory() {
+		String category = tab.getCategory();
+		return category == null ? "" : category; //$NON-NLS-1$
+	}
+
+	public String getId() {
+		return tab.getId();
+	}
+
+	public String getLabel() {
+		return tab.getLabel();
+	}
+
+	@Override
+	public Image getImage() {
+		String imagePath = tab.getImage();
+
+		if (imagePath == null || imagePath.trim().equals("")) { //$NON-NLS-1$
+			return null;
+		}
+
+		return Activator.getDefault().getImageFromPlugin(imagePath);
+	}
+
+	@Override
+	public boolean isIndented() {
+		return tab.isIndented();
+	}
+
+	@Override
+	public String getAfterTab() {
+		if (tab.getAfterTab() != null) {
+			return tab.getAfterTab().getId();
+		}
+		return super.getAfterTab();
+	}
+
+	@Override
+	public String toString() {
+		return "Tab " + getLabel() + " => " + getSectionDescriptors(); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * @return this tab's priority. The tabs should be ordered by ascending
+	 *         priority (i.e. the lower the priority int value, the higher
+	 *         the actual priority)
+	 */
+	public int getPriority() {
+		return tab.getPriority();
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		List<?> sectionDescriptors = getSectionDescriptors();
+		result = prime * result + ((tab == null) ? 0 : tab.hashCode());
+		result = prime * result + ((sectionDescriptors == null) ? 0 : sectionDescriptors.hashCode());
+		return result;
+	}
+
+	/**
+	 * XWT tab descriptors are equal if they have the same ID and an equal list (in order) of section descriptors.
+	 */
+	@Override
+	public boolean equals(Object obj) {
+		boolean result;
+
+		if (this == obj) {
+			result = true;
+		} else if ((obj == null) || (obj.getClass() != this.getClass())) {
+			result = false;
+		} else {
+			XWTTabDescriptor other = (XWTTabDescriptor) obj;
+
+			result = (other.getId() == null) ? this.getId() == null : (other.getId().equals(this.getId()));
+			if (result) {
+				result = (other.getSectionDescriptors() == null) ? this.getSectionDescriptors() == null : other.getSectionDescriptors().equals(this.getSectionDescriptors());
+			}
+		}
+
+		return result;
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/xwt/XWTTabDescriptorProvider.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/xwt/XWTTabDescriptorProvider.java
new file mode 100644
index 00000000000..4897ef3ba0e
--- /dev/null
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/xwt/XWTTabDescriptorProvider.java
@@ -0,0 +1,284 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 417409
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.properties.ui.xwt;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.text.Collator;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.papyrus.infra.constraints.runtime.ConstraintEngineListener;
+import org.eclipse.papyrus.infra.constraints.runtime.ConstraintsChangedEvent;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.internal.ui.Activator;
+import org.eclipse.papyrus.infra.properties.ui.runtime.DefaultDisplayEngine;
+import org.eclipse.papyrus.infra.properties.ui.runtime.DisplayEngine;
+import org.eclipse.papyrus.infra.properties.ui.runtime.PropertiesRuntime;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.internal.views.properties.tabbed.view.TabbedPropertyRegistry;
+import org.eclipse.ui.internal.views.properties.tabbed.view.TabbedPropertyRegistryFactory;
+import org.eclipse.ui.views.properties.tabbed.ITabDescriptor;
+import org.eclipse.ui.views.properties.tabbed.ITabDescriptorProvider;
+import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
+
+/**
+ * An implementation of ITabDescriptorProvider, which displays the Property view
+ * from XWT files.
+ *
+ * @author Camille Letavernier
+ */
+public class XWTTabDescriptorProvider implements ITabDescriptorProvider {
+
+	private ITabDescriptor[] cachedResult;
+
+	private ISelection previousSelection;
+
+	private IWorkbenchPart previousPart;
+
+	private final Map<IWorkbenchPart, DisplayEngine> displays = new HashMap<IWorkbenchPart, DisplayEngine>();
+
+
+	public XWTTabDescriptorProvider() {
+		PropertiesRuntime.getConstraintEngine().addConstraintEngineListener(new ConstraintEngineListener() {
+
+			@Override
+			public void constraintsChanged(ConstraintsChangedEvent event) {
+				// Purge the caches of all display engines because the XML view descriptions
+				// they cached are out of date
+				for (DisplayEngine next : displays.values()) {
+					((DefaultDisplayEngine) next).invalidate();
+				}
+			}
+		});
+	}
+
+	private DisplayEngine getDisplay(final IWorkbenchPart part) {
+		if (!displays.containsKey(part)) {
+			displays.put(part, new DefaultDisplayEngine());
+			part.getSite().getPage().addPartListener(new IPartListener() {
+
+				@Override
+				public void partClosed(IWorkbenchPart part) {
+					part.getSite().getPage().removePartListener(this);
+					DisplayEngine display = displays.get(part);
+					if (display != null) {
+						display.dispose();
+						displays.remove(part);
+					}
+
+					// We remove pointers to the cached IWorkbenchPart, to avoid Memory Leaks.
+					// Even if the closed part is not the previousPart, both parts may share the same objects (e.g. ModelExplorer & DiagramEditor).
+					// We'd better not retain the selection at all. In such a case, we won't receive a SelectionChangedEvent from the ModelExplorer.
+					previousPart = null;
+					previousSelection = null;
+				}
+
+				@Override
+				public void partActivated(IWorkbenchPart part) {
+					// Nothing
+				}
+
+				@Override
+				public void partBroughtToTop(IWorkbenchPart part) {
+					// Nothing
+				}
+
+				@Override
+				public void partDeactivated(IWorkbenchPart part) {
+					// Nothing
+				}
+
+				@Override
+				public void partOpened(IWorkbenchPart part) {
+					// Nothing
+				}
+
+			});
+		}
+
+		return displays.get(part);
+	}
+
+	@Override
+	public ITabDescriptor[] getTabDescriptors(final IWorkbenchPart part, final ISelection selection) {
+		if (selection != this.previousSelection || part != previousPart) {
+			this.previousSelection = selection;
+			this.previousPart = part;
+
+			List<ITabDescriptor> descriptors = new LinkedList<ITabDescriptor>();
+
+			Set<View> views = PropertiesRuntime.getConstraintEngine().getDisplayUnits(selection);
+			if (!views.isEmpty()) {
+				descriptors.addAll(getDisplay(part).getTabDescriptors(views));
+			}
+
+			// FIXME: In some cases (e.g. Selection in the Papyrus Tree outline), the IWorkbenchPart is not an ITabbedPropertySheetPageContributor
+			// TODO: Investigate on this case and fix the issue (contributor == null in this case)
+			ITabbedPropertySheetPageContributor contributor;
+			if (part instanceof ITabbedPropertySheetPageContributor) {
+				contributor = (ITabbedPropertySheetPageContributor) part;
+			} else {
+				contributor = (part.getAdapter(ITabbedPropertySheetPageContributor.class));
+			}
+
+			if (contributor != null) {
+				// get all tab descriptors for the registered extension points
+				// Memory leak here
+				TabbedPropertyRegistry registry = TabbedPropertyRegistryFactory.getInstance().createRegistry(contributor);
+
+				// invoke dynamically on the tab registry, as method is private
+				// problem of implementation of tabbed properties tabbed registry. Either contribution using extension points, either a tabprovider
+				// both contribution can not exist together, the only solution is to make a workaround.
+				try {
+					Method method = TabbedPropertyRegistry.class.getDeclaredMethod("getAllTabDescriptors"); //$NON-NLS-1$
+					method.setAccessible(true);
+					ITabDescriptor[] registeredTabDesriptors;
+
+					registeredTabDesriptors = (ITabDescriptor[]) method.invoke(registry);
+
+					if (registeredTabDesriptors != null) {
+						for (ITabDescriptor descriptor : registeredTabDesriptors) {
+							if (descriptor.getSectionDescriptors().size() > 0) {
+								descriptors.add(descriptor);
+							}
+						}
+					}
+				} catch (IllegalArgumentException e) {
+					Activator.log.error(e);
+				} catch (IllegalAccessException e) {
+					Activator.log.error(e);
+				} catch (InvocationTargetException e) {
+					Activator.log.error(e);
+				} catch (SecurityException e) {
+					Activator.log.error(e);
+				} catch (NoSuchMethodException e) {
+					Activator.log.error(e);
+				}
+			}
+
+			orderTabDescriptors(descriptors);
+
+			cachedResult = descriptors.toArray(new ITabDescriptor[descriptors.size()]);
+
+			// Workaround for memory leak
+			TabbedPropertyRegistryFactory.getInstance().disposeRegistry((ITabbedPropertySheetPageContributor) part);
+		}
+
+		return cachedResult;
+	}
+
+	/**
+	 * Order the tab descriptors in the given list, given the afterTab comparator
+	 *
+	 * @param descriptors
+	 *            tab descriptor list to order
+	 */
+	protected void orderTabDescriptors(final List<ITabDescriptor> descriptors) {
+
+		Collections.sort(descriptors, new Comparator<ITabDescriptor>() {
+
+			/**
+			 * compares two tab descriptors each other
+			 *
+			 * @param tabDescriptor1
+			 *            first tab to compare
+			 * @param tabDescriptor2
+			 *            second tab to compare
+			 * @return an integer lesser than -1 if the first tab should be placed before the second tab
+			 */
+			@Override
+			public int compare(ITabDescriptor tabDescriptor1, ITabDescriptor tabDescriptor2) {
+				int priority1 = getPriority(tabDescriptor1);
+				int priority2 = getPriority(tabDescriptor2);
+
+				if (priority1 < priority2) {
+					return -1;
+				}
+
+				if (priority1 > priority2) {
+					return 1;
+				}
+
+				// p1 == p2
+
+				priority1 = getXWTTabPriority(tabDescriptor1);
+				priority2 = getXWTTabPriority(tabDescriptor2);
+
+				if (priority1 < priority2) {
+					return -1;
+				}
+
+				if (priority1 > priority2) {
+					return 1;
+				}
+
+				// p1 == p2
+
+				String label1 = tabDescriptor1.getLabel();
+				String label2 = tabDescriptor2.getLabel();
+
+				return Collator.getInstance().compare(label1, label2);
+			}
+
+			/**
+			 * Returns the tab descriptor before tab
+			 *
+			 * @param tab
+			 *            the tab to test
+			 * @return the tab descriptor before tab
+			 */
+			private ITabDescriptor getPreviousTab(ITabDescriptor tab) {
+				String afterId = tab.getAfterTab();
+				if (!(ITabDescriptor.TOP.equals(afterId))) {
+					for (ITabDescriptor descriptor : descriptors) {
+						String id = descriptor.getId();
+						if (id != null && id.equals(afterId)) {
+							return descriptor;
+						}
+					}
+
+				}
+				// not found. Return null
+				return null;
+			}
+
+			private int getPriority(ITabDescriptor tab) {
+				ITabDescriptor previousTab = getPreviousTab(tab);
+				if (previousTab != null) {
+					return getPriority(previousTab) + 1;
+				}
+
+				return getXWTTabPriority(tab);
+			}
+
+			private int getXWTTabPriority(ITabDescriptor tab) {
+				if (tab instanceof XWTTabDescriptor) {
+					XWTTabDescriptor xwtTab = (XWTTabDescriptor) tab;
+					return xwtTab.getPriority();
+				} else {
+					return 100; // This tab is not handled by our framework
+				}
+			}
+
+		});
+	}
+}
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF
index e144c0631e0..f3c88e1b574 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.properties.contexts,
+Export-Package: org.eclipse.papyrus.infra.properties.catalog,
+ org.eclipse.papyrus.infra.properties.contexts,
  org.eclipse.papyrus.infra.properties.contexts.impl,
  org.eclipse.papyrus.infra.properties.contexts.util,
  org.eclipse.papyrus.infra.properties.environment,
  org.eclipse.papyrus.infra.properties.environment.impl,
  org.eclipse.papyrus.infra.properties.environment.util,
- org.eclipse.papyrus.infra.properties.catalog,
- org.eclipse.papyrus.infra.properties.internal;x-friends:="org.eclipse.papyrus.views.properties",
+ org.eclipse.papyrus.infra.properties.internal;x-friends:="org.eclipse.papyrus.infra.properties.ui,org.eclipse.papyrus.views.properties",
  org.eclipse.papyrus.infra.properties.spi,
  org.eclipse.papyrus.infra.properties.ui,
  org.eclipse.papyrus.infra.properties.ui.impl,
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/pom.xml b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/pom.xml
index 5d0386a803d..e7570a844e1 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/pom.xml
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-properties</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.properties</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/properties/pom.xml b/plugins/infra/properties/pom.xml
new file mode 100644
index 00000000000..68a871512ce
--- /dev/null
+++ b/plugins/infra/properties/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.infra-properties</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+	<name>Papyrus Infra Properties Framework</name>
+	<description>The model and UI framework for dynamic Properties View content.</description>
+
+	<modules>
+		<module>org.eclipse.papyrus.infra.properties</module>
+		<module>org.eclipse.papyrus.infra.properties.edit</module>
+		<module>org.eclipse.papyrus.infra.properties.editor</module>
+		<module>org.eclipse.papyrus.infra.properties.ui</module>
+	</modules>
+</project>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/pom.xml
index 8a046fb74cb..f3c028a2c7a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.controlmode.history</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
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 ccc8e7e1367..961f1e00951 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
@@ -1,29 +1,29 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.services.controlmode,

- org.eclipse.papyrus.infra.services.controlmode.commands,

- org.eclipse.papyrus.infra.services.controlmode.handler,

- org.eclipse.papyrus.infra.services.controlmode.participants,

- org.eclipse.papyrus.infra.services.controlmode.ui,

- org.eclipse.papyrus.infra.services.controlmode.util

-Require-Bundle: org.eclipse.emf.edit.ui,

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.core.expressions;bundle-version="3.4.400",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- com.google.guava;bundle-version="11.0.0",

- org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.services.controlmode.ControlModePlugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.services.controlmode,
+ org.eclipse.papyrus.infra.services.controlmode.commands,
+ org.eclipse.papyrus.infra.services.controlmode.handler,
+ org.eclipse.papyrus.infra.services.controlmode.participants,
+ org.eclipse.papyrus.infra.services.controlmode.ui,
+ org.eclipse.papyrus.infra.services.controlmode.util
+Require-Bundle: org.eclipse.emf.edit.ui,
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.core.expressions;bundle-version="3.4.400",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.gmf.runtime.emf.type.core,
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.services.controlmode.ControlModePlugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/pom.xml
index aa3a028637d..4261df2e9d7 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.controlmode</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/handler/ControlCommandHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/handler/ControlCommandHandler.java
index 0c8e1c0054b..863ec49631a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/handler/ControlCommandHandler.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/handler/ControlCommandHandler.java
@@ -35,10 +35,10 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.core.utils.AdapterUtils;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
 import org.eclipse.papyrus.infra.services.controlmode.ControlModeManager;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/handler/UncontrolCommandHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/handler/UncontrolCommandHandler.java
index d4659e5c77b..0031ed0712a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/handler/UncontrolCommandHandler.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/handler/UncontrolCommandHandler.java
@@ -22,8 +22,8 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.services.controlmode.ControlModeManager;
 import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/pom.xml
index cbb68e25657..4934ca60fd8 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.decoration</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/.classpath
index 098194ca4b7..eca7bdba8f0 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/.classpath
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.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/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c4..b3aa6d60f94 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 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.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/META-INF/MANIFEST.MF
index 77f4d78d938..4631b1575b8 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/META-INF/MANIFEST.MF
@@ -1,13 +1,20 @@
 Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.infra.services.edit.internal.ui;x-internal:=true,
  org.eclipse.papyrus.infra.services.edit.internal.ui.messages;x-internal:=true,
+ org.eclipse.papyrus.infra.services.edit.ui.databinding,
  org.eclipse.papyrus.infra.services.edit.ui.dialogs
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
+ org.eclipse.core.databinding.observable;bundle-version="1.6.0",
+ org.eclipse.emf.databinding;bundle-version="1.3.0",
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
  com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0"
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
@@ -16,4 +23,4 @@ Bundle-Name: %pluginName
 Bundle-Activator: org.eclipse.papyrus.infra.services.edit.internal.ui.Activator
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/pom.xml
index 9bf694cbf65..c429a23063d 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.edit.ui</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/databinding/AggregatedPapyrusObservableValue.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/databinding/AggregatedPapyrusObservableValue.java
new file mode 100644
index 00000000000..5410189303c
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/databinding/AggregatedPapyrusObservableValue.java
@@ -0,0 +1,69 @@
+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.edit.ui.databinding;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.databinding.observable.IObservable;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.papyrus.infra.tools.databinding.AggregatedObservable;
+import org.eclipse.papyrus.infra.tools.databinding.CommandBasedObservableValue;
+import org.eclipse.papyrus.infra.tools.databinding.MultipleObservableValue;
+
+
+public class AggregatedPapyrusObservableValue extends MultipleObservableValue {
+
+	private final List<CommandBasedObservableValue> observables = new LinkedList<CommandBasedObservableValue>();
+
+	private final EditingDomain domain;
+
+	public AggregatedPapyrusObservableValue(EditingDomain domain, IObservable... observableValues) {
+		this.domain = domain;
+		for (IObservable value : observableValues) {
+			if (aggregate(value) == null) {
+				throw new IllegalArgumentException("The input ObservableValues have an incorrect type"); //$NON-NLS-1$
+			}
+		}
+	}
+
+	@Override
+	public AggregatedObservable aggregate(IObservable observable) {
+		if (observable instanceof CommandBasedObservableValue) {
+			if (!observables.isEmpty()) {
+				Object valueType = observables.get(0).getValueType();
+				if (((IObservableValue) observable).getValueType() != valueType) {
+					return null;
+				}
+			}
+
+			observables.add((CommandBasedObservableValue) observable);
+			super.aggregate(observable);
+			return this;
+		}
+
+		return null; // TODO : maybe we can support some other types
+	}
+
+	@Override
+	public void doSetValue(Object value) {
+		CompoundCommand command = new CompoundCommand();
+		for (CommandBasedObservableValue observableValue : observables) {
+			command.append(observableValue.getCommand(value));
+		}
+		domain.getCommandStack().execute(command);
+	}
+
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/databinding/PapyrusObservableList.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/databinding/PapyrusObservableList.java
new file mode 100644
index 00000000000..435a2836533
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/databinding/PapyrusObservableList.java
@@ -0,0 +1,268 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.edit.ui.databinding;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Function;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableList;
+
+/**
+ * An ObservableList used to edit collections of EObjects through
+ * Papyrus commands
+ *
+ * @author Camille Letavernier
+ *
+ */
+@SuppressWarnings("unchecked")
+public class PapyrusObservableList extends EMFObservableList {
+
+	private final Function<? super ICommand, ? extends Command> commandWrapper;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param wrappedList
+	 *            The list to be edited when #commit() is called
+	 * @param domain
+	 *            The editing domain on which the commands will be executed
+	 * @param source
+	 *            The EObject from which the list will be retrieved
+	 * @param feature
+	 *            The feature from which the list will be retrieved
+	 */
+	public PapyrusObservableList(List<?> wrappedList, EditingDomain domain, EObject source, EStructuralFeature feature, Function<? super ICommand, ? extends Command> commandWrapper) {
+		super(wrappedList, domain, source, feature);
+
+		this.commandWrapper = commandWrapper;
+	}
+
+	/**
+	 * @return the IElementEditService used to retrieve the command
+	 */
+	protected IElementEditService getProvider() {
+		return ElementEditServiceUtils.getCommandProvider(source);
+	}
+
+	/**
+	 * Creates an EMF command from a GMF request, with the given IElementEditService
+	 *
+	 * @param provider
+	 * @param requests
+	 * @return
+	 * 		The EMF command corresponding to the given request
+	 */
+	protected Command getCommandFromRequests(IElementEditService provider, Collection<? extends IEditCommandRequest> requests) {
+		if (requests.size() == 1) {
+			return commandWrapper.apply(provider.getEditCommand(requests.iterator().next()));
+		}
+
+		CompositeCommand cc = new CompositeCommand("Edit list");
+
+		for (IEditCommandRequest request : requests) {
+			ICommand cmd = provider.getEditCommand(request);
+			cc.add(cmd);
+		}
+
+		return commandWrapper.apply(cc);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Command getAddCommand(int index, Object value) {
+		IElementEditService provider = getProvider();
+		if (provider != null) {
+			List<Object> values = new LinkedList<Object>(this);
+			values.add(index, value);
+			return getCommandFromRequests(provider, getRequests(values, null));
+		}
+
+		return super.getAddCommand(index, value);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Command getAddCommand(Object value) {
+		IElementEditService provider = getProvider();
+		if (provider != null) {
+			List<Object> values = new LinkedList<Object>(this);
+			values.add(value);
+			return getCommandFromRequests(provider, getRequests(values, null));
+		}
+
+		return super.getAddCommand(value);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Command getAddAllCommand(Collection<?> values) {
+		IElementEditService provider = getProvider();
+		if (provider != null) {
+			List<Object> result = new LinkedList<Object>(this);
+			result.addAll(values);
+			return getCommandFromRequests(provider, getRequests(result, null));
+		}
+
+		return super.getAddAllCommand(values);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Command getAddAllCommand(int index, Collection<?> values) {
+		IElementEditService provider = getProvider();
+		if (provider != null) {
+			List<Object> result = new LinkedList<Object>(this);
+			result.addAll(index, values);
+			return getCommandFromRequests(provider, getRequests(result, null));
+		}
+		return super.getAddAllCommand(index, values);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Command getClearCommand() {
+		IElementEditService provider = getProvider();
+		if (provider != null) {
+			return getCommandFromRequests(provider, getRequests(Collections.EMPTY_LIST, new LinkedList<Object>(this)));
+		}
+		return super.getClearCommand();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Command getRemoveCommand(int index) {
+		IElementEditService provider = getProvider();
+		if (provider != null) {
+			List<Object> values = new LinkedList<Object>(this);
+			Object o = values.remove(index);
+			return getCommandFromRequests(provider, getRequests(values, Collections.singletonList(o)));
+		}
+
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Command getRemoveCommand(final Object value) {
+		IElementEditService provider = getProvider();
+
+		if (provider != null) {
+			List<Object> values = new LinkedList<Object>(this);
+			values.remove(value);
+			return getCommandFromRequests(provider, getRequests(values, Collections.singletonList(value)));
+		}
+
+		return super.getRemoveCommand(value);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Command getRemoveAllCommand(Collection<?> values) {
+		IElementEditService provider = getProvider();
+		if (provider != null) {
+			List<Object> result = new LinkedList<Object>(this);
+			result.removeAll(values);
+			return getCommandFromRequests(provider, getRequests(result, values));
+		}
+		return super.getRemoveAllCommand(values);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<Command> getMoveCommands(int oldIndex, int newIndex) {
+		IElementEditService provider = getProvider();
+		if (provider != null) {
+			List<Object> values = new LinkedList<Object>(this);
+			Object result = values.remove(oldIndex);
+			values.add(newIndex, result);
+			return Collections.singletonList(getCommandFromRequests(provider, getRequests(values, null)));
+		}
+
+		return super.getMoveCommands(oldIndex, newIndex);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Command getSetCommand(int index, Object value) {
+		IElementEditService provider = getProvider();
+		if (provider != null) {
+			List<Object> values = new LinkedList<Object>(this);
+			Object oldElem = values.set(index, value);
+			return getCommandFromRequests(provider, getRequests(values, Collections.singletonList(oldElem)));
+		}
+
+		return super.getSetCommand(index, value);
+	}
+
+	/**
+	 * Compute the requests
+	 *
+	 * @param newValues
+	 *            the new list that will be set as a value of the observed feature
+	 * @param removedValues
+	 *            if element has been removed from the list put it there : it handles destroy of elements if the observed feature is a containment
+	 * @return
+	 */
+	protected Collection<? extends IEditCommandRequest> getRequests(List<Object> newValues, Collection<?> removedValues) {
+		LinkedList<IEditCommandRequest> requests = new LinkedList<IEditCommandRequest>();
+
+		if (feature instanceof EReference && ((EReference) feature).isContainment() && removedValues != null) {
+			for (Object o : removedValues) {
+				if (o instanceof EObject) {
+					requests.add(new DestroyElementRequest((TransactionalEditingDomain) editingDomain, (EObject) o, false));
+				}
+			}
+		}
+
+		requests.add(new SetRequest((TransactionalEditingDomain) editingDomain, source, feature, newValues));
+		return requests;
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/databinding/PapyrusObservableValue.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/databinding/PapyrusObservableValue.java
new file mode 100644
index 00000000000..f43ab6b315a
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/src/org/eclipse/papyrus/infra/services/edit/ui/databinding/PapyrusObservableValue.java
@@ -0,0 +1,189 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *  Christian W. Damus (CEA) - bugs 440108, 417409
+ *  Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - bug 447698
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.edit.ui.databinding;
+
+import java.util.function.Function;
+
+import org.eclipse.core.databinding.observable.IObservable;
+import org.eclipse.core.databinding.observable.Realm;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.UnexecutableCommand;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.services.edit.internal.ui.Activator;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.tools.databinding.AggregatedObservable;
+import org.eclipse.papyrus.infra.tools.databinding.CommandBasedObservableValue;
+import org.eclipse.papyrus.infra.tools.databinding.ReferenceCountedObservable;
+import org.eclipse.papyrus.infra.ui.emf.databinding.EMFObservableValue;
+
+/**
+ * An ObservableValue used to edit EObject properties through
+ * Papyrus commands
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class PapyrusObservableValue extends EMFObservableValue implements AggregatedObservable, CommandBasedObservableValue, ReferenceCountedObservable {
+
+	private final ReferenceCountedObservable.Support refCount = new ReferenceCountedObservable.Support(this);
+
+	private final Function<? super ICommand, ? extends Command> commandWrapper;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param eObject
+	 *            The EObject to edit
+	 * @param eStructuralFeature
+	 *            The structural feature to edit
+	 * @param domain
+	 *            The editing domain on which the commands will be executed
+	 */
+	public PapyrusObservableValue(EObject eObject, EStructuralFeature eStructuralFeature, EditingDomain domain, Function<? super ICommand, ? extends Command> commandWrapper) {
+		this(Realm.getDefault(), eObject, eStructuralFeature, domain, commandWrapper);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param realm
+	 * @param eObject
+	 *            The EObject to edit
+	 * @param eStructuralFeature
+	 *            The structural feature to edit
+	 * @param domain
+	 *            The editing domain on which the commands will be executed
+	 */
+	public PapyrusObservableValue(Realm realm, EObject eObject, EStructuralFeature eStructuralFeature, EditingDomain domain, Function<? super ICommand, ? extends Command> commandWrapper) {
+		super(eObject, eStructuralFeature, domain);
+
+		this.commandWrapper = commandWrapper;
+	}
+
+	@Override
+	protected void doSetValue(Object value) {
+
+		try {
+			Command emfCommand = getCommand(value);
+			domain.getCommandStack().execute(emfCommand);
+		} catch (Exception ex) {
+			//
+		}
+		// throw new IllegalArgumentException("an error occured");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Command getCommand(Object value) {
+		EObject eObjectValue = EMFHelper.getEObject(value);
+		if (eObjectValue != null) {
+			value = eObjectValue;
+		}
+
+		Object oldValue = getValue();
+
+		try {
+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getObserved());
+
+			if (provider != null) {
+				CompositeCommand cc = new CompositeCommand("Edit value");
+
+				if (oldValue instanceof EObject && eStructuralFeature instanceof EReference && ((EReference) eStructuralFeature).isContainment()) {
+					cc.add(provider.getEditCommand(new DestroyElementRequest((TransactionalEditingDomain) domain, (EObject) oldValue, false)));
+				}
+
+				IEditCommandRequest createSetRequest = createSetRequest((TransactionalEditingDomain) domain, eObject, eStructuralFeature, value);
+
+				if (createSetRequest == null) {
+					return UnexecutableCommand.INSTANCE;
+				}
+
+				cc.add(provider.getEditCommand(createSetRequest));
+
+				return commandWrapper.apply(cc);
+			}
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+
+		return UnexecutableCommand.INSTANCE;
+	}
+
+	protected IEditCommandRequest createSetRequest(TransactionalEditingDomain domain, EObject owner, EStructuralFeature feature, Object value) {
+		return new SetRequest(domain, owner, feature, value);
+	}
+
+	/**
+	 *
+	 * @return the {@link EStructuralFeature} observed by this object
+	 */
+	public EStructuralFeature getEStructuralFeature() {
+		return eStructuralFeature;
+	}
+
+	/**
+	 *
+	 * @return the {@link EObject} observed by this object
+	 */
+	public EObject getEObject() {
+		return eObject;
+	}
+
+	@Override
+	public AggregatedObservable aggregate(IObservable observable) {
+		try {
+			return new AggregatedPapyrusObservableValue(domain, this, observable);
+		} catch (IllegalArgumentException ex) {
+			return null; // The observable cannot be aggregated
+		}
+	}
+
+	@Override
+	public boolean hasDifferentValues() {
+		return false; // The value is not aggregated yet
+	}
+
+	@Override
+	public void retain() {
+		refCount.retain();
+	}
+
+	@Override
+	public void release() {
+		refCount.release();
+	}
+
+	@Override
+	public void autorelease() {
+		refCount.autorelease();
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/pom.xml
index 64fbc38bd59..bb7ddb61ee5 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-services</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.edit</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/pom.xml
index 35b379935a0..d36e9be6d87 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-services</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.labelprovider</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/pom.xml
index 6fd2987c157..aac3d66f858 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.localizer</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/pom.xml
index 079bd01ee17..45bd24a1052 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra-services</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.markerlistener</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/MarkersMonitorService.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/MarkersMonitorService.java
index f110f35fbad..27a01c0e489 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/MarkersMonitorService.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/infra/services/markerlistener/MarkersMonitorService.java
@@ -1,226 +1,224 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *	Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr

- *  Arnaud Cuccuru (CEA LIST) - arnaud.cuccuru@cea.fr

- *  Christian W. Damus (CEA) - refactor for non-workspace abstraction of problem markers (CDO)

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.services.markerlistener;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.LinkedList;

-import java.util.List;

-

-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.common.util.BasicEList;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.services.IService;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.services.markerlistener.providers.IMarkerMonitor;

-import org.eclipse.papyrus.infra.services.markerlistener.providers.IMarkerProvider;

-import org.eclipse.papyrus.infra.services.markerlistener.providers.MarkerMonitorRegistry;

-import org.eclipse.papyrus.infra.services.markerlistener.util.MarkerListenerUtils;

-

-// TODO: Auto-generated Javadoc

-/**

- * The Class MarkersMonitorService.

- */

-public class MarkersMonitorService implements IService {

-

-	/** The services registry. */

-	private ServicesRegistry servicesRegistry;

-

-	/**

-	 * The list of registered Marker Event Listeners

-	 */

-	protected List<IMarkerEventListener> registeredMarkerEventListeners;

-

-	private List<IMarkerMonitor> monitorExtensions;

-

-	private final IMarkerEventListener relay = createRelayListener();

-

-	/**

-	 * Gets the services registry.

-	 *

-	 * @return the services registry

-	 */

-	public ServicesRegistry getServicesRegistry() {

-		return servicesRegistry;

-	}

-

-

-	/**

-	 * Sets the services registry.

-	 *

-	 * @param servicesRegistry

-	 *            the new services registry

-	 */

-	public void setServicesRegistry(ServicesRegistry servicesRegistry) {

-		this.servicesRegistry = servicesRegistry;

-	}

-

-

-	/**

-	 * Instantiates a new markers monitor service.

-	 */

-	public MarkersMonitorService() {

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

-	 *

-	 * @param servicesRegistry

-	 * @throws ServiceException

-	 */

-

-	public void init(ServicesRegistry servicesRegistry) throws ServiceException {

-		this.servicesRegistry = servicesRegistry;

-		this.registeredMarkerEventListeners = this.getRegisteredMarkerEventListeners();

-		this.monitorExtensions = new MarkerMonitorRegistry().getMarkerMonitors();

-

-		checkMarkers();

-	}

-

-	protected List<IMarkerEventListener> getRegisteredMarkerEventListeners() {

-		IExtensionRegistry registry = Platform.getExtensionRegistry();

-		IConfigurationElement[] config = registry.getConfigurationElementsFor(IMarkerEventListener.MARKER_EVENT_LISTENER_EXTENSION_POINT_ID);

-		this.registeredMarkerEventListeners = new ArrayList<IMarkerEventListener>();

-		try {

-			for (int i = 0; i < config.length; i++) {

-				Object o = config[i].createExecutableExtension("class");

-				try {

-					this.registeredMarkerEventListeners.add((IMarkerEventListener) servicesRegistry.getService(o.getClass()));

-				} catch (ServiceException e) {

-					e.printStackTrace();

-				}

-			}

-		} catch (CoreException e) {

-			e.printStackTrace();

-		}

-		return this.registeredMarkerEventListeners;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

-	 *

-	 * @throws ServiceException

-	 */

-	public void startService() throws ServiceException {

-		ModelSet modelSet = ServiceUtils.getInstance().getModelSet(servicesRegistry);

-

-		for (IMarkerMonitor next : monitorExtensions) {

-			try {

-				next.initialize(modelSet);

-				next.addMarkerEventListener(relay);

-			} catch (Exception e) {

-				Activator.log.error("Uncaught exception in initialization of marker monitor.", e);

-			}

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

-	 *

-	 * @throws ServiceException

-	 */

-	public void disposeService() throws ServiceException {

-		for (IMarkerMonitor next : monitorExtensions) {

-			try {

-				next.removeMarkerEventListener(relay);

-				next.dispose();

-			} catch (Exception e) {

-				Activator.log.error("Uncaught exception in initialization of marker monitor.", e);

-			}

-		}

-	}

-

-	/**

-	 * Initial Checking for existing markers in notation.uml.

-	 */

-	void checkMarkers() {

-		try {

-			EList<Resource> resources = ServiceUtils.getInstance().getModelSet(servicesRegistry).getResources();

-			// create a copy of the list, see bug 392194 (avoid concurrent modification exceptions)

-			EList<Resource> resourcesCopy = new BasicEList<Resource>(resources);

-			// loop over all resources (e.g. error markers are on notation, breakpoints on UML model)

-			for (Resource resource : resourcesCopy) {

-				try {

-					Collection<? extends IPapyrusMarker> markers = getMarkers(resource, null /* all markers */, true);

-					for (IPapyrusMarker next : markers) {

-						EObject eObjectFromMarker = next.getEObject();

-						if (eObjectFromMarker != null && this.registeredMarkerEventListeners != null) {

-							for (IMarkerEventListener listener : this.registeredMarkerEventListeners) {

-								if (listener.isNotifiedOnInitialMarkerCheck()) {

-									listener.notifyMarkerChange(eObjectFromMarker, next, IMarkerEventListener.MARKER_ADDED);

-								}

-							}

-						}

-					}

-				} catch (CoreException e) {

-					Activator.log.error(e.getMessage(), e);

-				}

-			}

-		} catch (ServiceException e1) {

-			Activator.log.error(e1.getMessage(), e1);

-		}

-	}

-

-	public Collection<? extends IPapyrusMarker> getMarkers(Resource resource, String type, boolean includeSubtypes) throws CoreException {

-		List<IPapyrusMarker> result = new LinkedList<IPapyrusMarker>();

-		for (IMarkerProvider provider : MarkerListenerUtils.getMarkerProviders(resource)) {

-			result.addAll(provider.getMarkers(resource, type, includeSubtypes));

-		}

-		return result;

-	}

-

-	private IMarkerEventListener createRelayListener() {

-		return new IMarkerEventListener() {

-

-			public void notifyMarkerChange(EObject eObjectOfMarker, IPapyrusMarker marker, int addedOrRemoved) {

-

-				for (IMarkerEventListener next : registeredMarkerEventListeners) {

-					try {

-						next.notifyMarkerChange(eObjectOfMarker, marker, addedOrRemoved);

-					} catch (Exception e) {

-						Activator.log.error("Uncaught exception in marker listener.", e);

-					}

-				}

-			}

-

-			public void startService() {

-				// not needed

-			}

-

-			public void init(ServicesRegistry servicesRegistry) {

-				// not needed

-			}

-

-			public void disposeService() {

-				// not needed

-			}

-

-			public boolean isNotifiedOnInitialMarkerCheck() {

-				// not needed

-				return false;

-			}

-		};

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *	Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
+ *  Arnaud Cuccuru (CEA LIST) - arnaud.cuccuru@cea.fr
+ *  Christian W. Damus (CEA) - refactor for non-workspace abstraction of problem markers (CDO)
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.services.markerlistener;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+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.common.util.BasicEList;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.IService;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.services.markerlistener.providers.IMarkerMonitor;
+import org.eclipse.papyrus.infra.services.markerlistener.providers.IMarkerProvider;
+import org.eclipse.papyrus.infra.services.markerlistener.providers.MarkerMonitorRegistry;
+import org.eclipse.papyrus.infra.services.markerlistener.util.MarkerListenerUtils;
+
+/**
+ * The Class MarkersMonitorService.
+ */
+public class MarkersMonitorService implements IService {
+
+	/** The services registry. */
+	private ServicesRegistry servicesRegistry;
+
+	/**
+	 * The list of registered Marker Event Listeners
+	 */
+	protected List<IMarkerEventListener> registeredMarkerEventListeners;
+
+	private List<IMarkerMonitor> monitorExtensions;
+
+	private final IMarkerEventListener relay = createRelayListener();
+
+	/**
+	 * Gets the services registry.
+	 *
+	 * @return the services registry
+	 */
+	public ServicesRegistry getServicesRegistry() {
+		return servicesRegistry;
+	}
+
+
+	/**
+	 * Sets the services registry.
+	 *
+	 * @param servicesRegistry
+	 *            the new services registry
+	 */
+	public void setServicesRegistry(ServicesRegistry servicesRegistry) {
+		this.servicesRegistry = servicesRegistry;
+	}
+
+
+	/**
+	 * Instantiates a new markers monitor service.
+	 */
+	public MarkersMonitorService() {
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)
+	 *
+	 * @param servicesRegistry
+	 * @throws ServiceException
+	 */
+
+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+		this.servicesRegistry = servicesRegistry;
+		this.registeredMarkerEventListeners = this.getRegisteredMarkerEventListeners();
+		this.monitorExtensions = new MarkerMonitorRegistry().getMarkerMonitors();
+
+		checkMarkers();
+	}
+
+	protected List<IMarkerEventListener> getRegisteredMarkerEventListeners() {
+		IExtensionRegistry registry = Platform.getExtensionRegistry();
+		IConfigurationElement[] config = registry.getConfigurationElementsFor(IMarkerEventListener.MARKER_EVENT_LISTENER_EXTENSION_POINT_ID);
+		this.registeredMarkerEventListeners = new ArrayList<IMarkerEventListener>();
+			for (int i = 0; i < config.length; i++) {
+			// Access services by their ID (interface name) rather than create and throw away an instance
+			String serviceClass = config[i].getAttribute("class"); //$NON-NLS-1$
+				try {
+				this.registeredMarkerEventListeners.add((IMarkerEventListener) servicesRegistry.getService(serviceClass));
+			} catch (ClassCastException e) {
+				Activator.log.error("Registered service is not an IMarkerEventListener: " + serviceClass, e); //$NON-NLS-1$
+				} catch (ServiceException e) {
+				Activator.log.error("Failed to access registered service for marker listening", e); //$NON-NLS-1$
+			}
+		}
+		return this.registeredMarkerEventListeners;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()
+	 *
+	 * @throws ServiceException
+	 */
+	public void startService() throws ServiceException {
+		ModelSet modelSet = ServiceUtils.getInstance().getModelSet(servicesRegistry);
+
+		for (IMarkerMonitor next : monitorExtensions) {
+			try {
+				next.initialize(modelSet);
+				next.addMarkerEventListener(relay);
+			} catch (Exception e) {
+				Activator.log.error("Uncaught exception in initialization of marker monitor.", e);
+			}
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()
+	 *
+	 * @throws ServiceException
+	 */
+	public void disposeService() throws ServiceException {
+		for (IMarkerMonitor next : monitorExtensions) {
+			try {
+				next.removeMarkerEventListener(relay);
+				next.dispose();
+			} catch (Exception e) {
+				Activator.log.error("Uncaught exception in initialization of marker monitor.", e);
+			}
+		}
+	}
+
+	/**
+	 * Initial Checking for existing markers in notation.uml.
+	 */
+	void checkMarkers() {
+		try {
+			EList<Resource> resources = ServiceUtils.getInstance().getModelSet(servicesRegistry).getResources();
+			// create a copy of the list, see bug 392194 (avoid concurrent modification exceptions)
+			EList<Resource> resourcesCopy = new BasicEList<Resource>(resources);
+			// loop over all resources (e.g. error markers are on notation, breakpoints on UML model)
+			for (Resource resource : resourcesCopy) {
+				try {
+					Collection<? extends IPapyrusMarker> markers = getMarkers(resource, null /* all markers */, true);
+					for (IPapyrusMarker next : markers) {
+						EObject eObjectFromMarker = next.getEObject();
+						if (eObjectFromMarker != null && this.registeredMarkerEventListeners != null) {
+							for (IMarkerEventListener listener : this.registeredMarkerEventListeners) {
+								if (listener.isNotifiedOnInitialMarkerCheck()) {
+									listener.notifyMarkerChange(eObjectFromMarker, next, IMarkerEventListener.MARKER_ADDED);
+								}
+							}
+						}
+					}
+				} catch (CoreException e) {
+					Activator.log.error(e.getMessage(), e);
+				}
+			}
+		} catch (ServiceException e1) {
+			Activator.log.error(e1.getMessage(), e1);
+		}
+	}
+
+	public Collection<? extends IPapyrusMarker> getMarkers(Resource resource, String type, boolean includeSubtypes) throws CoreException {
+		List<IPapyrusMarker> result = new LinkedList<IPapyrusMarker>();
+		for (IMarkerProvider provider : MarkerListenerUtils.getMarkerProviders(resource)) {
+			result.addAll(provider.getMarkers(resource, type, includeSubtypes));
+		}
+		return result;
+	}
+
+	private IMarkerEventListener createRelayListener() {
+		return new IMarkerEventListener() {
+
+			public void notifyMarkerChange(EObject eObjectOfMarker, IPapyrusMarker marker, int addedOrRemoved) {
+
+				for (IMarkerEventListener next : registeredMarkerEventListeners) {
+					try {
+						next.notifyMarkerChange(eObjectOfMarker, marker, addedOrRemoved);
+					} catch (Exception e) {
+						Activator.log.error("Uncaught exception in marker listener.", e);
+					}
+				}
+			}
+
+			public void startService() {
+				// not needed
+			}
+
+			public void init(ServicesRegistry servicesRegistry) {
+				// not needed
+			}
+
+			public void disposeService() {
+				// not needed
+			}
+
+			public boolean isNotifiedOnInitialMarkerCheck() {
+				// not needed
+				return false;
+			}
+		};
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/pom.xml
index 943505ac9ee..b6d48b9c8cf 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.navigation</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/pom.xml
index a1df3cf8607..fd2454f82fb 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.openelement</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/.project
deleted file mode 100644
index 575eb62beef..00000000000
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.services.resourceloading.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/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4759947300a..00000000000
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-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

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/META-INF/MANIFEST.MF
deleted file mode 100644
index 4d0609a636d..00000000000
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.services.resourceloading.preferences

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.ui,

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.core.resources;bundle-version="3.8.0",

- org.eclipse.emf.common.ui;bundle-version="2.7.0",

- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.2.0",

- org.eclipse.emf.common;bundle-version="2.12.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.services.resourceloading.preferences.CorePlugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading.preferences;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/about.html b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/CorePreferenceInitializer.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/CorePreferenceInitializer.java
deleted file mode 100644
index 8fd4b37c10b..00000000000
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/CorePreferenceInitializer.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading.preferences;

-

-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;

-import org.eclipse.jface.preference.IPreferenceStore;

-

-/**

- * This preference initializer initializes diagram preferences specific to the

- * activity diagram.

- */

-public class CorePreferenceInitializer extends AbstractPreferenceInitializer {

-

-	/**

-	 * Initialize default preferences

-	 */

-	@Override

-	public void initializeDefaultPreferences() {

-		IPreferenceStore store = getPreferenceStore();

-		store.setDefault(ICorePreferenceConstants.PREF_CORE_DEFINE_LOADING_STRATEGY, 0);

-	}

-

-	/**

-	 * Get the preference store

-	 */

-	protected IPreferenceStore getPreferenceStore() {

-		return CorePlugin.getDefault().getPreferenceStore();

-	}

-}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/.classpath
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/.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/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/services/org.eclipse.papyrus.infra.services.resourceloading.ui/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/.project
new file mode 100644
index 00000000000..291c5bcfcf8
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.services.resourceloading.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/infra/org.eclipse.papyrus.infra.hyperlink/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-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

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+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
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..0cdc5618cba
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,30 @@
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ui,
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.core.resources;bundle-version="3.8.0",
+ org.eclipse.emf.common.ui;bundle-version="2.7.0",
+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.2.0",
+ org.eclipse.emf.common;bundle-version="2.12.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",
+ org.eclipse.core.expressions;bundle-version="3.5.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.emf.core;bundle-version="1.7.0",
+ org.eclipse.gmf.runtime.notation;bundle-version="1.8.0"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.services.resourceloading.internal.ui.UIPlugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading.ui;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.papyrus.infra.services.resourceloading.internal.ui;x-internal:=true,
+ org.eclipse.papyrus.infra.services.resourceloading.internal.ui.editor;x-internal:=true,
+ org.eclipse.papyrus.infra.services.resourceloading.internal.ui.expressions;x-internal:=true,
+ org.eclipse.papyrus.infra.services.resourceloading.internal.ui.preferences;x-internal:=true,
+ org.eclipse.papyrus.infra.services.resourceloading.internal.ui.strategy;x-internal:=true
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/META-INF/p2.inf b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/META-INF/p2.inf
new file mode 100644
index 00000000000..4af251b571a
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/META-INF/p2.inf
@@ -0,0 +1,5 @@
+# Inform p2 of the bundle renaming
+update.matchExp=providedCapabilities.exists(pc | \
+  pc.namespace == 'org.eclipse.equinox.p2.iu' \
+      && (pc.name == 'org.eclipse.papyrus.infra.services.resourceloading.preferences' \
+       || pc.name == 'org.eclipse.papyrus.infra.services.resourceloading.ui'))
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/about.html b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/about.html
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/about.html
@@ -1,28 +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>

+<!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/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/build.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/build.properties
index baec67aef78..f0b3f3014f2 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/build.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/build.properties
@@ -1,12 +1,12 @@
-#

-#Mon Sep 12 09:29:40 CEST 2011

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html,\

-               plugin.properties,\

-               messages.properties

-output..=bin/

-src.includes = about.html

-source..=src/

-bin..=bin/

+#
+#Mon Sep 12 09:29:40 CEST 2011
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               plugin.properties,\
+               messages.properties
+output..=bin/
+src.includes = about.html
+source..=src/
+bin..=bin/
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/messages.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/messages.properties
index b60b2df9f17..0c9dafc12ec 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/messages.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/messages.properties
@@ -1,6 +1,6 @@
-LoadedAssociatedResourceGroup_0=Automatically load the following associated resources

-LoadedAuthorizedResourceGroup_0=Automatically authorize the following resources

-LoadedAuthorizedResourceGroup_1=Select authorized elements

-LoadedAuthorizedResourceGroup_2=Select authorized elements

-LoadinStrategyGroup_0=Loading strategy :

-LoadinStrategyGroup_1=Select the loading strategy when model is opened

+LoadedAssociatedResourceGroup_0=Automatically load the following associated resources
+LoadedAuthorizedResourceGroup_0=Automatically authorize the following resources
+LoadedAuthorizedResourceGroup_1=Select authorized elements
+LoadedAuthorizedResourceGroup_2=Select authorized elements
+LoadinStrategyGroup_0=Loading strategy :
+LoadinStrategyGroup_1=Select the loading strategy when model is opened
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/plugin.properties
index 4e3986a7023..38c652833f2 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/plugin.properties
@@ -1,15 +1,15 @@
-#/*****************************************************************************

-# * Copyright (c) 2010 Atos Origin.

-# *

-# *    

-# * All rights reserved. This program and the accompanying materials

-# * are made available under the terms of the Eclipse Public License v1.0

-# * which accompanies this distribution, and is available at

-# * http://www.eclipse.org/legal/epl-v10.html

-# *

-# * Contributors:

-# *  Emilien Perico emilien.perico@atosorigin.com - Initial API and implementation

-# *

-# *****************************************************************************/

-pluginName=Preferences for resource loading feature

+#/*****************************************************************************
+# * Copyright (c) 2010 Atos Origin.
+# *
+# *    
+# * All rights reserved. This program and the accompanying materials
+# * are made available under the terms of the Eclipse Public License v1.0
+# * which accompanies this distribution, and is available at
+# * http://www.eclipse.org/legal/epl-v10.html
+# *
+# * Contributors:
+# *  Emilien Perico emilien.perico@atosorigin.com - Initial API and implementation
+# *
+# *****************************************************************************/
+pluginName=Preferences for resource loading feature
 providerName=Eclipse Modeling Project
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/plugin.xml
index 3e2d162b24a..9e41302230d 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/plugin.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/plugin.xml
@@ -1,46 +1,71 @@
-<?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.services.resourceloading.preferences.CorePreferenceInitializer">

-      </initializer>

-   </extension>

-   <extension

-         point="org.eclipse.ui.preferencePages">

-      <page

-      		category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"

-            class="org.eclipse.papyrus.infra.services.resourceloading.preferences.LoadingStrategyPreferencePage"

-            id="org.eclipse.papyrus.infra.services.resourceloading.preferences.ModelLoadingPreferencePage"

-            name="Model loading">

-      </page>

-   </extension>

-   <extension

-         point="org.eclipse.ui.propertyPages">   

-      <page

-            category="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.generalcategory"

-            class="org.eclipse.papyrus.infra.services.resourceloading.preferences.LoadingStrategyPreferencePage"

-            id="org.eclipse.papyrus.infra.services.resourceloading.properties.ModelLoadingPreferencePage2"

-            name="Model loading">

-         <enabledWhen>

-            <adapt

-                  type="org.eclipse.core.resources.IProject">

-            </adapt>

-         </enabledWhen>

-      </page>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.services.resourceloading.currentStrategyChooser">

-      <CurrentStrategyChooser

-            chooser="org.eclipse.papyrus.infra.services.resourceloading.preferences.StrategyChooser">

-      </CurrentStrategyChooser>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.services.resourceloading.loadingStrategyExtender">

-      <strategyExtender

-            description="org.eclipse.papyrus.core.resourceloading.preferences.strategyExtender1"

-            strategyExtension="org.eclipse.papyrus.infra.services.resourceloading.preferences.PreferenceLoadingStrategyExtension">

-      </strategyExtender>

-   </extension>

-</plugin>

+<?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.services.resourceloading.internal.ui.preferences.CorePreferenceInitializer">
+      </initializer>
+   </extension>
+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+      		category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"
+            class="org.eclipse.papyrus.infra.services.resourceloading.internal.ui.preferences.LoadingStrategyPreferencePage"
+            id="org.eclipse.papyrus.infra.services.resourceloading.ui.ModelLoadingPreferencePage"
+            name="Model loading">
+      </page>
+   </extension>
+   <extension
+         point="org.eclipse.ui.propertyPages">   
+      <page
+            category="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.generalcategory"
+            class="org.eclipse.papyrus.infra.services.resourceloading.internal.ui.preferences.LoadingStrategyPreferencePage"
+            id="org.eclipse.papyrus.infra.services.resourceloading.properties.ModelLoadingPreferencePage2"
+            name="Model loading">
+         <enabledWhen>
+            <adapt
+                  type="org.eclipse.core.resources.IProject">
+            </adapt>
+         </enabledWhen>
+      </page>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.services.resourceloading.currentStrategyChooser">
+      <CurrentStrategyChooser
+            chooser="org.eclipse.papyrus.infra.services.resourceloading.internal.ui.strategy.StrategyChooser">
+      </CurrentStrategyChooser>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.services.resourceloading.loadingStrategyExtender">
+      <strategyExtender
+            description="User preference resource loading strategy extender"
+            strategyExtension="org.eclipse.papyrus.infra.services.resourceloading.internal.ui.strategy.PreferenceLoadingStrategyExtension">
+      </strategyExtender>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
+      <editorDiagram
+            factoryClass="org.eclipse.papyrus.infra.services.resourceloading.internal.ui.editor.UnloadResourcesEditorFactory">
+      </editorDiagram>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.services.resourceloading.loadingStrategy">
+      <loadingStrategy
+            description="Ask the user if a resource has to be loaded"
+            id="3"
+            strategy="org.eclipse.papyrus.infra.services.resourceloading.internal.ui.strategy.AskUserStrategy">
+      </loadingStrategy>
+   </extension>
+   <extension
+         point="org.eclipse.core.expressions.propertyTesters">
+         <!-- the property tester is used to enable/disable handlers for loading/unloading a resource -->
+      <propertyTester
+            class="org.eclipse.papyrus.infra.services.resourceloading.internal.ui.expressions.LoadingTester"
+            id="org.eclipse.papyrus.infra.core.resourceloading.tester"
+            namespace="org.eclipse.papyrus.infra.core.resourceloading.tester"
+            properties="isAllLoaded, isAllNotLoaded"
+            type="org.eclipse.jface.viewers.IStructuredSelection">
+      </propertyTester>
+   </extension>
+</plugin>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/pom.xml
index 5aa45fa60d8..1d40d989c48 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.papyrus.infra.services.resourceloading.preferences</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
+	<artifactId>org.eclipse.papyrus.infra.services.resourceloading.ui</artifactId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/CorePlugin.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/UIPlugin.java
index 611123456f2..91d892f23fc 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/CorePlugin.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/UIPlugin.java
@@ -1,67 +1,67 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading.preferences;

-

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class CorePlugin extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.resourceloading.preferences"; //$NON-NLS-1$

-

-	// The shared instance

-	private static CorePlugin plugin;

-

-	/**

-	 * The constructor

-	 */

-	public CorePlugin() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static CorePlugin getDefault() {

-		return plugin;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2016 Atos Origin, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading.internal.ui;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class UIPlugin extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.resourceloading.ui"; //$NON-NLS-1$
+
+	// The shared instance
+	private static UIPlugin plugin;
+
+	/**
+	 * The constructor
+	 */
+	public UIPlugin() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static UIPlugin getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/editor/UnloadResourcesEditorFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/editor/UnloadResourcesEditorFactory.java
index 0c4f87fc896..bdbef4b1548 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/editor/UnloadResourcesEditorFactory.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/editor/UnloadResourcesEditorFactory.java
@@ -1,44 +1,44 @@
-package org.eclipse.papyrus.infra.services.resourceloading.editor;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.xml.type.AnyType;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.ui.extension.diagrameditor.EditorDescriptor;

-import org.eclipse.papyrus.infra.ui.extension.diagrameditor.IPluggableEditorFactory;

-

-

-public class UnloadResourcesEditorFactory implements IPluggableEditorFactory {

-

-	private EditorDescriptor editorDescriptor;

-

-	private ServicesRegistry serviceRegistry;

-

-	public IPageModel createIPageModel(Object pageIdentifier) {

-		URI uri = null;

-		if (pageIdentifier instanceof InternalEObject) {

-			InternalEObject internal = (InternalEObject) pageIdentifier;

-			uri = internal.eProxyURI();

-		}

-		return new UnloadResourcesEditorModel(uri);

-	}

-

-	public boolean isPageModelFactoryFor(Object pageIdentifier) {

-		boolean result = false;

-		// AnyType is a Proxy, but it is already handled by another EditorFactory.

-		// Ignore it to avoid conflicts

-		if (pageIdentifier instanceof EObject && !(pageIdentifier instanceof AnyType)) {

-			EObject eObjectPageIdentifier = (EObject) pageIdentifier;

-			result = eObjectPageIdentifier.eIsProxy();

-		}

-		return result;

-	}

-

-	public void init(ServicesRegistry serviceRegistry, EditorDescriptor editorDescriptor) {

-		this.editorDescriptor = editorDescriptor;

-		this.serviceRegistry = serviceRegistry;

-	}

-

-}

+package org.eclipse.papyrus.infra.services.resourceloading.internal.ui.editor;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.xml.type.AnyType;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.ui.extension.diagrameditor.EditorDescriptor;
+import org.eclipse.papyrus.infra.ui.extension.diagrameditor.IPluggableEditorFactory;
+
+
+public class UnloadResourcesEditorFactory implements IPluggableEditorFactory {
+
+	private EditorDescriptor editorDescriptor;
+
+	private ServicesRegistry serviceRegistry;
+
+	public IPageModel createIPageModel(Object pageIdentifier) {
+		URI uri = null;
+		if (pageIdentifier instanceof InternalEObject) {
+			InternalEObject internal = (InternalEObject) pageIdentifier;
+			uri = internal.eProxyURI();
+		}
+		return new UnloadResourcesEditorModel(uri);
+	}
+
+	public boolean isPageModelFactoryFor(Object pageIdentifier) {
+		boolean result = false;
+		// AnyType is a Proxy, but it is already handled by another EditorFactory.
+		// Ignore it to avoid conflicts
+		if (pageIdentifier instanceof EObject && !(pageIdentifier instanceof AnyType)) {
+			EObject eObjectPageIdentifier = (EObject) pageIdentifier;
+			result = eObjectPageIdentifier.eIsProxy();
+		}
+		return result;
+	}
+
+	public void init(ServicesRegistry serviceRegistry, EditorDescriptor editorDescriptor) {
+		this.editorDescriptor = editorDescriptor;
+		this.serviceRegistry = serviceRegistry;
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/editor/UnloadResourcesEditorModel.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/editor/UnloadResourcesEditorModel.java
index 30e5594d753..6a1cdc34ca1 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/editor/UnloadResourcesEditorModel.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/editor/UnloadResourcesEditorModel.java
@@ -1,168 +1,168 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin, CEA, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *

- *	 Atos Origin - Initial API and implementation

- *   Christian W. Damus (CEA) - bug 392301

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading.editor;

-

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Image;

-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 org.eclipse.swt.widgets.Text;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.ISharedImages;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.part.EditorActionBarContributor;

-import org.eclipse.ui.part.EditorPart;

-

-

-/**

- * A simple model that can be used as editor in tests.

- *

- * @author cedric dumoulin

- *

- */

-public class UnloadResourcesEditorModel implements IEditorModel {

-

-

-	private String name;

-

-	private final URI uri;

-

-	public UnloadResourcesEditorModel(URI uri) {

-		this.uri = uri;

-		name = "Unresolved tab";

-	}

-

-	public void dispose() {

-		// Pass. The tab icon is a workbench-shared image

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getTabTitle()

-	 *

-	 * @return

-	 */

-	public String getTabTitle() {

-		return name;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getTabIcon()

-	 *

-	 * @return

-	 */

-	public Image getTabIcon() {

-		return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_INFO_TSK);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getRawModel()

-	 *

-	 * @return

-	 */

-	public Object getRawModel() {

-		// TODO Auto-generated method stub

-		return this;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#createIEditorPart()

-	 *

-	 * @return

-	 * @throws PartInitException

-	 */

-	public IEditorPart createIEditorPart() throws PartInitException {

-		return new UnloadResourcesEditorPart(uri);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#getActionBarContributor()

-	 *

-	 * @return

-	 */

-	public EditorActionBarContributor getActionBarContributor() {

-		return null;

-	}

-

-	/**

-	 * A class implementing a fake editor.

-	 *

-	 * @author dumoulin

-	 *

-	 */

-	public static class UnloadResourcesEditorPart extends EditorPart {

-

-		private final URI unloadedUri;

-

-		public UnloadResourcesEditorPart(URI uri) {

-			unloadedUri = uri;

-		}

-

-		@Override

-		public void doSave(IProgressMonitor monitor) {

-		}

-

-		@Override

-		public void doSaveAs() {

-		}

-

-		@Override

-		public void init(IEditorSite site, IEditorInput input) throws PartInitException {

-			setSite(site);

-			setInput(input);

-			setPartName(input.getName());

-		}

-

-		@Override

-		public boolean isDirty() {

-			return false;

-		}

-

-		@Override

-		public boolean isSaveAsAllowed() {

-			return false;

-		}

-

-		@Override

-		public void createPartControl(Composite parent) {

-			Composite compo = new Composite(parent, SWT.NONE);

-			compo.setLayout(new GridLayout(2, false));

-			Image image = NotificationBuilder.getSWTImage(SWT.ICON_INFORMATION, parent.getShell());

-			Label label = new Label(compo, SWT.NONE);

-			label.setImage(image);

-			label.setLayoutData(new GridData(SWT.CENTER, SWT.TOP, false, false));

-			Text t = new Text(compo, SWT.None);

-			t.setText("This diagram is contained in an unresolved resource : " + URI.decode(unloadedUri.trimFragment().toString()));

-			t.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));

-			t.setEditable(false);

-			label.setBackground(t.getBackground());

-			compo.setBackground(t.getBackground());

-		}

-

-		@Override

-		public void setFocus() {

-		}

-

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin, CEA, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ *	 Atos Origin - Initial API and implementation
+ *   Christian W. Damus (CEA) - bug 392301
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading.internal.ui.editor;
+
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+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 org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.EditorActionBarContributor;
+import org.eclipse.ui.part.EditorPart;
+
+
+/**
+ * A simple model that can be used as editor in tests.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class UnloadResourcesEditorModel implements IEditorModel {
+
+
+	private String name;
+
+	private final URI uri;
+
+	public UnloadResourcesEditorModel(URI uri) {
+		this.uri = uri;
+		name = "Unresolved tab";
+	}
+
+	public void dispose() {
+		// Pass. The tab icon is a workbench-shared image
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getTabTitle()
+	 *
+	 * @return
+	 */
+	public String getTabTitle() {
+		return name;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getTabIcon()
+	 *
+	 * @return
+	 */
+	public Image getTabIcon() {
+		return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_INFO_TSK);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel#getRawModel()
+	 *
+	 * @return
+	 */
+	public Object getRawModel() {
+		// TODO Auto-generated method stub
+		return this;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#createIEditorPart()
+	 *
+	 * @return
+	 * @throws PartInitException
+	 */
+	public IEditorPart createIEditorPart() throws PartInitException {
+		return new UnloadResourcesEditorPart(uri);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IEditorModel#getActionBarContributor()
+	 *
+	 * @return
+	 */
+	public EditorActionBarContributor getActionBarContributor() {
+		return null;
+	}
+
+	/**
+	 * A class implementing a fake editor.
+	 *
+	 * @author dumoulin
+	 *
+	 */
+	public static class UnloadResourcesEditorPart extends EditorPart {
+
+		private final URI unloadedUri;
+
+		public UnloadResourcesEditorPart(URI uri) {
+			unloadedUri = uri;
+		}
+
+		@Override
+		public void doSave(IProgressMonitor monitor) {
+		}
+
+		@Override
+		public void doSaveAs() {
+		}
+
+		@Override
+		public void init(IEditorSite site, IEditorInput input) throws PartInitException {
+			setSite(site);
+			setInput(input);
+			setPartName(input.getName());
+		}
+
+		@Override
+		public boolean isDirty() {
+			return false;
+		}
+
+		@Override
+		public boolean isSaveAsAllowed() {
+			return false;
+		}
+
+		@Override
+		public void createPartControl(Composite parent) {
+			Composite compo = new Composite(parent, SWT.NONE);
+			compo.setLayout(new GridLayout(2, false));
+			Image image = NotificationBuilder.getSWTImage(SWT.ICON_INFORMATION, parent.getShell());
+			Label label = new Label(compo, SWT.NONE);
+			label.setImage(image);
+			label.setLayoutData(new GridData(SWT.CENTER, SWT.TOP, false, false));
+			Text t = new Text(compo, SWT.None);
+			t.setText("This diagram is contained in an unresolved resource : " + URI.decode(unloadedUri.trimFragment().toString()));
+			t.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			t.setEditable(false);
+			label.setBackground(t.getBackground());
+			compo.setBackground(t.getBackground());
+		}
+
+		@Override
+		public void setFocus() {
+		}
+
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/util/LoadingTester.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/expressions/LoadingTester.java
index d86524b3243..12501ebb521 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/util/LoadingTester.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/expressions/LoadingTester.java
@@ -1,153 +1,154 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Hemery (Atos) vincent.hemery@atos.net - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading.util;

-

-import java.util.Iterator;

-

-import org.eclipse.core.expressions.PropertyTester;

-import org.eclipse.core.runtime.IAdaptable;

-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.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.notation.Edge;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;

-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;

-

-/**

- * This class provides test to perform on resources to know their loading

- * status.

- */

-public class LoadingTester extends PropertyTester {

-

-	/**

-	 * property to test if the selected elements are in loaded resources (at

-	 * least one other than the opened one)

-	 */

-	public static final String IS_ALL_LOADED = "isAllLoaded"; //$NON-NLS-1$

-

-	/** property to test if the selected elements are in not loaded resources */

-	public static final String IS_ALL_NOTLOADED = "isAllNotLoaded"; //$NON-NLS-1$

-

-	/**

-	 * Test a property

-	 *

-	 * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)

-	 *

-	 * @param receiver

-	 * @param property

-	 * @param args

-	 * @param expectedValue

-	 * @return

-	 */

-	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {

-		if (IS_ALL_LOADED.equals(property) && receiver instanceof IStructuredSelection) {

-			boolean answer = isInLoadedResource((IStructuredSelection) receiver);

-			return new Boolean(answer).equals(expectedValue);

-		}

-		if (IS_ALL_NOTLOADED.equals(property) && receiver instanceof IStructuredSelection) {

-			boolean answer = isInNotLoadedResource((IStructuredSelection) receiver);

-			return new Boolean(answer).equals(expectedValue);

-		}

-		return false;

-	}

-

-	/**

-	 * Tests the selection in order to know if it is in a loaded resource

-	 *

-	 * @param selection

-	 *            selected elements

-	 * @return <code>true</code> if all selected elements are in loaded

-	 *         resources ; <code>false</code otherwise or if empty selection

-	 */

-	private boolean isInLoadedResource(IStructuredSelection selection) {

-		if (!selection.isEmpty()) {

-			boolean atLeastOneInSubmodel = false;

-			URI mainURI = null;

-			Iterator<?> iter = selection.iterator();

-			while (iter.hasNext()) {

-				Object obj = iter.next();

-				EObject eObject = EMFHelper.getEObject(obj);

-				if (eObject != null && !eObject.eIsProxy()) {

-					// test that there is at least one not loaded resource

-					// object

-					if (!atLeastOneInSubmodel) {

-						Resource containingResource = eObject.eResource();

-						if (mainURI == null && containingResource != null && containingResource.getResourceSet() instanceof ModelSet) {

-

-							// Bug 366709: Add tests to avoid NPEs

-							NotationModel notationModel = NotationUtils.getNotationModel((ModelSet) containingResource.getResourceSet());

-							if (notationModel != null) {

-								URI notationModelURI = notationModel.getResourceURI();

-								if (notationModelURI != null) {

-									mainURI = notationModelURI.trimFileExtension();

-								}

-							}

-						}

-						if (mainURI != null) {

-							URI uriTrim = containingResource.getURI().trimFileExtension();

-							atLeastOneInSubmodel = !uriTrim.equals(mainURI);

-						}

-					}

-					continue;

-				}

-

-				// a step failed

-				return false;

-			}

-			return atLeastOneInSubmodel;

-		}

-		return false;

-	}

-

-	/**

-	 * Tests the selection in order to know if it is in a not loaded resource

-	 *

-	 * @param selection

-	 *            selected elements

-	 * @return <code>true</code> if all selected elements are in not loaded

-	 *         resources ; <code>false</code otherwise or if empty selection

-	 */

-	private boolean isInNotLoadedResource(IStructuredSelection selection) {

-		if (!selection.isEmpty()) {

-			Iterator<?> iter = selection.iterator();

-			while (iter.hasNext()) {

-				Object obj = iter.next();

-				EObject eObject = EMFHelper.getEObject(obj);

-				if (eObject != null && eObject.eIsProxy()) {

-					continue;

-				} else if (obj instanceof IAdaptable) {

-					View view = (View) ((IAdaptable) obj).getAdapter(View.class);

-

-					if (view instanceof Edge) {

-						View target = ((Edge) view).getTarget();

-						if (target != null && ViewUtil.resolveSemanticElement(target) == null) {

-							// there is a backslash decorator

-							continue;

-						}

-					}

-				}

-				// a step failed

-				return false;

-			}

-			return true;

-		}

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 Atos, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Hemery (Atos) vincent.hemery@atos.net - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading.internal.ui.expressions;
+
+import java.util.Iterator;
+
+import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.util.TransactionUtil;
+import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
+import org.eclipse.gmf.runtime.notation.Edge;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+
+/**
+ * This class provides test to perform on resources to know their loading
+ * status.
+ */
+public class LoadingTester extends PropertyTester {
+
+	/**
+	 * property to test if the selected elements are in loaded resources (at
+	 * least one other than the opened one)
+	 */
+	public static final String IS_ALL_LOADED = "isAllLoaded"; //$NON-NLS-1$
+
+	/** property to test if the selected elements are in not loaded resources */
+	public static final String IS_ALL_NOTLOADED = "isAllNotLoaded"; //$NON-NLS-1$
+
+	/**
+	 * Test a property
+	 *
+	 * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
+	 *
+	 * @param receiver
+	 * @param property
+	 * @param args
+	 * @param expectedValue
+	 * @return
+	 */
+	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
+		if (IS_ALL_LOADED.equals(property) && receiver instanceof IStructuredSelection) {
+			boolean answer = isInLoadedResource((IStructuredSelection) receiver);
+			return new Boolean(answer).equals(expectedValue);
+		}
+		if (IS_ALL_NOTLOADED.equals(property) && receiver instanceof IStructuredSelection) {
+			boolean answer = isInNotLoadedResource((IStructuredSelection) receiver);
+			return new Boolean(answer).equals(expectedValue);
+		}
+		return false;
+	}
+
+	/**
+	 * Tests the selection in order to know if it is in a loaded resource
+	 *
+	 * @param selection
+	 *            selected elements
+	 * @return <code>true</code> if all selected elements are in loaded
+	 *         resources ; <code>false</code otherwise or if empty selection
+	 */
+	private boolean isInLoadedResource(IStructuredSelection selection) {
+		if (!selection.isEmpty()) {
+			boolean atLeastOneInSubmodel = false;
+			URI mainURI = null;
+			Iterator<?> iter = selection.iterator();
+			while (iter.hasNext()) {
+				Object obj = iter.next();
+				EObject eObject = EMFHelper.getEObject(obj);
+				if (eObject != null && !eObject.eIsProxy()) {
+					// test that there is at least one not loaded resource
+					// object
+					if (!atLeastOneInSubmodel) {
+						Resource containingResource = eObject.eResource();
+						if (mainURI == null && containingResource != null && containingResource.getResourceSet() instanceof ModelSet) {
+							mainURI = ((ModelSet) containingResource.getResourceSet()).getURIWithoutExtension();
+						}
+						if (mainURI != null) {
+							URI uriTrim = containingResource.getURI().trimFileExtension();
+							atLeastOneInSubmodel = !uriTrim.equals(mainURI);
+						}
+					}
+					continue;
+				}
+
+				// a step failed
+				return false;
+			}
+			return atLeastOneInSubmodel;
+		}
+		return false;
+	}
+
+	/**
+	 * Tests the selection in order to know if it is in a not loaded resource
+	 *
+	 * @param selection
+	 *            selected elements
+	 * @return <code>true</code> if all selected elements are in not loaded
+	 *         resources ; <code>false</code otherwise or if empty selection
+	 */
+	private boolean isInNotLoadedResource(IStructuredSelection selection) {
+		if (!selection.isEmpty()) {
+			Iterator<?> iter = selection.iterator();
+			while (iter.hasNext()) {
+				Object obj = iter.next();
+				EObject eObject = EMFHelper.getEObject(obj);
+				if (eObject != null && eObject.eIsProxy()) {
+					continue;
+				} else if (obj instanceof IAdaptable) {
+					View view = ((IAdaptable) obj).getAdapter(View.class);
+
+					if (view instanceof Edge) {
+						View target = ((Edge) view).getTarget();
+						if (target != null && resolveSemanticElement(target) == null) {
+							// there is a backslash decorator
+							continue;
+						}
+					}
+				}
+				// a step failed
+				return false;
+			}
+			return true;
+		}
+		return false;
+	}
+
+	private EObject resolveSemanticElement(View view) {
+		EObject result = view.getElement();
+
+		if ((result != null) && result.eIsProxy()) {
+			// Try harder to resolve it
+			result = EMFCoreUtil.resolve(TransactionUtil.getEditingDomain(view), result);
+		}
+
+		return result;
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/preferences/CorePreferenceInitializer.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/preferences/CorePreferenceInitializer.java
new file mode 100644
index 00000000000..ec6edbf881d
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/preferences/CorePreferenceInitializer.java
@@ -0,0 +1,52 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 Atos Origin, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading.internal.ui.preferences;
+
+import static org.eclipse.papyrus.infra.services.resourceloading.internal.ui.preferences.ICorePreferenceConstants.PREF_CORE_DEFINE_LOADING_STRATEGY;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.services.resourceloading.internal.ui.UIPlugin;
+import org.eclipse.ui.preferences.ScopedPreferenceStore;
+
+/**
+ * This preference initializer initializes diagram preferences specific to the
+ * activity diagram.
+ */
+public class CorePreferenceInitializer extends AbstractPreferenceInitializer {
+
+	/**
+	 * Initialize default preferences
+	 */
+	@Override
+	public void initializeDefaultPreferences() {
+		IPreferenceStore store = getPreferenceStore();
+		store.setDefault(PREF_CORE_DEFINE_LOADING_STRATEGY, 0);
+
+		// Migrate from the diagram bundle for upgrade from Papyrus 1.1 or earlier
+		IPreferenceStore legacy = new ScopedPreferenceStore(InstanceScope.INSTANCE, "org.eclipse.papyrus.infra.gmfdiag.preferences"); //$NON-NLS-1$
+		if (legacy.contains(PREF_CORE_DEFINE_LOADING_STRATEGY)) {
+			store.setValue(PREF_CORE_DEFINE_LOADING_STRATEGY, legacy.getInt(PREF_CORE_DEFINE_LOADING_STRATEGY));
+			legacy.setToDefault(PREF_CORE_DEFINE_LOADING_STRATEGY); // Removes it because now it has no default
+		}
+	}
+
+	/**
+	 * Get the preference store
+	 */
+	protected IPreferenceStore getPreferenceStore() {
+		return UIPlugin.getDefault().getPreferenceStore();
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/ICorePreferenceConstants.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/preferences/ICorePreferenceConstants.java
index 107824531d2..7cc3547579d 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/ICorePreferenceConstants.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/preferences/ICorePreferenceConstants.java
@@ -1,27 +1,27 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading.preferences;

-

-/**

- * Defines specific preference constants for papyrus core.

- *

- * @noimplement This interface is not intended to be implemented by clients.

- */

-public interface ICorePreferenceConstants {

-

-	/**

-	 * the preference to define the model loading strategy.

-	 */

-	public static final String PREF_CORE_DEFINE_LOADING_STRATEGY = "org.eclipse.papyrus.infra.services.resourceloading.preferences.loadingStrategy"; //$NON-NLS-1$

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading.internal.ui.preferences;
+
+/**
+ * Defines specific preference constants for papyrus core.
+ *
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface ICorePreferenceConstants {
+
+	/**
+	 * the preference to define the model loading strategy.
+	 */
+	public static final String PREF_CORE_DEFINE_LOADING_STRATEGY = "org.eclipse.papyrus.infra.services.resourceloading.preferences.loadingStrategy"; //$NON-NLS-1$
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/LoadedAuthorizedResourceGroup.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/preferences/LoadedAuthorizedResourceGroup.java
index f85b652c9d4..4f2b2ec3ca9 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/LoadedAuthorizedResourceGroup.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/preferences/LoadedAuthorizedResourceGroup.java
@@ -1,39 +1,40 @@
-/*****************************************************************************

- * Copyright (c) 2012 Atos.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Devernay (Atos) laurent.devernay@atos.net

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading.preferences;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Group;

-

-public class LoadedAuthorizedResourceGroup extends AbstractGroup {

-

-	public LoadedAuthorizedResourceGroup(Composite parent, String key, DialogPage dialogPage) {

-		super(parent, key, dialogPage);

-		createContent(parent);

-	}

-

-	public void createContent(Composite parent) {

-		Group group = new Group(parent, SWT.SCROLL_PAGE);

-		group.setLayout(new GridLayout());

-		group.setText(Messages.LoadedAuthorizedResourceGroup_0);

-

-		ResourcePreferencePathEditor pathEditor = new ResourcePreferencePathEditor(LoadedAuthorizedResourceManager.URI_PREF_PREFIX, Messages.LoadedAuthorizedResourceGroup_1, Messages.LoadedAuthorizedResourceGroup_2, group);

-

-		addFieldEditor(pathEditor);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 Atos.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Laurent Devernay (Atos) laurent.devernay@atos.net
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading.internal.ui.preferences;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.papyrus.infra.services.resourceloading.internal.ui.strategy.LoadedAuthorizedResourceManager;
+import org.eclipse.papyrus.infra.ui.preferences.AbstractPreferenceGroup;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+
+public class LoadedAuthorizedResourceGroup extends AbstractPreferenceGroup {
+
+	public LoadedAuthorizedResourceGroup(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, key, dialogPage);
+		createContent(parent);
+	}
+
+	public void createContent(Composite parent) {
+		Group group = new Group(parent, SWT.SCROLL_PAGE);
+		group.setLayout(new GridLayout());
+		group.setText(Messages.LoadedAuthorizedResourceGroup_0);
+
+		ResourcePreferencePathEditor pathEditor = new ResourcePreferencePathEditor(LoadedAuthorizedResourceManager.URI_PREF_PREFIX, Messages.LoadedAuthorizedResourceGroup_1, Messages.LoadedAuthorizedResourceGroup_2, group);
+
+		addFieldEditor(pathEditor);
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/LoadinStrategyGroup.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/preferences/LoadinStrategyGroup.java
index fec19b52637..6a0f17954e0 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/LoadinStrategyGroup.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/preferences/LoadinStrategyGroup.java
@@ -1,73 +1,73 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading.preferences;

-

-import java.util.Map;

-

-import org.eclipse.jface.dialogs.DialogPage;

-import org.eclipse.jface.preference.RadioGroupFieldEditor;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup;

-import org.eclipse.papyrus.infra.services.resourceloading.impl.ProxyManager;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Group;

-

-public class LoadinStrategyGroup extends AbstractGroup {

-

-	private static final String LABEL_LOADING_STRATEGY = "Loading strategy :";

-

-	private static final String SELECT_LOADING_STRATEGY = "Select the loading strategy when model is opened";

-

-	private RadioGroupFieldEditor fStrategyRadio;

-

-	public LoadinStrategyGroup(Composite parent, String title, DialogPage dialogPage) {

-		super(parent, title, dialogPage);

-		createContent(parent);

-	}

-

-	public void createContent(Composite parent) {

-		Group group = new Group(parent, SWT.SCROLL_PAGE);

-		group.setLayout(new GridLayout());

-		group.setText(SELECT_LOADING_STRATEGY);

-		fStrategyRadio = createStrategyRadio(group);

-		addFieldEditor(fStrategyRadio);

-	}

-

-	private static RadioGroupFieldEditor createStrategyRadio(Group group) {

-		String[][] values = getValuesFromExtensionPoint();

-		RadioGroupFieldEditor radio = new RadioGroupFieldEditor(ICorePreferenceConstants.PREF_CORE_DEFINE_LOADING_STRATEGY, LABEL_LOADING_STRATEGY, 1, values, group);

-		return radio;

-	}

-

-	/**

-	 * Gets the strategies value from extension point.

-	 *

-	 * @return the strategies value

-	 */

-	private static String[][] getValuesFromExtensionPoint() {

-		Map<Integer, String> allStrategies = ProxyManager.getAllStrategies();

-		String[][] result = new String[allStrategies.size()][2];

-		int i = 0;

-		for (Integer val : allStrategies.keySet()) {

-			result[i][0] = allStrategies.get(val);

-			result[i][1] = String.valueOf(val);

-			i++;

-		}

-		return result;

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading.internal.ui.preferences;
+
+import java.util.Map;
+
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.jface.preference.RadioGroupFieldEditor;
+import org.eclipse.papyrus.infra.services.resourceloading.impl.ProxyManager;
+import org.eclipse.papyrus.infra.ui.preferences.AbstractPreferenceGroup;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+
+public class LoadinStrategyGroup extends AbstractPreferenceGroup {
+
+	private static final String LABEL_LOADING_STRATEGY = "Loading strategy :";
+
+	private static final String SELECT_LOADING_STRATEGY = "Select the loading strategy when model is opened";
+
+	private RadioGroupFieldEditor fStrategyRadio;
+
+	public LoadinStrategyGroup(Composite parent, String title, DialogPage dialogPage) {
+		super(parent, title, dialogPage);
+		createContent(parent);
+	}
+
+	public void createContent(Composite parent) {
+		Group group = new Group(parent, SWT.SCROLL_PAGE);
+		group.setLayout(new GridLayout());
+		group.setText(SELECT_LOADING_STRATEGY);
+		fStrategyRadio = createStrategyRadio(group);
+		addFieldEditor(fStrategyRadio);
+	}
+
+	private static RadioGroupFieldEditor createStrategyRadio(Group group) {
+		String[][] values = getValuesFromExtensionPoint();
+		RadioGroupFieldEditor radio = new RadioGroupFieldEditor(ICorePreferenceConstants.PREF_CORE_DEFINE_LOADING_STRATEGY, LABEL_LOADING_STRATEGY, 1, values, group);
+		return radio;
+	}
+
+	/**
+	 * Gets the strategies value from extension point.
+	 *
+	 * @return the strategies value
+	 */
+	private static String[][] getValuesFromExtensionPoint() {
+		Map<Integer, String> allStrategies = ProxyManager.getAllStrategies();
+		String[][] result = new String[allStrategies.size()][2];
+		int i = 0;
+		for (Integer val : allStrategies.keySet()) {
+			result[i][0] = allStrategies.get(val);
+			result[i][1] = String.valueOf(val);
+			i++;
+		}
+		return result;
+	}
+
+
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/LoadingStrategyPreferencePage.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/preferences/LoadingStrategyPreferencePage.java
index 6ab178ec399..15fa16eea4d 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/LoadingStrategyPreferencePage.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/preferences/LoadingStrategyPreferencePage.java
@@ -1,113 +1,94 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading.preferences;

-

-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.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.services.resourceloading.Activator;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.ui.preferences.ScopedPreferenceStore;

-

-public class LoadingStrategyPreferencePage extends AbstractPapyrusNodePreferencePage {

-

-	private LoadinStrategyGroup groupComposite;

-

-	private IProject project;

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected String getBundleId() {

-		return CorePlugin.PLUGIN_ID;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static void initDefaults(IPreferenceStore store) {

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void createPageContents(Composite parent) {

-		groupComposite = new LoadinStrategyGroup(parent, getTitle(), this);

-		addAbstractGroup(groupComposite);

-		LoadedAuthorizedResourceGroup loadedAuthorizedResourceGroup = new LoadedAuthorizedResourceGroup(parent, getTitle(), this);

-		addAbstractGroup(loadedAuthorizedResourceGroup);

-		// TODO : if no value is set for the radio buttons (loading strategy) on

-		// a project, use the workspace loading strategy.

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean performOk() {

-		boolean result = super.performOk();

-		StrategyChooser.setCurrentStrategy(doGetPreferenceStore().getInt(ICorePreferenceConstants.PREF_CORE_DEFINE_LOADING_STRATEGY));

-		IPreferenceStore modifiedPrefStore = doGetPreferenceStore();

-		try {

-			if (modifiedPrefStore instanceof ScopedPreferenceStore) {

-				((ScopedPreferenceStore) modifiedPrefStore).save();

-			}

-		} catch (Exception e) {

-			Activator.logError(e);

-		}

-

-		return result;

-	}

-

-	/**

-	 * @see org.eclipse.ui.IWorkbenchPropertyPage#getElement()

-	 */

-	@Override

-	public IAdaptable getElement() {

-		return project;

-	}

-

-	/**

-	 * @see org.eclipse.ui.IWorkbenchPropertyPage#setElement(org.eclipse.core.runtime.IAdaptable)

-	 */

-	@Override

-	public void setElement(IAdaptable element) {

-		project = (IProject) element.getAdapter(IResource.class);

-	}

-

-	@Override

-	public IPreferenceStore getPreferenceStore() {

-		return doGetPreferenceStore();

-	}

-

-	/**

-	 * @see org.eclipse.jface.preference.PreferencePage#doGetPreferenceStore()

-	 */

-	@Override

-	protected IPreferenceStore doGetPreferenceStore() {

-		IPreferenceStore store;

-		if (project != null) {

-			store = new ScopedPreferenceStore(new ProjectScope(project), getBundleId());

-		} else {

-			store = new ScopedPreferenceStore(new InstanceScope(), getBundleId());

-		}

-		return store;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading.internal.ui.preferences;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.services.resourceloading.Activator;
+import org.eclipse.papyrus.infra.services.resourceloading.internal.ui.UIPlugin;
+import org.eclipse.papyrus.infra.services.resourceloading.internal.ui.strategy.StrategyChooser;
+import org.eclipse.papyrus.infra.ui.preferences.AbstractPapyrusPreferencePage;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.preferences.ScopedPreferenceStore;
+
+public class LoadingStrategyPreferencePage extends AbstractPapyrusPreferencePage {
+
+	private LoadinStrategyGroup groupComposite;
+
+	private IProject project;
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected String getBundleId() {
+		return UIPlugin.PLUGIN_ID;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static void initDefaults(IPreferenceStore store) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void createPageContents(Composite parent) {
+		groupComposite = new LoadinStrategyGroup(parent, getTitle(), this);
+		addPreferenceGroup(groupComposite);
+		LoadedAuthorizedResourceGroup loadedAuthorizedResourceGroup = new LoadedAuthorizedResourceGroup(parent, getTitle(), this);
+		addPreferenceGroup(loadedAuthorizedResourceGroup);
+		// TODO : if no value is set for the radio buttons (loading strategy) on
+		// a project, use the workspace loading strategy.
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean performOk() {
+		boolean result = super.performOk();
+		StrategyChooser.setCurrentStrategy(doGetPreferenceStore().getInt(ICorePreferenceConstants.PREF_CORE_DEFINE_LOADING_STRATEGY));
+		IPreferenceStore modifiedPrefStore = doGetPreferenceStore();
+		try {
+			if (modifiedPrefStore instanceof ScopedPreferenceStore) {
+				((ScopedPreferenceStore) modifiedPrefStore).save();
+			}
+		} catch (Exception e) {
+			Activator.logError(e);
+		}
+
+		return result;
+	}
+
+	/**
+	 * @see org.eclipse.ui.IWorkbenchPropertyPage#getElement()
+	 */
+	@Override
+	public IAdaptable getElement() {
+		return project;
+	}
+
+	/**
+	 * @see org.eclipse.ui.IWorkbenchPropertyPage#setElement(org.eclipse.core.runtime.IAdaptable)
+	 */
+	@Override
+	public void setElement(IAdaptable element) {
+		project = (IProject) element.getAdapter(IResource.class);
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/Messages.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/preferences/Messages.java
index 8cdc94375d7..40119003ffd 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/Messages.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/preferences/Messages.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

- * Copyright (c) 2012 Atos.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Devernay (Atos) laurent.devernay@atos.net

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading.preferences;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "messages"; //$NON-NLS-1$

-

-	public static String LoadedAssociatedResourceGroup_0;

-

-	public static String LoadedAuthorizedResourceGroup_0;

-

-	public static String LoadedAuthorizedResourceGroup_1;

-

-	public static String LoadedAuthorizedResourceGroup_2;

-

-	public static String LoadinStrategyGroup_0;

-

-	public static String LoadinStrategyGroup_1;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 Atos.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Laurent Devernay (Atos) laurent.devernay@atos.net
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading.internal.ui.preferences;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "messages"; //$NON-NLS-1$
+
+	public static String LoadedAssociatedResourceGroup_0;
+
+	public static String LoadedAuthorizedResourceGroup_0;
+
+	public static String LoadedAuthorizedResourceGroup_1;
+
+	public static String LoadedAuthorizedResourceGroup_2;
+
+	public static String LoadinStrategyGroup_0;
+
+	public static String LoadinStrategyGroup_1;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/ResourcePreferencePathEditor.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/preferences/ResourcePreferencePathEditor.java
index 796af1fae49..97e655b2435 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/ResourcePreferencePathEditor.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/preferences/ResourcePreferencePathEditor.java
@@ -1,60 +1,60 @@
-/*****************************************************************************

- * Copyright (c) 2012 Atos.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Devernay (Atos) laurent.devernay@atos.net

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading.preferences;

-

-import org.eclipse.emf.common.ui.dialogs.ResourceDialog;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.jface.preference.PathEditor;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Composite;

-

-public class ResourcePreferencePathEditor extends PathEditor {

-

-	public ResourcePreferencePathEditor() {

-		super();

-	}

-

-	public ResourcePreferencePathEditor(String name, String labelText, String dirChooserLabelText, Composite parent) {

-		super(name, labelText, dirChooserLabelText, parent);

-	}

-

-	@Override

-	protected String getNewInputObject() {

-		String labelText = getLabelText();

-		ResourceDialog dialog = new ResourceDialog(getShell(), labelText, SWT.OPEN | SWT.SINGLE);

-		dialog.open();

-		String uriTexte = dialog.getURIText();

-		URI uri = URI.createURI(uriTexte);

-		return uri.trimFileExtension().toString();

-	}

-

-	@Override

-	protected void doLoad() {

-		if (getList() != null) {

-			getList().removeAll();

-		}

-		super.doLoad();

-	}

-

-	@Override

-	protected void doLoadDefault() {

-		if (getList() != null) {

-			getList().removeAll();

-		}

-		super.doLoadDefault();

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 Atos.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Laurent Devernay (Atos) laurent.devernay@atos.net
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading.internal.ui.preferences;
+
+import org.eclipse.emf.common.ui.dialogs.ResourceDialog;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.jface.preference.PathEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+
+public class ResourcePreferencePathEditor extends PathEditor {
+
+	public ResourcePreferencePathEditor() {
+		super();
+	}
+
+	public ResourcePreferencePathEditor(String name, String labelText, String dirChooserLabelText, Composite parent) {
+		super(name, labelText, dirChooserLabelText, parent);
+	}
+
+	@Override
+	protected String getNewInputObject() {
+		String labelText = getLabelText();
+		ResourceDialog dialog = new ResourceDialog(getShell(), labelText, SWT.OPEN | SWT.SINGLE);
+		dialog.open();
+		String uriTexte = dialog.getURIText();
+		URI uri = URI.createURI(uriTexte);
+		return uri.trimFileExtension().toString();
+	}
+
+	@Override
+	protected void doLoad() {
+		if (getList() != null) {
+			getList().removeAll();
+		}
+		super.doLoad();
+	}
+
+	@Override
+	protected void doLoadDefault() {
+		if (getList() != null) {
+			getList().removeAll();
+		}
+		super.doLoadDefault();
+	}
+
+
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/AskUserStrategy.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/strategy/AskUserStrategy.java
index 94f12c8d020..4c2e00f2940 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/AskUserStrategy.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/strategy/AskUserStrategy.java
@@ -12,7 +12,7 @@
  *  Christian W. Damus (CEA LIST) - support control mode in CDO resources
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.services.resourceloading.strategies;
+package org.eclipse.papyrus.infra.services.resourceloading.internal.ui.strategy;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -30,6 +30,7 @@ import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategy;
+import org.eclipse.papyrus.infra.services.resourceloading.strategies.Messages;
 import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
 import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/LoadedAuthorizedResourceManager.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/strategy/LoadedAuthorizedResourceManager.java
index 2e43fd30db7..3ed9da2c45a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/LoadedAuthorizedResourceManager.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/strategy/LoadedAuthorizedResourceManager.java
@@ -12,7 +12,7 @@
  *  Christian W. Damus (CEA LIST) - support control mode in CDO resources
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.services.resourceloading.preferences;
+package org.eclipse.papyrus.infra.services.resourceloading.internal.ui.strategy;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -36,6 +36,7 @@ import org.eclipse.papyrus.infra.core.resource.IModel;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
 import org.eclipse.papyrus.infra.services.resourceloading.Activator;
+import org.eclipse.papyrus.infra.services.resourceloading.internal.ui.UIPlugin;
 import org.eclipse.papyrus.infra.services.resourceloading.util.LoadingUtils;
 import org.eclipse.ui.preferences.ScopedPreferenceStore;
 import org.osgi.service.prefs.BackingStoreException;
@@ -79,7 +80,7 @@ public class LoadedAuthorizedResourceManager implements IPropertyChangeListener
 
 	public static final String URI_PREF_PREFIX = PREFERENCE_PREFIX + URI_ID + "."; //$NON-NLS-1$
 
-	private static final String pluginId = CorePlugin.PLUGIN_ID;
+	private static final String pluginId = UIPlugin.PLUGIN_ID;
 
 	private static class Holder {
 
@@ -99,7 +100,7 @@ public class LoadedAuthorizedResourceManager implements IPropertyChangeListener
 	private Set<URI> loadedAuthorizedResourcesSet = null;
 
 	public LoadedAuthorizedResourceManager() {
-		prefStore = CorePlugin.getDefault().getPreferenceStore();
+		prefStore = UIPlugin.getDefault().getPreferenceStore();
 		prefStore.addPropertyChangeListener(this);
 	}
 
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/PreferenceLoadingStrategyExtension.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/strategy/PreferenceLoadingStrategyExtension.java
index a3e60cb0eb8..37c72c97825 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/PreferenceLoadingStrategyExtension.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/strategy/PreferenceLoadingStrategyExtension.java
@@ -1,33 +1,33 @@
-/*****************************************************************************

- * Copyright (c) 2012 Atos.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Laurent Devernay (Atos) laurent.devernay@atos.net

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading.preferences;

-

-import java.util.Set;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategyExtension;

-

-public class PreferenceLoadingStrategyExtension implements ILoadingStrategyExtension {

-

-	public boolean loadResource(ModelSet modelSet, URI uri) {

-		Set<URI> loadedAuthorizedResourcesSet = LoadedAuthorizedResourceManager.getInstance().getLoadedAuthorizedResourcesSet(modelSet);

-

-		if (loadedAuthorizedResourcesSet.contains(uri.trimFileExtension())) {

-			return true;

-		}

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2012 Atos.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Laurent Devernay (Atos) laurent.devernay@atos.net
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading.internal.ui.strategy;
+
+import java.util.Set;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategyExtension;
+
+public class PreferenceLoadingStrategyExtension implements ILoadingStrategyExtension {
+
+	public boolean loadResource(ModelSet modelSet, URI uri) {
+		Set<URI> loadedAuthorizedResourcesSet = LoadedAuthorizedResourceManager.getInstance().getLoadedAuthorizedResourcesSet(modelSet);
+
+		if (loadedAuthorizedResourcesSet.contains(uri.trimFileExtension())) {
+			return true;
+		}
+		return false;
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/StrategyChooser.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/strategy/StrategyChooser.java
index 5d0f426ee8c..a8f2dc122af 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/infra/services/resourceloading/preferences/StrategyChooser.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/src/org/eclipse/papyrus/infra/services/resourceloading/internal/ui/strategy/StrategyChooser.java
@@ -1,60 +1,69 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading.preferences;

-

-import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

-import org.eclipse.papyrus.infra.services.resourceloading.IStrategyChooser;

-

-

-/**

- * The Class StrategyChooser.

- */

-public class StrategyChooser implements IStrategyChooser {

-

-	/** The current strategy. */

-	private static Integer currentStrategy = -1;

-

-	/**

-	 * Instantiates a new strategy chooser.

-	 */

-	public StrategyChooser() {

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.services.resourceloading.IStrategyChooser#getCurrentStrategy()

-	 */

-	public int getCurrentStrategy() {

-		if (currentStrategy == -1) {

-			// set the current strategy at the first time

-			currentStrategy = Activator.getDefault().getPreferenceStore().getInt(ICorePreferenceConstants.PREF_CORE_DEFINE_LOADING_STRATEGY);

-		}

-		return currentStrategy;

-	}

-

-	/**

-	 * Sets the current strategy.

-	 *

-	 * @param strategy

-	 *            the new current strategy ID

-	 */

-	public static void setCurrentStrategy(int strategy) {

-		currentStrategy = strategy;

-		if (Activator.getDefault().getPreferenceStore().getInt(ICorePreferenceConstants.PREF_CORE_DEFINE_LOADING_STRATEGY) != strategy) {

-			Activator.getDefault().getPreferenceStore().setValue(ICorePreferenceConstants.PREF_CORE_DEFINE_LOADING_STRATEGY, String.valueOf(strategy));

-		}

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2016 Atos Origin, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading.internal.ui.strategy;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.services.resourceloading.IStrategyChooser;
+import org.eclipse.papyrus.infra.services.resourceloading.internal.ui.UIPlugin;
+import org.eclipse.papyrus.infra.services.resourceloading.internal.ui.preferences.ICorePreferenceConstants;
+
+
+/**
+ * The Class StrategyChooser.
+ */
+public class StrategyChooser implements IStrategyChooser {
+
+	/** The current strategy. */
+	private static Integer currentStrategy = -1;
+
+	/**
+	 * Instantiates a new strategy chooser.
+	 */
+	public StrategyChooser() {
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.services.resourceloading.IStrategyChooser#getCurrentStrategy()
+	 */
+	public int getCurrentStrategy() {
+		if (currentStrategy == -1) {
+			// set the current strategy at the first time
+			currentStrategy = UIPlugin.getDefault().getPreferenceStore().getInt(ICorePreferenceConstants.PREF_CORE_DEFINE_LOADING_STRATEGY);
+		}
+		return currentStrategy;
+	}
+
+	/**
+	 * Sets the current strategy.
+	 *
+	 * @param strategy
+	 *            the new current strategy ID
+	 */
+	public static void setCurrentStrategy(int strategy) {
+		currentStrategy = strategy;
+		IPreferenceStore store = UIPlugin.getDefault().getPreferenceStore();
+		if (store.getInt(ICorePreferenceConstants.PREF_CORE_DEFINE_LOADING_STRATEGY) != strategy) {
+			store.setValue(ICorePreferenceConstants.PREF_CORE_DEFINE_LOADING_STRATEGY, String.valueOf(strategy));
+		}
+	}
+
+	public boolean setStrategy(int strategy) {
+		if (currentStrategy != strategy) {
+			setCurrentStrategy(strategy);
+		}
+
+		return true;
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF
index d4c124a0850..9ad751a75cf 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF
@@ -1,25 +1,26 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.services.resourceloading,

- org.eclipse.papyrus.infra.services.resourceloading.impl,

- org.eclipse.papyrus.infra.services.resourceloading.strategies,

- org.eclipse.papyrus.infra.services.resourceloading.util

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.2.0",

- org.eclipse.core.expressions,

- org.eclipse.core.runtime;bundle-version="3.7.0",

- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.services.resourceloading.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.services.resourceloading,
+ org.eclipse.papyrus.infra.services.resourceloading.impl,
+ org.eclipse.papyrus.infra.services.resourceloading.strategies,
+ org.eclipse.papyrus.infra.services.resourceloading.util
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="1.2.0",
+ org.eclipse.core.expressions,
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.core.resources;bundle-version="3.11.0",
+ org.eclipse.emf.transaction;bundle-version="1.9.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.notation;bundle-version="1.8.0",
+ org.eclipse.gmf.runtime.emf.core;bundle-version="1.7.0",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.2.0"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.services.resourceloading.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.xml
index a98ea1234d0..9e3af4da9cf 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.xml
@@ -1,60 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension-point id="loadingStrategy" name="loadingStrategy" schema="schema/loadingStrategy.exsd"/>

-   <extension-point id="loadingStrategyExtender" name="loadingStrategyExtender" schema="schema/loadingStrategyExtender.exsd"/>

-   <extension-point id="currentStrategyChooser" name="Current Strategy Chooser" schema="schema/currentStrategyChooser.exsd"/>

-   <extension-point id="loadedAuthorizedResource" name="loadedAuthorizedResource" schema="schema/loadedAuthorizedResource.exsd"/>

-   <extension

-         point="org.eclipse.papyrus.infra.core.service">

-      <serviceFactory

-            classname="org.eclipse.papyrus.infra.services.resourceloading.OnDemandLoadingModelSetServiceFactory"

-            description="The service loading Models - Overload the original service."

-            id="org.eclipse.papyrus.infra.core.resource.ModelSet"

-            priority="5"

-            startKind="startup">

-      </serviceFactory>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.services.resourceloading.loadingStrategy">

-      <loadingStrategy

-            description="Load all the needed resources"

-            id="0"

-            strategy="org.eclipse.papyrus.infra.services.resourceloading.strategies.LoadAllResources">

-      </loadingStrategy>

-      <loadingStrategy

-            description="Load the additional resources (profile and pathmap). Submodels can be loaded manually by right-clicking in Model Explorer view."

-            id="1"

-            strategy="org.eclipse.papyrus.infra.services.resourceloading.strategies.LoadCurrentResource">

-      </loadingStrategy>

-      <loadingStrategy

-            description="Load the additional resources (profile and pathmap) and the needed submodels"

-            id="2"

-            strategy="org.eclipse.papyrus.infra.services.resourceloading.strategies.LoadControlledResources">

-      </loadingStrategy>

-      <loadingStrategy

-            description="Ask the user if a resource has to be loaded"

-            id="3"

-            strategy="org.eclipse.papyrus.infra.services.resourceloading.strategies.AskUserStrategy">

-      </loadingStrategy>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.ui.papyrusDiagram">

-      <editorDiagram

-            factoryClass="org.eclipse.papyrus.infra.services.resourceloading.editor.UnloadResourcesEditorFactory">

-      </editorDiagram>

-   </extension>

-   

-   <extension

-         point="org.eclipse.core.expressions.propertyTesters">

-         <!-- the property tester is used to enable/disable handlers for loading/unloading a resource -->

-      <propertyTester

-            class="org.eclipse.papyrus.infra.services.resourceloading.util.LoadingTester"

-            id="org.eclipse.papyrus.infra.core.resourceloading.tester"

-            namespace="org.eclipse.papyrus.infra.core.resourceloading.tester"

-            properties="isAllLoaded, isAllNotLoaded"

-            type="org.eclipse.jface.viewers.IStructuredSelection">

-      </propertyTester>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension-point id="loadingStrategy" name="loadingStrategy" schema="schema/loadingStrategy.exsd"/>
+   <extension-point id="loadingStrategyExtender" name="loadingStrategyExtender" schema="schema/loadingStrategyExtender.exsd"/>
+   <extension-point id="currentStrategyChooser" name="Current Strategy Chooser" schema="schema/currentStrategyChooser.exsd"/>
+   <extension-point id="loadedAuthorizedResource" name="loadedAuthorizedResource" schema="schema/loadedAuthorizedResource.exsd"/>
+   <extension
+         point="org.eclipse.papyrus.infra.core.service">
+      <serviceFactory
+            classname="org.eclipse.papyrus.infra.services.resourceloading.OnDemandLoadingModelSetServiceFactory"
+            description="The service loading Models - Overload the original service."
+            id="org.eclipse.papyrus.infra.core.resource.ModelSet"
+            priority="5"
+            startKind="startup">
+      </serviceFactory>
+      <serviceFactory
+            classname="org.eclipse.papyrus.infra.services.resourceloading.impl.StrategyChooserFactory"
+            description="On-demand resource loading strategy chooser."
+            id="org.eclipse.papyrus.infra.services.resourceloading.IStrategyChooser"
+            priority="50"
+            startKind="startup">
+      </serviceFactory>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.services.resourceloading.loadingStrategy">
+      <loadingStrategy
+            description="Load all the needed resources"
+            id="0"
+            strategy="org.eclipse.papyrus.infra.services.resourceloading.strategies.LoadAllResources">
+      </loadingStrategy>
+      <loadingStrategy
+            description="Load the additional resources (profile and pathmap). Submodels can be loaded manually by right-clicking in Model Explorer view."
+            id="1"
+            strategy="org.eclipse.papyrus.infra.services.resourceloading.strategies.LoadCurrentResource">
+      </loadingStrategy>
+      <loadingStrategy
+            description="Load the additional resources (profile and pathmap) and the needed submodels"
+            id="2"
+            strategy="org.eclipse.papyrus.infra.services.resourceloading.strategies.LoadControlledResources">
+      </loadingStrategy>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/pom.xml
index eaa475590cd..013b4ac126e 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.resourceloading</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/IStrategyChooser.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/IStrategyChooser.java
index 33ac9ee526b..a8d0f646db3 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/IStrategyChooser.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/IStrategyChooser.java
@@ -1,30 +1,44 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading;

-

-

-/**

- * The Interface IStrategyChooser that provides the current loading strategy to the proxy manager.

- * Proxy manager load the resource if needed, according to the current strategy

- */

-public interface IStrategyChooser {

-

-	/**

-	 * Gets the current strategy ID.

-	 * Proxy manager load the resource if needed, according to the current strategy

-	 *

-	 * @return the current strategy id

-	 */

-	int getCurrentStrategy();

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading;
+
+
+/**
+ * The Interface IStrategyChooser that provides the current loading strategy to the proxy manager.
+ * Proxy manager load the resource if needed, according to the current strategy
+ */
+public interface IStrategyChooser {
+
+	/**
+	 * Gets the current strategy ID.
+	 * Proxy manager load the resource if needed, according to the current strategy
+	 *
+	 * @return the current strategy id
+	 */
+	int getCurrentStrategy();
+
+	/**
+	 * Suggests a new strategy to take effect in preference over the current.
+	 * The strategy-chooser may deny the suggestion, in which case the current
+	 * strategy remains effective.
+	 * 
+	 * @param strategy
+	 *            the new strategy to engage
+	 * 
+	 * @return whether the suggestion to set the new {@code strategy} was accepted and implemented
+	 */
+	default boolean setStrategy(int strategy) {
+		return strategy == getCurrentStrategy();
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSet.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSet.java
index 1ec0ea895e9..90999944938 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSet.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSet.java
@@ -1,142 +1,166 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2016 LIFL, CEA LIST, Christian W. Damus, and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   LIFL - Initial API and implementation

- *   Christian W. Damus - bug 485220

- *   

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.resourceloading;

-

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.core.language.ILanguageService;

-import org.eclipse.papyrus.infra.core.resource.AbstractBaseModel;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModelUtils;

-import org.eclipse.papyrus.infra.core.utils.DiResourceSet;

-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;

-import org.eclipse.papyrus.infra.services.resourceloading.impl.ProxyManager;

-

-

-/**

- * A {@link ModelSet} allowing to load models on demand.

- * Also, this implementation allows to have loading strategies.

- *

- * TODO extends {@link ModelSet} rather than {@link DiResourceSet}. This can be done once

- * DiResourceSet is not referenced anywhere.

- *

- * @author cedric dumoulin

- * @author emilien perico

- *

- */

-public class OnDemandLoadingModelSet extends DiResourceSet {

-

-	/** Set that enables to always load the uri with any strategy. */

-	private Set<URI> uriLoading = new HashSet<URI>();

-

-	/**

-	 * The proxy manager that loads the model according to a specific strategy.

-	 */

-	private IProxyManager proxyManager;

-

-	private AbstractBaseModel semanticModel;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public OnDemandLoadingModelSet() {

-		super();

-		// Register declared models

-		// The ModelsReader has already been invoked in super()

-		// ModelsReader reader = new ModelsReader();

-		// reader.readModel(this);

-		proxyManager = new ProxyManager(this);

-	}

-

-

-

-	@Override

-	public void unload() {

-		super.unload();

-		proxyManager.dispose();

-		semanticModel = null;

-	}

-

-

-

-	/**

-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceSetImpl#getEObject(org.eclipse.emf.common.util.URI, boolean)

-	 */

-	@Override

-	public EObject getEObject(URI uri, boolean loadOnDemand) {

-		// return super.getEObject(uri, loadOnDemand);

-

-		URI resourceURI = uri.trimFragment();

-		// for performance reasons, we check the three initial resources first

-		if (resourceURI.equals(getSemanticResourceURI()) || resourceURI.equals(NotationUtils.getNotationModel(this).getResourceURI()) || resourceURI.equals(SashModelUtils.getSashModel(this).getResourceURI())

-				|| uriLoading.contains(resourceURI)) {

-			// do not manage eObject of the current resources

-			return super.getEObject(uri, loadOnDemand);

-		} else if (loadOnDemand) {

-			return proxyManager.getEObjectFromStrategy(uri);

-		} else {

-			// call super so that the eobject is returned

-			// if the resource is already loaded

-			return super.getEObject(uri, loadOnDemand);

-		}

-	}

-

-	/**

-	 * Enables to add an URI that will be always loaded.

-	 * It is not listening at the current loading strategy and always load the specified URI if needed.

-	 *

-	 * @param alwaysLoadedUri

-	 *            the always loaded uri

-	 */

-	public void forceUriLoading(URI alwaysLoadedUri) {

-		uriLoading.add(alwaysLoadedUri);

-	}

-

-	private AbstractBaseModel getSemanticModel() {

-		if (semanticModel == null) {

-			semanticModel = ILanguageService.getLanguageModels(this).stream()

-					.filter(AbstractBaseModel.class::isInstance)

-					.map(AbstractBaseModel.class::cast)

-					.findAny().orElseGet(DummyModel::new);

-		}

-

-		return semanticModel;

-	}

-

-	private URI getSemanticResourceURI() {

-		AbstractBaseModel model = getSemanticModel();

-		return (model == null) ? null : model.getResourceURI();

-	}

-

-	//

-	// Nested types

-	//

-

-	private static class DummyModel extends AbstractBaseModel {

-		@Override

-		public String getIdentifier() {

-			return ""; // Dummy model

-		}

-

-		@Override

-		protected String getModelFileExtension() {

-			return "\0"; // Dummy model

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2016 LIFL, CEA LIST, Christian W. Damus, and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   LIFL - Initial API and implementation
+ *   Christian W. Damus - bug 485220
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.core.language.ILanguageService;
+import org.eclipse.papyrus.infra.core.resource.AbstractBaseModel;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ModelsReader;
+import org.eclipse.papyrus.infra.core.utils.DiResourceSet;
+import org.eclipse.papyrus.infra.services.resourceloading.impl.ProxyManager;
+
+
+/**
+ * A {@link ModelSet} allowing to load models on demand.
+ * Also, this implementation allows to have loading strategies.
+ *
+ * TODO extends {@link ModelSet} rather than {@link DiResourceSet}. This can be done once
+ * DiResourceSet is not referenced anywhere.
+ *
+ * @author cedric dumoulin
+ * @author emilien perico
+ *
+ */
+public class OnDemandLoadingModelSet extends DiResourceSet {
+
+	/** Set that enables to always load the uri with any strategy. */
+	private Set<URI> uriLoading = new HashSet<URI>();
+
+	/**
+	 * The proxy manager that loads the model according to a specific strategy.
+	 */
+	private IProxyManager proxyManager;
+
+	private AbstractBaseModel semanticModel;
+
+	private Set<AbstractBaseModel> requiredModels;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public OnDemandLoadingModelSet() {
+		super();
+		// Register declared models
+		// The ModelsReader has already been invoked in super()
+		// ModelsReader reader = new ModelsReader();
+		// reader.readModel(this);
+		proxyManager = new ProxyManager(this);
+	}
+
+
+
+	@Override
+	public void unload() {
+		super.unload();
+		proxyManager.dispose();
+		semanticModel = null;
+	}
+
+
+
+	/**
+	 * @see org.eclipse.emf.ecore.resource.impl.ResourceSetImpl#getEObject(org.eclipse.emf.common.util.URI, boolean)
+	 */
+	@Override
+	public EObject getEObject(URI uri, boolean loadOnDemand) {
+		// return super.getEObject(uri, loadOnDemand);
+
+		URI resourceURI = uri.trimFragment();
+		// for performance reasons, we check the required resources first
+		if (resourceURI.equals(getSemanticResourceURI()) || isRequired(resourceURI) || uriLoading.contains(resourceURI)) {
+			// do not manage eObject of the current resources
+			return super.getEObject(uri, loadOnDemand);
+		} else if (loadOnDemand) {
+			return proxyManager.getEObjectFromStrategy(uri);
+		} else {
+			// call super so that the eobject is returned
+			// if the resource is already loaded
+			return super.getEObject(uri, loadOnDemand);
+		}
+	}
+
+	Set<AbstractBaseModel> getRequiredModels() {
+		if (requiredModels == null) {
+			requiredModels = new ModelsReader().getRequiredModels(this, AbstractBaseModel.class);
+		}
+
+		return requiredModels;
+		}
+
+	boolean isRequired(URI resourceURI) {
+		return getRequiredModels().stream()
+				.map(AbstractBaseModel::getResourceURI)
+				.anyMatch(u -> resourceURI.equals(u));
+	}
+
+	/**
+	 * Enables to add an URI that will be always loaded.
+	 * It is not listening at the current loading strategy and always load the specified URI if needed.
+	 *
+	 * @param alwaysLoadedUri
+	 *            the always loaded uri
+	 */
+	public void forceUriLoading(URI alwaysLoadedUri) {
+		uriLoading.add(alwaysLoadedUri);
+	}
+
+	private AbstractBaseModel getSemanticModel() {
+		if (semanticModel == null) {
+			semanticModel = ILanguageService.getLanguageModels(this).stream()
+					.filter(AbstractBaseModel.class::isInstance)
+					.map(AbstractBaseModel.class::cast)
+					.findAny().orElseGet(DummyModel::new);
+		}
+
+		return semanticModel;
+	}
+
+	private URI getSemanticResourceURI() {
+		AbstractBaseModel model = getSemanticModel();
+		return (model == null) ? null : model.getResourceURI();
+	}
+
+	//
+	// Nested types
+	//
+
+	private static class DummyModel extends AbstractBaseModel {
+		@Override
+		public String getIdentifier() {
+			return ""; // Dummy model
+		}
+
+		@Override
+		protected String getModelFileExtension() {
+			return "\0"; // Dummy model
+		}
+
+		@Override
+		public boolean canPersist(EObject object) {
+			return false;
+		}
+
+		@Override
+		public void persist(EObject object) {
+			throw new IllegalArgumentException("cannot persist " + object); //$NON-NLS-1$
+		}
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/impl/StrategyChooserFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/impl/StrategyChooserFactory.java
new file mode 100644
index 00000000000..c9cc54bd0d3
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/impl/StrategyChooserFactory.java
@@ -0,0 +1,50 @@
+/*****************************************************************************
+ * Copyright (c) 2016 Christian W. Damus and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *  
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.services.resourceloading.impl;
+
+import org.eclipse.papyrus.infra.core.services.IServiceFactory;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.services.resourceloading.IStrategyChooser;
+
+/**
+ * Factory for the model-set's {@link IStrategyChooser}.
+ */
+public class StrategyChooserFactory implements IServiceFactory {
+
+	public StrategyChooserFactory() {
+		super();
+	}
+
+	@Override
+	public Object createServiceInstance() throws ServiceException {
+		return ProxyManager.getStrategyChooser();
+	}
+
+	@Override
+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+
+	}
+
+	@Override
+	public void startService() throws ServiceException {
+		// Pass
+	}
+
+	@Override
+	public void disposeService() throws ServiceException {
+		// Pass
+	}
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/util/LoadingUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/util/LoadingUtils.java
index 4565f85eb4a..eb4eae52849 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/util/LoadingUtils.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/util/LoadingUtils.java
@@ -14,7 +14,8 @@
  *****************************************************************************/
 package org.eclipse.papyrus.infra.services.resourceloading.util;
 
-import java.lang.reflect.InvocationTargetException;
+import static org.eclipse.papyrus.infra.core.utils.TransactionHelper.createPrivilegedRunnable;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -24,21 +25,11 @@ import java.util.Set;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.ResourcesPlugin;
 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.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.util.EditPartUtilities;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.papyrus.infra.core.language.ILanguageService;
 import org.eclipse.papyrus.infra.core.resource.AbstractBaseModel;
 import org.eclipse.papyrus.infra.core.resource.IModel;
@@ -46,20 +37,14 @@ import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
 import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
+import org.eclipse.papyrus.infra.core.utils.IPapyrusRunnable;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResourceSet;
 import org.eclipse.papyrus.infra.services.resourceloading.Activator;
 import org.eclipse.papyrus.infra.services.resourceloading.Messages;
-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.infra.ui.util.TransactionUIHelper;
-import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;
-import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.IWorkbenchSiteProgressService;
-import org.eclipse.ui.statushandlers.StatusManager;
+import org.eclipse.papyrus.infra.tools.notify.NotificationBuilder;
+import org.eclipse.papyrus.infra.tools.notify.Type;
+import org.eclipse.papyrus.infra.tools.util.CoreExecutors;
+import org.eclipse.papyrus.infra.tools.util.IProgressRunnable;
 
 /**
  * This class provides utility methods for model loading
@@ -77,79 +62,73 @@ public class LoadingUtils {
 	 *            path of resources to load without file extension
 	 */
 	public static void loadResourcesInModelSet(final ModelSet modelSet, final URI uriWithoutFileExtension) {
-		final IEditorPart editor = getEditor();
-		if (editor instanceof IMultiDiagramEditor) {
-			// This must be created on the UI thread
-			final NotificationBuilder error = NotificationBuilder.createAsyncPopup(Messages.LoadingUtils_ErrorTitle, String.format(Messages.LoadingUtils_ErrorMessage, uriWithoutFileExtension.toString())).setType(Type.ERROR).setDelay(2000);
-
-			runInEditingDomain(modelSet.getTransactionalEditingDomain(), editor, new IRunnableWithProgress() {
+		// This must be created on the UI thread
+		final NotificationBuilder error = NotificationBuilder
+				.createAsyncPopup(Messages.LoadingUtils_ErrorTitle, String.format(Messages.LoadingUtils_ErrorMessage, uriWithoutFileExtension.toString()))
+				.setType(Type.ERROR).setDelay(2000);
 
-				@Override
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-						IMultiDiagramEditor core = (IMultiDiagramEditor) editor;
-						try {
-							IPageManager pageMngr = core.getServicesRegistry().getService(IPageManager.class);
-							List<Object> allPages = pageMngr.allPages();
-							// mark progress
-							monitor.beginTask(Messages.LoadingUtils_RefreshPagesTask, allPages.size());
-							// the uri is added after getting all the pages. If it is done before, the eobjects are resolved
-							for (Object o : allPages) {
-								// refresh pages to display proxy diagrams
-								if (o instanceof EObject) {
-									EObject eobject = (EObject) o;
-									if (eobject.eIsProxy()) {
-										InternalEObject internal = (InternalEObject) eobject;
-										URI uriProxy = internal.eProxyURI();
-										URI trimFragment = uriProxy.trimFragment();
-										if (uriWithoutFileExtension.equals(trimFragment.trimFileExtension())) {
-											try {
-												Resource r = modelSet.getResource(trimFragment, true);
-												if (r != null) {
-													EObject newEObject = r.getEObject(uriProxy.fragment());
-													if (pageMngr.isOpen(newEObject)) {
-														pageMngr.selectPage(newEObject);
-													}
-												} else {
-													error.run();
-												}
-											} catch (Exception e) {
-												error.run();
-												Activator.logError(e);
+		runInEditingDomain(modelSet, monitor -> {
+			try {
+				try {
+					IPageManager pageMngr = ServiceUtilsForResourceSet.getInstance().getIPageManager(modelSet);
+					List<Object> allPages = pageMngr.allPages();
+					// mark progress
+					monitor.beginTask(Messages.LoadingUtils_RefreshPagesTask, allPages.size());
+					// the uri is added after getting all the pages. If it is done before, the eobjects are resolved
+					for (Object o : allPages) {
+						// refresh pages to display proxy diagrams
+						if (o instanceof EObject) {
+							EObject eobject = (EObject) o;
+							if (eobject.eIsProxy()) {
+								InternalEObject internal = (InternalEObject) eobject;
+								URI uriProxy = internal.eProxyURI();
+								URI trimFragment = uriProxy.trimFragment();
+								if (uriWithoutFileExtension.equals(trimFragment.trimFileExtension())) {
+									try {
+										Resource r = modelSet.getResource(trimFragment, true);
+										if (r != null) {
+											EObject newEObject = r.getEObject(uriProxy.fragment());
+											if (pageMngr.isOpen(newEObject)) {
+												pageMngr.selectPage(newEObject);
 											}
+										} else {
+											error.run();
 										}
-									}
-								}
-								// mark progress
-								monitor.worked(1);
-							}
-							Set<String> extensions = getExtensions(modelSet);
-							// mark progress
-							monitor.beginTask(Messages.LoadingUtils_LoadModelsTask, extensions.size());
-							for (String s : extensions) {
-								try {
-									URI uriToLoad = uriWithoutFileExtension.appendFileExtension(s);
-									Resource r = modelSet.getResource(uriToLoad, true);
-									if (r == null) {
+									} catch (Exception e) {
 										error.run();
+										Activator.logError(e);
 									}
-								} catch (Exception re) {
-									error.run();
-									Activator.logError(re);
 								}
-								// mark progress
-								monitor.worked(1);
 							}
-						} catch (ServiceException e) {
-							Activator.logError(e);
 						}
-					} finally {
 						// mark progress
-						monitor.done();
+						monitor.worked(1);
 					}
+					Set<String> extensions = getExtensions(modelSet);
+					// mark progress
+					monitor.beginTask(Messages.LoadingUtils_LoadModelsTask, extensions.size());
+					for (String s : extensions) {
+						try {
+							URI uriToLoad = uriWithoutFileExtension.appendFileExtension(s);
+							Resource r = modelSet.getResource(uriToLoad, true);
+							if (r == null) {
+								error.run();
+							}
+						} catch (Exception re) {
+							error.run();
+							Activator.logError(re);
+						}
+						// mark progress
+						monitor.worked(1);
+					}
+				} catch (ServiceException e) {
+					Activator.logError(e);
 				}
-			});
-		}
+			} finally {
+				// mark progress
+				monitor.done();
+			}
+		});
 	}
 
 	/**
@@ -161,169 +140,68 @@ public class LoadingUtils {
 	 *            path of resources to unload without file extension
 	 */
 	public static void unloadResourcesFromModelSet(ModelSet modelSet, URI uriWithoutFileExtension) {
-		unloadResourcesFromModelSet(modelSet, uriWithoutFileExtension, false);
-	}
-
-	/**
-	 * Unload corresponding resources from model set for all its existing models.
-	 *
-	 * @param modelSet
-	 *            the model set
-	 * @param uriWithoutFileExtension
-	 *            path of resources to unload without file extension
-	 * @param refreshDiagramsWithProxies
-	 *            true if we must refresh necessary diagrams, false to skip it.
-	 */
-	public static void unloadResourcesFromModelSet(final ModelSet modelSet, final URI uriWithoutFileExtension, final boolean refreshDiagramsWithProxies) {
-		final IEditorPart editor = getEditor();
-		if (editor instanceof IMultiDiagramEditor) {
-			runInEditingDomain(modelSet.getTransactionalEditingDomain(), editor, new IRunnableWithProgress() {
-
-				@Override
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-
-					try {
-						IMultiDiagramEditor core = (IMultiDiagramEditor) editor;
-						try {
-							IPageManager pageMngr = core.getServicesRegistry().getService(IPageManager.class);
-							List<Object> allPages = pageMngr.allPages();
-							List<URI> pagesURIToOpen = new ArrayList<URI>(allPages.size());
-							List<URI> pagesURIToRefresh = new ArrayList<URI>(allPages.size());
-							if (refreshDiagramsWithProxies) {
-								// mark progress
-								monitor.beginTask(Messages.LoadingUtils_RefreshPagesTask, allPages.size());
-								for (Object o : allPages) {
-									// refresh pages to cancel display of proxified elements
-									if (o instanceof EObject) {
-										EObject eobject = (EObject) o;
-										if (!eobject.eIsProxy()) {
-											URI trimFragment = eobject.eResource().getURI();
-											String frag = eobject.eResource().getURIFragment(eobject);
-											if (uriWithoutFileExtension.equals(trimFragment.trimFileExtension())) {
-												// diagram was in unloaded resource. Refresh it.
-												if (pageMngr.isOpen(eobject)) {
-													pageMngr.closePage(eobject);
-													pagesURIToOpen.add(trimFragment.appendFragment(frag));
-												}
-											} else if (pageMngr.isOpen(eobject)) {
-												// diagram is still loaded but may display proxified elements
-												pagesURIToRefresh.add(trimFragment.appendFragment(frag));
-											}
-										}
-									}
-									// mark progress
-									monitor.worked(1);
-								}
-							}
-							// mark progress
-							monitor.beginTask(Messages.LoadingUtils_UnloadModelsTask, modelSet.getResources().size());
-
-							// Use the platform string of a normalized URI for comparison below, see bug 372326
-							// (registered libraries in the model set have different URIs - e.g. due to a pathmap -
-							// although they point to the same location).
-							// TODO: Use a single detection mechanism in ResourceUpdateService and here
-							String unloadPlatformString;
-							if (uriWithoutFileExtension.isPlatform()) {
-								unloadPlatformString = uriWithoutFileExtension.toPlatformString(true);
-							} else {
-								unloadPlatformString = URI.decode(uriWithoutFileExtension.toString());
-							}
-							// URIConverter uriConverter = modelSet.getURIConverter();
-							// unload resource
-							for (Resource res : new ArrayList<Resource>(modelSet.getResources())) {
-								URI normalizedURI = res.getURI();
-								String platformString;
-								if (normalizedURI.isPlatform()) {
-									platformString = normalizedURI.trimFileExtension().toPlatformString(true);
-								} else {
-									platformString = URI.decode(normalizedURI.trimFileExtension().toString());
-								}
+		runInEditingDomain(modelSet, monitor -> {
 
-								if ((platformString != null) && platformString.equals(unloadPlatformString)) {
-									// unload this resource
-									res.unload();
-									// there is no need to remove it from the resource set (which inevitably
-									// causes ConcurrentModificationExceptions!), especially as we may be
-									// loading it again (the editor is still open)
-								}
-								// mark progress
-								monitor.worked(1);
-							}
-							// // mark progress
-							// monitor.beginTask("Resolve", 1);
-							// EcoreUtil.resolveAll(modelSet);
-							// monitor.worked(1);
-
-							if (refreshDiagramsWithProxies) {
-								// mark progress
-								monitor.beginTask(Messages.LoadingUtils_RefreshPagesTask, allPages.size());
-								// reopen pages from proxies and refresh necessary pages
-								for (Object page : allPages) {
-									if (page instanceof EObject) {
-										EObject eobject = (EObject) page;
-										if (eobject.eIsProxy()) {
-											// reopen page from proxy if needed
-											InternalEObject internal = (InternalEObject) eobject;
-											URI uriProxy = internal.eProxyURI();
-											if (pagesURIToOpen.contains(uriProxy)) {
-												pageMngr.openPage(eobject);
-											}
-										} else if (eobject instanceof Diagram) {
-											// refresh page's diagram if needed
-											Diagram diag = ((Diagram) eobject);
-											if (pageMngr.isOpen(diag)) {
+			try {
+				// mark progress
+				monitor.beginTask(Messages.LoadingUtils_UnloadModelsTask, modelSet.getResources().size());
 
-												IDiagramGraphicalViewer graphicalViewer = core.getAdapter(IDiagramGraphicalViewer.class);
-												if (graphicalViewer == null) {
-													continue;
-												}
+				// Use the platform string of a normalized URI for comparison below, see bug 372326
+				// (registered libraries in the model set have different URIs - e.g. due to a pathmap -
+				// although they point to the same location).
+				// TODO: Use a single detection mechanism in ResourceUpdateService and here
+				String unloadPlatformString;
+				if (uriWithoutFileExtension.isPlatform()) {
+					unloadPlatformString = uriWithoutFileExtension.toPlatformString(true);
+				} else {
+					unloadPlatformString = URI.decode(uriWithoutFileExtension.toString());
+				}
+				// URIConverter uriConverter = modelSet.getURIConverter();
+				// unload resource
+				for (Resource res : new ArrayList<Resource>(modelSet.getResources())) {
+					URI normalizedURI = res.getURI();
+					String platformString;
+					if (normalizedURI.isPlatform()) {
+						platformString = normalizedURI.trimFileExtension().toPlatformString(true);
+					} else {
+						platformString = URI.decode(normalizedURI.trimFileExtension().toString());
+					}
 
-												Object part = graphicalViewer.getEditPartRegistry().get(diag);
-												if (part instanceof GraphicalEditPart) {
-													// refresh nodes
-													for (Object child : EditPartUtilities.getAllChildren((GraphicalEditPart) part)) {
-														if (child instanceof EditPart) {
-															((EditPart) child).refresh();
-														}
-													}
-													// refresh edges
-													for (Object child : EditPartUtilities.getAllNestedConnectionEditParts((GraphicalEditPart) part)) {
-														if (child instanceof EditPart) {
-															((EditPart) child).refresh();
-														}
-													}
-												}
-											}
-										}
-									}
-									// mark progress
-									monitor.worked(1);
-								}
-							}
-						} catch (ServiceException e) {
-							Activator.logError(e);
-						}
-					} finally {
-						// mark progress
-						monitor.done();
+					if ((platformString != null) && platformString.equals(unloadPlatformString)) {
+						// unload this resource
+						res.unload();
+						// there is no need to remove it from the resource set (which inevitably
+						// causes ConcurrentModificationExceptions!), especially as we may be
+						// loading it again (the editor is still open)
 					}
+					// mark progress
+					monitor.worked(1);
 				}
-			});
-		}
+				// // mark progress
+				// monitor.beginTask("Resolve", 1);
+				// EcoreUtil.resolveAll(modelSet);
+				// monitor.worked(1);
+			} finally {
+				// mark progress
+				monitor.done();
+			}
+		});
 	}
 
-	static void runInEditingDomain(TransactionalEditingDomain domain, IEditorPart editorContext, IRunnableWithProgress operation) {
-		final IWorkbenchSiteProgressService progress = editorContext.getSite().getService(IWorkbenchSiteProgressService.class);
-
+	static void runInEditingDomain(ModelSet modelSet, IPapyrusRunnable runnable) {
 		try {
-			progress.incrementBusy();
-			progress.busyCursorWhile(TransactionUIHelper.createPrivilegedRunnableWithProgress(domain, operation));
-		} catch (InterruptedException e) {
+			// Created the privileged progress-runnable that borrows the editing domain
+			IProgressRunnable privileged = createPrivilegedRunnable(
+					modelSet.getTransactionalEditingDomain(),
+					runnable);
+
+			// And wrap it in the service-registry context for best possible UI feed-back
+			privileged = ServiceUtilsForResourceSet.getInstance().runnable(privileged, modelSet);
+
+			// Go
+			CoreExecutors.getUIExecutorService().syncExec(privileged);
+		} catch (Exception e) {
 			Activator.log.error(e);
-		} catch (InvocationTargetException e) {
-			StatusManager.getManager().handle(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Failed to manage controlled resources.", e.getTargetException()), StatusManager.SHOW);
-		} finally {
-			progress.decrementBusy();
 		}
 	}
 
@@ -337,7 +215,7 @@ public class LoadingUtils {
 	private static Set<String> getExtensions(ModelSet modelSet) {
 		Set<String> result = new HashSet<String>();
 		// FIXME: Also need to generalize the notation and DI models
-		result.add(NotationModel.NOTATION_FILE_EXTENSION);
+		result.add("notation"); //$NON-NLS-1$
 		result.add(DiModel.DI_FILE_EXTENSION);
 
 		// Get the semantic model extensions
@@ -361,26 +239,6 @@ public class LoadingUtils {
 	}
 
 	/**
-	 * Get currently opened editor
-	 *
-	 * @return editor
-	 */
-	public static IEditorPart getEditor() {
-		IEditorPart editor = null;
-		IWorkbench workbench = PlatformUI.getWorkbench();
-		if (workbench != null) {
-			IWorkbenchWindow activeWorkbenchWindow = workbench.getActiveWorkbenchWindow();
-			if (activeWorkbenchWindow != null) {
-				IWorkbenchPage activePage = activeWorkbenchWindow.getActivePage();
-				if (activePage != null) {
-					editor = activePage.getActiveEditor();
-				}
-			}
-		}
-		return editor;
-	}
-
-	/**
 	 * Get File from a URI
 	 *
 	 * @param uri
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/pom.xml
index 31b21b89672..86c3b2ee0f5 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.semantic</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF
index d89c4ab7b87..433d31aa8c9 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF
@@ -1,30 +1,31 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.services.validation,

- org.eclipse.papyrus.infra.services.validation.commands,

- org.eclipse.papyrus.infra.services.validation.handler,

- org.eclipse.papyrus.infra.services.validation.internal;x-friends:="org.eclipse.papyrus.uml.service.validation",

- org.eclipse.papyrus.infra.services.validation.preferences

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.emf;bundle-version="2.6.0",

- org.eclipse.emf.ecore;bundle-version="2.6.1",

- org.eclipse.core.resources;bundle-version="3.6.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.papyrus.infra.services.decoration;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"

-Bundle-Vendor: %pluginProvider

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.services.validation.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.validation;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.services.validation,
+ org.eclipse.papyrus.infra.services.validation.commands,
+ org.eclipse.papyrus.infra.services.validation.handler,
+ org.eclipse.papyrus.infra.services.validation.internal;x-friends:="org.eclipse.papyrus.uml.service.validation",
+ org.eclipse.papyrus.infra.services.validation.preferences
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.emf;bundle-version="2.6.0",
+ org.eclipse.emf.ecore;bundle-version="2.6.1",
+ org.eclipse.core.resources;bundle-version="3.6.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.papyrus.infra.services.decoration;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
+ com.google.guava;bundle-version="11.0.0"
+Bundle-Vendor: %pluginProvider
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.services.validation.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.validation;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/plugin.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/plugin.xml
index 8e66ac2ee45..c7d0648a2ec 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/plugin.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/plugin.xml
@@ -2,13 +2,13 @@
 <?eclipse version="3.4"?>
 
 <plugin>
-   <extension-point id="diagnosticians" name="Registered diagnostician" schema="schema/diagnostician.exsd"/>
+   <extension-point id="diagnosticians" name="Registered diagnostician" schema="schema/diagnosticians.exsd"/>
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
             category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"
             class="org.eclipse.papyrus.infra.services.validation.preferences.PreferencePage"
-            id="org.eclipse.papyrus.infra.gmfdiag.preferences.validation"
+            id="org.eclipse.papyrus.infra.services.validation.preferences"
             name="Validation preferences">
       </page>
    </extension>
@@ -143,4 +143,20 @@
             decorationType="org.eclipse.emf.ecore.diagnostic">
       </client>
    </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.core.service">
+      <service
+            classname="org.eclipse.papyrus.infra.services.validation.internal.ValidationMarkersService"
+            description="Validation markers tracking service for the Model Validation View."
+            id="org.eclipse.papyrus.infra.services.validation.IValidationMarkersService"
+            priority="1"
+            startKind="startup">
+      </service>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.services.markerlistener.markereventlistener">
+      <listener
+            class="org.eclipse.papyrus.infra.services.validation.IValidationMarkersService">
+      </listener>
+   </extension>
 </plugin>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/pom.xml
index 0de8fc7d1d1..257341fe398 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.validation</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/IValidationMarkerListener.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/IValidationMarkerListener.java
new file mode 100644
index 00000000000..e7e295f9b1b
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/IValidationMarkerListener.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.infra.services.validation;
+
+import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker;
+
+/**
+ * This is the IValidationMarkerListener type. Enjoy.
+ */
+public interface IValidationMarkerListener {
+
+	void notifyMarkerChange(IPapyrusMarker marker, MarkerChangeKind kind);
+
+	enum MarkerChangeKind {
+		ADDED, REMOVED;
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/IValidationMarkersService.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/IValidationMarkersService.java
new file mode 100644
index 00000000000..987ba91b443
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/IValidationMarkersService.java
@@ -0,0 +1,41 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   Christian W. Damus - bug 485220
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.services.validation;
+
+import java.util.Collection;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker;
+
+
+/**
+ * @author damus
+ *
+ */
+public interface IValidationMarkersService {
+
+	Collection<IPapyrusMarker> getMarkers();
+
+	Collection<IPapyrusMarker> getMarkers(EObject object);
+
+	ModelSet getModelSet();
+
+	void addValidationMarkerListener(IValidationMarkerListener listener);
+
+	void removeValidationMarkerListener(
+			IValidationMarkerListener listener);
+
+}
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateModelHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateModelHandler.java
index 4358b6994b8..5c2395337c2 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateModelHandler.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateModelHandler.java
@@ -17,7 +17,7 @@ package org.eclipse.papyrus.infra.services.validation.handler;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.command.UnexecutableCommand;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.services.validation.commands.SelectAndValidateModelCommand;
 
 /**
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateSubtreeHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateSubtreeHandler.java
index ca5e78123af..9fc237e5a20 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateSubtreeHandler.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/SelectAndValidateSubtreeHandler.java
@@ -17,7 +17,7 @@ package org.eclipse.papyrus.infra.services.validation.handler;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.command.UnexecutableCommand;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.services.validation.commands.SelectAndValidateSubtreeCommand;
 
 /**
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromModelHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromModelHandler.java
index 7d69aaa6643..ebc14d10f46 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromModelHandler.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromModelHandler.java
@@ -17,7 +17,7 @@ package org.eclipse.papyrus.infra.services.validation.handler;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.command.UnexecutableCommand;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.services.validation.commands.ValidateDelMarkersFromModelCommand;
 
 /**
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromSubtreeHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromSubtreeHandler.java
index 59c757fc08d..aef1880714d 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromSubtreeHandler.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateDelMarkersFromSubtreeHandler.java
@@ -17,7 +17,7 @@ package org.eclipse.papyrus.infra.services.validation.handler;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.command.UnexecutableCommand;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.services.validation.commands.ValidateDelMarkersFromSubtreeCommand;
 
 /**
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateModelHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateModelHandler.java
index d63ee52585e..8776de58288 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateModelHandler.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateModelHandler.java
@@ -17,7 +17,7 @@ package org.eclipse.papyrus.infra.services.validation.handler;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.command.UnexecutableCommand;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.services.validation.commands.ValidateModelCommand;
 
 /**
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateSubtreeHandler.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateSubtreeHandler.java
index e1033a6a421..012b9452d23 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateSubtreeHandler.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/handler/ValidateSubtreeHandler.java
@@ -17,7 +17,7 @@ package org.eclipse.papyrus.infra.services.validation.handler;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.command.UnexecutableCommand;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.services.validation.commands.ValidateSubtreeCommand;
 
 /**
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/internal/ValidationMarkersService.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/internal/ValidationMarkersService.java
new file mode 100644
index 00000000000..07b8c16da4b
--- /dev/null
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/internal/ValidationMarkersService.java
@@ -0,0 +1,156 @@
+/*****************************************************************************
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   Christian W. Damus - bug 485220
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.validation.internal;
+
+import java.util.Collection;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.emf.ecore.EObject;
+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.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.services.markerlistener.IMarkerEventListener;
+import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker;
+import org.eclipse.papyrus.infra.services.validation.Activator;
+import org.eclipse.papyrus.infra.services.validation.IValidationMarkerListener;
+import org.eclipse.papyrus.infra.services.validation.IValidationMarkerListener.MarkerChangeKind;
+import org.eclipse.papyrus.infra.services.validation.IValidationMarkersService;
+
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+
+/**
+ * This is the ValidationMarkersService type. Enjoy.
+ */
+public class ValidationMarkersService
+		implements IMarkerEventListener, IValidationMarkersService {
+
+	private ModelSet modelSet;
+
+	private final Multimap<EObject, IPapyrusMarker> markers = HashMultimap
+			.create();
+
+	private final CopyOnWriteArrayList<IValidationMarkerListener> listeners = new CopyOnWriteArrayList<IValidationMarkerListener>();
+
+	public ValidationMarkersService() {
+		super();
+	}
+
+	public void init(ServicesRegistry services)
+			throws ServiceException {
+
+		modelSet = ServiceUtils.getInstance().getModelSet(services);
+	}
+
+	public void startService()
+			throws ServiceException {
+
+		// pass
+	}
+
+	public void disposeService()
+			throws ServiceException {
+
+		markers.clear();
+		modelSet = null;
+	}
+
+	public boolean isNotifiedOnInitialMarkerCheck() {
+		return true;
+	}
+
+	public void notifyMarkerChange(EObject eObjectOfMarker,
+			IPapyrusMarker marker, int addedOrRemoved) {
+
+		// ADDED
+		try {
+			if (marker.exists() && !marker.isSubtypeOf(IMarker.PROBLEM)) {
+				return;
+			}
+		} catch (CoreException e1) {
+			Activator.log.error(e1);
+		}
+		// ////
+
+		MarkerChangeKind kind = (addedOrRemoved == MARKER_ADDED)
+				? MarkerChangeKind.ADDED
+				: MarkerChangeKind.REMOVED;
+
+		switch (kind) {
+		case ADDED:
+			markers.put(eObjectOfMarker, marker);
+			break;
+		case REMOVED:
+			// workspace markers don't know their EObjects, so we can't look
+			// up the mapping to remove by key
+			markers.values().remove(marker);
+			break;
+		}
+
+		for (IValidationMarkerListener next : listeners) {
+			try {
+				next.notifyMarkerChange(marker, kind);
+			} catch (Exception e) {
+				Activator.log.error(
+						"Uncaught exception in validation marker listener.", e);
+			}
+		}
+	}
+
+	public ModelSet getModelSet() {
+		return modelSet;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.services.validation.IValidationMarkersService#getMarkers()
+	 *
+	 * @return
+	 */
+	public Collection<IPapyrusMarker> getMarkers() {
+		return markers.values();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.services.validation.IValidationMarkersService#getMarkers(org.eclipse.emf.ecore.EObject)
+	 *
+	 * @param object
+	 * @return
+	 */
+	public Collection<IPapyrusMarker> getMarkers(EObject object) {
+		return markers.get(object);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.services.validation.IValidationMarkersService#addValidationMarkerListener(org.eclipse.papyrus.infra.services.validation.IValidationMarkerListener)
+	 *
+	 * @param listener
+	 */
+	public void addValidationMarkerListener(IValidationMarkerListener listener) {
+		listeners.addIfAbsent(listener);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.services.validation.IValidationMarkersService#removeValidationMarkerListener(org.eclipse.papyrus.infra.services.validation.IValidationMarkerListener)
+	 *
+	 * @param listener
+	 */
+	public void removeValidationMarkerListener(
+			IValidationMarkerListener listener) {
+
+		listeners.remove(listener);
+	}
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/pom.xml
index 881ed2bf566..339cd36dd15 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.viewersearch</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/pom.xml
index a5e450baeda..cf5d535751e 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-services</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.viewlabelprovider</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/services/pom.xml b/plugins/infra/services/pom.xml
new file mode 100644
index 00000000000..efdee69f376
--- /dev/null
+++ b/plugins/infra/services/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.infra-services</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+	<name>Papyrus Infra Services</name>
+	<description>Core services provided by the Papyrus Editor's Service Registry.</description>
+
+	<modules>
+		<module>org.eclipse.papyrus.infra.services.controlmode</module>
+		<module>org.eclipse.papyrus.infra.services.controlmode.history</module>
+		<module>org.eclipse.papyrus.infra.services.decoration</module>
+		<module>org.eclipse.papyrus.infra.services.edit</module>
+		<module>org.eclipse.papyrus.infra.services.edit.ui</module>
+		<module>org.eclipse.papyrus.infra.services.labelprovider</module>
+		<module>org.eclipse.papyrus.infra.services.localizer</module>
+		<module>org.eclipse.papyrus.infra.services.markerlistener</module>
+		<module>org.eclipse.papyrus.infra.services.navigation</module>
+		<module>org.eclipse.papyrus.infra.services.openelement</module>
+		<module>org.eclipse.papyrus.infra.services.resourceloading</module>
+		<module>org.eclipse.papyrus.infra.services.resourceloading.ui</module>
+		<module>org.eclipse.papyrus.infra.services.semantic</module>
+		<module>org.eclipse.papyrus.infra.services.validation</module>
+		<module>org.eclipse.papyrus.infra.services.viewersearch</module>
+		<module>org.eclipse.papyrus.infra.services.viewlabelprovider</module>
+	</modules>
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/.classpath b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/.classpath
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.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/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.onefile.ui/.project b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.project
index 2520b07362d..2520b07362d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/.project
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.project
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-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

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+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
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF
index fc586354cf3..fc586354cf3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/about.html b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/about.html
new file mode 100644
index 00000000000..dd3c089a94c
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.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>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/infra/org.eclipse.papyrus.infra.onefile.ui/build.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/build.properties
index 082c8b2f4f1..082c8b2f4f1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/build.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/build.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/icons/papyrus.png b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/icons/papyrus.png
index 0f74e27b483..0f74e27b483 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/icons/papyrus.png
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/icons/papyrus.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/plugin.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/plugin.properties
index 1bc9dea55df..1bc9dea55df 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/plugin.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/plugin.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/plugin.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/plugin.xml
index f64926b75c3..f64926b75c3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/plugin.xml
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/plugin.xml
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/pom.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/pom.xml
index 1912554754a..18f26289ae9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/pom.xml
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-ui</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.onefile.ui</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/Activator.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/Activator.java
index 14f957c2394..14f957c2394 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/Activator.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/Activator.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/action/CopyFilesAndFoldersOperation.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/action/CopyFilesAndFoldersOperation.java
index aefe0637a67..aefe0637a67 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/action/CopyFilesAndFoldersOperation.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/action/CopyFilesAndFoldersOperation.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/action/PapyrusCopyFilesAndFoldersOperation.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/action/PapyrusCopyFilesAndFoldersOperation.java
index 05e987f060b..05e987f060b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/action/PapyrusCopyFilesAndFoldersOperation.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/action/PapyrusCopyFilesAndFoldersOperation.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/action/PapyrusModelPasteAction.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/action/PapyrusModelPasteAction.java
index 1b06a92d01f..1b06a92d01f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/action/PapyrusModelPasteAction.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/action/PapyrusModelPasteAction.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/action/PasteAction.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/action/PasteAction.java
index 4ca3a656edf..4ca3a656edf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/action/PasteAction.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/action/PasteAction.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/filters/OnlyDiFilter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/filters/OnlyDiFilter.java
index c16a65a8778..bd64925dbaf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/filters/OnlyDiFilter.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/filters/OnlyDiFilter.java
@@ -1,57 +1,57 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin Integration.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile.internal.ui.filters;

-

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.jface.viewers.ViewerFilter;

-import org.eclipse.papyrus.infra.onefile.utils.OneFileUtils;

-

-/**

- * Filter hiding di files and associated. the filter enables the content

- * provider

- *

- * @author tfaure

- *

- */

-public class OnlyDiFilter extends ViewerFilter {

-

-	public static final String FILTER_ID = "org.eclipse.papyrus.infra.onefile.onlyDiFilter";

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see

-	 * org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers

-	 * .Viewer, java.lang.Object, java.lang.Object)

-	 *

-	 * @Override

-	 */

-	@Override

-	public boolean select(Viewer viewer, Object parentElement, Object element) {

-		return OneFileUtils.isVisible(element);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see

-	 * org.eclipse.jface.viewers.ViewerFilter#isFilterProperty(java.lang.Object,

-	 * java.lang.String)

-	 *

-	 * @Override

-	 */

-	@Override

-	public boolean isFilterProperty(Object element, String property) {

-		return true;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Atos Origin Integration.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile.internal.ui.filters;
+
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.papyrus.infra.onefile.utils.OneFileUtils;
+
+/**
+ * Filter hiding di files and associated. the filter enables the content
+ * provider
+ *
+ * @author tfaure
+ *
+ */
+public class OnlyDiFilter extends ViewerFilter {
+
+	public static final String FILTER_ID = "org.eclipse.papyrus.infra.onefile.onlyDiFilter";
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers
+	 * .Viewer, java.lang.Object, java.lang.Object)
+	 *
+	 * @Override
+	 */
+	@Override
+	public boolean select(Viewer viewer, Object parentElement, Object element) {
+		return OneFileUtils.isVisible(element);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * org.eclipse.jface.viewers.ViewerFilter#isFilterProperty(java.lang.Object,
+	 * java.lang.String)
+	 *
+	 * @Override
+	 */
+	@Override
+	public boolean isFilterProperty(Object element, String property) {
+		return true;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/model/adapters/ModelAdapterFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/model/adapters/ModelAdapterFactory.java
index 223ff8c4e6a..223ff8c4e6a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/model/adapters/ModelAdapterFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/model/adapters/ModelAdapterFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/model/adapters/PapyrusCommonDropAdapterAssistant.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/model/adapters/PapyrusCommonDropAdapterAssistant.java
index 03cb59b34bf..e7e8bd4f18f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/model/adapters/PapyrusCommonDropAdapterAssistant.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/model/adapters/PapyrusCommonDropAdapterAssistant.java
@@ -1,86 +1,86 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin Integration - CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile.internal.ui.model.adapters;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

-import org.eclipse.swt.dnd.DropTargetEvent;

-import org.eclipse.swt.dnd.TransferData;

-import org.eclipse.ui.navigator.CommonDropAdapter;

-import org.eclipse.ui.navigator.resources.ResourceDropAdapterAssistant;

-

-/**

- * Assistant to manage drag and drop of {@link IPapyrusFile} {@link IPapyrusFile} are not adapted to {@link IResource} to prevent

- * misunderstanding so during transfer the selection is changed

- *

- * @author tristan.faure@atosorigin.com

- *

- */

-public class PapyrusCommonDropAdapterAssistant extends ResourceDropAdapterAssistant {

-

-	@Override

-	public IStatus validateDrop(Object target, int aDropOperation, TransferData transferType) {

-		manageSelection();

-		return super.validateDrop(target, aDropOperation, transferType);

-	}

-

-	@Override

-	public IStatus handleDrop(CommonDropAdapter aDropAdapter, DropTargetEvent aDropTargetEvent, Object aTarget) {

-		manageSelection();

-		return super.handleDrop(aDropAdapter, aDropTargetEvent, aTarget);

-	}

-

-	@Override

-	protected void doInit() {

-		super.doInit();

-		manageSelection();

-	}

-

-	private void manageSelection() {

-		List<Object> elements = new ArrayList<Object>();

-		ISelection selec = LocalSelectionTransfer.getTransfer().getSelection();

-		boolean selectionChanged = false;

-		if (selec instanceof IStructuredSelection) {

-			IStructuredSelection struc = (IStructuredSelection) selec;

-			for (Iterator<Object> i = struc.iterator(); i.hasNext();) {

-				Object o = i.next();

-				if (o instanceof IPapyrusFile) {

-					IPapyrusFile papy = (IPapyrusFile) o;

-					// TODO if a drop assistant is implemented use previous implementation :

-					// elements.add(papy.getMainFile());

-					elements.addAll(Arrays.asList(papy.getAssociatedResources()));

-					selectionChanged = true;

-				} else {

-					elements.add(o); // Do not prevent other drops.

-				}

-			}

-		}

-

-		if (!selectionChanged) {

-			return;

-		}

-

-		LocalSelectionTransfer.getTransfer().setSelection(new StructuredSelection(elements));

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Atos Origin Integration - CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile.internal.ui.model.adapters;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;
+import org.eclipse.swt.dnd.DropTargetEvent;
+import org.eclipse.swt.dnd.TransferData;
+import org.eclipse.ui.navigator.CommonDropAdapter;
+import org.eclipse.ui.navigator.resources.ResourceDropAdapterAssistant;
+
+/**
+ * Assistant to manage drag and drop of {@link IPapyrusFile} {@link IPapyrusFile} are not adapted to {@link IResource} to prevent
+ * misunderstanding so during transfer the selection is changed
+ *
+ * @author tristan.faure@atosorigin.com
+ *
+ */
+public class PapyrusCommonDropAdapterAssistant extends ResourceDropAdapterAssistant {
+
+	@Override
+	public IStatus validateDrop(Object target, int aDropOperation, TransferData transferType) {
+		manageSelection();
+		return super.validateDrop(target, aDropOperation, transferType);
+	}
+
+	@Override
+	public IStatus handleDrop(CommonDropAdapter aDropAdapter, DropTargetEvent aDropTargetEvent, Object aTarget) {
+		manageSelection();
+		return super.handleDrop(aDropAdapter, aDropTargetEvent, aTarget);
+	}
+
+	@Override
+	protected void doInit() {
+		super.doInit();
+		manageSelection();
+	}
+
+	private void manageSelection() {
+		List<Object> elements = new ArrayList<Object>();
+		ISelection selec = LocalSelectionTransfer.getTransfer().getSelection();
+		boolean selectionChanged = false;
+		if (selec instanceof IStructuredSelection) {
+			IStructuredSelection struc = (IStructuredSelection) selec;
+			for (Iterator<Object> i = struc.iterator(); i.hasNext();) {
+				Object o = i.next();
+				if (o instanceof IPapyrusFile) {
+					IPapyrusFile papy = (IPapyrusFile) o;
+					// TODO if a drop assistant is implemented use previous implementation :
+					// elements.add(papy.getMainFile());
+					elements.addAll(Arrays.asList(papy.getAssociatedResources()));
+					selectionChanged = true;
+				} else {
+					elements.add(o); // Do not prevent other drops.
+				}
+			}
+		}
+
+		if (!selectionChanged) {
+			return;
+		}
+
+		LocalSelectionTransfer.getTransfer().setSelection(new StructuredSelection(elements));
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/model/adapters/PapyrusLinkHelper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/model/adapters/PapyrusLinkHelper.java
index 0def064da62..76e629c7563 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/model/adapters/PapyrusLinkHelper.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/model/adapters/PapyrusLinkHelper.java
@@ -1,70 +1,70 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin Integration.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile.internal.ui.model.adapters;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.core.resources.IResource;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

-import org.eclipse.papyrus.infra.onefile.model.PapyrusModelHelper;

-import org.eclipse.papyrus.infra.onefile.ui.utils.OneFileUIUtils;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IFileEditorInput;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.navigator.ILinkHelper;

-

-/**

- * Link the Papyrus Editor with {@link IPapyrusFile}

- *

- * @author tristan.faure@atosorigin.com

- *

- */

-public class PapyrusLinkHelper implements ILinkHelper {

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.navigator.ILinkHelper#findSelection(org.eclipse.ui.

-	 * IEditorInput)

-	 */

-	public IStructuredSelection findSelection(IEditorInput anInput) {

-		List<Object> select = new ArrayList<Object>();

-		if (anInput instanceof IFileEditorInput) {

-			IFileEditorInput input = (IFileEditorInput) anInput;

-			IPapyrusFile papy = PapyrusModelHelper.getPapyrusModelFactory().createIPapyrusFile(input.getFile());

-			select.add(papy);

-			IResource res = papy.getMainFile();

-			while (res.getParent() != null) {

-				select.add(0, res.getParent());

-				res = res.getParent();

-			}

-			return new StructuredSelection(papy);

-		}

-		return null;

-	}

-

-	public void activateEditor(IWorkbenchPage page, IStructuredSelection selection) {

-		if (selection == null || selection.isEmpty()) {

-			return;

-		}

-		Object element = selection.getFirstElement();

-		IEditorPart part = OneFileUIUtils.isOpenInEditor(element);

-		if (part != null) {

-			page.bringToTop(part);

-		}

-

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Atos Origin Integration.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile.internal.ui.model.adapters;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;
+import org.eclipse.papyrus.infra.onefile.model.PapyrusModelHelper;
+import org.eclipse.papyrus.infra.onefile.ui.utils.OneFileUIUtils;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.navigator.ILinkHelper;
+
+/**
+ * Link the Papyrus Editor with {@link IPapyrusFile}
+ *
+ * @author tristan.faure@atosorigin.com
+ *
+ */
+public class PapyrusLinkHelper implements ILinkHelper {
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.navigator.ILinkHelper#findSelection(org.eclipse.ui.
+	 * IEditorInput)
+	 */
+	public IStructuredSelection findSelection(IEditorInput anInput) {
+		List<Object> select = new ArrayList<Object>();
+		if (anInput instanceof IFileEditorInput) {
+			IFileEditorInput input = (IFileEditorInput) anInput;
+			IPapyrusFile papy = PapyrusModelHelper.getPapyrusModelFactory().createIPapyrusFile(input.getFile());
+			select.add(papy);
+			IResource res = papy.getMainFile();
+			while (res.getParent() != null) {
+				select.add(0, res.getParent());
+				res = res.getParent();
+			}
+			return new StructuredSelection(papy);
+		}
+		return null;
+	}
+
+	public void activateEditor(IWorkbenchPage page, IStructuredSelection selection) {
+		if (selection == null || selection.isEmpty()) {
+			return;
+		}
+		Object element = selection.getFirstElement();
+		IEditorPart part = OneFileUIUtils.isOpenInEditor(element);
+		if (part != null) {
+			page.bringToTop(part);
+		}
+
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/model/adapters/PapyrusModelContributorResourceAdapter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/model/adapters/PapyrusModelContributorResourceAdapter.java
index 3200c6e813e..cb48e6f8fae 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/model/adapters/PapyrusModelContributorResourceAdapter.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/model/adapters/PapyrusModelContributorResourceAdapter.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin Integration.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin Integration) tristan.faure@atos.net - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile.internal.ui.model.adapters;

-

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.mapping.ResourceMapping;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.ui.ide.IContributorResourceAdapter2;

-

-

-/**

- * Another Adapter

- *

- * @author tfaure

- *

- */

-public class PapyrusModelContributorResourceAdapter implements IContributorResourceAdapter2 {

-

-	public IResource getAdaptedResource(IAdaptable adaptable) {

-		IResource res = (IResource) adaptable.getAdapter(IResource.class);

-		return res;

-	}

-

-	public ResourceMapping getAdaptedResourceMapping(IAdaptable adaptable) {

-		ResourceMapping res = (ResourceMapping) adaptable.getAdapter(ResourceMapping.class);

-		return res;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Atos Origin Integration.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin Integration) tristan.faure@atos.net - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile.internal.ui.model.adapters;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.mapping.ResourceMapping;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.ui.ide.IContributorResourceAdapter2;
+
+
+/**
+ * Another Adapter
+ *
+ * @author tfaure
+ *
+ */
+public class PapyrusModelContributorResourceAdapter implements IContributorResourceAdapter2 {
+
+	public IResource getAdaptedResource(IAdaptable adaptable) {
+		IResource res = (IResource) adaptable.getAdapter(IResource.class);
+		return res;
+	}
+
+	public ResourceMapping getAdaptedResourceMapping(IAdaptable adaptable) {
+		ResourceMapping res = (ResourceMapping) adaptable.getAdapter(ResourceMapping.class);
+		return res;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/model/adapters/SubResourceAdapterFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/model/adapters/SubResourceAdapterFactory.java
index e68c86ffc5b..e68c86ffc5b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/model/adapters/SubResourceAdapterFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/model/adapters/SubResourceAdapterFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/CopyToClipboardAction.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/CopyToClipboardAction.java
index 6e259be86e9..6e259be86e9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/CopyToClipboardAction.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/CopyToClipboardAction.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/OneFileDecorator.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/OneFileDecorator.java
index 86858d2c010..2304bad368f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/OneFileDecorator.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/OneFileDecorator.java
@@ -1,179 +1,179 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin Integration.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan FAURE (Atos) tristan.faure@atos.net - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile.internal.ui.providers;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.resources.IResource;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.viewers.IDecoration;

-import org.eclipse.jface.viewers.IDecorationContext;

-import org.eclipse.jface.viewers.ILightweightLabelDecorator;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.Font;

-import org.eclipse.ui.internal.WorkbenchPlugin;

-import org.eclipse.ui.internal.decorators.DecorationBuilder;

-

-

-/**

- * This decorator computes decoration of related files

- * for each decoration an intersection is made

- * and the {@link IPapyrusFile} will have the same decoration of the set

- *

- * @author tfaure

- *

- */

-@SuppressWarnings("restriction")

-public class OneFileDecorator extends LabelProvider implements ILightweightLabelDecorator {

-

-	public void decorate(Object element, IDecoration decoration) {

-		if (element instanceof IPapyrusFile) {

-			IPapyrusFile papy = (IPapyrusFile) element;

-			IResource[] associatedResources = papy.getAssociatedResources();

-			FilteredDecorationBuilder builder = new FilteredDecorationBuilder(decoration.getDecorationContext(), associatedResources.length);

-			for (IResource r : associatedResources) {

-				WorkbenchPlugin.getDefault().getDecoratorManager().getLightweightManager().getDecorations(r, builder);

-			}

-			builder.handleDecoration(decoration);

-		}

-	}

-

-	/**

-	 * The builder which intercepts decoration

-	 *

-	 * @author tfaure

-	 *

-	 */

-	protected class FilteredDecorationBuilder extends DecorationBuilder {

-

-		/** overlay, prefix and suffixes can be several so the number of occurences is saved */

-		private Map<ImageDescriptor, Integer> overlay = new HashMap<ImageDescriptor, Integer>();

-

-

-		private Map<String, Integer> prefixString = new HashMap<String, Integer>();

-

-

-		private Map<String, Integer> suffixString = new HashMap<String, Integer>();

-

-

-		private Color bgColor = null;

-

-		private boolean flagBgColor = false;

-

-		private Font newFont = null;

-

-		private boolean flagNewFont = false;

-

-		private Color fgColor = null;

-

-		private boolean flagFgColor = false;

-

-		private final int nbResource;

-

-		public FilteredDecorationBuilder(IDecorationContext context, int nbResource) {

-			super(context);

-			this.nbResource = nbResource;

-		}

-

-		@Override

-		public void addOverlay(ImageDescriptor overlay) {

-			Integer result = this.overlay.get(overlay);

-			if (result == null) {

-				result = 0;

-			}

-			result++;

-			this.overlay.put(overlay, result);

-		}

-

-		@Override

-		public void addPrefix(String prefixString) {

-			Integer result = this.prefixString.get(prefixString);

-			if (result == null) {

-				result = 0;

-			}

-			result++;

-			this.prefixString.put(prefixString, result);

-		}

-

-		@Override

-		public void addSuffix(String suffixString) {

-			Integer result = this.suffixString.get(suffixString);

-			if (result == null) {

-				result = 0;

-			}

-			result++;

-			this.suffixString.put(suffixString, result);

-		}

-

-		@Override

-		public void setBackgroundColor(Color bgColor) {

-			if (this.bgColor == null && !flagBgColor) {

-				this.bgColor = bgColor;

-				flagBgColor = true;

-			} else if (this.bgColor != null && !this.bgColor.equals(bgColor)) {

-				this.bgColor = null;

-			}

-		}

-

-		@Override

-		public void setFont(Font newFont) {

-			if (this.newFont == null && !flagNewFont) {

-				this.newFont = newFont;

-				flagNewFont = true;

-			} else if (this.newFont != null && !this.newFont.equals(newFont)) {

-				this.newFont = null;

-			}

-		}

-

-		@Override

-		public void setForegroundColor(Color fgColor) {

-			if (this.fgColor == null && !flagFgColor) {

-				this.fgColor = fgColor;

-				flagFgColor = true;

-			} else if (this.fgColor != null && !this.fgColor.equals(fgColor)) {

-				this.fgColor = null;

-			}

-		}

-

-		public void handleDecoration(IDecoration decoration) {

-			if (fgColor != null) {

-				decoration.setForegroundColor(fgColor);

-			}

-			if (bgColor != null) {

-				decoration.setBackgroundColor(bgColor);

-			}

-			if (newFont != null) {

-				decoration.setFont(newFont);

-			}

-			for (ImageDescriptor desc : overlay.keySet()) {

-				if (overlay.get(desc) == nbResource) {

-					decoration.addOverlay(desc);

-				}

-			}

-			for (String s : prefixString.keySet()) {

-				if (prefixString.get(s) == nbResource) {

-					decoration.addPrefix(s);

-				}

-			}

-			for (String s : suffixString.keySet()) {

-				if (suffixString.get(s) == nbResource) {

-					decoration.addSuffix(s);

-				}

-			}

-		}

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Atos Origin Integration.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan FAURE (Atos) tristan.faure@atos.net - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile.internal.ui.providers;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.IDecoration;
+import org.eclipse.jface.viewers.IDecorationContext;
+import org.eclipse.jface.viewers.ILightweightLabelDecorator;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.ui.internal.WorkbenchPlugin;
+import org.eclipse.ui.internal.decorators.DecorationBuilder;
+
+
+/**
+ * This decorator computes decoration of related files
+ * for each decoration an intersection is made
+ * and the {@link IPapyrusFile} will have the same decoration of the set
+ *
+ * @author tfaure
+ *
+ */
+@SuppressWarnings("restriction")
+public class OneFileDecorator extends LabelProvider implements ILightweightLabelDecorator {
+
+	public void decorate(Object element, IDecoration decoration) {
+		if (element instanceof IPapyrusFile) {
+			IPapyrusFile papy = (IPapyrusFile) element;
+			IResource[] associatedResources = papy.getAssociatedResources();
+			FilteredDecorationBuilder builder = new FilteredDecorationBuilder(decoration.getDecorationContext(), associatedResources.length);
+			for (IResource r : associatedResources) {
+				WorkbenchPlugin.getDefault().getDecoratorManager().getLightweightManager().getDecorations(r, builder);
+			}
+			builder.handleDecoration(decoration);
+		}
+	}
+
+	/**
+	 * The builder which intercepts decoration
+	 *
+	 * @author tfaure
+	 *
+	 */
+	protected class FilteredDecorationBuilder extends DecorationBuilder {
+
+		/** overlay, prefix and suffixes can be several so the number of occurences is saved */
+		private Map<ImageDescriptor, Integer> overlay = new HashMap<ImageDescriptor, Integer>();
+
+
+		private Map<String, Integer> prefixString = new HashMap<String, Integer>();
+
+
+		private Map<String, Integer> suffixString = new HashMap<String, Integer>();
+
+
+		private Color bgColor = null;
+
+		private boolean flagBgColor = false;
+
+		private Font newFont = null;
+
+		private boolean flagNewFont = false;
+
+		private Color fgColor = null;
+
+		private boolean flagFgColor = false;
+
+		private final int nbResource;
+
+		public FilteredDecorationBuilder(IDecorationContext context, int nbResource) {
+			super(context);
+			this.nbResource = nbResource;
+		}
+
+		@Override
+		public void addOverlay(ImageDescriptor overlay) {
+			Integer result = this.overlay.get(overlay);
+			if (result == null) {
+				result = 0;
+			}
+			result++;
+			this.overlay.put(overlay, result);
+		}
+
+		@Override
+		public void addPrefix(String prefixString) {
+			Integer result = this.prefixString.get(prefixString);
+			if (result == null) {
+				result = 0;
+			}
+			result++;
+			this.prefixString.put(prefixString, result);
+		}
+
+		@Override
+		public void addSuffix(String suffixString) {
+			Integer result = this.suffixString.get(suffixString);
+			if (result == null) {
+				result = 0;
+			}
+			result++;
+			this.suffixString.put(suffixString, result);
+		}
+
+		@Override
+		public void setBackgroundColor(Color bgColor) {
+			if (this.bgColor == null && !flagBgColor) {
+				this.bgColor = bgColor;
+				flagBgColor = true;
+			} else if (this.bgColor != null && !this.bgColor.equals(bgColor)) {
+				this.bgColor = null;
+			}
+		}
+
+		@Override
+		public void setFont(Font newFont) {
+			if (this.newFont == null && !flagNewFont) {
+				this.newFont = newFont;
+				flagNewFont = true;
+			} else if (this.newFont != null && !this.newFont.equals(newFont)) {
+				this.newFont = null;
+			}
+		}
+
+		@Override
+		public void setForegroundColor(Color fgColor) {
+			if (this.fgColor == null && !flagFgColor) {
+				this.fgColor = fgColor;
+				flagFgColor = true;
+			} else if (this.fgColor != null && !this.fgColor.equals(fgColor)) {
+				this.fgColor = null;
+			}
+		}
+
+		public void handleDecoration(IDecoration decoration) {
+			if (fgColor != null) {
+				decoration.setForegroundColor(fgColor);
+			}
+			if (bgColor != null) {
+				decoration.setBackgroundColor(bgColor);
+			}
+			if (newFont != null) {
+				decoration.setFont(newFont);
+			}
+			for (ImageDescriptor desc : overlay.keySet()) {
+				if (overlay.get(desc) == nbResource) {
+					decoration.addOverlay(desc);
+				}
+			}
+			for (String s : prefixString.keySet()) {
+				if (prefixString.get(s) == nbResource) {
+					decoration.addPrefix(s);
+				}
+			}
+			for (String s : suffixString.keySet()) {
+				if (suffixString.get(s) == nbResource) {
+					decoration.addSuffix(s);
+				}
+			}
+		}
+	}
+
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/PapyrusEditActionProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/PapyrusEditActionProvider.java
index 3c761b647f7..3c761b647f7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/PapyrusEditActionProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/PapyrusEditActionProvider.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/PapyrusModelActionProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/PapyrusModelActionProvider.java
index 626e22efcc1..626e22efcc1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/PapyrusModelActionProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/PapyrusModelActionProvider.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/SubresourceFileActionProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/SubresourceFileActionProvider.java
index 4388700868c..8d365c04aff 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/SubresourceFileActionProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/SubresourceFileActionProvider.java
@@ -1,77 +1,77 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin Integration - CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin) tristan.faure@atos.net - Initial API and implementation

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile.internal.ui.providers;

-

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.ui.actions.ActionContext;

-import org.eclipse.ui.internal.navigator.resources.actions.EditActionProvider;

-

-

-/**

- * An edit action provider to provide Copy/Paste/Delete on sub resources

- *

- * @author Tristan Faure

- *

- */

-@SuppressWarnings("restriction")

-public class SubresourceFileActionProvider extends EditActionProvider {

-

-	@Override

-	public void setContext(ActionContext context) {

-		// TODO Auto-generated method stub

-		List<Object> resources = new LinkedList<Object>();

-		if (context.getSelection() instanceof IStructuredSelection) {

-			IStructuredSelection contextSelec = (IStructuredSelection) context.getSelection();

-			for (Iterator<?> i = contextSelec.iterator(); i.hasNext();) {

-				Object o = i.next();

-				IResource res = adapt(o, IResource.class);

-				if (res != null) {

-					resources.add(res);

-				}

-			}

-		}

-		if (!resources.isEmpty()) {

-			ISelection selec = new StructuredSelection(resources);

-			super.setContext(new ActionContext(selec));

-		} else {

-			super.setContext(context);

-		}

-	}

-

-	@SuppressWarnings("unchecked")

-	public <T> T adapt(Object o, Class<T> aClass) {

-		T result = null;

-		if (aClass.isInstance(o)) {

-			result = (T) o;

-		}

-		if (o instanceof IAdaptable) {

-			IAdaptable adaptable = (IAdaptable) o;

-			result = (T) adaptable.getAdapter(aClass);

-		}

-		if (result == null) {

-			result = (T) Platform.getAdapterManager().getAdapter(o, aClass);

-		}

-

-		return result;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Atos Origin Integration - CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin) tristan.faure@atos.net - Initial API and implementation
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile.internal.ui.providers;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.ui.actions.ActionContext;
+import org.eclipse.ui.internal.navigator.resources.actions.EditActionProvider;
+
+
+/**
+ * An edit action provider to provide Copy/Paste/Delete on sub resources
+ *
+ * @author Tristan Faure
+ *
+ */
+@SuppressWarnings("restriction")
+public class SubresourceFileActionProvider extends EditActionProvider {
+
+	@Override
+	public void setContext(ActionContext context) {
+		// TODO Auto-generated method stub
+		List<Object> resources = new LinkedList<Object>();
+		if (context.getSelection() instanceof IStructuredSelection) {
+			IStructuredSelection contextSelec = (IStructuredSelection) context.getSelection();
+			for (Iterator<?> i = contextSelec.iterator(); i.hasNext();) {
+				Object o = i.next();
+				IResource res = adapt(o, IResource.class);
+				if (res != null) {
+					resources.add(res);
+				}
+			}
+		}
+		if (!resources.isEmpty()) {
+			ISelection selec = new StructuredSelection(resources);
+			super.setContext(new ActionContext(selec));
+		} else {
+			super.setContext(context);
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	public <T> T adapt(Object o, Class<T> aClass) {
+		T result = null;
+		if (aClass.isInstance(o)) {
+			result = (T) o;
+		}
+		if (o instanceof IAdaptable) {
+			IAdaptable adaptable = (IAdaptable) o;
+			result = (T) adaptable.getAdapter(aClass);
+		}
+		if (result == null) {
+			result = (T) Platform.getAdapterManager().getAdapter(o, aClass);
+		}
+
+		return result;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/testers/PapyrusClipboardTester.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/testers/PapyrusClipboardTester.java
index ac0c3a33a55..ac0c3a33a55 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/testers/PapyrusClipboardTester.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/testers/PapyrusClipboardTester.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/ui/providers/PapyrusContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/ui/providers/PapyrusContentProvider.java
index 3acce0e9984..4f06cac9c5b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/ui/providers/PapyrusContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/ui/providers/PapyrusContentProvider.java
@@ -1,307 +1,307 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin Integration - CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile.ui.providers;

-

-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.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IWorkspaceRoot;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.jface.viewers.AbstractTreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.onefile.internal.ui.Activator;

-import org.eclipse.papyrus.infra.onefile.internal.ui.filters.OnlyDiFilter;

-import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

-import org.eclipse.papyrus.infra.onefile.model.PapyrusModelHelper;

-import org.eclipse.papyrus.infra.onefile.utils.OneFileUtils;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.ui.model.WorkbenchContentProvider;

-import org.eclipse.ui.navigator.CommonViewer;

-

-/**

- * Content provider able to retrieve Papyrus children from an {@link IContainer}

- *

- * @author Tristan FAURE

- *

- */

-public class PapyrusContentProvider extends WorkbenchContentProvider {

-

-

-	private CommonViewer common;

-

-

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		super.inputChanged(viewer, oldInput, newInput);

-		if (viewer instanceof CommonViewer) {

-			common = (CommonViewer) viewer;

-		}

-	}

-

-	/**

-	 * Determine if the current navigator is filtered or not

-	 *

-	 * @return true if the viewer is filtered

-	 */

-	public boolean isFiltered() {

-		return common != null && common.getNavigatorContentService() != null && common.getNavigatorContentService().getFilterService() != null && common.getNavigatorContentService().getFilterService().isActive(OnlyDiFilter.FILTER_ID);

-	}

-

-	@Override

-	public void dispose() {

-		super.dispose();

-	}

-

-	@Override

-	public Object[] getElements(Object inputElement) {

-		if (inputElement instanceof IWorkspaceRoot) {

-			return null;

-		}

-		List<Object> result = new LinkedList<Object>();

-		try {

-			if (isFiltered()) {

-				if (inputElement instanceof IPapyrusFile) {

-					IPapyrusFile file = (IPapyrusFile) inputElement;

-					for (IResource r : file.getAssociatedResources()) {

-						result.add(PapyrusModelHelper.getPapyrusModelFactory().createISubResourceFile(file, (IFile) r));

-					}

-				} else {

-					IResource[] members = null;

-					if (inputElement instanceof IContainer) {

-						IContainer container = (IContainer) inputElement;

-						if (container.isAccessible()) {

-							members = container.members();

-						}

-					}

-					if (members != null) {

-						for (IResource r : members) {

-							if (r instanceof IFile) {

-								if (OneFileUtils.isDi(r)) {

-									IPapyrusFile createIPapyrusFile = PapyrusModelHelper.getPapyrusModelFactory().createIPapyrusFile((IFile) r);

-									result.add(createIPapyrusFile);

-								}

-							}

-						}

-					}

-				}

-			}

-		} catch (CoreException e) {

-			Activator.log.error(e);

-		}

-		return result.isEmpty() ? null : result.toArray();

-	}

-

-	@Override

-	public Object[] getChildren(Object inputElement) {

-		return getElements(inputElement);

-	}

-

-	@Override

-	public Object getParent(Object element) {

-		if (element instanceof IPapyrusFile) {

-			IPapyrusFile papyFile = (IPapyrusFile) element;

-			return papyFile.getParent();

-		}

-		return null;

-	}

-

-	@Override

-	public boolean hasChildren(Object element) {

-		return OneFileUtils.hasChildren(element);

-	}

-

-	@Override

-	protected void processDelta(IResourceDelta delta) {

-		super.processDelta(delta);

-		if (!isFiltered()) {

-			return;

-		}

-		Control ctrl = common.getControl();

-		if (ctrl == null || ctrl.isDisposed()) {

-			return;

-		}

-

-

-		final Collection<Runnable> runnables = new ArrayList<Runnable>();

-		processPapyrusDelta(delta, runnables);

-

-		if (runnables.isEmpty()) {

-			return;

-		}

-

-		// Are we in the UIThread? If so spin it until we are done

-		ctrl.getDisplay().asyncExec(new Runnable() {

-

-			/*

-			 * (non-Javadoc)

-			 *

-			 * @see java.lang.Runnable#run()

-			 */

-			public void run() {

-				// Abort if this happens after disposes

-				Control ctrl = common.getControl();

-				if (ctrl == null || ctrl.isDisposed()) {

-					return;

-				}

-				runUpdates(runnables);

-			}

-		});

-

-	}

-

-	private void runUpdates(Collection<?> runnables) {

-		Iterator<?> runnableIterator = runnables.iterator();

-		while (runnableIterator.hasNext()) {

-			((Runnable) runnableIterator.next()).run();

-		}

-

-	}

-

-	protected void processPapyrusDelta(IResourceDelta delta, Collection<Runnable> runnables) {

-		IResourceDelta[] affectedChildren = delta.getAffectedChildren(IResourceDelta.CHANGED);

-

-		// Handle changed children .

-		for (int i = 0; i < affectedChildren.length; i++) {

-			processPapyrusDelta(affectedChildren[i], runnables);

-		}

-

-		IResourceDelta[] addedChildren = delta.getAffectedChildren(IResourceDelta.ADDED);

-

-		IResourceDelta[] removedChildren = delta.getAffectedChildren(IResourceDelta.REMOVED);

-

-		final Object[] addedObjects;

-

-		final Object[] removedObjects;

-

-		// Process additions before removals as to not cause selection

-		// preservation prior to new objects being added

-		// Handle added children. Issue one update for all insertions.

-		if (addedChildren.length > 0) {

-			addedObjects = new Object[addedChildren.length];

-			for (int i = 0; i < addedChildren.length; i++) {

-				addedObjects[i] = addedChildren[i].getResource();

-			}

-		} else {

-			addedObjects = new Object[0];

-		}

-

-		removedObjects = new Object[removedChildren.length];

-		int i = 0;

-		for (IResourceDelta removeDelta : removedChildren) {

-			removedObjects[i++] = removeDelta.getResource();

-		}

-

-		// Handle removed children. Issue one update for all removals.

-		// heuristic test for items moving within same folder (i.e. renames)

-		Runnable addAndRemove = new Runnable() {

-

-			public void run() {

-				if (common instanceof AbstractTreeViewer && common.getControl() != null && !common.getControl().isDisposed()) {

-					// Disable redraw until the operation is finished so we don't

-					// get a flash of both the new and old item (in the case of

-					// rename)

-					// Only do this if we're both adding and removing files (the

-					// rename case)

-

-					// need to handle resource addition

-					if (addedObjects.length > 0) {

-						Set<Object> toRefresh = new HashSet<Object>();

-						Set<IPapyrusFile> toAdd = new HashSet<IPapyrusFile>(addedObjects.length);

-						for (Object r : addedObjects) {

-							if (r instanceof IResource) {

-								IResource current = (IResource) r;

-								if (OneFileUtils.diExists(current.getName(), current.getParent())) {

-									IPapyrusFile oneFile = PapyrusModelHelper.getPapyrusModelFactory().createIPapyrusFile(OneFileUtils.getDi(current.getName(), current.getParent()));

-									toRefresh.add(oneFile);

-									toRefresh.add(oneFile.getParent());

-								}

-

-								if (OneFileUtils.isDi(current)) {

-									toAdd.add(PapyrusModelHelper.getPapyrusModelFactory().createIPapyrusFile((IFile) current));

-								}

-							}

-						}

-

-						for (IPapyrusFile o : toAdd) {

-							common.add(o.getParent(), o);

-						}

-

-						for (Object o : toRefresh) {

-							common.refresh(o);

-						}

-					}

-

-					if (removedObjects.length > 0) {

-

-						Set<Object> toRefresh = new HashSet<Object>();

-						Set<Object> toRemove = new HashSet<Object>();

-

-						for (Object r : removedObjects) {

-							if (r instanceof IResource) {

-								IResource current = (IResource) r;

-								if (OneFileUtils.isDi(current)) {

-									toRemove.add(PapyrusModelHelper.getPapyrusModelFactory().createIPapyrusFile((IFile) current));

-									toRefresh.add(current.getParent());

-								} else if (OneFileUtils.diExists(current.getName(), current.getParent())) {

-									IPapyrusFile oneFile = PapyrusModelHelper.getPapyrusModelFactory().createIPapyrusFile(OneFileUtils.getDi(current.getName(), current.getParent()));

-									toRefresh.add(oneFile);

-									toRemove.add(PapyrusModelHelper.getPapyrusModelFactory().createISubResourceFile(oneFile, (IFile) current));

-								}

-							}

-						}

-

-						common.remove(toRemove.toArray());

-

-						for (Object o : toRefresh) {

-							common.refresh(o);

-						}

-					}

-				}

-			}

-		};

-		runnables.add(addAndRemove);

-	}

-

-	// @Override

-	// protected ITreeContentProvider getDelegateContentProvider() {

-	// if(provider == null) {

-	// provider = new WorkbenchContentProvider();

-	// }

-	// return provider;

-	// }

-	//

-	// @Override

-	// protected String getModelProviderId() {

-	// return OneFileModelProvider.MODEL_PROVIDER_ID;

-	// }

-	//

-	// @Override

-	// protected Object getModelRoot() {

-	// return null;

-	// }

-

-	// @Override

-	// protected ResourceTraversal[] getTraversals(ISynchronizationContext context, Object object) {

-	// return null;

-	// }

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Atos Origin Integration - CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile.ui.providers;
+
+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.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.viewers.AbstractTreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.onefile.internal.ui.Activator;
+import org.eclipse.papyrus.infra.onefile.internal.ui.filters.OnlyDiFilter;
+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;
+import org.eclipse.papyrus.infra.onefile.model.PapyrusModelHelper;
+import org.eclipse.papyrus.infra.onefile.utils.OneFileUtils;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.model.WorkbenchContentProvider;
+import org.eclipse.ui.navigator.CommonViewer;
+
+/**
+ * Content provider able to retrieve Papyrus children from an {@link IContainer}
+ *
+ * @author Tristan FAURE
+ *
+ */
+public class PapyrusContentProvider extends WorkbenchContentProvider {
+
+
+	private CommonViewer common;
+
+
+	@Override
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		super.inputChanged(viewer, oldInput, newInput);
+		if (viewer instanceof CommonViewer) {
+			common = (CommonViewer) viewer;
+		}
+	}
+
+	/**
+	 * Determine if the current navigator is filtered or not
+	 *
+	 * @return true if the viewer is filtered
+	 */
+	public boolean isFiltered() {
+		return common != null && common.getNavigatorContentService() != null && common.getNavigatorContentService().getFilterService() != null && common.getNavigatorContentService().getFilterService().isActive(OnlyDiFilter.FILTER_ID);
+	}
+
+	@Override
+	public void dispose() {
+		super.dispose();
+	}
+
+	@Override
+	public Object[] getElements(Object inputElement) {
+		if (inputElement instanceof IWorkspaceRoot) {
+			return null;
+		}
+		List<Object> result = new LinkedList<Object>();
+		try {
+			if (isFiltered()) {
+				if (inputElement instanceof IPapyrusFile) {
+					IPapyrusFile file = (IPapyrusFile) inputElement;
+					for (IResource r : file.getAssociatedResources()) {
+						result.add(PapyrusModelHelper.getPapyrusModelFactory().createISubResourceFile(file, (IFile) r));
+					}
+				} else {
+					IResource[] members = null;
+					if (inputElement instanceof IContainer) {
+						IContainer container = (IContainer) inputElement;
+						if (container.isAccessible()) {
+							members = container.members();
+						}
+					}
+					if (members != null) {
+						for (IResource r : members) {
+							if (r instanceof IFile) {
+								if (OneFileUtils.isDi(r)) {
+									IPapyrusFile createIPapyrusFile = PapyrusModelHelper.getPapyrusModelFactory().createIPapyrusFile((IFile) r);
+									result.add(createIPapyrusFile);
+								}
+							}
+						}
+					}
+				}
+			}
+		} catch (CoreException e) {
+			Activator.log.error(e);
+		}
+		return result.isEmpty() ? null : result.toArray();
+	}
+
+	@Override
+	public Object[] getChildren(Object inputElement) {
+		return getElements(inputElement);
+	}
+
+	@Override
+	public Object getParent(Object element) {
+		if (element instanceof IPapyrusFile) {
+			IPapyrusFile papyFile = (IPapyrusFile) element;
+			return papyFile.getParent();
+		}
+		return null;
+	}
+
+	@Override
+	public boolean hasChildren(Object element) {
+		return OneFileUtils.hasChildren(element);
+	}
+
+	@Override
+	protected void processDelta(IResourceDelta delta) {
+		super.processDelta(delta);
+		if (!isFiltered()) {
+			return;
+		}
+		Control ctrl = common.getControl();
+		if (ctrl == null || ctrl.isDisposed()) {
+			return;
+		}
+
+
+		final Collection<Runnable> runnables = new ArrayList<Runnable>();
+		processPapyrusDelta(delta, runnables);
+
+		if (runnables.isEmpty()) {
+			return;
+		}
+
+		// Are we in the UIThread? If so spin it until we are done
+		ctrl.getDisplay().asyncExec(new Runnable() {
+
+			/*
+			 * (non-Javadoc)
+			 *
+			 * @see java.lang.Runnable#run()
+			 */
+			public void run() {
+				// Abort if this happens after disposes
+				Control ctrl = common.getControl();
+				if (ctrl == null || ctrl.isDisposed()) {
+					return;
+				}
+				runUpdates(runnables);
+			}
+		});
+
+	}
+
+	private void runUpdates(Collection<?> runnables) {
+		Iterator<?> runnableIterator = runnables.iterator();
+		while (runnableIterator.hasNext()) {
+			((Runnable) runnableIterator.next()).run();
+		}
+
+	}
+
+	protected void processPapyrusDelta(IResourceDelta delta, Collection<Runnable> runnables) {
+		IResourceDelta[] affectedChildren = delta.getAffectedChildren(IResourceDelta.CHANGED);
+
+		// Handle changed children .
+		for (int i = 0; i < affectedChildren.length; i++) {
+			processPapyrusDelta(affectedChildren[i], runnables);
+		}
+
+		IResourceDelta[] addedChildren = delta.getAffectedChildren(IResourceDelta.ADDED);
+
+		IResourceDelta[] removedChildren = delta.getAffectedChildren(IResourceDelta.REMOVED);
+
+		final Object[] addedObjects;
+
+		final Object[] removedObjects;
+
+		// Process additions before removals as to not cause selection
+		// preservation prior to new objects being added
+		// Handle added children. Issue one update for all insertions.
+		if (addedChildren.length > 0) {
+			addedObjects = new Object[addedChildren.length];
+			for (int i = 0; i < addedChildren.length; i++) {
+				addedObjects[i] = addedChildren[i].getResource();
+			}
+		} else {
+			addedObjects = new Object[0];
+		}
+
+		removedObjects = new Object[removedChildren.length];
+		int i = 0;
+		for (IResourceDelta removeDelta : removedChildren) {
+			removedObjects[i++] = removeDelta.getResource();
+		}
+
+		// Handle removed children. Issue one update for all removals.
+		// heuristic test for items moving within same folder (i.e. renames)
+		Runnable addAndRemove = new Runnable() {
+
+			public void run() {
+				if (common instanceof AbstractTreeViewer && common.getControl() != null && !common.getControl().isDisposed()) {
+					// Disable redraw until the operation is finished so we don't
+					// get a flash of both the new and old item (in the case of
+					// rename)
+					// Only do this if we're both adding and removing files (the
+					// rename case)
+
+					// need to handle resource addition
+					if (addedObjects.length > 0) {
+						Set<Object> toRefresh = new HashSet<Object>();
+						Set<IPapyrusFile> toAdd = new HashSet<IPapyrusFile>(addedObjects.length);
+						for (Object r : addedObjects) {
+							if (r instanceof IResource) {
+								IResource current = (IResource) r;
+								if (OneFileUtils.diExists(current.getName(), current.getParent())) {
+									IPapyrusFile oneFile = PapyrusModelHelper.getPapyrusModelFactory().createIPapyrusFile(OneFileUtils.getDi(current.getName(), current.getParent()));
+									toRefresh.add(oneFile);
+									toRefresh.add(oneFile.getParent());
+								}
+
+								if (OneFileUtils.isDi(current)) {
+									toAdd.add(PapyrusModelHelper.getPapyrusModelFactory().createIPapyrusFile((IFile) current));
+								}
+							}
+						}
+
+						for (IPapyrusFile o : toAdd) {
+							common.add(o.getParent(), o);
+						}
+
+						for (Object o : toRefresh) {
+							common.refresh(o);
+						}
+					}
+
+					if (removedObjects.length > 0) {
+
+						Set<Object> toRefresh = new HashSet<Object>();
+						Set<Object> toRemove = new HashSet<Object>();
+
+						for (Object r : removedObjects) {
+							if (r instanceof IResource) {
+								IResource current = (IResource) r;
+								if (OneFileUtils.isDi(current)) {
+									toRemove.add(PapyrusModelHelper.getPapyrusModelFactory().createIPapyrusFile((IFile) current));
+									toRefresh.add(current.getParent());
+								} else if (OneFileUtils.diExists(current.getName(), current.getParent())) {
+									IPapyrusFile oneFile = PapyrusModelHelper.getPapyrusModelFactory().createIPapyrusFile(OneFileUtils.getDi(current.getName(), current.getParent()));
+									toRefresh.add(oneFile);
+									toRemove.add(PapyrusModelHelper.getPapyrusModelFactory().createISubResourceFile(oneFile, (IFile) current));
+								}
+							}
+						}
+
+						common.remove(toRemove.toArray());
+
+						for (Object o : toRefresh) {
+							common.refresh(o);
+						}
+					}
+				}
+			}
+		};
+		runnables.add(addAndRemove);
+	}
+
+	// @Override
+	// protected ITreeContentProvider getDelegateContentProvider() {
+	// if(provider == null) {
+	// provider = new WorkbenchContentProvider();
+	// }
+	// return provider;
+	// }
+	//
+	// @Override
+	// protected String getModelProviderId() {
+	// return OneFileModelProvider.MODEL_PROVIDER_ID;
+	// }
+	//
+	// @Override
+	// protected Object getModelRoot() {
+	// return null;
+	// }
+
+	// @Override
+	// protected ResourceTraversal[] getTraversals(ISynchronizationContext context, Object object) {
+	// return null;
+	// }
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/ui/providers/PapyrusLabelProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/ui/providers/PapyrusLabelProvider.java
index 3b017e62d75..acb1cf0ce5a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/ui/providers/PapyrusLabelProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/ui/providers/PapyrusLabelProvider.java
@@ -1,84 +1,84 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2016 Atos Origin Integration, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile.ui.providers;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.resource.ImageRegistry;

-import org.eclipse.jface.resource.JFaceResources;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ILabelProviderListener;

-import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

-import org.eclipse.papyrus.infra.onefile.model.ISubResourceFile;

-import org.eclipse.papyrus.infra.ui.util.PapyrusImageUtils;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * Label Provider for Papyrus Model Elements

- *

- * @author tristan.faure@atosorigin.com

- *

- */

-public class PapyrusLabelProvider implements ILabelProvider {

-

-	private ImageRegistry images = new ImageRegistry(JFaceResources.getResources());

-

-	public void addListener(ILabelProviderListener listener) {

-	}

-

-	public void dispose() {

-		images.dispose();

-	}

-

-	public boolean isLabelProperty(Object element, String property) {

-		return true;

-	}

-

-	public void removeListener(ILabelProviderListener listener) {

-	}

-

-	public Image getImage(Object element) {

-		if (element instanceof IPapyrusFile) {

-			return PapyrusImageUtils.getDefaultIcon();

-		}

-		if (element instanceof ISubResourceFile) {

-			IFile file = ((ISubResourceFile) element).getFile();

-			String ext = file.getFileExtension();

-			Image image = images.get(ext);

-			if (image == null) {

-				ImageDescriptor desc = PlatformUI.getWorkbench().getEditorRegistry().getImageDescriptor(file.getName());

-				images.put(ext, desc);

-			}

-			return images.get(ext);

-		}

-		return null;

-	}

-

-	public String getText(Object element) {

-		if (element instanceof IPapyrusFile) {

-			IPapyrusFile papyFile = (IPapyrusFile) element;

-			return papyFile.getText();

-		}

-		if (element instanceof ISubResourceFile) {

-			return ((ISubResourceFile) element).getText();

-		}

-		if (element instanceof IResource) {

-			return ((IResource) element).getName();

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 Atos Origin Integration, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile.ui.providers;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;
+import org.eclipse.papyrus.infra.onefile.model.ISubResourceFile;
+import org.eclipse.papyrus.infra.ui.util.PapyrusImageUtils;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * Label Provider for Papyrus Model Elements
+ *
+ * @author tristan.faure@atosorigin.com
+ *
+ */
+public class PapyrusLabelProvider implements ILabelProvider {
+
+	private ImageRegistry images = new ImageRegistry(JFaceResources.getResources());
+
+	public void addListener(ILabelProviderListener listener) {
+	}
+
+	public void dispose() {
+		images.dispose();
+	}
+
+	public boolean isLabelProperty(Object element, String property) {
+		return true;
+	}
+
+	public void removeListener(ILabelProviderListener listener) {
+	}
+
+	public Image getImage(Object element) {
+		if (element instanceof IPapyrusFile) {
+			return PapyrusImageUtils.getDefaultIcon();
+		}
+		if (element instanceof ISubResourceFile) {
+			IFile file = ((ISubResourceFile) element).getFile();
+			String ext = file.getFileExtension();
+			Image image = images.get(ext);
+			if (image == null) {
+				ImageDescriptor desc = PlatformUI.getWorkbench().getEditorRegistry().getImageDescriptor(file.getName());
+				images.put(ext, desc);
+			}
+			return images.get(ext);
+		}
+		return null;
+	}
+
+	public String getText(Object element) {
+		if (element instanceof IPapyrusFile) {
+			IPapyrusFile papyFile = (IPapyrusFile) element;
+			return papyFile.getText();
+		}
+		if (element instanceof ISubResourceFile) {
+			return ((ISubResourceFile) element).getText();
+		}
+		if (element instanceof IResource) {
+			return ((IResource) element).getName();
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/ui/providers/PapyrusViewerSorter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/ui/providers/PapyrusViewerSorter.java
index 564447e5e25..05fff62f22a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/ui/providers/PapyrusViewerSorter.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/ui/providers/PapyrusViewerSorter.java
@@ -1,54 +1,54 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin Integration.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.onefile.ui.providers;

-

-import java.text.Collator;

-

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.jface.viewers.ViewerSorter;

-import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

-import org.eclipse.ui.views.navigator.ResourceComparator;

-

-/**

- * Sort Papyrus Files according to their Main File

- *

- * @author tristan.faure@atosorigin.com

- */

-public class PapyrusViewerSorter extends ViewerSorter {

-

-	/**

-	 * {@link ResourceComparator} for comparison delegation

-	 */

-	ResourceComparator comp = new ResourceComparator(ResourceComparator.TYPE);

-

-	public PapyrusViewerSorter() {

-		super();

-	}

-

-	public PapyrusViewerSorter(Collator collator) {

-		super(collator);

-	}

-

-	@Override

-	public int compare(Viewer viewer, Object e1, Object e2) {

-		if (e1 instanceof IPapyrusFile) {

-			IPapyrusFile papyrusFile = (IPapyrusFile) e1;

-			e1 = papyrusFile.getMainFile();

-		}

-		if (e2 instanceof IPapyrusFile) {

-			IPapyrusFile papyrusFile = (IPapyrusFile) e2;

-			e2 = papyrusFile.getMainFile();

-		}

-		return comp.compare(viewer, e1, e2);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Atos Origin Integration.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.onefile.ui.providers;
+
+import java.text.Collator;
+
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;
+import org.eclipse.ui.views.navigator.ResourceComparator;
+
+/**
+ * Sort Papyrus Files according to their Main File
+ *
+ * @author tristan.faure@atosorigin.com
+ */
+public class PapyrusViewerSorter extends ViewerSorter {
+
+	/**
+	 * {@link ResourceComparator} for comparison delegation
+	 */
+	ResourceComparator comp = new ResourceComparator(ResourceComparator.TYPE);
+
+	public PapyrusViewerSorter() {
+		super();
+	}
+
+	public PapyrusViewerSorter(Collator collator) {
+		super(collator);
+	}
+
+	@Override
+	public int compare(Viewer viewer, Object e1, Object e2) {
+		if (e1 instanceof IPapyrusFile) {
+			IPapyrusFile papyrusFile = (IPapyrusFile) e1;
+			e1 = papyrusFile.getMainFile();
+		}
+		if (e2 instanceof IPapyrusFile) {
+			IPapyrusFile papyrusFile = (IPapyrusFile) e2;
+			e2 = papyrusFile.getMainFile();
+		}
+		return comp.compare(viewer, e1, e2);
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/ui/utils/OneFileUIUtils.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/ui/utils/OneFileUIUtils.java
index b231fb1ae58..b231fb1ae58 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/ui/utils/OneFileUIUtils.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/ui/utils/OneFileUIUtils.java
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.classpath b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.classpath
new file mode 100644
index 00000000000..64c5e31b7a2
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.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.ui.resources/.project b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.project
index 05ae6afc904..1233f09c6e8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/.project
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.ui.resources</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>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.ui.resources</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/org.eclipse.papyrus.infra.onefile/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..c585cc455ae 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-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

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+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
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/org.eclipse.papyrus.infra.psf/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.psf/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF
index 28133fde488..e4d2acb77b8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",

- org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="1.2.0",

- org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

- com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.ui.resources.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.resources;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
+ org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="1.2.0",
+ org.eclipse.emf.transaction;bundle-version="1.4.0",
+ org.eclipse.ui.ide;bundle-version="3.8.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.ui.resources.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.resources;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/about.html b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/about.html
new file mode 100644
index 00000000000..dd3c089a94c
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/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/infra/org.eclipse.papyrus.infra.ui.resources/build.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/build.properties
index 2c10fc54dc5..ad003b17745 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/build.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/build.properties
@@ -1,11 +1,11 @@
-#

-#Mon Sep 12 09:30:21 CEST 2011

-bin.includes = META-INF/,\

-               .,\

-               plugin.properties,\

-               plugin.xml,\

-               about.html

-output..=bin/

-src.includes = about.html

-source..=src/

-bin..=bin/

+#
+#Mon Sep 12 09:30:21 CEST 2011
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               plugin.xml,\
+               about.html
+output..=bin/
+src.includes = about.html
+source..=src/
+bin..=bin/
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/plugin.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/plugin.properties
index 2d8b78dabea..86c901d6502 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/plugin.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/plugin.properties
@@ -1,15 +1,15 @@
-#################################################################################

-# Copyright (c) 2011 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:

-#     Arthur Daussy  arthur.daussy@atosorigin.com - Initial API and implementation

-##################################################################################

-pluginName=Papyrus plugin for refactoring resources

-providerName=Eclipse Modeling Project

-renameParticipant.name = Papyrus Model Renaming

-deleteParticipant.name = Papyrus Model deleting

+#################################################################################
+# Copyright (c) 2011 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:
+#     Arthur Daussy  arthur.daussy@atosorigin.com - Initial API and implementation
+##################################################################################
+pluginName=Papyrus plugin for refactoring resources
+providerName=Eclipse Modeling Project
+renameParticipant.name = Papyrus Model Renaming
+deleteParticipant.name = Papyrus Model deleting
 moveParticipant.name = Papyrus Model Moving
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/plugin.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/plugin.xml
index 8816cf184f3..a35209c09a5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/plugin.xml
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/plugin.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.ltk.core.refactoring.renameParticipants">

-      <renameParticipant

-            class="org.eclipse.papyrus.infra.ui.resources.refactoring.RenameModelParticipant"

-            id="org.eclipse.papyrus.ui.resources.renameParticipant"

-            name="%renameParticipant.name">

-         <enablement>

-            <with

-                  variable="element">

-               <instanceof

-                     value="org.eclipse.core.resources.IFile">

-               </instanceof>

-            </with>

-         </enablement>

-      </renameParticipant>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.ltk.core.refactoring.renameParticipants">
+      <renameParticipant
+            class="org.eclipse.papyrus.infra.ui.resources.refactoring.RenameModelParticipant"
+            id="org.eclipse.papyrus.ui.resources.renameParticipant"
+            name="%renameParticipant.name">
+         <enablement>
+            <with
+                  variable="element">
+               <instanceof
+                     value="org.eclipse.core.resources.IFile">
+               </instanceof>
+            </with>
+         </enablement>
+      </renameParticipant>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/pom.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/pom.xml
index 341dca0b6b0..a42585307dd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/pom.xml
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-ui</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.ui.resources</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/Activator.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/Activator.java
index 5fe13412362..d6aee281d63 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/Activator.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/Activator.java
@@ -1,72 +1,72 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.resources;

-

-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.infra.ui.resources"; //$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)

-	 */

-	@Override

-	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)

-	 */

-	@Override

-	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;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Atos Origin - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.resources;
+
+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.infra.ui.resources"; //$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)
+	 */
+	@Override
+	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)
+	 */
+	@Override
+	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.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/DirtyEditorChange.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/DirtyEditorChange.java
index 210e6cca717..6d47696bbfa 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/DirtyEditorChange.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/DirtyEditorChange.java
@@ -1,146 +1,146 @@
-/*****************************************************************************

- * Copyright (c) 2009 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a> - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.resources.refactoring;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.OperationCanceledException;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.ltk.core.refactoring.Change;

-import org.eclipse.ltk.core.refactoring.RefactoringStatus;

-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

-import org.eclipse.papyrus.infra.ui.util.EditorUtils;

-import org.eclipse.swt.widgets.Display;

-

-

-/**

- * A change that checks if an editor is actually editing the model and if it must be save.

- *

- * @author tszadel

- *

- */

-public class DirtyEditorChange extends Change {

-

-	private final IFile oldFile;

-

-	private final IFile newFile;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param resourceSet

-	 *            The resource set being changed.

-	 * @param oldFile

-	 *            The old file.

-	 * @param newFile

-	 *            The new file.

-	 */

-	public DirtyEditorChange(IFile oldFile, IFile newFile) {

-		this.oldFile = oldFile;

-		this.newFile = newFile;

-	}

-

-	/**

-	 * @see org.eclipse.ltk.core.refactoring.Change#getModifiedElement()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public Object getModifiedElement() {

-		return oldFile;

-	}

-

-	/**

-	 * @see org.eclipse.ltk.core.refactoring.Change#getName()

-	 *

-	 * @return

-	 */

-

-	@Override

-	public String getName() {

-		return Messages.DirtyEditorChange_0;

-	}

-

-	/**

-	 * @see org.eclipse.ltk.core.refactoring.Change#initializeValidationData(org.eclipse.core.runtime.IProgressMonitor)

-	 *

-	 * @param pm

-	 */

-

-	@Override

-	public void initializeValidationData(IProgressMonitor pm) {

-		// Nothing

-	}

-

-

-	private boolean hasDirtyEditors() {

-		IMultiDiagramEditor[] list = EditorUtils.getRelatedEditors(oldFile);

-		if (list != null && list.length > 0) {

-			for (IMultiDiagramEditor editor : list) {

-				if (editor.isDirty()) {

-					return true;

-				}

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.ltk.core.refactoring.Change#isValid(org.eclipse.core.runtime.IProgressMonitor)

-	 *

-	 * @param pm

-	 *            The progress monitor.

-	 * @return The status.

-	 * @throws CoreException

-	 *             Error.

-	 * @throws OperationCanceledException

-	 *             Operation canceled.

-	 */

-

-	@Override

-	public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException, OperationCanceledException {

-		final RefactoringStatus status = new RefactoringStatus();

-		// We need to get the current workbench... so we have to use the UI-Thread!

-		Display.getDefault().syncExec(new Runnable() {

-

-			public void run() {

-				if (hasDirtyEditors()) {

-					if (!MessageDialog.openConfirm(Display.getDefault().getActiveShell(), Messages.DirtyEditorChange_1, Messages.DirtyEditorChange_2)) {

-						status.addFatalError(Messages.DirtyEditorChange_3);

-					}

-				}

-			}

-		});

-

-		return status;

-	}

-

-	/**

-	 * @see org.eclipse.ltk.core.refactoring.Change#perform(org.eclipse.core.runtime.IProgressMonitor)

-	 *

-	 * @param pm

-	 *            The progress monitor.

-	 * @return The change used to undo.

-	 * @throws CoreException

-	 *             Error.

-	 */

-

-	@Override

-	public Change perform(IProgressMonitor pm) throws CoreException {

-		// Nothing to do

-		return new DirtyEditorChange(newFile, oldFile);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a> - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.resources.refactoring;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.ltk.core.refactoring.Change;
+import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.ui.util.EditorUtils;
+import org.eclipse.swt.widgets.Display;
+
+
+/**
+ * A change that checks if an editor is actually editing the model and if it must be save.
+ *
+ * @author tszadel
+ *
+ */
+public class DirtyEditorChange extends Change {
+
+	private final IFile oldFile;
+
+	private final IFile newFile;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param resourceSet
+	 *            The resource set being changed.
+	 * @param oldFile
+	 *            The old file.
+	 * @param newFile
+	 *            The new file.
+	 */
+	public DirtyEditorChange(IFile oldFile, IFile newFile) {
+		this.oldFile = oldFile;
+		this.newFile = newFile;
+	}
+
+	/**
+	 * @see org.eclipse.ltk.core.refactoring.Change#getModifiedElement()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public Object getModifiedElement() {
+		return oldFile;
+	}
+
+	/**
+	 * @see org.eclipse.ltk.core.refactoring.Change#getName()
+	 *
+	 * @return
+	 */
+
+	@Override
+	public String getName() {
+		return Messages.DirtyEditorChange_0;
+	}
+
+	/**
+	 * @see org.eclipse.ltk.core.refactoring.Change#initializeValidationData(org.eclipse.core.runtime.IProgressMonitor)
+	 *
+	 * @param pm
+	 */
+
+	@Override
+	public void initializeValidationData(IProgressMonitor pm) {
+		// Nothing
+	}
+
+
+	private boolean hasDirtyEditors() {
+		IMultiDiagramEditor[] list = EditorUtils.getRelatedEditors(oldFile);
+		if (list != null && list.length > 0) {
+			for (IMultiDiagramEditor editor : list) {
+				if (editor.isDirty()) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.ltk.core.refactoring.Change#isValid(org.eclipse.core.runtime.IProgressMonitor)
+	 *
+	 * @param pm
+	 *            The progress monitor.
+	 * @return The status.
+	 * @throws CoreException
+	 *             Error.
+	 * @throws OperationCanceledException
+	 *             Operation canceled.
+	 */
+
+	@Override
+	public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException, OperationCanceledException {
+		final RefactoringStatus status = new RefactoringStatus();
+		// We need to get the current workbench... so we have to use the UI-Thread!
+		Display.getDefault().syncExec(new Runnable() {
+
+			public void run() {
+				if (hasDirtyEditors()) {
+					if (!MessageDialog.openConfirm(Display.getDefault().getActiveShell(), Messages.DirtyEditorChange_1, Messages.DirtyEditorChange_2)) {
+						status.addFatalError(Messages.DirtyEditorChange_3);
+					}
+				}
+			}
+		});
+
+		return status;
+	}
+
+	/**
+	 * @see org.eclipse.ltk.core.refactoring.Change#perform(org.eclipse.core.runtime.IProgressMonitor)
+	 *
+	 * @param pm
+	 *            The progress monitor.
+	 * @return The change used to undo.
+	 * @throws CoreException
+	 *             Error.
+	 */
+
+	@Override
+	public Change perform(IProgressMonitor pm) throws CoreException {
+		// Nothing to do
+		return new DirtyEditorChange(newFile, oldFile);
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/Messages.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/Messages.java
index 54817287408..05dfba882d1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/Messages.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/Messages.java
@@ -1,66 +1,66 @@
-/*****************************************************************************

- * Copyright (c) 2011 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:

- *  Arthur Daussy - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.resources.refactoring;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.ui.resources.refactoring.messages"; //$NON-NLS-1$

-

-	public static String DirtyEditorChange_0;

-

-	public static String DirtyEditorChange_1;

-

-	public static String DirtyEditorChange_2;

-

-	public static String DirtyEditorChange_3;

-

-	public static String MoveModelParticipant_Name;

-

-	public static String RenameModelChange_0;

-

-	public static String RenameModelChange_5;

-

-	public static String RenameModelChange_6;

-

-	public static String RenameModelChange_7;

-

-	public static String RenameModelChange_8;

-

-	public static String RenameModelChange_Change;

-

-	public static String RenameModelChange_DaveDirtyEditor;

-

-	public static String RenameModelChange_ErrorLoading;

-

-	public static String RenameModelChange_LoadingEMF;

-

-	public static String RenameModelChange_ModifyURI;

-

-	public static String RenameModelChange_Name;

-

-	public static String RenameModelChange_RemoveOldFile;

-

-	public static String RenameModelChange_savingResource;

-

-	public static String RenameModelChange_Unloading;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 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:
+ *  Arthur Daussy - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.resources.refactoring;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.ui.resources.refactoring.messages"; //$NON-NLS-1$
+
+	public static String DirtyEditorChange_0;
+
+	public static String DirtyEditorChange_1;
+
+	public static String DirtyEditorChange_2;
+
+	public static String DirtyEditorChange_3;
+
+	public static String MoveModelParticipant_Name;
+
+	public static String RenameModelChange_0;
+
+	public static String RenameModelChange_5;
+
+	public static String RenameModelChange_6;
+
+	public static String RenameModelChange_7;
+
+	public static String RenameModelChange_8;
+
+	public static String RenameModelChange_Change;
+
+	public static String RenameModelChange_DaveDirtyEditor;
+
+	public static String RenameModelChange_ErrorLoading;
+
+	public static String RenameModelChange_LoadingEMF;
+
+	public static String RenameModelChange_ModifyURI;
+
+	public static String RenameModelChange_Name;
+
+	public static String RenameModelChange_RemoveOldFile;
+
+	public static String RenameModelChange_savingResource;
+
+	public static String RenameModelChange_Unloading;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ModelParticipantHelpers.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ModelParticipantHelpers.java
index 9a8643201c9..865a40d590f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ModelParticipantHelpers.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ModelParticipantHelpers.java
@@ -1,126 +1,126 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 Atos Origin, CEA, and others.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a> - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 436377

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.resources.refactoring;

-

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.OperationCanceledException;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;

-import org.eclipse.papyrus.infra.ui.resources.refactoring.ui.RenameParticipantsDialog;

-import org.eclipse.swt.widgets.Display;

-

-public class ModelParticipantHelpers {

-

-	/**

-	 * get the files related the initialFile which need to be modified/deleted

-	 * if initialFile is modified/deleted

-	 *

-	 * @param initialFile

-	 * @return a list of related files. Does not include initialFile.

-	 *

-	 * @throws OperationCanceledException

-	 *             if user interaction is required to determine the resources to fix and the user elects to cancel that analysis

-	 */

-	public static Set<IResource> getResourceToFix(final IFile initialFile) throws OperationCanceledException {

-

-		RenameDialogRunnable runnable = new RenameDialogRunnable(initialFile);

-		Display.getDefault().syncExec(runnable);

-

-		if (runnable.wasCancelled()) {

-			throw new OperationCanceledException();

-		}

-

-		return new HashSet<IResource>(runnable.getFiles());

-	}

-

-	/**

-	 * get the files related the initialFile which need to be modified/deleted

-	 * if initialFile is modified/deleted

-	 *

-	 * @param initialFile

-	 * @return a list of related files. Does not include initialFile.

-	 */

-	public static Set<IResource> getRelatedFiles(final IFile initialFile) {

-

-

-		IContainer parent = initialFile.getParent();

-		IPath initialPath = initialFile.getFullPath();

-

-		IPath diPath = null;

-

-		if (DiModel.DI_FILE_EXTENSION.equalsIgnoreCase(initialPath.getFileExtension())) {

-			diPath = initialPath;

-		} else {

-			return Collections.<IResource> singleton(initialFile);

-		}

-

-		Set<IResource> relatedFiles = new HashSet<IResource>();

-		if (diPath != null) {

-			IFile diFile = parent.getFile(diPath.makeRelativeTo(parent.getFullPath()));

-			if (diFile.exists()) {

-				try {

-					for (IResource r : diFile.getParent().members()) {

-						if (r.getFullPath().removeFileExtension().lastSegment().equals(diFile.getFullPath().removeFileExtension().lastSegment())) {

-							relatedFiles.add(r);

-						}

-					}

-				} catch (CoreException e) {

-				}

-			}

-		}

-

-		// If the initialFile is contained in the list, we remove it

-		if (relatedFiles.contains(initialFile)) {

-			relatedFiles.remove(initialFile);

-		}

-

-

-

-		return relatedFiles;

-	}

-

-	public static class RenameDialogRunnable implements Runnable {

-

-		private IFile initialFile;

-

-		private RenameParticipantsDialog renameParticipantsDialog;

-

-		public RenameDialogRunnable(IFile file) {

-			initialFile = file;

-		}

-

-		public void run() {

-			renameParticipantsDialog = new RenameParticipantsDialog(Display.getDefault().getActiveShell(), initialFile);

-			renameParticipantsDialog.open();

-		}

-

-		public Collection<? extends IResource> getFiles() {

-			return renameParticipantsDialog.getFiles();

-		}

-

-		public boolean wasCancelled() {

-			return renameParticipantsDialog.getReturnCode() != Window.OK;

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 Atos Origin, CEA, and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a> - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 436377
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.resources.refactoring;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
+import org.eclipse.papyrus.infra.ui.resources.refactoring.ui.RenameParticipantsDialog;
+import org.eclipse.swt.widgets.Display;
+
+public class ModelParticipantHelpers {
+
+	/**
+	 * get the files related the initialFile which need to be modified/deleted
+	 * if initialFile is modified/deleted
+	 *
+	 * @param initialFile
+	 * @return a list of related files. Does not include initialFile.
+	 *
+	 * @throws OperationCanceledException
+	 *             if user interaction is required to determine the resources to fix and the user elects to cancel that analysis
+	 */
+	public static Set<IResource> getResourceToFix(final IFile initialFile) throws OperationCanceledException {
+
+		RenameDialogRunnable runnable = new RenameDialogRunnable(initialFile);
+		Display.getDefault().syncExec(runnable);
+
+		if (runnable.wasCancelled()) {
+			throw new OperationCanceledException();
+		}
+
+		return new HashSet<IResource>(runnable.getFiles());
+	}
+
+	/**
+	 * get the files related the initialFile which need to be modified/deleted
+	 * if initialFile is modified/deleted
+	 *
+	 * @param initialFile
+	 * @return a list of related files. Does not include initialFile.
+	 */
+	public static Set<IResource> getRelatedFiles(final IFile initialFile) {
+
+
+		IContainer parent = initialFile.getParent();
+		IPath initialPath = initialFile.getFullPath();
+
+		IPath diPath = null;
+
+		if (DiModel.DI_FILE_EXTENSION.equalsIgnoreCase(initialPath.getFileExtension())) {
+			diPath = initialPath;
+		} else {
+			return Collections.<IResource> singleton(initialFile);
+		}
+
+		Set<IResource> relatedFiles = new HashSet<IResource>();
+		if (diPath != null) {
+			IFile diFile = parent.getFile(diPath.makeRelativeTo(parent.getFullPath()));
+			if (diFile.exists()) {
+				try {
+					for (IResource r : diFile.getParent().members()) {
+						if (r.getFullPath().removeFileExtension().lastSegment().equals(diFile.getFullPath().removeFileExtension().lastSegment())) {
+							relatedFiles.add(r);
+						}
+					}
+				} catch (CoreException e) {
+				}
+			}
+		}
+
+		// If the initialFile is contained in the list, we remove it
+		if (relatedFiles.contains(initialFile)) {
+			relatedFiles.remove(initialFile);
+		}
+
+
+
+		return relatedFiles;
+	}
+
+	public static class RenameDialogRunnable implements Runnable {
+
+		private IFile initialFile;
+
+		private RenameParticipantsDialog renameParticipantsDialog;
+
+		public RenameDialogRunnable(IFile file) {
+			initialFile = file;
+		}
+
+		public void run() {
+			renameParticipantsDialog = new RenameParticipantsDialog(Display.getDefault().getActiveShell(), initialFile);
+			renameParticipantsDialog.open();
+		}
+
+		public Collection<? extends IResource> getFiles() {
+			return renameParticipantsDialog.getFiles();
+		}
+
+		public boolean wasCancelled() {
+			return renameParticipantsDialog.getReturnCode() != Window.OK;
+		}
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/RenameModelChange.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/RenameModelChange.java
index 423ca667e16..423ca667e16 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/RenameModelChange.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/RenameModelChange.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/RenameModelParticipant.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/RenameModelParticipant.java
index be8aecea95b..558b1b41db2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/RenameModelParticipant.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/RenameModelParticipant.java
@@ -1,272 +1,272 @@
-/*****************************************************************************

- * Copyright (c) 2009, 2014 Atos Origin, 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:

- *  <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a> - Initial API and implementation

- *	Camille Letavernier (CEA LIST) camille.letavernier@cea.fr

- *  Christian W. Damus (CEA) - bug 436377

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.resources.refactoring;

-

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IResource;

-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.core.runtime.OperationCanceledException;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.ltk.core.refactoring.Change;

-import org.eclipse.ltk.core.refactoring.RefactoringStatus;

-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;

-import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;

-import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Shell;

-

-/**

- * Participant that is aware of the renaming of a model.

- *

- * @author <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a>

- *

- */

-public class RenameModelParticipant extends RenameParticipant {

-

-	private IFile fileToRename;

-

-	private IFile newFile;

-

-	private Collection<? extends IResource> impacted;

-

-	private boolean cancelled;

-

-	/**

-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#createPreChange(org.eclipse.core.runtime.IProgressMonitor)

-	 *

-	 * @param pm

-	 *            The progress monitor.

-	 * @return The change.

-	 * @throws CoreException

-	 * @throws OperationCanceledException

-	 */

-

-	@Override

-	public Change createPreChange(IProgressMonitor pm) throws CoreException, OperationCanceledException {

-		return new DirtyEditorChange(fileToRename, newFile);

-	}

-

-	/**

-	 * Overrides checkConditions.

-	 *

-	 * {@inheritDoc}

-	 *

-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#checkConditions(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext)

-	 */

-	@Override

-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) throws OperationCanceledException {

-		if (cancelled) {

-			throw new OperationCanceledException();

-		}

-

-		if (isDiFile(fileToRename) && DiModel.DI_FILE_EXTENSION.equals(newFile.getFileExtension())) {

-			Collection<IResource> conflictingFiles = findConflictingFiles();

-			if (!conflictingFiles.isEmpty()) {

-				// Conflicts have been detected. Warn the user.

-

-				final String[] fileNames = new String[conflictingFiles.size()];

-

-				int i = 0;

-				for (IResource resource : conflictingFiles) {

-					fileNames[i++] = resource.getName();

-				}

-

-				String defaultMessage;

-

-				if (fileNames.length == 1) {

-					defaultMessage = "The file " + fileNames[0] + " already exists. Delete it or choose another name";

-				} else {

-					defaultMessage = "Some files alreay exist. Delete them or choose another name. Files: " + Arrays.deepToString(fileNames);

-				}

-

-				Display display = Display.getDefault();

-				if (display != null) {

-

-					RunnableWithResult<Boolean> runnable;

-					Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<Boolean>() {

-

-						public void run() {

-							setResult(false);

-							final Shell shell = Display.getDefault().getActiveShell();

-							if (shell != null) {

-								String title, message;

-

-								if (fileNames.length == 1) {

-									title = "The file " + fileNames[0] + " already exists.";

-									message = "The file " + fileNames[0] + " already exists. Do you want to delete it? (Warning: This operation cannot be undone)";

-								} else {

-									title = "Some files already exist";

-									message = "The files " + Arrays.deepToString(fileNames) + " alreay exist. Do you want to delete them? (Warning: This operation cannot be undone)";

-								}

-

-								boolean result = MessageDialog.openQuestion(shell, title, message);

-								setResult(result);

-								setStatus(Status.OK_STATUS);

-							}

-						}

-

-					});

-

-					if (runnable.getResult()) {

-						try {

-							for (IResource resource : conflictingFiles) {

-								resource.delete(true, new NullProgressMonitor());

-								impacted.remove(resource);

-							}

-						} catch (CoreException ex) {

-							// FIXME: Inconsistent state. Use a DeleteResourceChange to allow valid Undo/Redo

-							// Use preChange?

-							return RefactoringStatus.createFatalErrorStatus(ex.getMessage());

-						}

-					} else {

-						pm.setCanceled(true); // Cancel the refactoring

-						return new RefactoringStatus();

-					}

-				} else {

-					return RefactoringStatus.createFatalErrorStatus(defaultMessage);

-				}

-			}

-		}

-

-		return new RefactoringStatus();

-	}

-

-	private Collection<IResource> findConflictingFiles() {

-		List<IResource> conflictingFiles = new LinkedList<IResource>();

-

-		if (isDiFile(fileToRename)) {

-			// Check whether conflicting files exist.

-			Collection<IResource> participants = ModelParticipantHelpers.getRelatedFiles(fileToRename);

-			participants.add(fileToRename);

-			for (IResource participant : participants) {

-				IContainer parent = participant.getParent();

-				String targetName = newFile.getFullPath().removeFileExtension().addFileExtension(participant.getFileExtension()).lastSegment();

-				IFile targetFile = parent.getFile(new Path(targetName));

-				if (targetFile.exists()) {

-					conflictingFiles.add(targetFile);

-				}

-			}

-		}

-

-		return conflictingFiles;

-	}

-

-	/**

-	 * Overrides createChange.

-	 *

-	 * {@inheritDoc}

-	 *

-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#createChange(org.eclipse.core.runtime.IProgressMonitor)

-	 */

-	@Override

-	public Change createChange(IProgressMonitor pm) throws CoreException, OperationCanceledException {

-		return new RenameModelChange(fileToRename, newFile, impacted);

-	}

-

-	/**

-	 * Overrides getName.

-	 *

-	 * {@inheritDoc}

-	 *

-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#getName()

-	 */

-	@Override

-	public String getName() {

-		return "Papyrus Model Renaming";

-	}

-

-	/**

-	 * Overrides initialize.

-	 *

-	 * {@inheritDoc}

-	 *

-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#initialize(java.lang.Object)

-	 */

-	@Override

-	protected boolean initialize(Object element) {

-		cancelled = false;

-

-		if (!(element instanceof IFile)) {

-			return false;

-		}

-

-		if (!isDiFile((IFile) element)) {

-			return false;

-		}

-

-		fileToRename = (IFile) element;

-		String ext = fileToRename.getFileExtension();

-

-		IContainer parent = fileToRename.getParent();

-		String newName = getArguments().getNewName();

-

-		int idx = newName.lastIndexOf('.');

-		// Do not refactor when the user remove or changes the extension: This is not a valid Papyrus model anymore

-		if (idx > 0) {

-			String extension = newName.substring(idx + 1);

-			if (!DiModel.DI_FILE_EXTENSION.equals(extension)) { // Extension changed

-				return false;

-			}

-			newName = newName.substring(0, idx);

-		} else {

-			return false; // No extension

-		}

-

-		boolean otherFiles = false;

-		for (IResource file : ModelParticipantHelpers.getRelatedFiles(fileToRename)) {

-			IPath path = file.getFullPath();

-			// Only add the change if the resource exists

-			IFile renFile = parent.getFile(path.makeRelativeTo(parent.getFullPath()));

-			if (!path.equals(fileToRename.getFullPath()) && renFile.exists()) {

-				otherFiles = true;

-				break;

-			}

-		}

-		if (otherFiles) {

-			// Get the new file

-			IPath newDiPath = fileToRename.getFullPath().removeLastSegments(1);

-			newDiPath = newDiPath.append(newName).addFileExtension(ext);

-			newFile = parent.getFile(newDiPath.makeRelativeTo(parent.getFullPath()));

-

-			try {

-				impacted = ModelParticipantHelpers.getResourceToFix(fileToRename);

-			} catch (OperationCanceledException e) {

-				cancelled = true;

-			}

-

-			return true;

-		} else {

-			return false;

-		}

-

-	}

-

-	private boolean isDiFile(IFile file) {

-		return DiModel.DI_FILE_EXTENSION.equals(file.getFileExtension());

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009, 2014 Atos Origin, 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:
+ *  <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a> - Initial API and implementation
+ *	Camille Letavernier (CEA LIST) camille.letavernier@cea.fr
+ *  Christian W. Damus (CEA) - bug 436377
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.resources.refactoring;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+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.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.ltk.core.refactoring.Change;
+import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
+import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * Participant that is aware of the renaming of a model.
+ *
+ * @author <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a>
+ *
+ */
+public class RenameModelParticipant extends RenameParticipant {
+
+	private IFile fileToRename;
+
+	private IFile newFile;
+
+	private Collection<? extends IResource> impacted;
+
+	private boolean cancelled;
+
+	/**
+	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#createPreChange(org.eclipse.core.runtime.IProgressMonitor)
+	 *
+	 * @param pm
+	 *            The progress monitor.
+	 * @return The change.
+	 * @throws CoreException
+	 * @throws OperationCanceledException
+	 */
+
+	@Override
+	public Change createPreChange(IProgressMonitor pm) throws CoreException, OperationCanceledException {
+		return new DirtyEditorChange(fileToRename, newFile);
+	}
+
+	/**
+	 * Overrides checkConditions.
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#checkConditions(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext)
+	 */
+	@Override
+	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) throws OperationCanceledException {
+		if (cancelled) {
+			throw new OperationCanceledException();
+		}
+
+		if (isDiFile(fileToRename) && DiModel.DI_FILE_EXTENSION.equals(newFile.getFileExtension())) {
+			Collection<IResource> conflictingFiles = findConflictingFiles();
+			if (!conflictingFiles.isEmpty()) {
+				// Conflicts have been detected. Warn the user.
+
+				final String[] fileNames = new String[conflictingFiles.size()];
+
+				int i = 0;
+				for (IResource resource : conflictingFiles) {
+					fileNames[i++] = resource.getName();
+				}
+
+				String defaultMessage;
+
+				if (fileNames.length == 1) {
+					defaultMessage = "The file " + fileNames[0] + " already exists. Delete it or choose another name";
+				} else {
+					defaultMessage = "Some files alreay exist. Delete them or choose another name. Files: " + Arrays.deepToString(fileNames);
+				}
+
+				Display display = Display.getDefault();
+				if (display != null) {
+
+					RunnableWithResult<Boolean> runnable;
+					Display.getDefault().syncExec(runnable = new RunnableWithResult.Impl<Boolean>() {
+
+						public void run() {
+							setResult(false);
+							final Shell shell = Display.getDefault().getActiveShell();
+							if (shell != null) {
+								String title, message;
+
+								if (fileNames.length == 1) {
+									title = "The file " + fileNames[0] + " already exists.";
+									message = "The file " + fileNames[0] + " already exists. Do you want to delete it? (Warning: This operation cannot be undone)";
+								} else {
+									title = "Some files already exist";
+									message = "The files " + Arrays.deepToString(fileNames) + " alreay exist. Do you want to delete them? (Warning: This operation cannot be undone)";
+								}
+
+								boolean result = MessageDialog.openQuestion(shell, title, message);
+								setResult(result);
+								setStatus(Status.OK_STATUS);
+							}
+						}
+
+					});
+
+					if (runnable.getResult()) {
+						try {
+							for (IResource resource : conflictingFiles) {
+								resource.delete(true, new NullProgressMonitor());
+								impacted.remove(resource);
+							}
+						} catch (CoreException ex) {
+							// FIXME: Inconsistent state. Use a DeleteResourceChange to allow valid Undo/Redo
+							// Use preChange?
+							return RefactoringStatus.createFatalErrorStatus(ex.getMessage());
+						}
+					} else {
+						pm.setCanceled(true); // Cancel the refactoring
+						return new RefactoringStatus();
+					}
+				} else {
+					return RefactoringStatus.createFatalErrorStatus(defaultMessage);
+				}
+			}
+		}
+
+		return new RefactoringStatus();
+	}
+
+	private Collection<IResource> findConflictingFiles() {
+		List<IResource> conflictingFiles = new LinkedList<IResource>();
+
+		if (isDiFile(fileToRename)) {
+			// Check whether conflicting files exist.
+			Collection<IResource> participants = ModelParticipantHelpers.getRelatedFiles(fileToRename);
+			participants.add(fileToRename);
+			for (IResource participant : participants) {
+				IContainer parent = participant.getParent();
+				String targetName = newFile.getFullPath().removeFileExtension().addFileExtension(participant.getFileExtension()).lastSegment();
+				IFile targetFile = parent.getFile(new Path(targetName));
+				if (targetFile.exists()) {
+					conflictingFiles.add(targetFile);
+				}
+			}
+		}
+
+		return conflictingFiles;
+	}
+
+	/**
+	 * Overrides createChange.
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#createChange(org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	@Override
+	public Change createChange(IProgressMonitor pm) throws CoreException, OperationCanceledException {
+		return new RenameModelChange(fileToRename, newFile, impacted);
+	}
+
+	/**
+	 * Overrides getName.
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#getName()
+	 */
+	@Override
+	public String getName() {
+		return "Papyrus Model Renaming";
+	}
+
+	/**
+	 * Overrides initialize.
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#initialize(java.lang.Object)
+	 */
+	@Override
+	protected boolean initialize(Object element) {
+		cancelled = false;
+
+		if (!(element instanceof IFile)) {
+			return false;
+		}
+
+		if (!isDiFile((IFile) element)) {
+			return false;
+		}
+
+		fileToRename = (IFile) element;
+		String ext = fileToRename.getFileExtension();
+
+		IContainer parent = fileToRename.getParent();
+		String newName = getArguments().getNewName();
+
+		int idx = newName.lastIndexOf('.');
+		// Do not refactor when the user remove or changes the extension: This is not a valid Papyrus model anymore
+		if (idx > 0) {
+			String extension = newName.substring(idx + 1);
+			if (!DiModel.DI_FILE_EXTENSION.equals(extension)) { // Extension changed
+				return false;
+			}
+			newName = newName.substring(0, idx);
+		} else {
+			return false; // No extension
+		}
+
+		boolean otherFiles = false;
+		for (IResource file : ModelParticipantHelpers.getRelatedFiles(fileToRename)) {
+			IPath path = file.getFullPath();
+			// Only add the change if the resource exists
+			IFile renFile = parent.getFile(path.makeRelativeTo(parent.getFullPath()));
+			if (!path.equals(fileToRename.getFullPath()) && renFile.exists()) {
+				otherFiles = true;
+				break;
+			}
+		}
+		if (otherFiles) {
+			// Get the new file
+			IPath newDiPath = fileToRename.getFullPath().removeLastSegments(1);
+			newDiPath = newDiPath.append(newName).addFileExtension(ext);
+			newFile = parent.getFile(newDiPath.makeRelativeTo(parent.getFullPath()));
+
+			try {
+				impacted = ModelParticipantHelpers.getResourceToFix(fileToRename);
+			} catch (OperationCanceledException e) {
+				cancelled = true;
+			}
+
+			return true;
+		} else {
+			return false;
+		}
+
+	}
+
+	private boolean isDiFile(IFile file) {
+		return DiModel.DI_FILE_EXTENSION.equals(file.getFileExtension());
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/messages.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/messages.properties
index 3b38d28d433..af76317fa33 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/messages.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/messages.properties
@@ -1,19 +1,19 @@
-DirtyEditorChange_0=Check opened editors

-DirtyEditorChange_1=Confirm saving

-DirtyEditorChange_2=The related editor(s) must be saved to continue.

-DirtyEditorChange_3=Process can not continue if editors are not saved

-MoveModelParticipant_Name=Papyrus Model Move

-RenameModelChange_0=The resources listed are read only, the rename process can not continue : 

-RenameModelChange_5=Warning

-RenameModelChange_6=Changing URI {0} into {1}

-RenameModelChange_7=The file you are renaming is opened in an editor and has unsaved changes.\nTo continue the process has to save the editor.\nDo you want to continue ?

-RenameModelChange_8=The process can not continue with an unsaved editor

-RenameModelChange_Change=Rename {0} to {1}

-RenameModelChange_DaveDirtyEditor=Saving dirty editors

-RenameModelChange_ErrorLoading=Error while loading resource {0}

-RenameModelChange_LoadingEMF=Loading EMF model into memory

-RenameModelChange_ModifyURI=Modifying resources' URI

-RenameModelChange_Name=Update all resources related to {0}

-RenameModelChange_RemoveOldFile=Removing old files

-RenameModelChange_savingResource=Saving resources

-RenameModelChange_Unloading=Unloading model

+DirtyEditorChange_0=Check opened editors
+DirtyEditorChange_1=Confirm saving
+DirtyEditorChange_2=The related editor(s) must be saved to continue.
+DirtyEditorChange_3=Process can not continue if editors are not saved
+MoveModelParticipant_Name=Papyrus Model Move
+RenameModelChange_0=The resources listed are read only, the rename process can not continue : 
+RenameModelChange_5=Warning
+RenameModelChange_6=Changing URI {0} into {1}
+RenameModelChange_7=The file you are renaming is opened in an editor and has unsaved changes.\nTo continue the process has to save the editor.\nDo you want to continue ?
+RenameModelChange_8=The process can not continue with an unsaved editor
+RenameModelChange_Change=Rename {0} to {1}
+RenameModelChange_DaveDirtyEditor=Saving dirty editors
+RenameModelChange_ErrorLoading=Error while loading resource {0}
+RenameModelChange_LoadingEMF=Loading EMF model into memory
+RenameModelChange_ModifyURI=Modifying resources' URI
+RenameModelChange_Name=Update all resources related to {0}
+RenameModelChange_RemoveOldFile=Removing old files
+RenameModelChange_savingResource=Saving resources
+RenameModelChange_Unloading=Unloading model
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/IScopeChooser.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/IScopeChooser.java
index c887ae50b4c..ec12b8674b9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/IScopeChooser.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/IScopeChooser.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  <a href="mailto:tristan.faure@atos.net">Tristan FAURE</a> - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.resources.refactoring.ui;

-

-import java.util.List;

-

-import org.eclipse.core.resources.IFile;

-

-

-/**

- * Interface for elements getting related files from a file

- *

- * @author tfaure

- *

- */

-public interface IScopeChooser {

-

-	/**

-	 * The name or label of the chooser

-	 *

-	 * @return

-	 */

-	public String getName();

-

-	/**

-	 * The description to inform user

-	 *

-	 * @return

-	 */

-	public String getDescription();

-

-	/**

-	 * Return the list of files related to the given parameter

-	 *

-	 * @param f

-	 * @return

-	 */

-	public List<IFile> getRelatedFiles(IFile f);

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Atos.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  <a href="mailto:tristan.faure@atos.net">Tristan FAURE</a> - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.resources.refactoring.ui;
+
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+
+
+/**
+ * Interface for elements getting related files from a file
+ *
+ * @author tfaure
+ *
+ */
+public interface IScopeChooser {
+
+	/**
+	 * The name or label of the chooser
+	 *
+	 * @return
+	 */
+	public String getName();
+
+	/**
+	 * The description to inform user
+	 *
+	 * @return
+	 */
+	public String getDescription();
+
+	/**
+	 * Return the list of files related to the given parameter
+	 *
+	 * @param f
+	 * @return
+	 */
+	public List<IFile> getRelatedFiles(IFile f);
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/Messages.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/Messages.java
index 52b99539b80..8b31cecd601 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/Messages.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/Messages.java
@@ -1,35 +1,35 @@
-package org.eclipse.papyrus.infra.ui.resources.refactoring.ui;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.ui.resources.refactoring.ui.messages"; //$NON-NLS-1$

-

-	public static String RenameParticipantsDialog_DESCRIPTION;

-

-	public static String RenameParticipantsDialog_DESCRIPTION_LABEL;

-

-	public static String RenameParticipantsDialog_DESCRIPTION_NO_ANALYSIS;

-

-	public static String RenameParticipantsDialog_DESCRIPTION_PROJECT;

-

-	public static String RenameParticipantsDialog_DESCRIPTION_WORKSPACE;

-

-	public static String RenameParticipantsDialog_NAME_NO_ANALYSIS;

-

-	public static String RenameParticipantsDialog_NAME_PROJECT;

-

-	public static String RenameParticipantsDialog_NAME_WORKSPACE;

-

-	public static String RenameParticipantsDialog_OPTIONS;

-

-	public static String RenameParticipantsDialog_SELECT_RENAME_OPTION;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

+package org.eclipse.papyrus.infra.ui.resources.refactoring.ui;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.ui.resources.refactoring.ui.messages"; //$NON-NLS-1$
+
+	public static String RenameParticipantsDialog_DESCRIPTION;
+
+	public static String RenameParticipantsDialog_DESCRIPTION_LABEL;
+
+	public static String RenameParticipantsDialog_DESCRIPTION_NO_ANALYSIS;
+
+	public static String RenameParticipantsDialog_DESCRIPTION_PROJECT;
+
+	public static String RenameParticipantsDialog_DESCRIPTION_WORKSPACE;
+
+	public static String RenameParticipantsDialog_NAME_NO_ANALYSIS;
+
+	public static String RenameParticipantsDialog_NAME_PROJECT;
+
+	public static String RenameParticipantsDialog_NAME_WORKSPACE;
+
+	public static String RenameParticipantsDialog_OPTIONS;
+
+	public static String RenameParticipantsDialog_SELECT_RENAME_OPTION;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/RenameParticipantsDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/RenameParticipantsDialog.java
index 437d86ff9eb..4fa9d469d66 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/RenameParticipantsDialog.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/RenameParticipantsDialog.java
@@ -1,211 +1,211 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2014 Atos, 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:

- *  <a href="mailto:tristan.faure@atos.net">Tristan FAURE</a> - Initial API and implementation

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr

- *  Christian W. Damus (CEA) - bug 436377

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.resources.refactoring.ui;

-

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.jface.dialogs.TrayDialog;

-import org.eclipse.jface.viewers.ArrayContentProvider;

-import org.eclipse.jface.viewers.ComboViewer;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.infra.ui.resources.refactoring.ui.ScopeChooser.ScopeChooserVisitor;

-import org.eclipse.swt.SWT;

-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.Control;

-import org.eclipse.swt.widgets.Group;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.swt.widgets.Text;

-

-

-/**

- * A dialog that asks the user to select the scope for analysis of dependent resources in a refactoring of some model resource.

- * If the user cancels the dialog, then the initialization of the refactoring participant is cancelled and the refactoring

- * wizard does not advance (the user may then cancel the refactoring).

- *

- * @author tfaure

- *

- */

-public class RenameParticipantsDialog extends TrayDialog {

-

-	private final IFile context;

-

-	protected IScopeChooser currentScope;

-

-	/**

-	 * Create the dialog.

-	 *

-	 * @param parentShell

-	 */

-	public RenameParticipantsDialog(Shell parentShell, IFile context) {

-		super(parentShell);

-		this.context = context;

-	}

-

-	@Override

-	protected void configureShell(Shell newShell) {

-		super.configureShell(newShell);

-

-		newShell.setText(Messages.RenameParticipantsDialog_SELECT_RENAME_OPTION);

-	}

-

-	/**

-	 * Create contents of the dialog.

-	 *

-	 * @param parent

-	 */

-	@Override

-	protected Control createDialogArea(Composite parent) {

-		Composite area = (Composite) super.createDialogArea(parent);

-

-		final int verticalSpace = convertVerticalDLUsToPixels(8);

-

-		Composite composite = new Composite(area, SWT.NONE);

-		composite.setLayout(new GridLayout(2, false));

-

-		Label blurb = new Label(composite, SWT.WRAP);

-		blurb.setText(Messages.RenameParticipantsDialog_DESCRIPTION);

-		GridData gdata = new GridData(SWT.FILL, SWT.BEGINNING, false, false, 2, 1);

-		gdata.widthHint = 250;

-		blurb.setLayoutData(gdata);

-

-		Label scopeLabel = new Label(composite, SWT.NONE);

-		scopeLabel.setText("Scope:");

-		gdata = new GridData(SWT.LEAD, SWT.BEGINNING, false, false);

-		gdata.verticalIndent = verticalSpace;

-		scopeLabel.setLayoutData(gdata);

-

-		ComboViewer comboViewer = new ComboViewer(composite, SWT.READ_ONLY);

-		comboViewer.setUseHashlookup(true);

-		comboViewer.setLabelProvider(new LabelProvider() {

-

-			@Override

-			public boolean isLabelProperty(Object element, String property) {

-				return true;

-			}

-

-			@Override

-			public String getText(Object element) {

-				if (element instanceof IScopeChooser) {

-					IScopeChooser scope = (IScopeChooser) element;

-					return scope.getName();

-				}

-				return null;

-			}

-		});

-		comboViewer.setContentProvider(ArrayContentProvider.getInstance());

-

-		Combo combo = comboViewer.getCombo();

-		gdata = new GridData(SWT.FILL, SWT.FILL, false, false);

-		gdata.verticalIndent = verticalSpace;

-		combo.setLayoutData(gdata);

-

-		Group grpDescription = new Group(composite, SWT.NONE);

-		grpDescription.setText(Messages.RenameParticipantsDialog_DESCRIPTION_LABEL);

-		grpDescription.setLayout(new GridLayout(1, false));

-		grpDescription.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 2, 1));

-

-		final Text scopeDescription = new Text(grpDescription, SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.READ_ONLY | SWT.V_SCROLL);

-		gdata = new GridData(SWT.FILL, SWT.FILL, false, false);

-		gdata.heightHint = convertHeightInCharsToPixels(3);

-		scopeDescription.setLayoutData(gdata);

-		scopeDescription.setText(""); //$NON-NLS-1$

-

-		// when the selection changed the description too

-		comboViewer.addSelectionChangedListener(new ISelectionChangedListener() {

-

-			public void selectionChanged(SelectionChangedEvent event) {

-				if (event.getSelection() instanceof IStructuredSelection) {

-					IStructuredSelection selec = (IStructuredSelection) event.getSelection();

-					if (selec.getFirstElement() instanceof IScopeChooser) {

-						IScopeChooser chooser = (IScopeChooser) selec.getFirstElement();

-						scopeDescription.setText(chooser.getDescription());

-						currentScope = chooser;

-					}

-				}

-			}

-		});

-		Object[] input = getInput();

-		comboViewer.setInput(input);

-		comboViewer.setSelection(new StructuredSelection(input[0]));

-

-		// We have no help for this dialog (yet)

-		setHelpAvailable(false);

-

-		return area;

-	}

-

-	@Override

-	protected boolean isResizable() {

-		return true;

-	}

-

-	/**

-	 * Pre defined list of chooser maybe later an extension point will be creates

-	 *

-	 * @return

-	 */

-	private Object[] getInput() {

-		final ScopeChooserVisitor visitor = new ScopeChooserVisitor();

-		return new IScopeChooser[] { new ScopeChooser(Messages.RenameParticipantsDialog_NAME_PROJECT, Messages.RenameParticipantsDialog_DESCRIPTION_PROJECT) {

-

-			public List<IFile> getRelatedFiles(IFile f) {

-				try {

-					f.getProject().accept(visitor, IResource.DEPTH_INFINITE, IContainer.EXCLUDE_DERIVED);

-					return visitor.getFiles();

-				} catch (CoreException e) {

-					e.printStackTrace();

-				}

-				return Collections.emptyList();

-			}

-		}, new ScopeChooser(Messages.RenameParticipantsDialog_NAME_WORKSPACE, Messages.RenameParticipantsDialog_DESCRIPTION_WORKSPACE) {

-

-			public List<IFile> getRelatedFiles(IFile f) {

-				try {

-					ResourcesPlugin.getWorkspace().getRoot().accept(visitor, IResource.DEPTH_INFINITE, IContainer.EXCLUDE_DERIVED);

-					return visitor.getFiles();

-				} catch (CoreException e) {

-					e.printStackTrace();

-				}

-				return Collections.emptyList();

-			}

-		}, new ScopeChooser(Messages.RenameParticipantsDialog_NAME_NO_ANALYSIS, Messages.RenameParticipantsDialog_DESCRIPTION_NO_ANALYSIS) {

-

-			public List<IFile> getRelatedFiles(IFile f) {

-				return Arrays.asList(f);

-			}

-		} };

-	}

-

-	public Collection<? extends IResource> getFiles() {

-		return currentScope.getRelatedFiles(context);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2014 Atos, 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:
+ *  <a href="mailto:tristan.faure@atos.net">Tristan FAURE</a> - Initial API and implementation
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr
+ *  Christian W. Damus (CEA) - bug 436377
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.resources.refactoring.ui;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.dialogs.TrayDialog;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.infra.ui.resources.refactoring.ui.ScopeChooser.ScopeChooserVisitor;
+import org.eclipse.swt.SWT;
+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.Control;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+
+
+/**
+ * A dialog that asks the user to select the scope for analysis of dependent resources in a refactoring of some model resource.
+ * If the user cancels the dialog, then the initialization of the refactoring participant is cancelled and the refactoring
+ * wizard does not advance (the user may then cancel the refactoring).
+ *
+ * @author tfaure
+ *
+ */
+public class RenameParticipantsDialog extends TrayDialog {
+
+	private final IFile context;
+
+	protected IScopeChooser currentScope;
+
+	/**
+	 * Create the dialog.
+	 *
+	 * @param parentShell
+	 */
+	public RenameParticipantsDialog(Shell parentShell, IFile context) {
+		super(parentShell);
+		this.context = context;
+	}
+
+	@Override
+	protected void configureShell(Shell newShell) {
+		super.configureShell(newShell);
+
+		newShell.setText(Messages.RenameParticipantsDialog_SELECT_RENAME_OPTION);
+	}
+
+	/**
+	 * Create contents of the dialog.
+	 *
+	 * @param parent
+	 */
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite area = (Composite) super.createDialogArea(parent);
+
+		final int verticalSpace = convertVerticalDLUsToPixels(8);
+
+		Composite composite = new Composite(area, SWT.NONE);
+		composite.setLayout(new GridLayout(2, false));
+
+		Label blurb = new Label(composite, SWT.WRAP);
+		blurb.setText(Messages.RenameParticipantsDialog_DESCRIPTION);
+		GridData gdata = new GridData(SWT.FILL, SWT.BEGINNING, false, false, 2, 1);
+		gdata.widthHint = 250;
+		blurb.setLayoutData(gdata);
+
+		Label scopeLabel = new Label(composite, SWT.NONE);
+		scopeLabel.setText("Scope:");
+		gdata = new GridData(SWT.LEAD, SWT.BEGINNING, false, false);
+		gdata.verticalIndent = verticalSpace;
+		scopeLabel.setLayoutData(gdata);
+
+		ComboViewer comboViewer = new ComboViewer(composite, SWT.READ_ONLY);
+		comboViewer.setUseHashlookup(true);
+		comboViewer.setLabelProvider(new LabelProvider() {
+
+			@Override
+			public boolean isLabelProperty(Object element, String property) {
+				return true;
+			}
+
+			@Override
+			public String getText(Object element) {
+				if (element instanceof IScopeChooser) {
+					IScopeChooser scope = (IScopeChooser) element;
+					return scope.getName();
+				}
+				return null;
+			}
+		});
+		comboViewer.setContentProvider(ArrayContentProvider.getInstance());
+
+		Combo combo = comboViewer.getCombo();
+		gdata = new GridData(SWT.FILL, SWT.FILL, false, false);
+		gdata.verticalIndent = verticalSpace;
+		combo.setLayoutData(gdata);
+
+		Group grpDescription = new Group(composite, SWT.NONE);
+		grpDescription.setText(Messages.RenameParticipantsDialog_DESCRIPTION_LABEL);
+		grpDescription.setLayout(new GridLayout(1, false));
+		grpDescription.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 2, 1));
+
+		final Text scopeDescription = new Text(grpDescription, SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.READ_ONLY | SWT.V_SCROLL);
+		gdata = new GridData(SWT.FILL, SWT.FILL, false, false);
+		gdata.heightHint = convertHeightInCharsToPixels(3);
+		scopeDescription.setLayoutData(gdata);
+		scopeDescription.setText(""); //$NON-NLS-1$
+
+		// when the selection changed the description too
+		comboViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+
+			public void selectionChanged(SelectionChangedEvent event) {
+				if (event.getSelection() instanceof IStructuredSelection) {
+					IStructuredSelection selec = (IStructuredSelection) event.getSelection();
+					if (selec.getFirstElement() instanceof IScopeChooser) {
+						IScopeChooser chooser = (IScopeChooser) selec.getFirstElement();
+						scopeDescription.setText(chooser.getDescription());
+						currentScope = chooser;
+					}
+				}
+			}
+		});
+		Object[] input = getInput();
+		comboViewer.setInput(input);
+		comboViewer.setSelection(new StructuredSelection(input[0]));
+
+		// We have no help for this dialog (yet)
+		setHelpAvailable(false);
+
+		return area;
+	}
+
+	@Override
+	protected boolean isResizable() {
+		return true;
+	}
+
+	/**
+	 * Pre defined list of chooser maybe later an extension point will be creates
+	 *
+	 * @return
+	 */
+	private Object[] getInput() {
+		final ScopeChooserVisitor visitor = new ScopeChooserVisitor();
+		return new IScopeChooser[] { new ScopeChooser(Messages.RenameParticipantsDialog_NAME_PROJECT, Messages.RenameParticipantsDialog_DESCRIPTION_PROJECT) {
+
+			public List<IFile> getRelatedFiles(IFile f) {
+				try {
+					f.getProject().accept(visitor, IResource.DEPTH_INFINITE, IContainer.EXCLUDE_DERIVED);
+					return visitor.getFiles();
+				} catch (CoreException e) {
+					e.printStackTrace();
+				}
+				return Collections.emptyList();
+			}
+		}, new ScopeChooser(Messages.RenameParticipantsDialog_NAME_WORKSPACE, Messages.RenameParticipantsDialog_DESCRIPTION_WORKSPACE) {
+
+			public List<IFile> getRelatedFiles(IFile f) {
+				try {
+					ResourcesPlugin.getWorkspace().getRoot().accept(visitor, IResource.DEPTH_INFINITE, IContainer.EXCLUDE_DERIVED);
+					return visitor.getFiles();
+				} catch (CoreException e) {
+					e.printStackTrace();
+				}
+				return Collections.emptyList();
+			}
+		}, new ScopeChooser(Messages.RenameParticipantsDialog_NAME_NO_ANALYSIS, Messages.RenameParticipantsDialog_DESCRIPTION_NO_ANALYSIS) {
+
+			public List<IFile> getRelatedFiles(IFile f) {
+				return Arrays.asList(f);
+			}
+		} };
+	}
+
+	public Collection<? extends IResource> getFiles() {
+		return currentScope.getRelatedFiles(context);
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/ScopeChooser.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/ScopeChooser.java
index d3f26dec4dd..55cc7aafa08 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/ScopeChooser.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/ScopeChooser.java
@@ -1,99 +1,99 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  <a href="mailto:tristan.faure@atos.net">Tristan FAURE</a> - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.resources.refactoring.ui;

-

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceVisitor;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.content.IContentType;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.Resource.Factory.Registry;

-import org.eclipse.ui.ide.IDE;

-

-

-

-/**

- * Default Implementation of {@link IScopeChooser}

- *

- * @author tfaure

- */

-public abstract class ScopeChooser implements IScopeChooser {

-

-	private final String description;

-

-	private final String label;

-

-	public ScopeChooser(String label, String formDescription) {

-		this.label = label;

-		this.description = formDescription;

-

-	}

-

-	public String getName() {

-		return label;

-	}

-

-	public String getDescription() {

-		return description;

-	}

-

-

-

-	public static class ScopeChooserVisitor implements IResourceVisitor {

-

-		private List<IFile> files = new LinkedList<IFile>();

-

-		public boolean visit(IResource resource) throws CoreException {

-			if (resource instanceof IFile) {

-				IFile file = (IFile) resource;

-				if (isXMI(file)) {

-					files.add(file);

-				}

-				return false;

-			}

-			return true;

-		}

-

-		/**

-		 * Determine if the given file is an XMI some specific code has been set for notation and di

-		 *

-		 * @param f

-		 * @return

-		 */

-		public boolean isXMI(IFile f) {

-			URI uri = URI.createPlatformResourceURI(f.getFullPath().toString(), true);

-			IContentType contentType = IDE.getContentType(f);

-			Registry instance = Resource.Factory.Registry.INSTANCE;

-			Object old = instance.getContentTypeToFactoryMap().get(Resource.Factory.Registry.DEFAULT_CONTENT_TYPE_IDENTIFIER);

-			Object old2 = instance.getExtensionToFactoryMap().get(Resource.Factory.Registry.DEFAULT_EXTENSION);

-			instance.getContentTypeToFactoryMap().put(Resource.Factory.Registry.DEFAULT_CONTENT_TYPE_IDENTIFIER, null);

-			instance.getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, null);

-			boolean result = (f != null && contentType != null && (Resource.Factory.Registry.INSTANCE.getFactory(uri, contentType.getId()) != null || "notation".equals(f.getFileExtension()) || "di".equals(f.getFileExtension())));

-			instance.getContentTypeToFactoryMap().put(Resource.Factory.Registry.DEFAULT_CONTENT_TYPE_IDENTIFIER, old);

-			instance.getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, old2);

-			return result;

-		}

-

-		public List<IFile> getFiles() {

-			return files;

-		}

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011 Atos.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  <a href="mailto:tristan.faure@atos.net">Tristan FAURE</a> - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.resources.refactoring.ui;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.Resource.Factory.Registry;
+import org.eclipse.ui.ide.IDE;
+
+
+
+/**
+ * Default Implementation of {@link IScopeChooser}
+ *
+ * @author tfaure
+ */
+public abstract class ScopeChooser implements IScopeChooser {
+
+	private final String description;
+
+	private final String label;
+
+	public ScopeChooser(String label, String formDescription) {
+		this.label = label;
+		this.description = formDescription;
+
+	}
+
+	public String getName() {
+		return label;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+
+
+	public static class ScopeChooserVisitor implements IResourceVisitor {
+
+		private List<IFile> files = new LinkedList<IFile>();
+
+		public boolean visit(IResource resource) throws CoreException {
+			if (resource instanceof IFile) {
+				IFile file = (IFile) resource;
+				if (isXMI(file)) {
+					files.add(file);
+				}
+				return false;
+			}
+			return true;
+		}
+
+		/**
+		 * Determine if the given file is an XMI some specific code has been set for notation and di
+		 *
+		 * @param f
+		 * @return
+		 */
+		public boolean isXMI(IFile f) {
+			URI uri = URI.createPlatformResourceURI(f.getFullPath().toString(), true);
+			IContentType contentType = IDE.getContentType(f);
+			Registry instance = Resource.Factory.Registry.INSTANCE;
+			Object old = instance.getContentTypeToFactoryMap().get(Resource.Factory.Registry.DEFAULT_CONTENT_TYPE_IDENTIFIER);
+			Object old2 = instance.getExtensionToFactoryMap().get(Resource.Factory.Registry.DEFAULT_EXTENSION);
+			instance.getContentTypeToFactoryMap().put(Resource.Factory.Registry.DEFAULT_CONTENT_TYPE_IDENTIFIER, null);
+			instance.getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, null);
+			boolean result = (f != null && contentType != null && (Resource.Factory.Registry.INSTANCE.getFactory(uri, contentType.getId()) != null || "notation".equals(f.getFileExtension()) || "di".equals(f.getFileExtension())));
+			instance.getContentTypeToFactoryMap().put(Resource.Factory.Registry.DEFAULT_CONTENT_TYPE_IDENTIFIER, old);
+			instance.getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, old2);
+			return result;
+		}
+
+		public List<IFile> getFiles() {
+			return files;
+		}
+
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/messages.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/messages.properties
index 9d42912b7d1..865f6b7de28 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/messages.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/infra/ui/resources/refactoring/ui/messages.properties
@@ -1,23 +1,23 @@
-#

-# Copyright (c) 2011, 2014 Atos Origin, CEA, and others.

-#

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#  Atos Origin - Initial API and implementation

-#  Christian W. Damus (CEA) - bug 436377

-#  

-

-RenameParticipantsDialog_DESCRIPTION=The rename operation can affect related files that have references to elements in the renamed file.  Please choose the scope of resources to analyze for references to be updated.

-RenameParticipantsDialog_DESCRIPTION_LABEL=Description

-RenameParticipantsDialog_DESCRIPTION_NO_ANALYSIS=No resources are analyzed for references.  This option is discouraged except for specific advanced cases.

-RenameParticipantsDialog_DESCRIPTION_PROJECT=Resources in the project containing the renamed file will be analyzed for references.

-RenameParticipantsDialog_DESCRIPTION_WORKSPACE=All resources in the workspace will be analyzed for references.  This may be a long-running operation.

-RenameParticipantsDialog_NAME_NO_ANALYSIS=No Analysis

-RenameParticipantsDialog_NAME_PROJECT=Project (default)

-RenameParticipantsDialog_NAME_WORKSPACE=Workspace

-RenameParticipantsDialog_OPTIONS=Options

-RenameParticipantsDialog_SELECT_RENAME_OPTION=Select Rename Options

+#
+# Copyright (c) 2011, 2014 Atos Origin, CEA, and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#  Atos Origin - Initial API and implementation
+#  Christian W. Damus (CEA) - bug 436377
+#  
+
+RenameParticipantsDialog_DESCRIPTION=The rename operation can affect related files that have references to elements in the renamed file.  Please choose the scope of resources to analyze for references to be updated.
+RenameParticipantsDialog_DESCRIPTION_LABEL=Description
+RenameParticipantsDialog_DESCRIPTION_NO_ANALYSIS=No resources are analyzed for references.  This option is discouraged except for specific advanced cases.
+RenameParticipantsDialog_DESCRIPTION_PROJECT=Resources in the project containing the renamed file will be analyzed for references.
+RenameParticipantsDialog_DESCRIPTION_WORKSPACE=All resources in the workspace will be analyzed for references.  This may be a long-running operation.
+RenameParticipantsDialog_NAME_NO_ANALYSIS=No Analysis
+RenameParticipantsDialog_NAME_PROJECT=Project (default)
+RenameParticipantsDialog_NAME_WORKSPACE=Workspace
+RenameParticipantsDialog_OPTIONS=Options
+RenameParticipantsDialog_SELECT_RENAME_OPTION=Select Rename Options
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.classpath b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.classpath
new file mode 100644
index 00000000000..eca7bdba8f0
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.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/JavaSE-1.8"/>
+	<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.ui/.gitignore b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.gitignore
index de5a788c8c3..de5a788c8c3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/.gitignore
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.gitignore
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/.project b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.project
index d6fae3f9482..9943e4559d6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/.project
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.project
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.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.papyrus.emf.facet.common.ProjectNature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.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.papyrus.emf.facet.common.ProjectNature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..b3aa6d60f94
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/org.eclipse.papyrus.infra.sync/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.sync/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF
index 34b327f9339..9448f025be2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF
@@ -1,53 +1,54 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.ui,

- org.eclipse.papyrus.infra.ui.contentoutline,

- org.eclipse.papyrus.infra.ui.converter,

- org.eclipse.papyrus.infra.ui.dnd,

- org.eclipse.papyrus.infra.ui.editor,

- org.eclipse.papyrus.infra.ui.editor.reload,

- org.eclipse.papyrus.infra.ui.editorsfactory,

- org.eclipse.papyrus.infra.ui.extension.commands,

- org.eclipse.papyrus.infra.ui.extension.diagrameditor,

- org.eclipse.papyrus.infra.ui.internal.commands;x-internal:=true,

- org.eclipse.papyrus.infra.ui.internal.preferences;x-internal:=true,

- org.eclipse.papyrus.infra.ui.lifecycleevents,

- org.eclipse.papyrus.infra.ui.menu,

- org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor,

- org.eclipse.papyrus.infra.ui.preferences,

- org.eclipse.papyrus.infra.ui.preferences.dialog,

- org.eclipse.papyrus.infra.ui.providers,

- org.eclipse.papyrus.infra.ui.services,

- org.eclipse.papyrus.infra.ui.services.internal;x-internal:=true,

- org.eclipse.papyrus.infra.ui.util

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.ui;bundle-version="3.107.0",

- org.eclipse.core.runtime;bundle-version="3.10.0",

- org.eclipse.core.expressions;bundle-version="3.4.600",

- org.eclipse.emf.ecore,

- org.eclipse.emf.transaction,

- com.google.guava;bundle-version="11.0.0",

- org.eclipse.core.databinding;bundle-version="1.6.0",

- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",

- org.eclipse.ui.ide;bundle-version="3.12.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0",

- org.eclipse.emf.edit.ui;bundle-version="2.12.0",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",

- org.eclipse.ui.views.properties.tabbed;bundle-version="3.7.0",

- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-Version: 1.2.0.qualifier

-Eclipse-BuddyPolicy: dependent

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.ui.Activator

-Bundle-Description: Plugin dedicated to manage generic menus and actions,

- linked to EMF but not to UML nor GMF technologies.

-Bundle-SymbolicName: org.eclipse.papyrus.infra.ui;singleton:=true

-Import-Package: org.eclipse.papyrus.infra.emf.utils

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.ui,
+ org.eclipse.papyrus.infra.ui.command,
+ org.eclipse.papyrus.infra.ui.contentoutline,
+ org.eclipse.papyrus.infra.ui.converter,
+ org.eclipse.papyrus.infra.ui.dnd,
+ org.eclipse.papyrus.infra.ui.editor,
+ org.eclipse.papyrus.infra.ui.editor.reload,
+ org.eclipse.papyrus.infra.ui.editorsfactory,
+ org.eclipse.papyrus.infra.ui.extension.commands,
+ org.eclipse.papyrus.infra.ui.extension.diagrameditor,
+ org.eclipse.papyrus.infra.ui.internal.commands;x-internal:=true,
+ org.eclipse.papyrus.infra.ui.internal.preferences;x-internal:=true,
+ org.eclipse.papyrus.infra.ui.lifecycleevents,
+ org.eclipse.papyrus.infra.ui.menu,
+ org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor,
+ org.eclipse.papyrus.infra.ui.preferences,
+ org.eclipse.papyrus.infra.ui.preferences.dialog,
+ org.eclipse.papyrus.infra.ui.providers,
+ org.eclipse.papyrus.infra.ui.services,
+ org.eclipse.papyrus.infra.ui.services.internal;x-internal:=true,
+ org.eclipse.papyrus.infra.ui.util
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.ui;bundle-version="3.107.0",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.eclipse.core.expressions;bundle-version="3.4.600",
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.transaction,
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.core.databinding;bundle-version="1.6.0",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
+ org.eclipse.ui.ide;bundle-version="3.12.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0",
+ org.eclipse.emf.edit.ui;bundle-version="2.12.0",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",
+ org.eclipse.ui.views.properties.tabbed;bundle-version="3.7.0",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0"
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Eclipse-BuddyPolicy: dependent
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.ui.Activator
+Bundle-Description: Plugin dedicated to manage generic menus and actions,
+ linked to EMF but not to UML nor GMF technologies.
+Bundle-SymbolicName: org.eclipse.papyrus.infra.ui;singleton:=true
+Import-Package: org.eclipse.papyrus.infra.emf.utils
diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/about.html b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/about.html
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/about.html
@@ -1,28 +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>

+<!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.ui/build.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/build.properties
index 0129c1a0b6a..404777cc537 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/build.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/build.properties
@@ -1,10 +1,10 @@
-source.. = src/

-output.. = bin/

-bin.includes = plugin.xml,\

-               META-INF/,\

-               .,\

-               about.html,\

-               plugin.properties,\

-               icons/,\

-               schema/

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = plugin.xml,\
+               META-INF/,\
+               .,\
+               about.html,\
+               plugin.properties,\
+               icons/,\
+               schema/
+src.includes = about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/icons/papyrus/32x32/PapyrusLogo32x32.png b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/icons/papyrus/32x32/PapyrusLogo32x32.png
index 57e441b344c..57e441b344c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/icons/papyrus/32x32/PapyrusLogo32x32.png
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/icons/papyrus/32x32/PapyrusLogo32x32.png
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/icons/papyrus/32x32/Papyrus_32x32_t.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/icons/papyrus/32x32/Papyrus_32x32_t.gif
index 50cd9a142ee..50cd9a142ee 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/icons/papyrus/32x32/Papyrus_32x32_t.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/icons/papyrus/32x32/Papyrus_32x32_t.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/icons/papyrus/Papyrus.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/icons/papyrus/Papyrus.gif
index 8a31f458379..8a31f458379 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/icons/papyrus/Papyrus.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/icons/papyrus/Papyrus.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/icons/papyrus/Papyrus_16x16.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/icons/papyrus/Papyrus_16x16.gif
index 8a31f458379..8a31f458379 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/icons/papyrus/Papyrus_16x16.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/icons/papyrus/Papyrus_16x16.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/plugin.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/plugin.properties
index 31d899f9131..31d899f9131 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/plugin.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/plugin.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/plugin.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/plugin.xml
index 7b5b9c5ed7a..638b14b0962 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/plugin.xml
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/plugin.xml
@@ -1,533 +1,533 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<?eclipse version="3.0"?>

-

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse version="3.0"?>
+
 <!--
  <copyright>
  </copyright>
 
  $Id$
--->

-<plugin>

-   <extension-point id="papyrusDiagram" name="PapyrusDiagram" schema="schema/papyrusDiagram.exsd"/>

-   <extension-point id="papyrusContentOutline" name="PapyrusContentOutline" schema="schema/contentOutline.exsd"/>

-   

- <extension

-         point="org.eclipse.ui.menus">

-      <menuContribution

-            locationURI="menu:org.eclipse.ui.main.menu?after=navigate">

-         <menu

-               id="org.eclipse.papyrus.ui.menu"

-               label="Papyrus"

-               tooltip="Papyrus Editor Menu">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </menu>

-      </menuContribution>

-  </extension>

-  <extension

-        point="org.eclipse.ui.menus">

-      

-        <menuContribution

-              allPopups="false"

-              locationURI="menu:org.eclipse.papyrus.ui.menu">

-                <menu

-            label="&amp;Name Edition..."

-            tooltip="Quick formatting for labels">

-         <command

-               commandId="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingUpperCaseCommand"

-               label="&amp;To apply uppercase"

-               style="push">

-            <parameter

-                  name="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"

-                  value="uppercase">

-            </parameter>

-      	 </command>

-      	 <command

-              commandId="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingLowerCaseCommand"

-              label="&amp;To apply lowercase"

-              style="push">

-           <parameter

-                 name="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"

-                 value="lowercase">

-           </parameter>

-      	 </command>

-      	 <command

-               commandId="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingSwitchSpace2UnderscoreCommand"

-               label="&amp;To switch space and underscore"

-               style="push">

-            <parameter

-                  name="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"

-                  value="switchSpace2Underscore">

-            </parameter>

-      	 </command>

-      	 <command

-               commandId="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingCapitalizeFirstLetterCommand"

-               label="&amp;To apply camelcase"

-               style="push">

-            <parameter

-                  name="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"

-                  value="capitalizeFirstLetter">

-            </parameter>

-      	 </command>

-      	 <command

-               commandId="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingRemoveSpaceCommand"

-               label="&amp;To remove or add space"

-               style="push">

-            <parameter

-                  name="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"

-                  value="removeSpace">

-            </parameter>

-      	 </command>

-        <visibleWhen

-              checkEnabled="true">

-        </visibleWhen>

-      </menu>

-        </menuContribution>

-  </extension>   

-<extension

-      id="PapyrusQuickFormattingCommand" 

-      name="QuickFormattingCommand"

-      point="org.eclipse.ui.commands">

-   <command

-         categoryId="org.eclipse.papyrus.infra.ui.quickformat"

-         description="The command to quickly format in uppercase the selected labels"

-         id="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingUpperCaseCommand"

-         name="Upper Case Quick Format Command">

-      <commandParameter

-            id="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"

-            name="name"

-            optional="false">

-      </commandParameter>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.infra.ui.quickformat"

-         description="The command to quickly format in lowercase the selected labels"

-         id="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingLowerCaseCommand"

-         name="Lower Case Quick Format Command">

-      <commandParameter

-            id="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"

-            name="name"

-            optional="false">

-      </commandParameter>

-   </command>

-   

-   <command

-         categoryId="org.eclipse.papyrus.infra.ui.quickformat"

-         description="The command to quickly format by switching space and underscore in the selected labels"

-         id="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingSwitchSpace2UnderscoreCommand"

-         name="Switch Space to Underscore Quick Format Command">

-      <commandParameter

-            id="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"

-            name="name"

-            optional="false">

-      </commandParameter>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.infra.ui.quickformat"

-         description="The command to quickly format by capitalizing the first letter in the selected labels"

-         id="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingCapitalizeFirstLetterCommand"

-         name="Capitalize First Letter Quick Format Command">

-      <commandParameter

-            id="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"

-            name="name"

-            optional="false">

-      </commandParameter>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.infra.ui.quickformat"

-         description="The command to quickly format by removing space in the selected labels"

-         id="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingRemoveSpaceCommand"

-         name="Remove Space Quick Format Command">

-      <commandParameter

-            id="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"

-            name="name"

-            optional="false">

-      </commandParameter>

-   </command>

-   <category

-         description="quickformat routines"

-         id="org.eclipse.papyrus.infra.ui.quickformat"

-         name="quickformat routines">

-   </category>

-</extension>

-

-   <extension

-         point="org.eclipse.ui.menus">

-      <menuContribution

-            locationURI="toolbar:org.eclipse.ui.main.toolbar">

-         <toolbar

-               id="org.eclipse.papyrus.ui.toolbar">

-            <command

-                  commandId="org.eclipse.papyrus.infra.core.commands.dropdowncommand"

-                  icon="icons/papyrus/Papyrus_16x16.gif"

-                  label="Close Diagrams"

-                  style="pulldown"

-                  tooltip="Close Current Editor&apos;s Diagrams ">

-               <visibleWhen>

-                  <with

-                        variable="activeEditorId">

-                     <equals

-                           value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                     </equals>

-                  </with>

-               </visibleWhen>

-            </command>

-         </toolbar>

-      </menuContribution>

-      <menuContribution

-            locationURI="toolbar:org.eclipse.papyrus.ui.toolbar">

-      </menuContribution>

-      <menuContribution

-            locationURI="popup:org.eclipse.papyrus.infra.core.editor.ui.tabmenu?endof=tabcommands">

-         <command

-               commandId="org.eclipse.papyrus.infra.core.commands.closediagram"

-               label="Close Diagram"

-               style="push"

-               tooltip="Close Currently Selected Diagram">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.infra.core.commands.closealldiagram"

-               label="Close All Diagrams"

-               style="push"

-               tooltip="Close All Opened Diagrams">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.infra.core.commands.closeothersdiagrams"

-               label="Close Other Diagrams"

-               style="push"

-               tooltip="Close All Diagrams except the selected one">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.infra.core.sasheditor.command.tabdoubleclick"

-               label="&amp;Rename Diagram"

-               style="push"

-               tooltip="Rename the diagram">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-      <menuContribution

-            allPopups="false"

-            locationURI="menu:org.eclipse.papyrus.infra.core.commands.dropdowncommand">

-         <command

-               commandId="org.eclipse.papyrus.infra.core.commands.closediagram"

-               style="push"

-               tooltip="Close Currently Selected Diagram">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.infra.core.commands.closealldiagram"

-               label="Close All Diagrams"

-               style="push"

-               tooltip="Close All Opened Diagrams">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.infra.core.commands.closeothersdiagrams"

-               label="Close Other Diagrams"

-               style="push"

-               tooltip="Close All Diagrams except the selected one">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.infra.core.commands.privatePageLayout"

-               label="Private Page Layout"

-               style="toggle"

-               tooltip="Store editor page layout privately, not shared in the DI file">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

-   <extension

-         point="org.eclipse.ui.commands">

-      <command

-            id="org.eclipse.papyrus.infra.core.commands.closealldiagram"

-            name="Close All Diagrams">

-      </command>

-      <command

-            id="org.eclipse.papyrus.infra.core.commands.closediagram"

-            name="Close Diagram">

-      </command>

-      <command

-            id="org.eclipse.papyrus.infra.core.commands.closeothersdiagrams"

-            name="Close Other Diagrams">

-      </command>

-      <command

-            defaultHandler="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands.CloseDiagramCommand"

-            id="org.eclipse.papyrus.infra.core.commands.dropdowncommand"

-            name="dropdown tool">

-      </command>

-      <command

-            id="org.eclipse.papyrus.infra.core.sasheditor.command.tabdoubleclick"

-            name="Rename diagram">

-      </command>

-      <command

-            id="org.eclipse.papyrus.infra.core.commands.privatePageLayout"

-            name="Private Page Layout"

-            description="Store editor page layout privately, not shared in the DI file">

-         <state

-               id="org.eclipse.ui.commands.toggleState"

-               class="org.eclipse.papyrus.infra.ui.internal.commands.PageLayoutStorageState">

-         </state>

-      </command>

-   </extension>

-   <extension

-         point="org.eclipse.ui.handlers">

-      <handler

-            class="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands.CloseDiagramCommand"

-            commandId="org.eclipse.papyrus.infra.core.commands.closediagram">

-      </handler>

-      <handler

-            class="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands.CloseAllDiagramsCommand"

-            commandId="org.eclipse.papyrus.infra.core.commands.closealldiagram">

-      </handler>

-      <handler

-            class="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands.CloseOtherDiagramsCommand"

-            commandId="org.eclipse.papyrus.infra.core.commands.closeothersdiagrams">

-      </handler>

-      <handler

-            class="org.eclipse.papyrus.infra.ui.internal.commands.TogglePageLayoutStorageHandler"

-            commandId="org.eclipse.papyrus.infra.core.commands.privatePageLayout">

-      </handler>

-   </extension>

- 

-   <extension

-         point="org.eclipse.papyrus.infra.core.service">

-      <serviceFactory

-            classname="org.eclipse.papyrus.infra.ui.editor.PageIconRegistryServiceFactory"

-            id="org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistry"

-            priority="1"

-            startKind="startup">

-      </serviceFactory>

-      <serviceFactory

-            classname="org.eclipse.papyrus.infra.ui.editor.DiSashModelManagerServiceFactory"

-            description="The concrete implementation of SashContentProviderr and IPageMngr"

-            id="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelManager"

-            priority="1"

-            startKind="startup">

-         <dependsOn

-               serviceKeyRef="org.eclipse.emf.transaction.TransactionalEditingDomain">

-         </dependsOn>

-         <dependsOn

-               serviceKeyRef="org.eclipse.papyrus.infra.core.resource.ModelSet">

-         </dependsOn>

-      </serviceFactory>

-      <serviceFactory

-            classname="org.eclipse.papyrus.infra.ui.editor.DiSashModelMngrServiceFactory"

-            description="The concrete implementation of SashContentProviderr and IPageMngr"

-            id="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelMngr"

-            priority="1"

-            startKind="startup">

-         <dependsOn

-               serviceKeyRef="org.eclipse.emf.transaction.TransactionalEditingDomain">

-         </dependsOn>

-         <dependsOn

-               serviceKeyRef="org.eclipse.papyrus.infra.core.resource.ModelSet">

-         </dependsOn>

-      </serviceFactory>

-      <serviceFactory

-            classname="org.eclipse.papyrus.infra.ui.editor.PageMngrServiceFactory"

-            description="IPageMngr allows to add and remove pages to the editor."

-            id="org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr"

-            priority="1"

-            startKind="startup">

-         <dependsOn

-               serviceKeyRef="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelManager">

-         </dependsOn>

-      </serviceFactory>

-      <serviceFactory

-            classname="org.eclipse.papyrus.infra.ui.editor.ContentProviderServiceFactory"

-            description="The SashContentProvider maintain the structure of pages of the editor."

-            id="org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider"

-            priority="1"

-            startKind="startup">

-         <dependsOn

-               serviceKeyRef="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelManager">

-         </dependsOn>

-      </serviceFactory>

-      <service

-            classname="org.eclipse.papyrus.infra.ui.lifecycleevents.SaveAndDirtyService"

-            description="Service used to maintain the dirty state, and to perform save and saveAs"

-            id="org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveAndDirtyService"

-            priority="1"

-            startKind="startup">

-         <dependsOn

-               serviceKeyRef="org.eclipse.emf.transaction.TransactionalEditingDomain">

-         </dependsOn>

-         <dependsOn

-               serviceKeyRef="org.eclipse.papyrus.infra.core.resource.ModelSet">

-         </dependsOn>

-         <dependsOn

-               serviceKeyRef="org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor">

-         </dependsOn>

-      </service>

-      <serviceFactory

-            classname="org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProviderServiceFactory"

-            description="Service allowing to listen on save events."

-            id="org.eclipse.papyrus.infra.ui.lifecycleevents.ILifeCycleEventsProvider"

-            priority="1"

-            startKind="startup">

-         <dependsOn

-               serviceKeyRef=" org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveAndDirtyService">

-         </dependsOn>

-      </serviceFactory>

-      <serviceFactory

-            classname="org.eclipse.papyrus.infra.ui.editor.PageMngrServiceFactory"

-            description="IPageManager allows to add and remove pages to the editor."

-            id="org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager"

-            priority="10"

-            startKind="startup">

-         <dependsOn

-               serviceKeyRef="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelManager">

-         </dependsOn>

-      </serviceFactory>

-      <service

-            classname="org.eclipse.papyrus.infra.ui.services.ResourceUpdateService"

-            id="org.eclipse.papyrus.infra.ui.services.ResourceUpdateService"

-            priority="1"

-            startKind="startup">

-         <dependsOn

-               description="This service is used to reopen the IMultiDiagramEditor when changes are detected"

-               serviceKeyRef="org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor">

-         </dependsOn>

-      </service>

-      <service

-            classname="org.eclipse.papyrus.infra.ui.services.SaveLayoutBeforeClose"

-            description="Saves the sash model when closing the editor"

-            priority="1"

-            startKind="startup">

-         <dependsOn

-               serviceKeyRef="org.eclipse.papyrus.infra.core.resource.ModelSet">

-         </dependsOn>

-         <dependsOn

-               serviceKeyRef="org.eclipse.papyrus.infra.ui.services.EditorLifecycleManager">

-         </dependsOn>

-      </service>

-   </extension>

+-->
+<plugin>
+   <extension-point id="papyrusDiagram" name="PapyrusDiagram" schema="schema/papyrusDiagram.exsd"/>
+   <extension-point id="papyrusContentOutline" name="PapyrusContentOutline" schema="schema/contentOutline.exsd"/>
+   
+ <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="menu:org.eclipse.ui.main.menu?after=navigate">
+         <menu
+               id="org.eclipse.papyrus.ui.menu"
+               label="Papyrus"
+               tooltip="Papyrus Editor Menu">
+            <visibleWhen>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+            </visibleWhen>
+         </menu>
+      </menuContribution>
+  </extension>
+  <extension
+        point="org.eclipse.ui.menus">
+      
+        <menuContribution
+              allPopups="false"
+              locationURI="menu:org.eclipse.papyrus.ui.menu">
+                <menu
+            label="&amp;Name Edition..."
+            tooltip="Quick formatting for labels">
+         <command
+               commandId="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingUpperCaseCommand"
+               label="&amp;To apply uppercase"
+               style="push">
+            <parameter
+                  name="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"
+                  value="uppercase">
+            </parameter>
+      	 </command>
+      	 <command
+              commandId="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingLowerCaseCommand"
+              label="&amp;To apply lowercase"
+              style="push">
+           <parameter
+                 name="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"
+                 value="lowercase">
+           </parameter>
+      	 </command>
+      	 <command
+               commandId="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingSwitchSpace2UnderscoreCommand"
+               label="&amp;To switch space and underscore"
+               style="push">
+            <parameter
+                  name="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"
+                  value="switchSpace2Underscore">
+            </parameter>
+      	 </command>
+      	 <command
+               commandId="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingCapitalizeFirstLetterCommand"
+               label="&amp;To apply camelcase"
+               style="push">
+            <parameter
+                  name="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"
+                  value="capitalizeFirstLetter">
+            </parameter>
+      	 </command>
+      	 <command
+               commandId="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingRemoveSpaceCommand"
+               label="&amp;To remove or add space"
+               style="push">
+            <parameter
+                  name="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"
+                  value="removeSpace">
+            </parameter>
+      	 </command>
+        <visibleWhen
+              checkEnabled="true">
+        </visibleWhen>
+      </menu>
+        </menuContribution>
+  </extension>   
+<extension
+      id="PapyrusQuickFormattingCommand" 
+      name="QuickFormattingCommand"
+      point="org.eclipse.ui.commands">
+   <command
+         categoryId="org.eclipse.papyrus.infra.ui.quickformat"
+         description="The command to quickly format in uppercase the selected labels"
+         id="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingUpperCaseCommand"
+         name="Upper Case Quick Format Command">
+      <commandParameter
+            id="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"
+            name="name"
+            optional="false">
+      </commandParameter>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.infra.ui.quickformat"
+         description="The command to quickly format in lowercase the selected labels"
+         id="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingLowerCaseCommand"
+         name="Lower Case Quick Format Command">
+      <commandParameter
+            id="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"
+            name="name"
+            optional="false">
+      </commandParameter>
+   </command>
+   
+   <command
+         categoryId="org.eclipse.papyrus.infra.ui.quickformat"
+         description="The command to quickly format by switching space and underscore in the selected labels"
+         id="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingSwitchSpace2UnderscoreCommand"
+         name="Switch Space to Underscore Quick Format Command">
+      <commandParameter
+            id="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"
+            name="name"
+            optional="false">
+      </commandParameter>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.infra.ui.quickformat"
+         description="The command to quickly format by capitalizing the first letter in the selected labels"
+         id="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingCapitalizeFirstLetterCommand"
+         name="Capitalize First Letter Quick Format Command">
+      <commandParameter
+            id="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"
+            name="name"
+            optional="false">
+      </commandParameter>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.infra.ui.quickformat"
+         description="The command to quickly format by removing space in the selected labels"
+         id="org.eclipse.papyrus.infra.ui.menu.commands.QuickFormattingRemoveSpaceCommand"
+         name="Remove Space Quick Format Command">
+      <commandParameter
+            id="org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"
+            name="name"
+            optional="false">
+      </commandParameter>
+   </command>
+   <category
+         description="quickformat routines"
+         id="org.eclipse.papyrus.infra.ui.quickformat"
+         name="quickformat routines">
+   </category>
+</extension>
+
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="toolbar:org.eclipse.ui.main.toolbar">
+         <toolbar
+               id="org.eclipse.papyrus.ui.toolbar">
+            <command
+                  commandId="org.eclipse.papyrus.infra.core.commands.dropdowncommand"
+                  icon="icons/papyrus/Papyrus_16x16.gif"
+                  label="Close Diagrams"
+                  style="pulldown"
+                  tooltip="Close Current Editor&apos;s Diagrams ">
+               <visibleWhen>
+                  <with
+                        variable="activeEditorId">
+                     <equals
+                           value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                     </equals>
+                  </with>
+               </visibleWhen>
+            </command>
+         </toolbar>
+      </menuContribution>
+      <menuContribution
+            locationURI="toolbar:org.eclipse.papyrus.ui.toolbar">
+      </menuContribution>
+      <menuContribution
+            locationURI="popup:org.eclipse.papyrus.infra.core.editor.ui.tabmenu?endof=tabcommands">
+         <command
+               commandId="org.eclipse.papyrus.infra.core.commands.closediagram"
+               label="Close Diagram"
+               style="push"
+               tooltip="Close Currently Selected Diagram">
+            <visibleWhen>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.infra.core.commands.closealldiagram"
+               label="Close All Diagrams"
+               style="push"
+               tooltip="Close All Opened Diagrams">
+            <visibleWhen>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.infra.core.commands.closeothersdiagrams"
+               label="Close Other Diagrams"
+               style="push"
+               tooltip="Close All Diagrams except the selected one">
+            <visibleWhen>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.infra.core.sasheditor.command.tabdoubleclick"
+               label="&amp;Rename Diagram"
+               style="push"
+               tooltip="Rename the diagram">
+            <visibleWhen>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+      <menuContribution
+            allPopups="false"
+            locationURI="menu:org.eclipse.papyrus.infra.core.commands.dropdowncommand">
+         <command
+               commandId="org.eclipse.papyrus.infra.core.commands.closediagram"
+               style="push"
+               tooltip="Close Currently Selected Diagram">
+            <visibleWhen>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.infra.core.commands.closealldiagram"
+               label="Close All Diagrams"
+               style="push"
+               tooltip="Close All Opened Diagrams">
+            <visibleWhen>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.infra.core.commands.closeothersdiagrams"
+               label="Close Other Diagrams"
+               style="push"
+               tooltip="Close All Diagrams except the selected one">
+            <visibleWhen>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.infra.core.commands.privatePageLayout"
+               label="Private Page Layout"
+               style="toggle"
+               tooltip="Store editor page layout privately, not shared in the DI file">
+            <visibleWhen>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            id="org.eclipse.papyrus.infra.core.commands.closealldiagram"
+            name="Close All Diagrams">
+      </command>
+      <command
+            id="org.eclipse.papyrus.infra.core.commands.closediagram"
+            name="Close Diagram">
+      </command>
+      <command
+            id="org.eclipse.papyrus.infra.core.commands.closeothersdiagrams"
+            name="Close Other Diagrams">
+      </command>
+      <command
+            defaultHandler="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands.CloseDiagramCommand"
+            id="org.eclipse.papyrus.infra.core.commands.dropdowncommand"
+            name="dropdown tool">
+      </command>
+      <command
+            id="org.eclipse.papyrus.infra.core.sasheditor.command.tabdoubleclick"
+            name="Rename diagram">
+      </command>
+      <command
+            id="org.eclipse.papyrus.infra.core.commands.privatePageLayout"
+            name="Private Page Layout"
+            description="Store editor page layout privately, not shared in the DI file">
+         <state
+               id="org.eclipse.ui.commands.toggleState"
+               class="org.eclipse.papyrus.infra.ui.internal.commands.PageLayoutStorageState">
+         </state>
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands.CloseDiagramCommand"
+            commandId="org.eclipse.papyrus.infra.core.commands.closediagram">
+      </handler>
+      <handler
+            class="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands.CloseAllDiagramsCommand"
+            commandId="org.eclipse.papyrus.infra.core.commands.closealldiagram">
+      </handler>
+      <handler
+            class="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.commands.CloseOtherDiagramsCommand"
+            commandId="org.eclipse.papyrus.infra.core.commands.closeothersdiagrams">
+      </handler>
+      <handler
+            class="org.eclipse.papyrus.infra.ui.internal.commands.TogglePageLayoutStorageHandler"
+            commandId="org.eclipse.papyrus.infra.core.commands.privatePageLayout">
+      </handler>
+   </extension>
+ 
+   <extension
+         point="org.eclipse.papyrus.infra.core.service">
+      <serviceFactory
+            classname="org.eclipse.papyrus.infra.ui.editor.PageIconRegistryServiceFactory"
+            id="org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistry"
+            priority="1"
+            startKind="startup">
+      </serviceFactory>
+      <serviceFactory
+            classname="org.eclipse.papyrus.infra.ui.editor.DiSashModelManagerServiceFactory"
+            description="The concrete implementation of SashContentProviderr and IPageMngr"
+            id="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelManager"
+            priority="1"
+            startKind="startup">
+         <dependsOn
+               serviceKeyRef="org.eclipse.emf.transaction.TransactionalEditingDomain">
+         </dependsOn>
+         <dependsOn
+               serviceKeyRef="org.eclipse.papyrus.infra.core.resource.ModelSet">
+         </dependsOn>
+      </serviceFactory>
+      <serviceFactory
+            classname="org.eclipse.papyrus.infra.ui.editor.DiSashModelMngrServiceFactory"
+            description="The concrete implementation of SashContentProviderr and IPageMngr"
+            id="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelMngr"
+            priority="1"
+            startKind="startup">
+         <dependsOn
+               serviceKeyRef="org.eclipse.emf.transaction.TransactionalEditingDomain">
+         </dependsOn>
+         <dependsOn
+               serviceKeyRef="org.eclipse.papyrus.infra.core.resource.ModelSet">
+         </dependsOn>
+      </serviceFactory>
+      <serviceFactory
+            classname="org.eclipse.papyrus.infra.ui.editor.PageMngrServiceFactory"
+            description="IPageMngr allows to add and remove pages to the editor."
+            id="org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr"
+            priority="1"
+            startKind="startup">
+         <dependsOn
+               serviceKeyRef="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelManager">
+         </dependsOn>
+      </serviceFactory>
+      <serviceFactory
+            classname="org.eclipse.papyrus.infra.ui.editor.ContentProviderServiceFactory"
+            description="The SashContentProvider maintain the structure of pages of the editor."
+            id="org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider"
+            priority="1"
+            startKind="startup">
+         <dependsOn
+               serviceKeyRef="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelManager">
+         </dependsOn>
+      </serviceFactory>
+      <service
+            classname="org.eclipse.papyrus.infra.ui.lifecycleevents.SaveAndDirtyService"
+            description="Service used to maintain the dirty state, and to perform save and saveAs"
+            id="org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveAndDirtyService"
+            priority="1"
+            startKind="startup">
+         <dependsOn
+               serviceKeyRef="org.eclipse.emf.transaction.TransactionalEditingDomain">
+         </dependsOn>
+         <dependsOn
+               serviceKeyRef="org.eclipse.papyrus.infra.core.resource.ModelSet">
+         </dependsOn>
+         <dependsOn
+               serviceKeyRef="org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor">
+         </dependsOn>
+      </service>
+      <serviceFactory
+            classname="org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProviderServiceFactory"
+            description="Service allowing to listen on save events."
+            id="org.eclipse.papyrus.infra.ui.lifecycleevents.ILifeCycleEventsProvider"
+            priority="1"
+            startKind="startup">
+         <dependsOn
+               serviceKeyRef=" org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveAndDirtyService">
+         </dependsOn>
+      </serviceFactory>
+      <serviceFactory
+            classname="org.eclipse.papyrus.infra.ui.editor.PageMngrServiceFactory"
+            description="IPageManager allows to add and remove pages to the editor."
+            id="org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager"
+            priority="10"
+            startKind="startup">
+         <dependsOn
+               serviceKeyRef="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelManager">
+         </dependsOn>
+      </serviceFactory>
+      <service
+            classname="org.eclipse.papyrus.infra.ui.services.ResourceUpdateService"
+            id="org.eclipse.papyrus.infra.ui.services.ResourceUpdateService"
+            priority="1"
+            startKind="startup">
+         <dependsOn
+               description="This service is used to reopen the IMultiDiagramEditor when changes are detected"
+               serviceKeyRef="org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor">
+         </dependsOn>
+      </service>
+      <service
+            classname="org.eclipse.papyrus.infra.ui.services.SaveLayoutBeforeClose"
+            description="Saves the sash model when closing the editor"
+            priority="1"
+            startKind="startup">
+         <dependsOn
+               serviceKeyRef="org.eclipse.papyrus.infra.core.resource.ModelSet">
+         </dependsOn>
+         <dependsOn
+               serviceKeyRef="org.eclipse.papyrus.infra.ui.services.EditorLifecycleManager">
+         </dependsOn>
+      </service>
+   </extension>
    
-   <extension

-         point="org.eclipse.ui.exportWizards">

-      <category

-            id="org.eclipse.papyrus.infra.core.exportcategory"

-            name="Papyrus">

-      </category>

-   </extension>

-   <extension

-         point="org.eclipse.ui.importWizards">

-      <category

-            id="org.eclipse.papyrus.infra.core.importcategory"

-            name="Papyrus">

-      </category>

-   </extension>

-

-   <extension

-         point="org.eclipse.papyrus.infra.ui.papyrusContentOutline">

-      <contentoutline

-            class="org.eclipse.papyrus.infra.ui.contentoutline.NestedEditorDelegatedOutlinePage"

-            description="Generic outline for Papyrus"

-            priority="2">

-      </contentoutline>

-   </extension>

-   <extension

-          point="org.eclipse.papyrus.infra.ui.papyrusDiagram">

-       <editorDiagram

-             factoryClass="org.eclipse.papyrus.infra.ui.editorsfactory.anytype.AnyTypeEditorFactory">

-       </editorDiagram>

-    </extension>

-

-    <extension

-          point="org.eclipse.core.runtime.preferences">

-       <initializer

-             class="org.eclipse.papyrus.infra.ui.internal.preferences.EditorPreferences$Initializer">

-       </initializer>

-    </extension>

-    <extension

-          point="org.eclipse.ui.preferencePages">

-       <page

-             category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"

-             class="org.eclipse.papyrus.infra.ui.internal.preferences.EditorPreferencePage"

-             id="org.eclipse.papyrus.infra.core.editorPrefs"

-             name="Editor">

-       </page>

-    </extension>

-    

-   <extension

-         point="org.eclipse.core.expressions.definitions">

-      <!-- Is a Papyrus editor active that has a semantic model selection? -->

-      <definition id="org.eclipse.papyrus.ui.semanticModelActive">

-         <with

-               variable="activeEditor">

-            <adapt

-                  type="org.eclipse.papyrus.infra.core.services.ServicesRegistry">

-               <test

-                     property="org.eclipse.papyrus.infra.core.hasSemanticModel">

-               </test>

-            </adapt>

-         </with>

-      </definition>

-   </extension>

-</plugin>

+   <extension
+         point="org.eclipse.ui.exportWizards">
+      <category
+            id="org.eclipse.papyrus.infra.core.exportcategory"
+            name="Papyrus">
+      </category>
+   </extension>
+   <extension
+         point="org.eclipse.ui.importWizards">
+      <category
+            id="org.eclipse.papyrus.infra.core.importcategory"
+            name="Papyrus">
+      </category>
+   </extension>
+
+   <extension
+         point="org.eclipse.papyrus.infra.ui.papyrusContentOutline">
+      <contentoutline
+            class="org.eclipse.papyrus.infra.ui.contentoutline.NestedEditorDelegatedOutlinePage"
+            description="Generic outline for Papyrus"
+            priority="2">
+      </contentoutline>
+   </extension>
+   <extension
+          point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
+       <editorDiagram
+             factoryClass="org.eclipse.papyrus.infra.ui.editorsfactory.anytype.AnyTypeEditorFactory">
+       </editorDiagram>
+    </extension>
+
+    <extension
+          point="org.eclipse.core.runtime.preferences">
+       <initializer
+             class="org.eclipse.papyrus.infra.ui.internal.preferences.EditorPreferences$Initializer">
+       </initializer>
+    </extension>
+    <extension
+          point="org.eclipse.ui.preferencePages">
+       <page
+             category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"
+             class="org.eclipse.papyrus.infra.ui.internal.preferences.EditorPreferencePage"
+             id="org.eclipse.papyrus.infra.core.editorPrefs"
+             name="Editor">
+       </page>
+    </extension>
+    
+   <extension
+         point="org.eclipse.core.expressions.definitions">
+      <!-- Is a Papyrus editor active that has a semantic model selection? -->
+      <definition id="org.eclipse.papyrus.ui.semanticModelActive">
+         <with
+               variable="activeEditor">
+            <adapt
+                  type="org.eclipse.papyrus.infra.core.services.ServicesRegistry">
+               <test
+                     property="org.eclipse.papyrus.infra.core.hasSemanticModel">
+               </test>
+            </adapt>
+         </with>
+      </definition>
+   </extension>
+</plugin>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/pom.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/pom.xml
index 392c6db7ab2..f6a01ae6b41 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/pom.xml
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/pom.xml
@@ -2,14 +2,12 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-ui</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.ui</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<description>Plugin dedicated to manage generic menus and actions, linked to EMF but not to UML nor GMF technologies.</description>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/schema/contentOutline.exsd b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/schema/contentOutline.exsd
index 0b84e1af92c..0b84e1af92c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/schema/contentOutline.exsd
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/schema/contentOutline.exsd
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/schema/papyrusDiagram.exsd b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/schema/papyrusDiagram.exsd
index 241fe0c27f1..241fe0c27f1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/schema/papyrusDiagram.exsd
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/schema/papyrusDiagram.exsd
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/Activator.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/Activator.java
index 730eea20ada..a744cf9db8d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/Activator.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/Activator.java
@@ -1,99 +1,99 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

- *  Christian W. Damus = bug 485220

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui;

-

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.core.services.spi.IContextualServiceRegistryTracker;

-import org.eclipse.papyrus.infra.tools.spi.IExecutorServiceFactory;

-import org.eclipse.papyrus.infra.ui.util.UIUtil;

-import org.eclipse.papyrus.infra.ui.util.WorkbenchPartHelper;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-import org.osgi.framework.ServiceRegistration;

-

-/**

- * 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.ui"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * The plug-in's logger

-	 */

-	public static LogHelper log;

-

-	private ServiceRegistration<IExecutorServiceFactory> executorFactoryReg;

-	private ServiceRegistration<IContextualServiceRegistryTracker> serviceRegistryTrackerReg;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-

-		IExecutorServiceFactory executorFactory = () -> UIUtil.createUIExecutor(Display.getDefault());

-		executorFactoryReg = context.registerService(IExecutorServiceFactory.class, executorFactory, null);

-

-		IContextualServiceRegistryTracker serviceRegistryTracker = () -> {

-			ServicesRegistry result = null;

-			IEditorPart editor = WorkbenchPartHelper.getCurrentActiveEditorPart();

-			if (editor != null) {

-				result = editor.getAdapter(ServicesRegistry.class);

-			}

-			return result;

-		};

-		serviceRegistryTrackerReg = context.registerService(IContextualServiceRegistryTracker.class, serviceRegistryTracker, null);

-	}

-

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		if (serviceRegistryTrackerReg != null) {

-			serviceRegistryTrackerReg.unregister();

-			serviceRegistryTrackerReg = null;

-		}

-		if (executorFactoryReg != null) {

-			executorFactoryReg.unregister();

-			executorFactoryReg = null;

-		}

-

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *  Christian W. Damus = bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui;
+
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.services.spi.IContextualServiceRegistryTracker;
+import org.eclipse.papyrus.infra.tools.spi.IExecutorServiceFactory;
+import org.eclipse.papyrus.infra.ui.util.UIUtil;
+import org.eclipse.papyrus.infra.ui.util.WorkbenchPartHelper;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+
+/**
+ * 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.ui"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/**
+	 * The plug-in's logger
+	 */
+	public static LogHelper log;
+
+	private ServiceRegistration<IExecutorServiceFactory> executorFactoryReg;
+	private ServiceRegistration<IContextualServiceRegistryTracker> serviceRegistryTrackerReg;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+
+		IExecutorServiceFactory executorFactory = () -> UIUtil.createUIExecutor(Display.getDefault());
+		executorFactoryReg = context.registerService(IExecutorServiceFactory.class, executorFactory, null);
+
+		IContextualServiceRegistryTracker serviceRegistryTracker = () -> {
+			ServicesRegistry result = null;
+			IEditorPart editor = WorkbenchPartHelper.getCurrentActiveEditorPart();
+			if (editor != null) {
+				result = editor.getAdapter(ServicesRegistry.class);
+			}
+			return result;
+		};
+		serviceRegistryTrackerReg = context.registerService(IContextualServiceRegistryTracker.class, serviceRegistryTracker, null);
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		if (serviceRegistryTrackerReg != null) {
+			serviceRegistryTrackerReg.unregister();
+			serviceRegistryTrackerReg = null;
+		}
+		if (executorFactoryReg != null) {
+			executorFactoryReg.unregister();
+			executorFactoryReg = null;
+		}
+
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractCommandHandler.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractCommandHandler.java
new file mode 100644
index 00000000000..9145151e8a0
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractCommandHandler.java
@@ -0,0 +1,189 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 		Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *      Vincent Lorenzo (CEA-LIST) vincent.lorenzo@cea.fr
+ *      Christian W. Damus (CEA) - Refactoring package/profile import/apply UI for CDO
+ *      Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.command;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.ui.Activator;
+import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForHandlers;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * <pre>
+ *
+ * This abstract command handler manages:
+ * - current selection in order to build a list of the selected {@link EObject}
+ * - execute the command (returned by children) in Papyrus {@link TransactionalEditingDomain}
+ * - calculate the command enablement and visibility regarding the command executability
+ * (the command is now shown in menu if not executable).
+ *
+ * </pre>
+ */
+public abstract class AbstractCommandHandler extends AbstractPapyrusHandler {
+
+	private List<?> selection = Collections.EMPTY_LIST;
+
+	/**
+	 * Returns the command to execute (to be implemented
+	 * in children implementing this class)
+	 *
+	 * @param context
+	 *            the command evaluation context
+	 * 
+	 * @return the command to execute
+	 */
+	protected abstract Command getCommand(IEvaluationContext context);
+
+	protected Command getCommand(ExecutionEvent event) {
+		Command result = null;
+
+		Object context = event.getApplicationContext();
+		if (context instanceof IEvaluationContext) {
+			result = getCommand((IEvaluationContext) context);
+		} else {
+			throw new IllegalArgumentException("No evaluation context in execution event: " + event); //$NON-NLS-1$
+		}
+
+		return result;
+	}
+
+	protected List<?> getSelection() {
+		return selection;
+	}
+
+	/**
+	 * <pre>
+	 * Get the selected element, the first selected element if several are selected or null
+	 * if no selection or the selection is not an {@link EObject}.
+	 *
+	 * @return selected {@link EObject} or null
+	 * </pre>
+	 *
+	 */
+	protected EObject getSelectedElement() {
+		EObject eObject = null;
+
+		// Get current selection
+		List<?> selection = getSelection();
+
+		// Treat non-null selected object (try to adapt and return EObject)
+		if (!selection.isEmpty()) {
+
+			// Get first element if the selection is an IStructuredSelection
+			Object first = selection.get(0);
+
+			EObject businessObject = EMFHelper.getEObject(first);
+			if (businessObject != null) {
+				eObject = businessObject;
+			}
+		}
+
+		return eObject;
+	}
+
+	/**
+	 * <pre>
+	 * Parse current selection and extract the list of {@link EObject} from
+	 * this selection.
+	 *
+	 * This also tries to adapt selected element into {@link EObject}
+	 * (for example to get the {@link EObject} from a selection in the ModelExplorer).
+	 *
+	 * @return a list of currently selected {@link EObject}
+	 * </pre>
+	 *
+	 */
+	protected List<EObject> getSelectedElements() {
+
+		List<EObject> selectedEObjects = new ArrayList<EObject>();
+
+		// Get current selection
+		Collection<?> selection = getSelection();
+
+		// Treat non-null selected object (try to adapt and return EObject)
+		if (!selection.isEmpty()) {
+
+			// Parse current selection
+			for (Object current : selection) {
+				// Adapt current selection to EObject
+				EObject selectedEObject = EMFHelper.getEObject(current);
+				if (selectedEObject != null) {
+					// we avoid to add null element in the list!
+					selectedEObjects.add(selectedEObject);
+				}
+			}
+		}
+
+		return selectedEObjects;
+	}
+
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		try {
+			ISelection selection = HandlerUtil.getCurrentSelection(event);
+			this.selection = (selection instanceof IStructuredSelection) ? ((IStructuredSelection) selection).toList() : Collections.EMPTY_LIST;
+
+			ServiceUtilsForHandlers.getInstance().getTransactionalEditingDomain(event).getCommandStack().execute(getCommand(event));
+		} catch (ServiceException e) {
+			Activator.log.error("Unexpected error while executing command.", e); //$NON-NLS-1$
+		} finally {
+			// clear the selection
+			this.selection = Collections.EMPTY_LIST;
+		}
+
+		return null;
+	}
+
+	protected boolean computeEnabled(IEvaluationContext context) {
+		boolean result = false;
+
+		Command command = getCommand(context);
+		if (command != null) {
+			result = command.canExecute();
+			command.dispose();
+		}
+
+		return result;
+	}
+
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		if (evaluationContext instanceof IEvaluationContext) {
+			IEvaluationContext context = (IEvaluationContext) evaluationContext;
+
+			Object selection = ((IEvaluationContext) evaluationContext).getDefaultVariable();
+			if (selection instanceof Collection<?>) {
+				this.selection = (selection instanceof List<?>) ? (List<?>) selection : new java.util.ArrayList<Object>((Collection<?>) selection);
+				setBaseEnabled(computeEnabled(context));
+				this.selection = Collections.EMPTY_LIST;
+			}
+		}
+		super.setEnabled(evaluationContext);
+	}
+}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractPapyrusHandler.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractPapyrusHandler.java
new file mode 100644
index 00000000000..d77ab4240be
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/command/AbstractPapyrusHandler.java
@@ -0,0 +1,217 @@
+/*****************************************************************************
+ * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.command;
+
+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.expressions.IEvaluationContext;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TreeSelection;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForHandlers;
+import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForIEvaluationContext;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * This provides facilities to get the TransactionEditingDomain and the PageManager from
+ * the current Papyrus editor or view context.
+ */
+public abstract class AbstractPapyrusHandler extends AbstractHandler {
+
+	/**
+	 * Obtains the transactional editing domain associated with the Papyrus Editor or View
+	 * that is the context of the specified {@code execution}.
+	 * 
+	 * @param execution
+	 *            an execution event
+	 * 
+	 * @return the editing domain, or {@code null} if there is none (such as when the Papyrus Editor is closing)
+	 */
+	protected TransactionalEditingDomain getEditingDomain(ExecutionEvent execution) {
+		TransactionalEditingDomain result = null;
+
+		try {
+			result = ServiceUtilsForHandlers.getInstance().getTransactionalEditingDomain(execution);
+		} catch (ServiceException e) {
+			// The wrong kind of editor/view is active or the Papyrus Editor is shutting down.
+			// These are both normal conditions
+		}
+
+		return result;
+	}
+
+	/**
+	 * Obtains the transactional editing domain associated with the Papyrus Editor or View
+	 * that has the specified evaluation {@code context}.
+	 * 
+	 * @param context
+	 *            an evaluation context for a command's enablement or other computation
+	 * 
+	 * @return the editing domain, or {@code null} if there is none (such as when the Papyrus Editor is closing)
+	 */
+	protected TransactionalEditingDomain getEditingDomain(IEvaluationContext context) {
+		TransactionalEditingDomain result = null;
+
+		try {
+			result = ServiceUtilsForIEvaluationContext.getInstance().getTransactionalEditingDomain(context);
+		} catch (ServiceException e) {
+			// The wrong kind of editor/view is active or the Papyrus Editor is shutting down.
+			// These are both normal conditions
+		}
+
+		return result;
+	}
+
+	/**
+	 * Obtains the page manager associated with the Papyrus Editor or View
+	 * that is the context of the specified {@code execution}.
+	 * 
+	 * @param execution
+	 *            an execution event
+	 * 
+	 * @return the page manager, or {@code null} if there is none (such as when the Papyrus Editor is closing)
+	 */
+	protected IPageManager getPageManager(ExecutionEvent execution) {
+		IPageManager result = null;
+
+		try {
+			result = ServiceUtilsForHandlers.getInstance().getIPageManager(execution);
+		} catch (ServiceException e) {
+			// The wrong kind of editor/view is active or the Papyrus Editor is shutting down.
+			// These are both normal conditions
+		}
+
+		return result;
+	}
+
+	/**
+	 * Obtains the page manager associated with the Papyrus Editor or View
+	 * that has the specified evaluation {@code context}.
+	 * 
+	 * @param context
+	 *            an evaluation context for a command's enablement or other computation
+	 * 
+	 * @return the page manager, or {@code null} if there is none (such as when the Papyrus Editor is closing)
+	 */
+	protected IPageManager getPageManager(IEvaluationContext context) {
+		IPageManager result = null;
+
+		try {
+			result = ServiceUtilsForIEvaluationContext.getInstance().getIPageManager(context);
+		} catch (ServiceException e) {
+			// The wrong kind of editor/view is active or the Papyrus Editor is shutting down.
+			// These are both normal conditions
+		}
+
+		return result;
+	}
+
+	/**
+	 * Adapt the specified object to the requested type, if possible.
+	 * Return null if the object can't be adapted.
+	 *
+	 * @param object
+	 * @param expectedClassType
+	 * @return The adapted object, or null.
+	 */
+	@SuppressWarnings("unchecked")
+	private <T> T adapt(Object object, Class<T> expectedClassType) {
+
+
+		EObject eobject = EMFHelper.getEObject(object);
+
+		if (eobject != null && expectedClassType.isInstance(eobject)) {
+			return (T) eobject;
+		}
+
+
+
+		// Try global mechanism
+		{
+			T ele = Platform.getAdapterManager().getAdapter(object, expectedClassType);
+			if (ele != null) {
+				return ele;
+			}
+			// Try as EObject if the expectedClasType is sub-type of EObject.
+			if (EObject.class.isAssignableFrom(expectedClassType)) {
+				// to EObject
+				eobject = Platform.getAdapterManager().getAdapter(object, EObject.class);
+
+				if (eobject != null && expectedClassType.isInstance(eobject)) {
+
+					return (T) eobject;
+				}
+			}
+		}
+		// Can't be adapted
+		return null;
+
+	}
+
+	/**
+	 * Filter the list, and only retain objects that can be adapted to the specified type
+	 *
+	 * @param objects
+	 * @param class1
+	 * @return
+	 */
+	private <T> List<T> getAllElementAdaptedToType(List<Object> list, Class<T> expectedClassType) {
+
+		List<T> res = new ArrayList<T>();
+
+		for (Object cur : list) {
+
+			T adapted = adapt(cur, expectedClassType);
+			if (adapted != null) {
+				res.add(adapted);
+			}
+		}
+		return res;
+	}
+
+	/**
+	 * Get all selected element of the specified type.
+	 *
+	 * @param expectedType
+	 * @return
+	 * @throws ExecutionException
+	 */
+	@SuppressWarnings("unchecked")
+	protected <T> List<T> getCurrentSelectionAdaptedToType(ExecutionEvent event, Class<T> expectedType) throws ExecutionException {
+
+		// Get selection from the workbench
+		ISelection selection = HandlerUtil.getCurrentSelectionChecked(event);
+
+		// Get the selected objects according to the type of the selected
+		if (selection instanceof IStructuredSelection) {
+			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
+			return getAllElementAdaptedToType(structuredSelection.toList(), expectedType);
+		} else if (selection instanceof TreeSelection) {
+			TreeSelection treeSelection = (TreeSelection) selection;
+			return getAllElementAdaptedToType(treeSelection.toList(), expectedType);
+
+		}
+		return null;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/ContentOutlineRegistry.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/ContentOutlineRegistry.java
index 1fb84925184..1fb84925184 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/ContentOutlineRegistry.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/ContentOutlineRegistry.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/IPapyrusContentOutlinePage.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/IPapyrusContentOutlinePage.java
index 15116aa267b..8ce4fd3985f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/IPapyrusContentOutlinePage.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/IPapyrusContentOutlinePage.java
@@ -1,34 +1,34 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.contentoutline;

-

-import org.eclipse.papyrus.infra.core.editor.BackboneException;

-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

-

-/**

- * Extends the original interface to add the init method.

- */

-public interface IPapyrusContentOutlinePage extends org.eclipse.ui.views.contentoutline.IContentOutlinePage {

-

-	/**

-	 * Init the content outline.

-	 *

-	 * @param multiEditor

-	 *            the multiEditor is used to access to the context

-	 * @throws BackboneException

-	 *             during research of the associated context.

-	 */

-	void init(IMultiDiagramEditor multiEditor) throws BackboneException;

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.contentoutline;
+
+import org.eclipse.papyrus.infra.core.editor.BackboneException;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+
+/**
+ * Extends the original interface to add the init method.
+ */
+public interface IPapyrusContentOutlinePage extends org.eclipse.ui.views.contentoutline.IContentOutlinePage {
+
+	/**
+	 * Init the content outline.
+	 *
+	 * @param multiEditor
+	 *            the multiEditor is used to access to the context
+	 * @throws BackboneException
+	 *             during research of the associated context.
+	 */
+	void init(IMultiDiagramEditor multiEditor) throws BackboneException;
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePage.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePage.java
index 4cf52a66930..833f0ef89fb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePage.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/contentoutline/NestedEditorDelegatedOutlinePage.java
@@ -1,1098 +1,1098 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2014 CEA LIST and other.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 437217

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.contentoutline;

-

-import java.lang.reflect.Field;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.core.runtime.PlatformObject;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.papyrus.infra.core.Activator;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IEditorPage;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.utils.AdapterUtils;

-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

-import org.eclipse.papyrus.infra.ui.editor.IReloadableEditor;

-import org.eclipse.papyrus.infra.ui.editor.reload.EditorReloadEvent;

-import org.eclipse.papyrus.infra.ui.editor.reload.IEditorReloadListener;

-import org.eclipse.papyrus.infra.ui.editor.reload.IReloadContextProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Text;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IViewSite;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.SubActionBars;

-import org.eclipse.ui.part.IPageBookViewPage;

-import org.eclipse.ui.part.IPageSite;

-import org.eclipse.ui.part.Page;

-import org.eclipse.ui.part.PageBook;

-import org.eclipse.ui.part.PageSite;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-

-import com.google.common.collect.Lists;

-

-/**

- * Page for Papyrus outline when active nested editor is a GMF editor

- */

-public class NestedEditorDelegatedOutlinePage extends Page implements IPapyrusContentOutlinePage, IPageLifeCycleEventsListener, IEditorReloadListener {

-

-	/** The editor for which I am a slave. */

-	private IMultiDiagramEditor multiEditor;

-

-	/** Sash window container to listen for page changes inside the same editor */

-	private ISashWindowsContainer sashWindowsContainer;

-

-	/** Page book in which all outline controls of nested editors will be stored and displayed one by one */

-	private PageBook sashEditorPageBook;

-

-	/**

-	 * Map from papyrus pages (representing nested editors) to outline page records (key type: <code>org.eclipse.papyrus.infra.core.sasheditor.editor.IPage</code>;

-	 * value type: <code>OutlinePageRec</code>).

-	 */

-	private Map<IPage, OutlinePageRec> mapIPapyrusPageToOutlineRec = new HashMap<IPage, OutlinePageRec>();

-

-	/**

-	 * The page rec which provided the current page or <code>null</code>

-	 */

-	private OutlinePageRec activeRec;

-

-	/**

-	 * Default page rec that displays a simple message

-	 */

-	private OutlinePageRec defaultPageRec;

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void init(IMultiDiagramEditor multiEditor) {

-		this.multiEditor = multiEditor;

-

-		internalInit(multiEditor);

-

-		IReloadableEditor.Adapter.getAdapter(multiEditor).addEditorReloadListener(this);

-	}

-

-	private void internalInit(IMultiDiagramEditor multiEditor) {

-		sashWindowsContainer = (ISashWindowsContainer) multiEditor.getAdapter(ISashWindowsContainer.class);

-		sashWindowsContainer.addPageLifeCycleListener(this);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void init(IPageSite pageSite) {

-		IViewSite viewSite = getViewSite(pageSite);

-

-		DelegatedPageSite delegatedPageSite = new DelegatedPageSite(viewSite, this);

-		super.init(delegatedPageSite);

-	}

-

-	/**

-	 * /**

-	 * The <code>PageBookView</code> implementation of this <code>IWorkbenchPart</code> method cleans up all the pages. Subclasses

-	 * may extend.

-	 */

-	@Override

-	public void dispose() {

-		if (multiEditor != null) {

-			IReloadableEditor.Adapter.getAdapter(multiEditor).removeEditorReloadListener(this);

-		}

-

-		internalDispose();

-

-		multiEditor = null;

-

-		// Run super.

-		super.dispose();

-	}

-

-	private void internalDispose() {

-		// Deref all of the pages.

-		activeRec = null;

-		if (defaultPageRec != null) {

-			// check for null since the default page may not have

-			// been created (ex. perspective never visible)

-			defaultPageRec.contentOutlinePage.dispose();

-			defaultPageRec.dispose();

-			defaultPageRec = null;

-		}

-

-		java.util.List<OutlinePageRec> records = new ArrayList<NestedEditorDelegatedOutlinePage.OutlinePageRec>(mapIPapyrusPageToOutlineRec.values());

-		Iterator<OutlinePageRec> itr = records.iterator();

-		while (itr.hasNext()) {

-			OutlinePageRec rec = itr.next();

-			removePage(rec);

-		}

-

-		// remove listener and all refs to editor

-		sashWindowsContainer.removePageLifeCycleListener(this);

-	}

-

-	/**

-	 * Refreshes the global actions for the active page.

-	 */

-	@SuppressWarnings({ "rawtypes", "unchecked" })

-	protected void refreshGlobalActionHandlers() {

-		// Clear old actions.

-		IActionBars bars = getSite().getActionBars();

-		bars.clearGlobalActionHandlers();

-

-		// Set new actions.

-		Map newActionHandlers = ((SubActionBars) activeRec.getPageSite().getActionBars()).getGlobalActionHandlers();

-		if (newActionHandlers != null) {

-			Set<?> keys = newActionHandlers.entrySet();

-			Iterator<?> iter = keys.iterator();

-			while (iter.hasNext()) {

-				Map.Entry<String, IAction> entry = (Map.Entry) iter.next();

-				bars.setGlobalActionHandler(entry.getKey(), entry.getValue());

-			}

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		// nothing here

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public ISelection getSelection() {

-		// nothing here

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		// nothing here

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		// nothing here

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void createControl(Composite parent) {

-		sashEditorPageBook = new PageBook(parent, SWT.BORDER);

-

-		createContents();

-	}

-

-	protected void createContents() {

-		// Create the default page rec.

-		IContentOutlinePage defaultPage = createDefaultPage(sashEditorPageBook);

-		defaultPageRec = new OutlinePageRec(null, defaultPage);

-		preparePage(defaultPageRec);

-

-		// Show the initial active page or the default page

-		IPage activePage = sashWindowsContainer.getActiveSashWindowsPage();

-		if (activePage != null) {

-			OutlinePageRec rec = getOutlinePageRec(activePage);

-			if (rec == null) {

-				rec = createPage(activePage);

-			}

-

-			// Show the page, if it was successfully created

-			if (rec != null) {

-				showOutlinePageRec(rec);

-			} else {

-				showOutlinePageRec(defaultPageRec);

-			}

-		} else {

-			showOutlinePageRec(defaultPageRec);

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Control getControl() {

-		return sashEditorPageBook;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {

-		// nothing here

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void pageChanged(IPage newPage) {

-		// throw new UnsupportedOperationException("pageChanged not implemented " + newPage);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void pageOpened(IPage page) {

-		// Activator.log.debug("Opened");

-		// create the new Outline

-		// Create a page for the part.

-		OutlinePageRec rec = getOutlinePageRec(page);

-		if (rec == null) {

-			rec = createPage(page);

-		}

-

-		// Show the page, if it was successfully created

-		if (rec != null) {

-			showOutlinePageRec(rec);

-		} else {

-			showOutlinePageRec(defaultPageRec);

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void pageClosed(IPage papyrusPage) {

-		// Activator.log.debug("Closed");

-		// Update the active part.

-		if (activeRec != null && activeRec.papyrusPage == papyrusPage) {

-			showOutlinePageRec(defaultPageRec);

-		}

-

-		// Find and remove the part page.

-		OutlinePageRec rec = getOutlinePageRec(papyrusPage);

-		if (rec != null) {

-			removePage(rec);

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void pageActivated(IPage page) {

-		// Activator.log.debug("Activated");

-		// Create a page for the partm, if necessary.

-		OutlinePageRec rec = getOutlinePageRec(page, true);

-

-		// Show the page, if it was successfully created

-		if (rec != null) {

-			showOutlinePageRec(rec);

-		} else {

-			showOutlinePageRec(defaultPageRec);

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void pageDeactivated(IPage page) {

-		// throw new UnsupportedOperationException("pageDeactivated not implemented " + page);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void pageAboutToBeOpened(IPage page) {

-		// throw new UnsupportedOperationException("pageAboutToBeOpened not implemented "+page);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void pageAboutToBeClosed(IPage page) {

-		// throw new UnsupportedOperationException("pageAboutToBeClosed not implemented " + page);

-	}

-

-	@Override

-	public void editorAboutToReload(EditorReloadEvent event) {

-		event.putContext(new OutlineContext());

-

-		internalDispose();

-	}

-

-	@Override

-	public void editorReloaded(EditorReloadEvent event) {

-		internalInit(event.getEditor());

-		createContents();

-

-		((OutlineContext) event.getContext()).restore();

-	}

-

-	// /////////////////////////////////////////////////////////////////////////////////////////////////////////////////

-	// MAINLY INSPIRED FROM PAGE BOOK VIEW

-	// /////////////////////////////////////////////////////////////////////////////////////////////////////////////////

-

-	/**

-	 * Creates and returns the default page for this view.

-	 *

-	 * @param book

-	 *            the pagebook control

-	 * @return the default page

-	 */

-	protected IContentOutlinePage createDefaultPage(PageBook book) {

-		MessageOutlinePage page = new MessageOutlinePage();

-		initPage(page);

-		page.createControl(book);

-		return page;

-	}

-

-	/**

-	 * Creates an outline record for a given papyrus Page. Adds it to the pagebook but does not show it.

-	 *

-	 * @param page

-	 *            The nested editor we are created an outline.

-	 * @return the created outline page record

-	 */

-	protected OutlinePageRec createPage(IPage papyrusPage) {

-		OutlinePageRec rec = doCreatePage(papyrusPage);

-		if (rec != null) {

-			mapIPapyrusPageToOutlineRec.put(papyrusPage, rec);

-			preparePage(rec);

-		}

-		return rec;

-	}

-

-	/**

-	 * Prepares the page in the given page rec for use in this view.

-	 *

-	 * @param rec

-	 */

-	protected void preparePage(OutlinePageRec rec) {

-		IPageSite site = null;

-

-		if (!doesPageExist(rec.contentOutlinePage)) {

-			if (rec.contentOutlinePage instanceof IPageBookViewPage) {

-				site = ((IPageBookViewPage) rec.contentOutlinePage).getSite();

-				rec.setPageSite(site);

-			}

-		}

-	}

-

-	/**

-	 * Initializes the given page with a page site.

-	 * <p>

-	 * Subclasses should call this method after the page is created but before creating its controls.

-	 * </p>

-	 * <p>

-	 * Subclasses may override

-	 * </p>

-	 *

-	 * @param page

-	 *            The page to initialize

-	 */

-	protected void initPage(IPageBookViewPage page) {

-		try {

-			IPageSite site = super.getSite();

-			// try to create a specific page site for this page

-			page.init(new PageSite(getViewSite(site)));

-		} catch (PartInitException e) {

-			Activator.log.error(e);

-		}

-	}

-

-	/**

-	 * @param site

-	 *            the page site from which parent view site is retrieved

-	 * @return the retrieved page site

-	 */

-	protected static IViewSite getViewSite(IPageSite site) {

-		if (site instanceof IViewSite) {

-			return ((IViewSite) site);

-		}

-		// no way to get the IViewSite from the page site.

-		if (site instanceof PageSite) {

-			try {

-				Field parentSiteField = PageSite.class.getDeclaredField("parentSite");

-				parentSiteField.setAccessible(true);

-				Object parentSite = parentSiteField.get(site);

-				if (parentSite instanceof IViewSite) {

-					return ((IViewSite) parentSite);

-				}

-			} catch (SecurityException e) {

-				Activator.log.error(e);

-			} catch (NoSuchFieldException e) {

-				Activator.log.error(e);

-			} catch (IllegalArgumentException e) {

-				Activator.log.error(e);

-			} catch (IllegalAccessException e) {

-				Activator.log.error(e);

-			}

-		}

-		return null;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * Method declared on PageBookView.

-	 */

-	protected OutlinePageRec doCreatePage(IPage papyrusPage) {

-		// Try to get an outline page.

-		if (papyrusPage instanceof IEditorPage) {

-			IEditorPart part = ((IEditorPage) papyrusPage).getIEditorPart();

-			Object obj = getAdapter(part, IContentOutlinePage.class, false);

-			if (obj instanceof IContentOutlinePage) {

-				IContentOutlinePage page = (IContentOutlinePage) obj;

-				if (page instanceof IPageBookViewPage) {

-					initPage((IPageBookViewPage) page);

-				}

-				page.createControl(getPageBook());

-				return new OutlinePageRec(papyrusPage, page);

-			}

-		}

-

-		// There is no content outline

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public DelegatedPageSite getSite() {

-		return (DelegatedPageSite) super.getSite();

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * Method declared on PageBookView.

-	 */

-	protected void doDestroyPage(IPage papyrusPage, OutlinePageRec rec) {

-		IContentOutlinePage contentOutlinePage = rec.contentOutlinePage;

-		contentOutlinePage.dispose();

-		rec.dispose();

-	}

-

-	protected Collection<OutlinePageRec> getAllPages() {

-		return mapIPapyrusPageToOutlineRec.values();

-	}

-

-	/**

-	 * Returns true if the page has already been created.

-	 *

-	 * @param page

-	 *            the page to test

-	 * @return true if this page has already been created.

-	 */

-	protected boolean doesPageExist(IContentOutlinePage page) {

-		return mapIPapyrusPageToOutlineRec.containsKey(page);

-	}

-

-	/**

-	 * Returns the papyrus page which contributed the current outline page to this view.

-	 *

-	 * @return the page which contributed the current outline page or <code>null</code> if no part contributed the current page

-	 */

-	protected IPage getCurrentContributingPage() {

-		if (activeRec == null) {

-			return null;

-		}

-		return activeRec.papyrusPage;

-	}

-

-	/**

-	 * Returns the currently visible outline page for this view or <code>null</code> if no page is currently visible.

-	 *

-	 * @return the currently visible page

-	 */

-	public IContentOutlinePage getCurrentOutlinePage() {

-		if (activeRec == null) {

-			return null;

-		}

-		return activeRec.contentOutlinePage;

-	}

-

-	/**

-	 * Returns the view site for the given page of this view.

-	 *

-	 * @param page

-	 *            the page

-	 * @return the corresponding site, or <code>null</code> if not found

-	 */

-	protected IPageSite getPageSite(IPage page) {

-		OutlinePageRec rec = getOutlinePageRec(page);

-		if (rec != null) {

-			return rec.getPageSite();

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the default page for this view.

-	 *

-	 * @return the default page

-	 */

-	public IContentOutlinePage getDefaultOutlinePage() {

-		return defaultPageRec.contentOutlinePage;

-	}

-

-	/**

-	 * Returns the pagebook control for this view.

-	 *

-	 * @return the pagebook control, or <code>null</code> if not initialized

-	 */

-	protected PageBook getPageBook() {

-		return sashEditorPageBook;

-	}

-

-	/**

-	 * Returns the page record for the given part.

-	 *

-	 * @param part

-	 *            the part

-	 * @return the corresponding page record, or <code>null</code> if not

-	 *         found

-	 */

-	protected OutlinePageRec getOutlinePageRec(IPage papyrusPage) {

-		return mapIPapyrusPageToOutlineRec.get(papyrusPage);

-	}

-

-	OutlinePageRec getOutlinePageRec(IPage papyrusPage, boolean create) {

-		OutlinePageRec result = getOutlinePageRec(papyrusPage);

-		if (result == null) {

-			result = createPage(papyrusPage);

-		}

-		return result;

-	}

-

-	/**

-	 * Returns the page record for the given page of this view.

-	 *

-	 * @param page

-	 *            the page

-	 * @return the corresponding page record, or <code>null</code> if not

-	 *         found

-	 */

-	protected OutlinePageRec getPageRec(IContentOutlinePage contentOutlinePage) {

-		Iterator<OutlinePageRec> itr = mapIPapyrusPageToOutlineRec.values().iterator();

-		while (itr.hasNext()) {

-			OutlinePageRec rec = itr.next();

-			if (rec.contentOutlinePage == contentOutlinePage) {

-				return rec;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Removes a page record.

-	 *

-	 * @param rec

-	 *            the page record to remove

-	 */

-	protected void removePage(OutlinePageRec rec) {

-		mapIPapyrusPageToOutlineRec.remove(rec.papyrusPage);

-

-		Control control = rec.contentOutlinePage.getControl();

-		if (control != null && !control.isDisposed()) {

-			// Dispose the page's control so pages don't have to do this in their dispose method.

-			// The page's control is a child of this view's control so if this view is closed, the page's control will already be disposed.

-			control.dispose();

-		}

-

-		// Do this before destroying the page, otherwise we won't be able to retrieve the page site (it will be null)

-		IPageSite site = rec.getPageSite();

-		if (site instanceof PageSite) { // test null pointer and PageSite

-			((SubActionBars) ((PageSite) site).getActionBars()).deactivate();

-			((SubActionBars) ((PageSite) site).getActionBars()).dispose();

-		}

-

-		// Free the page

-		doDestroyPage(rec.papyrusPage, rec);

-	}

-

-	/*

-	 * (non-Javadoc) Method declared on IWorkbenchPart.

-	 */

-	@Override

-	public void setFocus() {

-		// first set focus on the page book, in case the page

-		// doesn't properly handle setFocus

-		if (sashEditorPageBook != null) {

-			sashEditorPageBook.setFocus();

-		}

-		// then set focus on the page, if any

-		if (activeRec != null) {

-			activeRec.contentOutlinePage.setFocus();

-		}

-	}

-

-	/**

-	 * Shows page contained in the given page record in this view. The page

-	 * record must be one from this pagebook view.

-	 * <p>

-	 * The <code>PageBookView</code> implementation of this method asks the pagebook control to show the given page's control, and records that the given page is now current. Subclasses may extend.

-	 * </p>

-	 *

-	 * @param pageRec

-	 *            the page record containing the page to show

-	 */

-	protected void showOutlinePageRec(OutlinePageRec pageRec) {

-		// If already showing do nothing

-		if (activeRec == pageRec) {

-			return;

-		}

-		// If the page is the same, just set activeRec to pageRec

-		if (activeRec != null && pageRec != null && activeRec.contentOutlinePage == pageRec.contentOutlinePage) {

-			activeRec = pageRec;

-			return;

-		}

-

-		activeRec = pageRec;

-		Control pageControl = activeRec.contentOutlinePage.getControl();

-		if (pageControl != null && !pageControl.isDisposed()) {

-			PageSite pageSite = (PageSite) activeRec.getPageSite();

-			// Verify that the page control is not disposed

-			// If we are closing, it may have already been disposed

-			sashEditorPageBook.showPage(pageControl);

-			getSite().setActivePageSite(pageSite);

-		}

-

-	}

-

-	/**

-	 * If it is possible to adapt the given object to the given type, this

-	 * returns the adapter. Performs the following checks:

-	 *

-	 * <ol>

-	 * <li>Returns <code>sourceObject</code> if it is an instance of the adapter type.</li>

-	 * <li>If sourceObject implements IAdaptable, it is queried for adapters.</li>

-	 * <li>If sourceObject is not an instance of PlatformObject (which would have already done so), the adapter manager is queried for adapters</li>

-	 * </ol>

-	 *

-	 * Otherwise returns null.

-	 *

-	 * @param sourceObject

-	 *            object to adapt, or null

-	 * @param adapter

-	 *            type to adapt to

-	 * @param activatePlugins

-	 *            true if IAdapterManager.loadAdapter should be used (may trigger plugin activation)

-	 * @return a representation of sourceObject that is assignable to the

-	 *         adapter type, or null if no such representation exists

-	 */

-	public static Object getAdapter(Object sourceObject, Class<?> adapter, boolean activatePlugins) {

-		Assert.isNotNull(adapter);

-		if (sourceObject == null) {

-			return null;

-		}

-		if (adapter.isInstance(sourceObject)) {

-			return sourceObject;

-		}

-

-		if (sourceObject instanceof IAdaptable) {

-			IAdaptable adaptable = (IAdaptable) sourceObject;

-

-			Object result = adaptable.getAdapter(adapter);

-			if (result != null) {

-				// Sanity-check

-				Assert.isTrue(adapter.isInstance(result));

-				return result;

-			}

-		}

-

-		if (!(sourceObject instanceof PlatformObject)) {

-			Object result;

-			if (activatePlugins) {

-				result = Platform.getAdapterManager().loadAdapter(sourceObject, adapter.getName());

-			} else {

-				result = Platform.getAdapterManager().getAdapter(sourceObject, adapter);

-			}

-			if (result != null) {

-				return result;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * A data structure used to store the information about the editor outline page within the papyrus outline page.

-	 */

-	protected static class OutlinePageRec {

-

-		public Object subActionBars;

-

-		/** papyrus page: current editor opened as nested editor */

-		public IPage papyrusPage;

-

-		/** outline page recorded for the given papyrus page */

-		public IContentOutlinePage contentOutlinePage;

-

-		/** page site for the recorded outline page */

-		public IPageSite pageSite;

-

-		/**

-		 * Creates a new page record initialized to the given papyrus page and outline page.

-		 *

-		 * @param papyrusPage

-		 * @param contentOutlinePage

-		 */

-		public OutlinePageRec(IPage papyrusPage, IContentOutlinePage contentOutlinePage) {

-			this.papyrusPage = papyrusPage;

-			this.contentOutlinePage = contentOutlinePage;

-		}

-

-		/**

-		 * Sets the page site

-		 *

-		 * @param pageSite

-		 *            the page site for the recorded content outline page

-		 */

-		public void setPageSite(IPageSite pageSite) {

-			this.pageSite = pageSite;

-		}

-

-		/**

-		 * Sets the page site

-		 *

-		 * @param pageSite

-		 *            the page site for the recorded content outline page

-		 */

-		public IPageSite getPageSite() {

-			return this.pageSite;

-		}

-

-		/**

-		 * Disposes of this page record by <code>null</code>ing its fields.

-		 */

-		public void dispose() {

-			papyrusPage = null;

-			contentOutlinePage = null;

-			pageSite = null;

-		}

-	}

-

-	protected static class DelegatedPageSite extends PageSite {

-

-		/** Page site of the active page in the book */

-		protected PageSite activePageSite;

-

-		private NestedEditorDelegatedOutlinePage nestedEditorDelegatedOutlinePage;

-

-		/**

-		 * Constructor.

-		 *

-		 * @param parentViewSite

-		 * @param nestedEditorDelegatedOutlinePage

-		 */

-		public DelegatedPageSite(IViewSite parentViewSite, NestedEditorDelegatedOutlinePage nestedEditorDelegatedOutlinePage) {

-			super(parentViewSite);

-			this.nestedEditorDelegatedOutlinePage = nestedEditorDelegatedOutlinePage;

-		}

-

-		/**

-		 * Sets the active page site

-		 *

-		 * @param activePageSite

-		 *            the activePageSite to set

-		 */

-		public void setActivePageSite(PageSite activePageSite) {

-			// remove the contribution of the previous active page site

-			if (this.activePageSite != null) {

-				// update the action bars for the current page

-				getActionBars().deactivate();

-				getActionBars().clearGlobalActionHandlers();

-				getActionBars().updateActionBars();

-

-				activePageSite.deactivate();

-

-			}

-			this.activePageSite = activePageSite;

-			if (this.activePageSite != null) {

-				activePageSite.activate();

-				// update the action bars for the current page

-				getActionBars().activate();

-				getActionBars().updateActionBars();

-			}

-		}

-

-		/**

-		 * Returns the active page site

-		 *

-		 * @return the active Page Site

-		 */

-		public PageSite getActivePageSite() {

-			return activePageSite;

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		public SubActionBars getActionBars() {

-			if (activePageSite != null) {

-				return (SubActionBars) activePageSite.getActionBars();

-			}

-			return (SubActionBars) super.getActionBars();

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		public void deactivate() {

-			// deactivate the action bars of the current active page

-			if (activePageSite != null) {

-				activePageSite.deactivate();

-			}

-

-			// deactivate all subcontributions

-			for (OutlinePageRec rec : nestedEditorDelegatedOutlinePage.getAllPages()) {

-				IPageSite site = rec.getPageSite();

-				IActionBars bars = site.getActionBars();

-				if (bars instanceof SubActionBars) {

-					SubActionBars subActionBars = (SubActionBars) bars;

-					subActionBars.deactivate();

-					subActionBars.clearGlobalActionHandlers();

-					subActionBars.updateActionBars();

-				}

-			}

-			super.deactivate();

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		public void activate() {

-

-			// here, we have to desactivate all contributions of all pages of this delegating service.

-			// when the page site is activated, the pagebookview has already tried to update some action bars, even if it should not

-			// so we recompute all the active contributions items here, after desactivating all the contributions.

-			for (OutlinePageRec rec : nestedEditorDelegatedOutlinePage.getAllPages()) {

-				IPageSite site = rec.getPageSite();

-				IActionBars bars = site.getActionBars();

-				if (bars instanceof SubActionBars) {

-					SubActionBars subActionBars = (SubActionBars) bars;

-					subActionBars.deactivate();

-					subActionBars.clearGlobalActionHandlers();

-					subActionBars.updateActionBars();

-				}

-			}

-			if (this.activePageSite != null) {

-				activePageSite.activate();

-				// update the action bars for the current page

-				getActionBars().activate();

-				getActionBars().updateActionBars();

-			}

-			super.activate();

-		}

-	}

-

-	protected static class MessageOutlinePage implements IContentOutlinePage, IPageBookViewPage {

-

-		private Text label;

-

-		private IPageSite site;

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			label = new Text(parent, SWT.NONE);

-			label.setText("No outline for this editor");

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		public void dispose() {

-			if (label != null && label.isDisposed()) {

-				label.dispose();

-				label = null;

-			}

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		public Control getControl() {

-			return label;

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		public void setActionBars(IActionBars actionBars) {

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		public void setFocus() {

-			if (label != null && label.isDisposed()) {

-				label.setFocus();

-			}

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		public void addSelectionChangedListener(ISelectionChangedListener listener) {

-			// nothing here

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		public ISelection getSelection() {

-			// nothing here

-			return null;

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-			// nothing here

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		public void setSelection(ISelection selection) {

-			// nothing here

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		public IPageSite getSite() {

-			return site;

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		public void init(IPageSite site) throws PartInitException {

-			this.site = site;

-		}

-

-	}

-

-	private class OutlineContext {

-

-		private List<PageContext> pages = Lists.newArrayListWithCapacity(mapIPapyrusPageToOutlineRec.size());

-

-		OutlineContext() {

-			for (OutlinePageRec next : mapIPapyrusPageToOutlineRec.values()) {

-				pages.add(new PageContext(next));

-			}

-		}

-

-		public void restore() {

-			for (PageContext next : pages) {

-				next.restore();

-			}

-		}

-

-		//

-		// Nested types

-		//

-

-		private class PageContext {

-

-			final URI diagramToken;

-

-			final Object context;

-

-			PageContext(OutlinePageRec outlinePage) {

-				Object diagram = outlinePage.papyrusPage.getRawModel();

-				diagramToken = (diagram instanceof EObject) ? EcoreUtil.getURI((EObject) diagram) : null;

-

-				// Can only sensibly manage restoring the state of the page if we can find it again

-				if (diagramToken == null) {

-					context = null;

-				} else {

-					IReloadContextProvider provider = AdapterUtils.adapt(outlinePage.contentOutlinePage, IReloadContextProvider.class, null);

-					context = (provider == null) ? null : provider.createReloadContext();

-				}

-			}

-

-			void restore() {

-				if (diagramToken != null) {

-					try {

-						ModelSet modelSet = multiEditor.getServicesRegistry().getService(ModelSet.class);

-

-						Object diagram = modelSet.getEObject(diagramToken, true);

-						if (diagram != null) {

-							IPage page = sashWindowsContainer.lookupModelPage(diagram);

-							if (page != null) {

-								OutlinePageRec outlinePage = getOutlinePageRec(page, true);

-								if ((outlinePage != null) && (context != null)) {

-									// Restore it. We know it adapts if it provided the reload state in the first place

-									AdapterUtils.adapt(outlinePage.contentOutlinePage, IReloadContextProvider.class, null).restore(context);

-								}

-							}

-						}

-					} catch (ServiceException e) {

-						Activator.log.error(e);

-					}

-				}

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST and other.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 437217
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.contentoutline;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.PlatformObject;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.papyrus.infra.core.Activator;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IEditorPage;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPageLifeCycleEventsListener;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.utils.AdapterUtils;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.ui.editor.IReloadableEditor;
+import org.eclipse.papyrus.infra.ui.editor.reload.EditorReloadEvent;
+import org.eclipse.papyrus.infra.ui.editor.reload.IEditorReloadListener;
+import org.eclipse.papyrus.infra.ui.editor.reload.IReloadContextProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IViewSite;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.SubActionBars;
+import org.eclipse.ui.part.IPageBookViewPage;
+import org.eclipse.ui.part.IPageSite;
+import org.eclipse.ui.part.Page;
+import org.eclipse.ui.part.PageBook;
+import org.eclipse.ui.part.PageSite;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+
+import com.google.common.collect.Lists;
+
+/**
+ * Page for Papyrus outline when active nested editor is a GMF editor
+ */
+public class NestedEditorDelegatedOutlinePage extends Page implements IPapyrusContentOutlinePage, IPageLifeCycleEventsListener, IEditorReloadListener {
+
+	/** The editor for which I am a slave. */
+	private IMultiDiagramEditor multiEditor;
+
+	/** Sash window container to listen for page changes inside the same editor */
+	private ISashWindowsContainer sashWindowsContainer;
+
+	/** Page book in which all outline controls of nested editors will be stored and displayed one by one */
+	private PageBook sashEditorPageBook;
+
+	/**
+	 * Map from papyrus pages (representing nested editors) to outline page records (key type: <code>org.eclipse.papyrus.infra.core.sasheditor.editor.IPage</code>;
+	 * value type: <code>OutlinePageRec</code>).
+	 */
+	private Map<IPage, OutlinePageRec> mapIPapyrusPageToOutlineRec = new HashMap<IPage, OutlinePageRec>();
+
+	/**
+	 * The page rec which provided the current page or <code>null</code>
+	 */
+	private OutlinePageRec activeRec;
+
+	/**
+	 * Default page rec that displays a simple message
+	 */
+	private OutlinePageRec defaultPageRec;
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void init(IMultiDiagramEditor multiEditor) {
+		this.multiEditor = multiEditor;
+
+		internalInit(multiEditor);
+
+		IReloadableEditor.Adapter.getAdapter(multiEditor).addEditorReloadListener(this);
+	}
+
+	private void internalInit(IMultiDiagramEditor multiEditor) {
+		sashWindowsContainer = (ISashWindowsContainer) multiEditor.getAdapter(ISashWindowsContainer.class);
+		sashWindowsContainer.addPageLifeCycleListener(this);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void init(IPageSite pageSite) {
+		IViewSite viewSite = getViewSite(pageSite);
+
+		DelegatedPageSite delegatedPageSite = new DelegatedPageSite(viewSite, this);
+		super.init(delegatedPageSite);
+	}
+
+	/**
+	 * /**
+	 * The <code>PageBookView</code> implementation of this <code>IWorkbenchPart</code> method cleans up all the pages. Subclasses
+	 * may extend.
+	 */
+	@Override
+	public void dispose() {
+		if (multiEditor != null) {
+			IReloadableEditor.Adapter.getAdapter(multiEditor).removeEditorReloadListener(this);
+		}
+
+		internalDispose();
+
+		multiEditor = null;
+
+		// Run super.
+		super.dispose();
+	}
+
+	private void internalDispose() {
+		// Deref all of the pages.
+		activeRec = null;
+		if (defaultPageRec != null) {
+			// check for null since the default page may not have
+			// been created (ex. perspective never visible)
+			defaultPageRec.contentOutlinePage.dispose();
+			defaultPageRec.dispose();
+			defaultPageRec = null;
+		}
+
+		java.util.List<OutlinePageRec> records = new ArrayList<NestedEditorDelegatedOutlinePage.OutlinePageRec>(mapIPapyrusPageToOutlineRec.values());
+		Iterator<OutlinePageRec> itr = records.iterator();
+		while (itr.hasNext()) {
+			OutlinePageRec rec = itr.next();
+			removePage(rec);
+		}
+
+		// remove listener and all refs to editor
+		sashWindowsContainer.removePageLifeCycleListener(this);
+	}
+
+	/**
+	 * Refreshes the global actions for the active page.
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	protected void refreshGlobalActionHandlers() {
+		// Clear old actions.
+		IActionBars bars = getSite().getActionBars();
+		bars.clearGlobalActionHandlers();
+
+		// Set new actions.
+		Map newActionHandlers = ((SubActionBars) activeRec.getPageSite().getActionBars()).getGlobalActionHandlers();
+		if (newActionHandlers != null) {
+			Set<?> keys = newActionHandlers.entrySet();
+			Iterator<?> iter = keys.iterator();
+			while (iter.hasNext()) {
+				Map.Entry<String, IAction> entry = (Map.Entry) iter.next();
+				bars.setGlobalActionHandler(entry.getKey(), entry.getValue());
+			}
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		// nothing here
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ISelection getSelection() {
+		// nothing here
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		// nothing here
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setSelection(ISelection selection) {
+		// nothing here
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void createControl(Composite parent) {
+		sashEditorPageBook = new PageBook(parent, SWT.BORDER);
+
+		createContents();
+	}
+
+	protected void createContents() {
+		// Create the default page rec.
+		IContentOutlinePage defaultPage = createDefaultPage(sashEditorPageBook);
+		defaultPageRec = new OutlinePageRec(null, defaultPage);
+		preparePage(defaultPageRec);
+
+		// Show the initial active page or the default page
+		IPage activePage = sashWindowsContainer.getActiveSashWindowsPage();
+		if (activePage != null) {
+			OutlinePageRec rec = getOutlinePageRec(activePage);
+			if (rec == null) {
+				rec = createPage(activePage);
+			}
+
+			// Show the page, if it was successfully created
+			if (rec != null) {
+				showOutlinePageRec(rec);
+			} else {
+				showOutlinePageRec(defaultPageRec);
+			}
+		} else {
+			showOutlinePageRec(defaultPageRec);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Control getControl() {
+		return sashEditorPageBook;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
+		// nothing here
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void pageChanged(IPage newPage) {
+		// throw new UnsupportedOperationException("pageChanged not implemented " + newPage);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void pageOpened(IPage page) {
+		// Activator.log.debug("Opened");
+		// create the new Outline
+		// Create a page for the part.
+		OutlinePageRec rec = getOutlinePageRec(page);
+		if (rec == null) {
+			rec = createPage(page);
+		}
+
+		// Show the page, if it was successfully created
+		if (rec != null) {
+			showOutlinePageRec(rec);
+		} else {
+			showOutlinePageRec(defaultPageRec);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void pageClosed(IPage papyrusPage) {
+		// Activator.log.debug("Closed");
+		// Update the active part.
+		if (activeRec != null && activeRec.papyrusPage == papyrusPage) {
+			showOutlinePageRec(defaultPageRec);
+		}
+
+		// Find and remove the part page.
+		OutlinePageRec rec = getOutlinePageRec(papyrusPage);
+		if (rec != null) {
+			removePage(rec);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void pageActivated(IPage page) {
+		// Activator.log.debug("Activated");
+		// Create a page for the partm, if necessary.
+		OutlinePageRec rec = getOutlinePageRec(page, true);
+
+		// Show the page, if it was successfully created
+		if (rec != null) {
+			showOutlinePageRec(rec);
+		} else {
+			showOutlinePageRec(defaultPageRec);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void pageDeactivated(IPage page) {
+		// throw new UnsupportedOperationException("pageDeactivated not implemented " + page);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void pageAboutToBeOpened(IPage page) {
+		// throw new UnsupportedOperationException("pageAboutToBeOpened not implemented "+page);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void pageAboutToBeClosed(IPage page) {
+		// throw new UnsupportedOperationException("pageAboutToBeClosed not implemented " + page);
+	}
+
+	@Override
+	public void editorAboutToReload(EditorReloadEvent event) {
+		event.putContext(new OutlineContext());
+
+		internalDispose();
+	}
+
+	@Override
+	public void editorReloaded(EditorReloadEvent event) {
+		internalInit(event.getEditor());
+		createContents();
+
+		((OutlineContext) event.getContext()).restore();
+	}
+
+	// /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	// MAINLY INSPIRED FROM PAGE BOOK VIEW
+	// /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Creates and returns the default page for this view.
+	 *
+	 * @param book
+	 *            the pagebook control
+	 * @return the default page
+	 */
+	protected IContentOutlinePage createDefaultPage(PageBook book) {
+		MessageOutlinePage page = new MessageOutlinePage();
+		initPage(page);
+		page.createControl(book);
+		return page;
+	}
+
+	/**
+	 * Creates an outline record for a given papyrus Page. Adds it to the pagebook but does not show it.
+	 *
+	 * @param page
+	 *            The nested editor we are created an outline.
+	 * @return the created outline page record
+	 */
+	protected OutlinePageRec createPage(IPage papyrusPage) {
+		OutlinePageRec rec = doCreatePage(papyrusPage);
+		if (rec != null) {
+			mapIPapyrusPageToOutlineRec.put(papyrusPage, rec);
+			preparePage(rec);
+		}
+		return rec;
+	}
+
+	/**
+	 * Prepares the page in the given page rec for use in this view.
+	 *
+	 * @param rec
+	 */
+	protected void preparePage(OutlinePageRec rec) {
+		IPageSite site = null;
+
+		if (!doesPageExist(rec.contentOutlinePage)) {
+			if (rec.contentOutlinePage instanceof IPageBookViewPage) {
+				site = ((IPageBookViewPage) rec.contentOutlinePage).getSite();
+				rec.setPageSite(site);
+			}
+		}
+	}
+
+	/**
+	 * Initializes the given page with a page site.
+	 * <p>
+	 * Subclasses should call this method after the page is created but before creating its controls.
+	 * </p>
+	 * <p>
+	 * Subclasses may override
+	 * </p>
+	 *
+	 * @param page
+	 *            The page to initialize
+	 */
+	protected void initPage(IPageBookViewPage page) {
+		try {
+			IPageSite site = super.getSite();
+			// try to create a specific page site for this page
+			page.init(new PageSite(getViewSite(site)));
+		} catch (PartInitException e) {
+			Activator.log.error(e);
+		}
+	}
+
+	/**
+	 * @param site
+	 *            the page site from which parent view site is retrieved
+	 * @return the retrieved page site
+	 */
+	protected static IViewSite getViewSite(IPageSite site) {
+		if (site instanceof IViewSite) {
+			return ((IViewSite) site);
+		}
+		// no way to get the IViewSite from the page site.
+		if (site instanceof PageSite) {
+			try {
+				Field parentSiteField = PageSite.class.getDeclaredField("parentSite");
+				parentSiteField.setAccessible(true);
+				Object parentSite = parentSiteField.get(site);
+				if (parentSite instanceof IViewSite) {
+					return ((IViewSite) parentSite);
+				}
+			} catch (SecurityException e) {
+				Activator.log.error(e);
+			} catch (NoSuchFieldException e) {
+				Activator.log.error(e);
+			} catch (IllegalArgumentException e) {
+				Activator.log.error(e);
+			} catch (IllegalAccessException e) {
+				Activator.log.error(e);
+			}
+		}
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * Method declared on PageBookView.
+	 */
+	protected OutlinePageRec doCreatePage(IPage papyrusPage) {
+		// Try to get an outline page.
+		if (papyrusPage instanceof IEditorPage) {
+			IEditorPart part = ((IEditorPage) papyrusPage).getIEditorPart();
+			Object obj = getAdapter(part, IContentOutlinePage.class, false);
+			if (obj instanceof IContentOutlinePage) {
+				IContentOutlinePage page = (IContentOutlinePage) obj;
+				if (page instanceof IPageBookViewPage) {
+					initPage((IPageBookViewPage) page);
+				}
+				page.createControl(getPageBook());
+				return new OutlinePageRec(papyrusPage, page);
+			}
+		}
+
+		// There is no content outline
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DelegatedPageSite getSite() {
+		return (DelegatedPageSite) super.getSite();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * Method declared on PageBookView.
+	 */
+	protected void doDestroyPage(IPage papyrusPage, OutlinePageRec rec) {
+		IContentOutlinePage contentOutlinePage = rec.contentOutlinePage;
+		contentOutlinePage.dispose();
+		rec.dispose();
+	}
+
+	protected Collection<OutlinePageRec> getAllPages() {
+		return mapIPapyrusPageToOutlineRec.values();
+	}
+
+	/**
+	 * Returns true if the page has already been created.
+	 *
+	 * @param page
+	 *            the page to test
+	 * @return true if this page has already been created.
+	 */
+	protected boolean doesPageExist(IContentOutlinePage page) {
+		return mapIPapyrusPageToOutlineRec.containsKey(page);
+	}
+
+	/**
+	 * Returns the papyrus page which contributed the current outline page to this view.
+	 *
+	 * @return the page which contributed the current outline page or <code>null</code> if no part contributed the current page
+	 */
+	protected IPage getCurrentContributingPage() {
+		if (activeRec == null) {
+			return null;
+		}
+		return activeRec.papyrusPage;
+	}
+
+	/**
+	 * Returns the currently visible outline page for this view or <code>null</code> if no page is currently visible.
+	 *
+	 * @return the currently visible page
+	 */
+	public IContentOutlinePage getCurrentOutlinePage() {
+		if (activeRec == null) {
+			return null;
+		}
+		return activeRec.contentOutlinePage;
+	}
+
+	/**
+	 * Returns the view site for the given page of this view.
+	 *
+	 * @param page
+	 *            the page
+	 * @return the corresponding site, or <code>null</code> if not found
+	 */
+	protected IPageSite getPageSite(IPage page) {
+		OutlinePageRec rec = getOutlinePageRec(page);
+		if (rec != null) {
+			return rec.getPageSite();
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the default page for this view.
+	 *
+	 * @return the default page
+	 */
+	public IContentOutlinePage getDefaultOutlinePage() {
+		return defaultPageRec.contentOutlinePage;
+	}
+
+	/**
+	 * Returns the pagebook control for this view.
+	 *
+	 * @return the pagebook control, or <code>null</code> if not initialized
+	 */
+	protected PageBook getPageBook() {
+		return sashEditorPageBook;
+	}
+
+	/**
+	 * Returns the page record for the given part.
+	 *
+	 * @param part
+	 *            the part
+	 * @return the corresponding page record, or <code>null</code> if not
+	 *         found
+	 */
+	protected OutlinePageRec getOutlinePageRec(IPage papyrusPage) {
+		return mapIPapyrusPageToOutlineRec.get(papyrusPage);
+	}
+
+	OutlinePageRec getOutlinePageRec(IPage papyrusPage, boolean create) {
+		OutlinePageRec result = getOutlinePageRec(papyrusPage);
+		if (result == null) {
+			result = createPage(papyrusPage);
+		}
+		return result;
+	}
+
+	/**
+	 * Returns the page record for the given page of this view.
+	 *
+	 * @param page
+	 *            the page
+	 * @return the corresponding page record, or <code>null</code> if not
+	 *         found
+	 */
+	protected OutlinePageRec getPageRec(IContentOutlinePage contentOutlinePage) {
+		Iterator<OutlinePageRec> itr = mapIPapyrusPageToOutlineRec.values().iterator();
+		while (itr.hasNext()) {
+			OutlinePageRec rec = itr.next();
+			if (rec.contentOutlinePage == contentOutlinePage) {
+				return rec;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Removes a page record.
+	 *
+	 * @param rec
+	 *            the page record to remove
+	 */
+	protected void removePage(OutlinePageRec rec) {
+		mapIPapyrusPageToOutlineRec.remove(rec.papyrusPage);
+
+		Control control = rec.contentOutlinePage.getControl();
+		if (control != null && !control.isDisposed()) {
+			// Dispose the page's control so pages don't have to do this in their dispose method.
+			// The page's control is a child of this view's control so if this view is closed, the page's control will already be disposed.
+			control.dispose();
+		}
+
+		// Do this before destroying the page, otherwise we won't be able to retrieve the page site (it will be null)
+		IPageSite site = rec.getPageSite();
+		if (site instanceof PageSite) { // test null pointer and PageSite
+			((SubActionBars) ((PageSite) site).getActionBars()).deactivate();
+			((SubActionBars) ((PageSite) site).getActionBars()).dispose();
+		}
+
+		// Free the page
+		doDestroyPage(rec.papyrusPage, rec);
+	}
+
+	/*
+	 * (non-Javadoc) Method declared on IWorkbenchPart.
+	 */
+	@Override
+	public void setFocus() {
+		// first set focus on the page book, in case the page
+		// doesn't properly handle setFocus
+		if (sashEditorPageBook != null) {
+			sashEditorPageBook.setFocus();
+		}
+		// then set focus on the page, if any
+		if (activeRec != null) {
+			activeRec.contentOutlinePage.setFocus();
+		}
+	}
+
+	/**
+	 * Shows page contained in the given page record in this view. The page
+	 * record must be one from this pagebook view.
+	 * <p>
+	 * The <code>PageBookView</code> implementation of this method asks the pagebook control to show the given page's control, and records that the given page is now current. Subclasses may extend.
+	 * </p>
+	 *
+	 * @param pageRec
+	 *            the page record containing the page to show
+	 */
+	protected void showOutlinePageRec(OutlinePageRec pageRec) {
+		// If already showing do nothing
+		if (activeRec == pageRec) {
+			return;
+		}
+		// If the page is the same, just set activeRec to pageRec
+		if (activeRec != null && pageRec != null && activeRec.contentOutlinePage == pageRec.contentOutlinePage) {
+			activeRec = pageRec;
+			return;
+		}
+
+		activeRec = pageRec;
+		Control pageControl = activeRec.contentOutlinePage.getControl();
+		if (pageControl != null && !pageControl.isDisposed()) {
+			PageSite pageSite = (PageSite) activeRec.getPageSite();
+			// Verify that the page control is not disposed
+			// If we are closing, it may have already been disposed
+			sashEditorPageBook.showPage(pageControl);
+			getSite().setActivePageSite(pageSite);
+		}
+
+	}
+
+	/**
+	 * If it is possible to adapt the given object to the given type, this
+	 * returns the adapter. Performs the following checks:
+	 *
+	 * <ol>
+	 * <li>Returns <code>sourceObject</code> if it is an instance of the adapter type.</li>
+	 * <li>If sourceObject implements IAdaptable, it is queried for adapters.</li>
+	 * <li>If sourceObject is not an instance of PlatformObject (which would have already done so), the adapter manager is queried for adapters</li>
+	 * </ol>
+	 *
+	 * Otherwise returns null.
+	 *
+	 * @param sourceObject
+	 *            object to adapt, or null
+	 * @param adapter
+	 *            type to adapt to
+	 * @param activatePlugins
+	 *            true if IAdapterManager.loadAdapter should be used (may trigger plugin activation)
+	 * @return a representation of sourceObject that is assignable to the
+	 *         adapter type, or null if no such representation exists
+	 */
+	public static Object getAdapter(Object sourceObject, Class<?> adapter, boolean activatePlugins) {
+		Assert.isNotNull(adapter);
+		if (sourceObject == null) {
+			return null;
+		}
+		if (adapter.isInstance(sourceObject)) {
+			return sourceObject;
+		}
+
+		if (sourceObject instanceof IAdaptable) {
+			IAdaptable adaptable = (IAdaptable) sourceObject;
+
+			Object result = adaptable.getAdapter(adapter);
+			if (result != null) {
+				// Sanity-check
+				Assert.isTrue(adapter.isInstance(result));
+				return result;
+			}
+		}
+
+		if (!(sourceObject instanceof PlatformObject)) {
+			Object result;
+			if (activatePlugins) {
+				result = Platform.getAdapterManager().loadAdapter(sourceObject, adapter.getName());
+			} else {
+				result = Platform.getAdapterManager().getAdapter(sourceObject, adapter);
+			}
+			if (result != null) {
+				return result;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * A data structure used to store the information about the editor outline page within the papyrus outline page.
+	 */
+	protected static class OutlinePageRec {
+
+		public Object subActionBars;
+
+		/** papyrus page: current editor opened as nested editor */
+		public IPage papyrusPage;
+
+		/** outline page recorded for the given papyrus page */
+		public IContentOutlinePage contentOutlinePage;
+
+		/** page site for the recorded outline page */
+		public IPageSite pageSite;
+
+		/**
+		 * Creates a new page record initialized to the given papyrus page and outline page.
+		 *
+		 * @param papyrusPage
+		 * @param contentOutlinePage
+		 */
+		public OutlinePageRec(IPage papyrusPage, IContentOutlinePage contentOutlinePage) {
+			this.papyrusPage = papyrusPage;
+			this.contentOutlinePage = contentOutlinePage;
+		}
+
+		/**
+		 * Sets the page site
+		 *
+		 * @param pageSite
+		 *            the page site for the recorded content outline page
+		 */
+		public void setPageSite(IPageSite pageSite) {
+			this.pageSite = pageSite;
+		}
+
+		/**
+		 * Sets the page site
+		 *
+		 * @param pageSite
+		 *            the page site for the recorded content outline page
+		 */
+		public IPageSite getPageSite() {
+			return this.pageSite;
+		}
+
+		/**
+		 * Disposes of this page record by <code>null</code>ing its fields.
+		 */
+		public void dispose() {
+			papyrusPage = null;
+			contentOutlinePage = null;
+			pageSite = null;
+		}
+	}
+
+	protected static class DelegatedPageSite extends PageSite {
+
+		/** Page site of the active page in the book */
+		protected PageSite activePageSite;
+
+		private NestedEditorDelegatedOutlinePage nestedEditorDelegatedOutlinePage;
+
+		/**
+		 * Constructor.
+		 *
+		 * @param parentViewSite
+		 * @param nestedEditorDelegatedOutlinePage
+		 */
+		public DelegatedPageSite(IViewSite parentViewSite, NestedEditorDelegatedOutlinePage nestedEditorDelegatedOutlinePage) {
+			super(parentViewSite);
+			this.nestedEditorDelegatedOutlinePage = nestedEditorDelegatedOutlinePage;
+		}
+
+		/**
+		 * Sets the active page site
+		 *
+		 * @param activePageSite
+		 *            the activePageSite to set
+		 */
+		public void setActivePageSite(PageSite activePageSite) {
+			// remove the contribution of the previous active page site
+			if (this.activePageSite != null) {
+				// update the action bars for the current page
+				getActionBars().deactivate();
+				getActionBars().clearGlobalActionHandlers();
+				getActionBars().updateActionBars();
+
+				activePageSite.deactivate();
+
+			}
+			this.activePageSite = activePageSite;
+			if (this.activePageSite != null) {
+				activePageSite.activate();
+				// update the action bars for the current page
+				getActionBars().activate();
+				getActionBars().updateActionBars();
+			}
+		}
+
+		/**
+		 * Returns the active page site
+		 *
+		 * @return the active Page Site
+		 */
+		public PageSite getActivePageSite() {
+			return activePageSite;
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public SubActionBars getActionBars() {
+			if (activePageSite != null) {
+				return (SubActionBars) activePageSite.getActionBars();
+			}
+			return (SubActionBars) super.getActionBars();
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public void deactivate() {
+			// deactivate the action bars of the current active page
+			if (activePageSite != null) {
+				activePageSite.deactivate();
+			}
+
+			// deactivate all subcontributions
+			for (OutlinePageRec rec : nestedEditorDelegatedOutlinePage.getAllPages()) {
+				IPageSite site = rec.getPageSite();
+				IActionBars bars = site.getActionBars();
+				if (bars instanceof SubActionBars) {
+					SubActionBars subActionBars = (SubActionBars) bars;
+					subActionBars.deactivate();
+					subActionBars.clearGlobalActionHandlers();
+					subActionBars.updateActionBars();
+				}
+			}
+			super.deactivate();
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public void activate() {
+
+			// here, we have to desactivate all contributions of all pages of this delegating service.
+			// when the page site is activated, the pagebookview has already tried to update some action bars, even if it should not
+			// so we recompute all the active contributions items here, after desactivating all the contributions.
+			for (OutlinePageRec rec : nestedEditorDelegatedOutlinePage.getAllPages()) {
+				IPageSite site = rec.getPageSite();
+				IActionBars bars = site.getActionBars();
+				if (bars instanceof SubActionBars) {
+					SubActionBars subActionBars = (SubActionBars) bars;
+					subActionBars.deactivate();
+					subActionBars.clearGlobalActionHandlers();
+					subActionBars.updateActionBars();
+				}
+			}
+			if (this.activePageSite != null) {
+				activePageSite.activate();
+				// update the action bars for the current page
+				getActionBars().activate();
+				getActionBars().updateActionBars();
+			}
+			super.activate();
+		}
+	}
+
+	protected static class MessageOutlinePage implements IContentOutlinePage, IPageBookViewPage {
+
+		private Text label;
+
+		private IPageSite site;
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public void createControl(Composite parent) {
+			label = new Text(parent, SWT.NONE);
+			label.setText("No outline for this editor");
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public void dispose() {
+			if (label != null && label.isDisposed()) {
+				label.dispose();
+				label = null;
+			}
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public Control getControl() {
+			return label;
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public void setActionBars(IActionBars actionBars) {
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public void setFocus() {
+			if (label != null && label.isDisposed()) {
+				label.setFocus();
+			}
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public void addSelectionChangedListener(ISelectionChangedListener listener) {
+			// nothing here
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public ISelection getSelection() {
+			// nothing here
+			return null;
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+			// nothing here
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public void setSelection(ISelection selection) {
+			// nothing here
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public IPageSite getSite() {
+			return site;
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public void init(IPageSite site) throws PartInitException {
+			this.site = site;
+		}
+
+	}
+
+	private class OutlineContext {
+
+		private List<PageContext> pages = Lists.newArrayListWithCapacity(mapIPapyrusPageToOutlineRec.size());
+
+		OutlineContext() {
+			for (OutlinePageRec next : mapIPapyrusPageToOutlineRec.values()) {
+				pages.add(new PageContext(next));
+			}
+		}
+
+		public void restore() {
+			for (PageContext next : pages) {
+				next.restore();
+			}
+		}
+
+		//
+		// Nested types
+		//
+
+		private class PageContext {
+
+			final URI diagramToken;
+
+			final Object context;
+
+			PageContext(OutlinePageRec outlinePage) {
+				Object diagram = outlinePage.papyrusPage.getRawModel();
+				diagramToken = (diagram instanceof EObject) ? EcoreUtil.getURI((EObject) diagram) : null;
+
+				// Can only sensibly manage restoring the state of the page if we can find it again
+				if (diagramToken == null) {
+					context = null;
+				} else {
+					IReloadContextProvider provider = AdapterUtils.adapt(outlinePage.contentOutlinePage, IReloadContextProvider.class, null);
+					context = (provider == null) ? null : provider.createReloadContext();
+				}
+			}
+
+			void restore() {
+				if (diagramToken != null) {
+					try {
+						ModelSet modelSet = multiEditor.getServicesRegistry().getService(ModelSet.class);
+
+						Object diagram = modelSet.getEObject(diagramToken, true);
+						if (diagram != null) {
+							IPage page = sashWindowsContainer.lookupModelPage(diagram);
+							if (page != null) {
+								OutlinePageRec outlinePage = getOutlinePageRec(page, true);
+								if ((outlinePage != null) && (context != null)) {
+									// Restore it. We know it adapts if it provided the reload state in the first place
+									AdapterUtils.adapt(outlinePage.contentOutlinePage, IReloadContextProvider.class, null).restore(context);
+								}
+							}
+						}
+					} catch (ServiceException e) {
+						Activator.log.error(e);
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/AbstractStringValueConverter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/AbstractStringValueConverter.java
index 813d5a71fbe..02e1f24f92c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/AbstractStringValueConverter.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/AbstractStringValueConverter.java
@@ -1,86 +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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.converter;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.ui.Activator;

-import org.eclipse.papyrus.infra.ui.messages.Messages;

-

-/**

- * Abstract class for String value Container

- *

- * @author VL222926

- *

- */

-public abstract class AbstractStringValueConverter implements IStringValueConverter {

-

-	protected static final String THE_STRING_X_IS_NOT_VALID_TO_CREATE_Y = Messages.AbstractStringValueConverter_TheStringXIsNotValidToCreateY;

-

-	protected static final String THE_FEATURE_X_CANT_BE_RESOLVED = Messages.AbstractStringValueConverter_TheFeatureXCantBeResolved;

-

-	protected static final String THE_STRING_VALUE_X_CANT_BE_RESOLVED = Messages.AbstractStringValueConverter_TheStringValueXCantBeResolved;

-

-	protected static final String SOME_STRING_ARE_NOT_VALID_TO_CREATE_X = Messages.AbstractStringValueConverter_SomeStringsAreNotValidToCreateY;

-

-	protected static final String SOME_STRING_CANT_BE_RESOLVED_TO_FIND_X = Messages.AbstractStringValueConverter_SomeStringsCantBeResolvedToFindY;

-

-	protected static final String NO_X_REPRESENTED_BY_Y_HAVE_BEEN_FOUND = Messages.AbstractStringValueConverter_NoXReprensentedByYHaveBeenFound;

-

-	private ConvertedValueContainer<?> result;

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.ui.converter.IStringValueConverter#deduceValueFromString(java.lang.Object, java.lang.String)

-	 *

-	 * @param type

-	 * @param valueAsString

-	 * @return

-	 */

-	@Override

-	public final ConvertedValueContainer<?> deduceValueFromString(final Object type, final String valueAsString) {

-		result = doDeduceValueFromString(type, valueAsString);

-		if (result == null) {

-			final IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(THE_STRING_VALUE_X_CANT_BE_RESOLVED, valueAsString));

-			result = new ConvertedValueContainer<Object>(null, status);

-		}

-		return result;

-	}

-

-	/**

-	 * 

-	 * @return

-	 * 		the converted value, you should call deduceValueFromString before to call this method

-	 */

-	public final ConvertedValueContainer<?> getConvertedValue() {

-		if (this.result == null) {

-			throw new IllegalStateException("You should call deduceValueFromString before to call this method"); //$NON-NLS-1$

-		}

-		return this.result;

-	}

-

-	/**

-	 *

-	 * @param type

-	 *            the type of the object

-	 * @param valueAsString

-	 *            the string to resolve

-	 * @return

-	 * 		a {@link ConvertedValueContainer} with the resolved values and a status

-	 */

-	protected abstract ConvertedValueContainer<?> doDeduceValueFromString(final Object type, final String valueAsString);

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.ui.converter;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.ui.Activator;
+import org.eclipse.papyrus.infra.ui.messages.Messages;
+
+/**
+ * Abstract class for String value Container
+ *
+ * @author VL222926
+ *
+ */
+public abstract class AbstractStringValueConverter implements IStringValueConverter {
+
+	protected static final String THE_STRING_X_IS_NOT_VALID_TO_CREATE_Y = Messages.AbstractStringValueConverter_TheStringXIsNotValidToCreateY;
+
+	protected static final String THE_FEATURE_X_CANT_BE_RESOLVED = Messages.AbstractStringValueConverter_TheFeatureXCantBeResolved;
+
+	protected static final String THE_STRING_VALUE_X_CANT_BE_RESOLVED = Messages.AbstractStringValueConverter_TheStringValueXCantBeResolved;
+
+	protected static final String SOME_STRING_ARE_NOT_VALID_TO_CREATE_X = Messages.AbstractStringValueConverter_SomeStringsAreNotValidToCreateY;
+
+	protected static final String SOME_STRING_CANT_BE_RESOLVED_TO_FIND_X = Messages.AbstractStringValueConverter_SomeStringsCantBeResolvedToFindY;
+
+	protected static final String NO_X_REPRESENTED_BY_Y_HAVE_BEEN_FOUND = Messages.AbstractStringValueConverter_NoXReprensentedByYHaveBeenFound;
+
+	private ConvertedValueContainer<?> result;
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.ui.converter.IStringValueConverter#deduceValueFromString(java.lang.Object, java.lang.String)
+	 *
+	 * @param type
+	 * @param valueAsString
+	 * @return
+	 */
+	@Override
+	public final ConvertedValueContainer<?> deduceValueFromString(final Object type, final String valueAsString) {
+		result = doDeduceValueFromString(type, valueAsString);
+		if (result == null) {
+			final IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(THE_STRING_VALUE_X_CANT_BE_RESOLVED, valueAsString));
+			result = new ConvertedValueContainer<Object>(null, status);
+		}
+		return result;
+	}
+
+	/**
+	 * 
+	 * @return
+	 * 		the converted value, you should call deduceValueFromString before to call this method
+	 */
+	public final ConvertedValueContainer<?> getConvertedValue() {
+		if (this.result == null) {
+			throw new IllegalStateException("You should call deduceValueFromString before to call this method"); //$NON-NLS-1$
+		}
+		return this.result;
+	}
+
+	/**
+	 *
+	 * @param type
+	 *            the type of the object
+	 * @param valueAsString
+	 *            the string to resolve
+	 * @return
+	 * 		a {@link ConvertedValueContainer} with the resolved values and a status
+	 */
+	protected abstract ConvertedValueContainer<?> doDeduceValueFromString(final Object type, final String valueAsString);
+
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/ConvertedValueContainer.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/ConvertedValueContainer.java
index e4466c9470d..657091fb03c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/ConvertedValueContainer.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/ConvertedValueContainer.java
@@ -1,75 +1,75 @@
-/*****************************************************************************

- * 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.converter;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IStatus;

-

-

-/**

- *

- * This class allows to store the value created for a pasted String AND a result status associated to this pasted String

- *

- * @param <T>

- */

-

-public class ConvertedValueContainer<T> {

-

-	/**

-	 * this field is used when the pasted value is monovalued

-	 */

-	private final T value;

-

-	/**

-	 * the resulting status of the parsing

-	 */

-	private final IStatus status;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param realValue

-	 *            a monovalued Value (can be <code>null</code>)

-	 * @param realListValue

-	 *            a collection value (can be <code>null</code>)

-	 * @param status

-	 *            a status (can be <code>null</code>)

-	 */

-	public ConvertedValueContainer(final T realValue, final IStatus status) {

-		this.value = realValue;

-		this.status = status;

-		Assert.isNotNull(status);

-	}

-

-

-	/**

-	 *

-	 * @return

-	 *         the status of the conversion

-	 */

-	public final IStatus getStatus() {

-		return this.status;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the value

-	 */

-	public final T getConvertedValue() {

-		return this.value;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.converter;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IStatus;
+
+
+/**
+ *
+ * This class allows to store the value created for a pasted String AND a result status associated to this pasted String
+ *
+ * @param <T>
+ */
+
+public class ConvertedValueContainer<T> {
+
+	/**
+	 * this field is used when the pasted value is monovalued
+	 */
+	private final T value;
+
+	/**
+	 * the resulting status of the parsing
+	 */
+	private final IStatus status;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param realValue
+	 *            a monovalued Value (can be <code>null</code>)
+	 * @param realListValue
+	 *            a collection value (can be <code>null</code>)
+	 * @param status
+	 *            a status (can be <code>null</code>)
+	 */
+	public ConvertedValueContainer(final T realValue, final IStatus status) {
+		this.value = realValue;
+		this.status = status;
+		Assert.isNotNull(status);
+	}
+
+
+	/**
+	 *
+	 * @return
+	 *         the status of the conversion
+	 */
+	public final IStatus getStatus() {
+		return this.status;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the value
+	 */
+	public final T getConvertedValue() {
+		return this.value;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/EMFStringValueConverter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/EMFStringValueConverter.java
index cc42fe5acc9..2847e7180fa 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/EMFStringValueConverter.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/EMFStringValueConverter.java
@@ -1,373 +1,373 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.ui.converter;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.common.util.Enumerator;

-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.EStructuralFeature;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.emf.utils.EMFContants;

-import org.eclipse.papyrus.infra.tools.util.BooleanHelper;

-import org.eclipse.papyrus.infra.tools.util.TypesConstants;

-import org.eclipse.papyrus.infra.ui.Activator;

-

-/**

- * Value solver for EMF

- *

- * WARNING : incomplete implementations

- *

- * @author vl222926

- *

- */

-

-public class EMFStringValueConverter extends AbstractStringValueConverter {

-

-

-

-	/**

-	 * Context used for the resolution of the string

-	 */

-	private EObject resolutionContext;

-

-	/**

-	 * The separator used for multivalue

-	 */

-	protected final String multiValueSeparator;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param resolutionContext

-	 *            the context used for the resolution of the string

-	 */

-	public EMFStringValueConverter(final EObject resolutionContext, final String multiValueSeparator) {

-		this.resolutionContext = resolutionContext;

-		this.multiValueSeparator = multiValueSeparator;

-	}

-

-

-	/**

-	 *

-	 * @return

-	 * 		the context to use for the resolution

-	 */

-	public EObject getResolutionContext() {

-		return resolutionContext;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.ui.services.IDisposable#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		this.resolutionContext = null;

-	}

-

-	/**

-	 *

-	 * @param resolutionContext

-	 *            the table context

-	 * @param feature

-	 *            the feature

-	 * @param valueAsString

-	 *            the pasted string for this feature

-	 * @return

-	 * 		the value for the pasted string or <code>null</code> if not found

-	 */

-	@Override

-	protected ConvertedValueContainer<?> doDeduceValueFromString(final Object feature, final String valueAsString) {

-		final EClassifier featureType = getFeatureType(feature);

-		if (feature instanceof EStructuralFeature) {

-			return deduceValueFromString(feature, featureType, valueAsString);

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param feature

-	 * @param featureType

-	 * @param valueAsString

-	 * @return

-	 */

-	protected ConvertedValueContainer<?> deduceValueFromString(final Object feature, final EClassifier featureType, final String valueAsString) {

-		ConvertedValueContainer<?> realValue = null;

-		// if(feature instanceof EStructuralFeature) {

-		final int upperbound = getFeatureUpperBound(feature);

-		boolean isMany = (upperbound > 1 || upperbound == -1);

-		if (featureType instanceof EDataType) {

-			if (featureType instanceof EEnum) {

-				realValue = deduceEEnumLiteralValue((EEnum) featureType, isMany, valueAsString);

-			}

-			final String typeName = featureType.getName();

-			if (TypesConstants.STRING.equals(typeName) || EMFContants.ESTRING.equals(typeName)) {

-				realValue = deduceStringValue(isMany, valueAsString);

-			} else if (EMFContants.EBOOLEAN.equals(typeName) || TypesConstants.BOOLEAN.equals(typeName)) {

-				realValue = deduceBooleanValue(isMany, valueAsString);

-			} else if (EMFContants.EINT.equals(typeName) || TypesConstants.INTEGER.equals(typeName)) {

-				realValue = deduceIntValue(isMany, valueAsString);

-			} else if (EMFContants.EDOUBLE.equals(typeName)) {

-				realValue = deduceDoubleValue(isMany, valueAsString);

-			}

-		} else if (featureType instanceof EClass) {

-			realValue = deduceEObjectValue(getResolutionContext(), feature, (EClass) featureType, isMany, valueAsString);

-		}

-		return realValue;

-	}

-

-	protected int getFeatureUpperBound(final Object feature) {

-		return ((EStructuralFeature) feature).getUpperBound();

-	}

-

-

-

-	/**

-	 *

-	 * @param resolutionContext

-	 *            the context used for the resolution

-	 * @param feature

-	 *            the feature

-	 * @param featureType

-	 *            the type of the feature

-	 * @param isMany

-	 *            <code>true</code> if the feature isMany

-	 * @param valueAsString

-	 *            the string value to resolve

-	 * @return

-	 * 		a value container referencing the eobject represented by the string

-	 * @throws StringValueSolverException

-	 */

-	protected ConvertedValueContainer<?> deduceEObjectValue(EObject resolutionContext, Object feature, EClass featureType, boolean isMany, String valueAsString) {

-		if (valueAsString == null || valueAsString.equals("")) {

-			return new ConvertedValueContainer<EObject>(null, Status.OK_STATUS);

-		}

-		final IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(THE_STRING_VALUE_X_CANT_BE_RESOLVED, valueAsString));

-		return new ConvertedValueContainer<EObject>(null, status);

-	}

-

-	/**

-	 *

-	 * @param feature

-	 *            an object representing a feature

-	 * @return

-	 * 		the type of the feature

-	 */

-	protected EClassifier getFeatureType(final Object feature) {

-		final EClassifier featureType;

-		if (feature instanceof EStructuralFeature) {

-			return ((EStructuralFeature) feature).getEType();

-		} else {

-			featureType = null;

-		}

-		return featureType;

-	}

-

-	/**

-	 *

-	 * @param eenum

-	 *            the enumeration

-	 * @param isMany

-	 *            <code>true</code> if the feature is many

-	 * @param valueAsString

-	 *            the value to convert

-	 * @return

-	 * 		the converted value

-	 */

-	protected ConvertedValueContainer<?> deduceEEnumLiteralValue(final EEnum eenum, final boolean isMany, final String valueAsString) {

-		ConvertedValueContainer<?> returnedValue = null;

-		IStatus iStatus = Status.OK_STATUS;

-		final Collection<String> unresolvedValues = new ArrayList<String>();

-		if (isMany) {

-			final Collection<EEnumLiteral> values = new ArrayList<EEnumLiteral>();

-			for (final String str : valueAsString.split(this.multiValueSeparator)) {

-				final EEnumLiteral literal = eenum.getEEnumLiteral(str);

-				if (literal != null) {

-					values.add(literal);

-				} else {

-					unresolvedValues.add(str);

-				}

-			}

-			if (!unresolvedValues.isEmpty()) {

-				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(SOME_STRING_ARE_NOT_VALID_TO_CREATE_X, EMFContants.EENUM_LITERAL), unresolvedValues);

-			}

-			returnedValue = new MultiConvertedValueContainer<EEnumLiteral>(values, iStatus);

-		} else {

-			final EEnumLiteral literal = eenum.getEEnumLiteral(valueAsString);

-			if (literal != null) {

-				// returnedValue = new ConvertedValueContainer<EEnumLiteral>(literal, iStatus);

-				// fix a bug on enumerator

-				returnedValue = new ConvertedValueContainer<Enumerator>(literal.getInstance(), iStatus);

-			} else {

-				unresolvedValues.add(valueAsString);

-				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(THE_STRING_X_IS_NOT_VALID_TO_CREATE_Y, valueAsString, EMFContants.EENUM_LITERAL), unresolvedValues);

-				returnedValue = new ConvertedValueContainer<Boolean>(null, iStatus);

-			}

-		}

-		return returnedValue;

-	}

-

-	/**

-	 *

-	 * @param isMany

-	 *            <code>true</code> if the feature isMany

-	 * @param valueAsString

-	 *            the value to parse

-	 * @return

-	 * 		the result of the parsing

-	 */

-	protected ConvertedValueContainer<?> deduceBooleanValue(final boolean isMany, final String valueAsString) {

-		ConvertedValueContainer<?> returnedValue = null;

-		IStatus iStatus = Status.OK_STATUS;

-		final Collection<String> unresolvedValues = new ArrayList<String>();

-		if (isMany) {

-			final Collection<Boolean> values = new ArrayList<Boolean>();

-			for (final String str : valueAsString.split(this.multiValueSeparator)) {

-				if (BooleanHelper.isBoolean(str)) {

-					values.add(Boolean.valueOf(valueAsString));

-				} else {

-					unresolvedValues.add(str);

-				}

-			}

-			if (!unresolvedValues.isEmpty()) {

-				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(SOME_STRING_ARE_NOT_VALID_TO_CREATE_X, TypesConstants.BOOLEAN), unresolvedValues);

-			}

-			returnedValue = new MultiConvertedValueContainer<Boolean>(values, iStatus);

-		} else {

-			if (BooleanHelper.isBoolean(valueAsString)) {

-				returnedValue = new ConvertedValueContainer<Boolean>(Boolean.valueOf(valueAsString), iStatus);

-			} else {

-				unresolvedValues.add(valueAsString);

-				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(THE_STRING_X_IS_NOT_VALID_TO_CREATE_Y, valueAsString, TypesConstants.BOOLEAN), unresolvedValues);

-				returnedValue = new ConvertedValueContainer<Boolean>(null, iStatus);

-			}

-		}

-		return returnedValue;

-	}

-

-	/**

-	 *

-	 * @param isMany

-	 *            <code>true</code> if the feature isMany

-	 * @param valueAsString

-	 *            the value to parse

-	 * @return

-	 * 		the result of the parsing

-	 */

-	protected ConvertedValueContainer<?> deduceDoubleValue(final boolean isMany, final String valueAsString) {

-		ConvertedValueContainer<?> returnedValue = null;

-		IStatus iStatus = Status.OK_STATUS;

-		final Collection<String> unresolvedValues = new ArrayList<String>();

-		if (isMany) {

-			final Collection<Double> values = new ArrayList<Double>();

-			for (final String str : valueAsString.split(this.multiValueSeparator)) {

-				final Double value = Double.valueOf(str);

-				if (value != null) {

-					values.add(value);

-				} else {

-					unresolvedValues.add(str);

-				}

-			}

-			if (!unresolvedValues.isEmpty()) {

-				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(SOME_STRING_ARE_NOT_VALID_TO_CREATE_X, TypesConstants.DOUBLE), unresolvedValues);

-			}

-			returnedValue = new MultiConvertedValueContainer<Double>(values, iStatus);

-		} else {

-			try {

-				returnedValue = new ConvertedValueContainer<Double>(Double.valueOf(valueAsString), iStatus);

-			} catch (final NumberFormatException e) {

-				unresolvedValues.add(valueAsString);

-				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(THE_STRING_X_IS_NOT_VALID_TO_CREATE_Y, valueAsString, TypesConstants.DOUBLE), unresolvedValues);

-				returnedValue = new ConvertedValueContainer<Boolean>(null, iStatus);

-			}

-		}

-		return returnedValue;

-	}

-

-	/**

-	 *

-	 * @param isMany

-	 *            <code>true</code> if the feature isMany

-	 * @param valueAsString

-	 *            the value to parse

-	 * @return

-	 * 		the result of the parsing

-	 */

-	protected ConvertedValueContainer<?> deduceIntValue(final boolean isMany, final String valueAsString) {

-		ConvertedValueContainer<?> returnedValue = null;

-		IStatus iStatus = Status.OK_STATUS;

-		final Collection<String> unresolvedValues = new ArrayList<String>();

-		if (isMany) {

-			final Collection<Integer> values = new ArrayList<Integer>();

-			for (final String str : valueAsString.split(this.multiValueSeparator)) {

-				try {

-					values.add(Integer.valueOf(str));

-				} catch (final NumberFormatException e) {

-					unresolvedValues.add(str);

-				}

-			}

-			if (!unresolvedValues.isEmpty()) {

-				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(SOME_STRING_ARE_NOT_VALID_TO_CREATE_X, TypesConstants.INTEGER), unresolvedValues);

-			}

-			returnedValue = new MultiConvertedValueContainer<Integer>(values, iStatus);

-		} else {

-			try {

-				returnedValue = new ConvertedValueContainer<Integer>(Integer.valueOf(valueAsString), iStatus);

-			} catch (final NumberFormatException e) {

-				unresolvedValues.add(valueAsString);

-				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(THE_STRING_X_IS_NOT_VALID_TO_CREATE_Y, valueAsString, TypesConstants.INTEGER), unresolvedValues);

-				returnedValue = new ConvertedValueContainer<Boolean>(null, iStatus);

-			}

-		}

-		return returnedValue;

-	}

-

-

-	/**

-	 *

-	 * @param isMany

-	 *            <code>true</code> if the feature is many

-	 * @param valueAsString

-	 *            the value as string

-	 * @return

-	 * 		the value container with the real value(s)

-	 */

-	protected ConvertedValueContainer<?> deduceStringValue(final boolean isMany, final String valueAsString) {

-		ConvertedValueContainer<?> returnedValue = null;

-		final IStatus iStatus = Status.OK_STATUS;

-		if (isMany) {

-			final Collection<String> values = new ArrayList<String>();

-			for (final String str : valueAsString.split(this.multiValueSeparator)) {

-				values.add(str);

-			}

-			returnedValue = new MultiConvertedValueContainer<String>(values, iStatus);

-		} else {

-			returnedValue = new ConvertedValueContainer<String>(valueAsString, iStatus);

-		}

-		return returnedValue;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.ui.converter;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.util.Enumerator;
+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.EStructuralFeature;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.emf.utils.EMFContants;
+import org.eclipse.papyrus.infra.tools.util.BooleanHelper;
+import org.eclipse.papyrus.infra.tools.util.TypesConstants;
+import org.eclipse.papyrus.infra.ui.Activator;
+
+/**
+ * Value solver for EMF
+ *
+ * WARNING : incomplete implementations
+ *
+ * @author vl222926
+ *
+ */
+
+public class EMFStringValueConverter extends AbstractStringValueConverter {
+
+
+
+	/**
+	 * Context used for the resolution of the string
+	 */
+	private EObject resolutionContext;
+
+	/**
+	 * The separator used for multivalue
+	 */
+	protected final String multiValueSeparator;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param resolutionContext
+	 *            the context used for the resolution of the string
+	 */
+	public EMFStringValueConverter(final EObject resolutionContext, final String multiValueSeparator) {
+		this.resolutionContext = resolutionContext;
+		this.multiValueSeparator = multiValueSeparator;
+	}
+
+
+	/**
+	 *
+	 * @return
+	 * 		the context to use for the resolution
+	 */
+	public EObject getResolutionContext() {
+		return resolutionContext;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.ui.services.IDisposable#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		this.resolutionContext = null;
+	}
+
+	/**
+	 *
+	 * @param resolutionContext
+	 *            the table context
+	 * @param feature
+	 *            the feature
+	 * @param valueAsString
+	 *            the pasted string for this feature
+	 * @return
+	 * 		the value for the pasted string or <code>null</code> if not found
+	 */
+	@Override
+	protected ConvertedValueContainer<?> doDeduceValueFromString(final Object feature, final String valueAsString) {
+		final EClassifier featureType = getFeatureType(feature);
+		if (feature instanceof EStructuralFeature) {
+			return deduceValueFromString(feature, featureType, valueAsString);
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param feature
+	 * @param featureType
+	 * @param valueAsString
+	 * @return
+	 */
+	protected ConvertedValueContainer<?> deduceValueFromString(final Object feature, final EClassifier featureType, final String valueAsString) {
+		ConvertedValueContainer<?> realValue = null;
+		// if(feature instanceof EStructuralFeature) {
+		final int upperbound = getFeatureUpperBound(feature);
+		boolean isMany = (upperbound > 1 || upperbound == -1);
+		if (featureType instanceof EDataType) {
+			if (featureType instanceof EEnum) {
+				realValue = deduceEEnumLiteralValue((EEnum) featureType, isMany, valueAsString);
+			}
+			final String typeName = featureType.getName();
+			if (TypesConstants.STRING.equals(typeName) || EMFContants.ESTRING.equals(typeName)) {
+				realValue = deduceStringValue(isMany, valueAsString);
+			} else if (EMFContants.EBOOLEAN.equals(typeName) || TypesConstants.BOOLEAN.equals(typeName)) {
+				realValue = deduceBooleanValue(isMany, valueAsString);
+			} else if (EMFContants.EINT.equals(typeName) || TypesConstants.INTEGER.equals(typeName)) {
+				realValue = deduceIntValue(isMany, valueAsString);
+			} else if (EMFContants.EDOUBLE.equals(typeName)) {
+				realValue = deduceDoubleValue(isMany, valueAsString);
+			}
+		} else if (featureType instanceof EClass) {
+			realValue = deduceEObjectValue(getResolutionContext(), feature, (EClass) featureType, isMany, valueAsString);
+		}
+		return realValue;
+	}
+
+	protected int getFeatureUpperBound(final Object feature) {
+		return ((EStructuralFeature) feature).getUpperBound();
+	}
+
+
+
+	/**
+	 *
+	 * @param resolutionContext
+	 *            the context used for the resolution
+	 * @param feature
+	 *            the feature
+	 * @param featureType
+	 *            the type of the feature
+	 * @param isMany
+	 *            <code>true</code> if the feature isMany
+	 * @param valueAsString
+	 *            the string value to resolve
+	 * @return
+	 * 		a value container referencing the eobject represented by the string
+	 * @throws StringValueSolverException
+	 */
+	protected ConvertedValueContainer<?> deduceEObjectValue(EObject resolutionContext, Object feature, EClass featureType, boolean isMany, String valueAsString) {
+		if (valueAsString == null || valueAsString.equals("")) {
+			return new ConvertedValueContainer<EObject>(null, Status.OK_STATUS);
+		}
+		final IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(THE_STRING_VALUE_X_CANT_BE_RESOLVED, valueAsString));
+		return new ConvertedValueContainer<EObject>(null, status);
+	}
+
+	/**
+	 *
+	 * @param feature
+	 *            an object representing a feature
+	 * @return
+	 * 		the type of the feature
+	 */
+	protected EClassifier getFeatureType(final Object feature) {
+		final EClassifier featureType;
+		if (feature instanceof EStructuralFeature) {
+			return ((EStructuralFeature) feature).getEType();
+		} else {
+			featureType = null;
+		}
+		return featureType;
+	}
+
+	/**
+	 *
+	 * @param eenum
+	 *            the enumeration
+	 * @param isMany
+	 *            <code>true</code> if the feature is many
+	 * @param valueAsString
+	 *            the value to convert
+	 * @return
+	 * 		the converted value
+	 */
+	protected ConvertedValueContainer<?> deduceEEnumLiteralValue(final EEnum eenum, final boolean isMany, final String valueAsString) {
+		ConvertedValueContainer<?> returnedValue = null;
+		IStatus iStatus = Status.OK_STATUS;
+		final Collection<String> unresolvedValues = new ArrayList<String>();
+		if (isMany) {
+			final Collection<EEnumLiteral> values = new ArrayList<EEnumLiteral>();
+			for (final String str : valueAsString.split(this.multiValueSeparator)) {
+				final EEnumLiteral literal = eenum.getEEnumLiteral(str);
+				if (literal != null) {
+					values.add(literal);
+				} else {
+					unresolvedValues.add(str);
+				}
+			}
+			if (!unresolvedValues.isEmpty()) {
+				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(SOME_STRING_ARE_NOT_VALID_TO_CREATE_X, EMFContants.EENUM_LITERAL), unresolvedValues);
+			}
+			returnedValue = new MultiConvertedValueContainer<EEnumLiteral>(values, iStatus);
+		} else {
+			final EEnumLiteral literal = eenum.getEEnumLiteral(valueAsString);
+			if (literal != null) {
+				// returnedValue = new ConvertedValueContainer<EEnumLiteral>(literal, iStatus);
+				// fix a bug on enumerator
+				returnedValue = new ConvertedValueContainer<Enumerator>(literal.getInstance(), iStatus);
+			} else {
+				unresolvedValues.add(valueAsString);
+				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(THE_STRING_X_IS_NOT_VALID_TO_CREATE_Y, valueAsString, EMFContants.EENUM_LITERAL), unresolvedValues);
+				returnedValue = new ConvertedValueContainer<Boolean>(null, iStatus);
+			}
+		}
+		return returnedValue;
+	}
+
+	/**
+	 *
+	 * @param isMany
+	 *            <code>true</code> if the feature isMany
+	 * @param valueAsString
+	 *            the value to parse
+	 * @return
+	 * 		the result of the parsing
+	 */
+	protected ConvertedValueContainer<?> deduceBooleanValue(final boolean isMany, final String valueAsString) {
+		ConvertedValueContainer<?> returnedValue = null;
+		IStatus iStatus = Status.OK_STATUS;
+		final Collection<String> unresolvedValues = new ArrayList<String>();
+		if (isMany) {
+			final Collection<Boolean> values = new ArrayList<Boolean>();
+			for (final String str : valueAsString.split(this.multiValueSeparator)) {
+				if (BooleanHelper.isBoolean(str)) {
+					values.add(Boolean.valueOf(valueAsString));
+				} else {
+					unresolvedValues.add(str);
+				}
+			}
+			if (!unresolvedValues.isEmpty()) {
+				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(SOME_STRING_ARE_NOT_VALID_TO_CREATE_X, TypesConstants.BOOLEAN), unresolvedValues);
+			}
+			returnedValue = new MultiConvertedValueContainer<Boolean>(values, iStatus);
+		} else {
+			if (BooleanHelper.isBoolean(valueAsString)) {
+				returnedValue = new ConvertedValueContainer<Boolean>(Boolean.valueOf(valueAsString), iStatus);
+			} else {
+				unresolvedValues.add(valueAsString);
+				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(THE_STRING_X_IS_NOT_VALID_TO_CREATE_Y, valueAsString, TypesConstants.BOOLEAN), unresolvedValues);
+				returnedValue = new ConvertedValueContainer<Boolean>(null, iStatus);
+			}
+		}
+		return returnedValue;
+	}
+
+	/**
+	 *
+	 * @param isMany
+	 *            <code>true</code> if the feature isMany
+	 * @param valueAsString
+	 *            the value to parse
+	 * @return
+	 * 		the result of the parsing
+	 */
+	protected ConvertedValueContainer<?> deduceDoubleValue(final boolean isMany, final String valueAsString) {
+		ConvertedValueContainer<?> returnedValue = null;
+		IStatus iStatus = Status.OK_STATUS;
+		final Collection<String> unresolvedValues = new ArrayList<String>();
+		if (isMany) {
+			final Collection<Double> values = new ArrayList<Double>();
+			for (final String str : valueAsString.split(this.multiValueSeparator)) {
+				final Double value = Double.valueOf(str);
+				if (value != null) {
+					values.add(value);
+				} else {
+					unresolvedValues.add(str);
+				}
+			}
+			if (!unresolvedValues.isEmpty()) {
+				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(SOME_STRING_ARE_NOT_VALID_TO_CREATE_X, TypesConstants.DOUBLE), unresolvedValues);
+			}
+			returnedValue = new MultiConvertedValueContainer<Double>(values, iStatus);
+		} else {
+			try {
+				returnedValue = new ConvertedValueContainer<Double>(Double.valueOf(valueAsString), iStatus);
+			} catch (final NumberFormatException e) {
+				unresolvedValues.add(valueAsString);
+				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(THE_STRING_X_IS_NOT_VALID_TO_CREATE_Y, valueAsString, TypesConstants.DOUBLE), unresolvedValues);
+				returnedValue = new ConvertedValueContainer<Boolean>(null, iStatus);
+			}
+		}
+		return returnedValue;
+	}
+
+	/**
+	 *
+	 * @param isMany
+	 *            <code>true</code> if the feature isMany
+	 * @param valueAsString
+	 *            the value to parse
+	 * @return
+	 * 		the result of the parsing
+	 */
+	protected ConvertedValueContainer<?> deduceIntValue(final boolean isMany, final String valueAsString) {
+		ConvertedValueContainer<?> returnedValue = null;
+		IStatus iStatus = Status.OK_STATUS;
+		final Collection<String> unresolvedValues = new ArrayList<String>();
+		if (isMany) {
+			final Collection<Integer> values = new ArrayList<Integer>();
+			for (final String str : valueAsString.split(this.multiValueSeparator)) {
+				try {
+					values.add(Integer.valueOf(str));
+				} catch (final NumberFormatException e) {
+					unresolvedValues.add(str);
+				}
+			}
+			if (!unresolvedValues.isEmpty()) {
+				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(SOME_STRING_ARE_NOT_VALID_TO_CREATE_X, TypesConstants.INTEGER), unresolvedValues);
+			}
+			returnedValue = new MultiConvertedValueContainer<Integer>(values, iStatus);
+		} else {
+			try {
+				returnedValue = new ConvertedValueContainer<Integer>(Integer.valueOf(valueAsString), iStatus);
+			} catch (final NumberFormatException e) {
+				unresolvedValues.add(valueAsString);
+				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(THE_STRING_X_IS_NOT_VALID_TO_CREATE_Y, valueAsString, TypesConstants.INTEGER), unresolvedValues);
+				returnedValue = new ConvertedValueContainer<Boolean>(null, iStatus);
+			}
+		}
+		return returnedValue;
+	}
+
+
+	/**
+	 *
+	 * @param isMany
+	 *            <code>true</code> if the feature is many
+	 * @param valueAsString
+	 *            the value as string
+	 * @return
+	 * 		the value container with the real value(s)
+	 */
+	protected ConvertedValueContainer<?> deduceStringValue(final boolean isMany, final String valueAsString) {
+		ConvertedValueContainer<?> returnedValue = null;
+		final IStatus iStatus = Status.OK_STATUS;
+		if (isMany) {
+			final Collection<String> values = new ArrayList<String>();
+			for (final String str : valueAsString.split(this.multiValueSeparator)) {
+				values.add(str);
+			}
+			returnedValue = new MultiConvertedValueContainer<String>(values, iStatus);
+		} else {
+			returnedValue = new ConvertedValueContainer<String>(valueAsString, iStatus);
+		}
+		return returnedValue;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/IStringValueConverter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/IStringValueConverter.java
index 242c4acc523..5ce086d2dd7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/IStringValueConverter.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/IStringValueConverter.java
@@ -1,36 +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.ui.converter;

-

-import org.eclipse.ui.services.IDisposable;

-

-/**

- * Common interface for string converter

- *

- * @author VL222926

- *

- */

-public interface IStringValueConverter extends IDisposable {

-

-	/**

-	 *

-	 * @param type

-	 *            an object representing the type of the in which we want to convert the string

-	 * @param valueAsString

-	 *            the value represented by a string

-	 * @return

-	 *         a {@link ConvertedValueContainer}

-	 */

-	public ConvertedValueContainer<?> deduceValueFromString(final Object type, final String valueAsString);

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.ui.converter;
+
+import org.eclipse.ui.services.IDisposable;
+
+/**
+ * Common interface for string converter
+ *
+ * @author VL222926
+ *
+ */
+public interface IStringValueConverter extends IDisposable {
+
+	/**
+	 *
+	 * @param type
+	 *            an object representing the type of the in which we want to convert the string
+	 * @param valueAsString
+	 *            the value represented by a string
+	 * @return
+	 *         a {@link ConvertedValueContainer}
+	 */
+	public ConvertedValueContainer<?> deduceValueFromString(final Object type, final String valueAsString);
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/MultiConvertedValueContainer.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/MultiConvertedValueContainer.java
index 13aacbf3396..4324d0191fa 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/MultiConvertedValueContainer.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/MultiConvertedValueContainer.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.converter;

-

-import java.util.Collection;

-

-import org.eclipse.core.runtime.IStatus;

-

-/**

- *

- * This class allows to store the value created for a pasted String AND a result status associated to this pasted String

- *

- * @param <T>

- */

-public class MultiConvertedValueContainer<T> extends ConvertedValueContainer<Collection<T>> {

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param realValue

-	 * @param status

-	 */

-	public MultiConvertedValueContainer(final Collection<T> realValue, final IStatus status) {

-		super(realValue, status);

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.converter;
+
+import java.util.Collection;
+
+import org.eclipse.core.runtime.IStatus;
+
+/**
+ *
+ * This class allows to store the value created for a pasted String AND a result status associated to this pasted String
+ *
+ * @param <T>
+ */
+public class MultiConvertedValueContainer<T> extends ConvertedValueContainer<Collection<T>> {
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param realValue
+	 * @param status
+	 */
+	public MultiConvertedValueContainer(final Collection<T> realValue, final IStatus status) {
+		super(realValue, status);
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/StringValueConverterStatus.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/StringValueConverterStatus.java
index 8a41a9edaa3..979bc06460c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/StringValueConverterStatus.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/converter/StringValueConverterStatus.java
@@ -1,60 +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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.converter;

-

-import java.util.Collection;

-

-import org.eclipse.core.runtime.Status;

-

-/**

- * This status is used y the String Value solvers

- *

- * @author vl222926

- *

- */

-public class StringValueConverterStatus extends Status {

-

-	/**

-	 * the list of the uresolved strings

-	 */

-	private Collection<String> unresolvedString;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param severity

-	 *            the severity of the status

-	 * @param pluginId

-	 *            the plugin id providing this status

-	 * @param message

-	 *            the message for this status

-	 * @param unresolvedString

-	 *            the list of the unresolved string

-	 */

-	public StringValueConverterStatus(int severity, String pluginId, String message, Collection<String> unresolvedString) {

-		super(severity, pluginId, message);

-		this.unresolvedString = unresolvedString;

-	}

-

-

-	/**

-	 *

-	 * @return

-	 *         the list of the unresolved string

-	 */

-	public final Collection<String> getUnresolvedString() {

-		return unresolvedString;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.ui.converter;
+
+import java.util.Collection;
+
+import org.eclipse.core.runtime.Status;
+
+/**
+ * This status is used y the String Value solvers
+ *
+ * @author vl222926
+ *
+ */
+public class StringValueConverterStatus extends Status {
+
+	/**
+	 * the list of the uresolved strings
+	 */
+	private Collection<String> unresolvedString;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param severity
+	 *            the severity of the status
+	 * @param pluginId
+	 *            the plugin id providing this status
+	 * @param message
+	 *            the message for this status
+	 * @param unresolvedString
+	 *            the list of the unresolved string
+	 */
+	public StringValueConverterStatus(int severity, String pluginId, String message, Collection<String> unresolvedString) {
+		super(severity, pluginId, message);
+		this.unresolvedString = unresolvedString;
+	}
+
+
+	/**
+	 *
+	 * @return
+	 *         the list of the unresolved string
+	 */
+	public final Collection<String> getUnresolvedString() {
+		return unresolvedString;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/dnd/PapyrusTransfer.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/dnd/PapyrusTransfer.java
index a31e0562b90..a31e0562b90 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/dnd/PapyrusTransfer.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/dnd/PapyrusTransfer.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/ContentProviderServiceFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/ContentProviderServiceFactory.java
index e67c81034fb..49557e36432 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/ContentProviderServiceFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/ContentProviderServiceFactory.java
@@ -1,68 +1,68 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.ui.editor;

-

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelManager;

-import org.eclipse.papyrus.infra.core.services.IServiceFactory;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-

-/**

- * A service factory to create the {@link ISashWindowsContentProvider} service.

- * This service depends on {@link DiSashModelMngrServiceFactory}.

- *

- * @author cedric dumoulin

- *

- */

-public class ContentProviderServiceFactory implements IServiceFactory {

-

-	/**

-	 * The sashModelMangr.

-	 */

-	private DiSashModelManager sashModelMngr;

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

-	 *

-	 * @param servicesRegistry

-	 * @throws ServiceException

-	 */

-	@Override

-	public void init(ServicesRegistry servicesRegistry) throws ServiceException {

-		// Get required services

-		sashModelMngr = servicesRegistry.getService(DiSashModelManager.class);

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

-	 *

-	 * @throws ServiceException

-	 */

-	@Override

-	public void startService() throws ServiceException {

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

-	 *

-	 * @throws ServiceException

-	 */

-	@Override

-	public void disposeService() throws ServiceException {

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance()

-	 *

-	 * @return

-	 * @throws ServiceException

-	 */

-	@Override

-	public Object createServiceInstance() throws ServiceException {

-		return sashModelMngr.getISashWindowsContentProvider();

-	}

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.ui.editor;
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelManager;
+import org.eclipse.papyrus.infra.core.services.IServiceFactory;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+
+/**
+ * A service factory to create the {@link ISashWindowsContentProvider} service.
+ * This service depends on {@link DiSashModelMngrServiceFactory}.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class ContentProviderServiceFactory implements IServiceFactory {
+
+	/**
+	 * The sashModelMangr.
+	 */
+	private DiSashModelManager sashModelMngr;
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)
+	 *
+	 * @param servicesRegistry
+	 * @throws ServiceException
+	 */
+	@Override
+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+		// Get required services
+		sashModelMngr = servicesRegistry.getService(DiSashModelManager.class);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()
+	 *
+	 * @throws ServiceException
+	 */
+	@Override
+	public void startService() throws ServiceException {
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()
+	 *
+	 * @throws ServiceException
+	 */
+	@Override
+	public void disposeService() throws ServiceException {
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance()
+	 *
+	 * @return
+	 * @throws ServiceException
+	 */
+	@Override
+	public Object createServiceInstance() throws ServiceException {
+		return sashModelMngr.getISashWindowsContentProvider();
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java
index 983e28735ec..bbfb16f40a6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java
@@ -1,1244 +1,1244 @@
-/*****************************************************************************

- * Copyright (c) 2008, 2016 LIFL, CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - manage models by URI, not IFile (CDO)

- *  Christian W. Damus (CEA) - bug 410346

- *  Christian W. Damus (CEA) - bug 431953 (pre-requisite refactoring of ModelSet service start-up)

- *  Christian W. Damus (CEA) - bug 437217

- *  Christian W. Damus - bugs 469464, 469188, 485220

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.ui.editor;

-

-import static org.eclipse.papyrus.infra.core.Activator.log;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.concurrent.CopyOnWriteArrayList;

-import java.util.concurrent.atomic.AtomicReference;

-

-import org.eclipse.core.commands.operations.IUndoContext;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.runtime.CoreException;

-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.SubMonitor;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.ui.URIEditorInput;

-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.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.core.editor.BackboneException;

-import org.eclipse.papyrus.infra.core.language.ILanguageChangeListener;

-import org.eclipse.papyrus.infra.core.language.ILanguageService;

-import org.eclipse.papyrus.infra.core.language.LanguageChangeEvent;

-import org.eclipse.papyrus.infra.core.resource.ModelMultiException;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelManager;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.AbstractMultiPageSashEditor;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;

-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

-import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServiceMultiException;

-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.ui.Activator;

-import org.eclipse.papyrus.infra.ui.contentoutline.ContentOutlineRegistry;

-import org.eclipse.papyrus.infra.ui.editor.IReloadableEditor.DirtyPolicy;

-import org.eclipse.papyrus.infra.ui.editor.reload.EditorReloadEvent;

-import org.eclipse.papyrus.infra.ui.editor.reload.IEditorReloadListener;

-import org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent;

-import org.eclipse.papyrus.infra.ui.lifecycleevents.IEditorInputChangedListener;

-import org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveAndDirtyService;

-import org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor.ActionBarContributorRegistry;

-import org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor.CoreComposedActionBarContributor;

-import org.eclipse.papyrus.infra.ui.services.EditorLifecycleManager;

-import org.eclipse.papyrus.infra.ui.services.internal.EditorLifecycleManagerImpl;

-import org.eclipse.papyrus.infra.ui.services.internal.InternalEditorLifecycleManager;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.IEditorActionBarContributor;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IFileEditorInput;

-import org.eclipse.ui.IURIEditorInput;

-import org.eclipse.ui.IViewReference;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchActionConstants;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.progress.UIJob;

-import org.eclipse.ui.statushandlers.StatusManager;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;

-

-import com.google.common.collect.ImmutableList;

-import com.google.common.collect.ImmutableSet;

-

-/**

- * Multi diagram editor allowing to plug various kind of editors. Editors are

- * registered with the help of the Eclipse extension mechanism. This

- * implementation allows to register editors and context separately. An editor

- * should specify which context it need to run. This multi diagram editor allows

- * to show editor side by side in one or more sash windows.

- *

- * The real implementation for the generic type T of SashMultiPageEditorPart is

- * actually di2.Diagram

- *

- * @author cedric dumoulin

- * @author <a href="mailto:jerome.benois@obeo.fr">Jerome Benois</a>

- * @author <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a>

- *         Refactoring.

- *

- *         TODO : remove GMF dependency !

- */

-public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implements IMultiDiagramEditor, ITabbedPropertySheetPageContributor, IGotoMarker, IEditingDomainProvider {

-

-	/** ContentOutline registry */

-	private ContentOutlineRegistry contentOutlineRegistry;

-

-	/** Services registry. Used to get registered services */

-	private ServicesRegistry servicesRegistry;

-

-	/**

-	 * ActionBarContributor Registry. Allows to get an ActionBar by its Id. The

-	 * registry is initialized from the Eclipse extension mechanism.

-	 */

-	private ActionBarContributorRegistry actionBarContributorRegistry;

-

-	/** SashModelMngr to add pages */

-	protected DiSashModelManager sashModelMngr;

-

-	/**

-	 * Service used to maintain the dirty state and to perform save and saveAs.

-	 */

-	protected ISaveAndDirtyService saveAndDirtyService;

-

-	private final List<IPropertySheetPage> propertiesPages = new LinkedList<IPropertySheetPage>();

-

-	private final List<Runnable> closeActions = new ArrayList<>();

-

-	/**

-	 * Listener on {@link ISaveAndDirtyService#addInputChangedListener(IEditorInputChangedListener)}

-	 */

-	private static class EditorInputChangedListener implements IEditorInputChangedListener {

-

-		private CoreMultiDiagramEditor editor;

-

-		public EditorInputChangedListener(CoreMultiDiagramEditor editor) {

-			this.editor = editor;

-		}

-

-		/**

-		 * This method is called when the editor input is changed from the

-		 * ISaveAndDirtyService.

-		 *

-		 * @see org.eclipse.papyrus.infra.ui.lifecycleevents.IEditorInputChangedListener#editorInputChanged(org.eclipse.ui.part.FileEditorInput)

-		 *

-		 * @param fileEditorInput

-		 */

-		@Override

-		public void editorInputChanged(FileEditorInput fileEditorInput) {

-			// Change the editor input.

-			editor.setInputWithNotify(fileEditorInput);

-			editor.setPartName(fileEditorInput.getName());

-		}

-

-		/**

-		 * The isDirty flag has changed, reflect its new value

-		 *

-		 * @see org.eclipse.papyrus.infra.ui.lifecycleevents.IEditorInputChangedListener#isDirtyChanged()

-		 *

-		 */

-		@Override

-		public void isDirtyChanged() {

-

-			// Run it in async way.

-			editor.getSite().getShell().getDisplay().asyncExec(new Runnable() {

-

-				@Override

-				public void run() {

-					// editor can be null if this object has been finalized, but

-					// still queued in the asyncExec queue.

-					// This can happen if the editor is disposed, but some run still in

-					// the exec queue.

-					// When the method is executed asynchronously, the object is already finalized, and so

-					// editor is null.

-					if (editor == null) {

-						return;

-					}

-					editor.firePropertyChange(IEditorPart.PROP_DIRTY);

-				}

-			});

-		}

-

-		public void dispose() {

-			this.editor = null;

-		}

-	}

-

-	protected EditorInputChangedListener editorInputChangedListener;

-

-	private TransactionalEditingDomain transactionalEditingDomain;

-

-	/**

-	 * Object managing models lifeCycle.

-	 */

-	protected ModelSet resourceSet;

-

-	/**

-	 * Cached event that can be reused.

-	 */

-	protected DoSaveEvent lifeCycleEvent;

-

-	private class ContentChangedListener implements IContentChangedListener {

-

-		/**

-		 * Called when the content is changed. RefreshTabs.

-		 */

-		@Override

-		public void contentChanged(ContentEvent event) {

-			scheduleRefresh();

-		}

-	}

-

-	/**

-	 * A listener on model change events.

-	 */

-	private ContentChangedListener contentChangedListener;

-

-	/**

-	 * Undo context used to have the same undo context in all Papyrus related

-	 * views and editors. TODO : move away, use a version independent of GMF,

-	 * add a listener that will add the context to all commands modifying

-	 * attached Resources (==> linked to ModelSet ?)

-	 */

-	private IUndoContext undoContext;

-

-	/**

-	 * Editor reload listeners.

-	 */

-	private CopyOnWriteArrayList<IEditorReloadListener> reloadListeners = new CopyOnWriteArrayList<IEditorReloadListener>();

-

-	/**

-	 * A pending reload operation (awaiting next activation of the editor).

-	 */

-	private final AtomicReference<DeferredReload> pendingReload = new AtomicReference<DeferredReload>();

-

-	public CoreMultiDiagramEditor() {

-		super();

-

-		addSelfReloadListener();

-	}

-

-	/**

-	 * Get the contentOutlineRegistry. Create it if needed.

-	 *

-	 * @return the contentOutlineRegistry

-	 */

-	protected ContentOutlineRegistry getContentOutlineRegistry() {

-		if (contentOutlineRegistry == null) {

-			createContentOutlineRegistry();

-		}

-

-		return contentOutlineRegistry;

-	}

-

-	/**

-	 * Create the contentOutlineRegistry.

-	 */

-	private void createContentOutlineRegistry() {

-		contentOutlineRegistry = new ContentOutlineRegistry(this, Activator.PLUGIN_ID);

-	}

-

-	/**

-	 * Returns the service registry associated to the editor.

-	 *

-	 * @return the servicesRegistry The registry.

-	 */

-	@Override

-	public ServicesRegistry getServicesRegistry() {

-		if (servicesRegistry == null) {

-			servicesRegistry = createServicesRegistry();

-		}

-		return servicesRegistry;

-	}

-

-	/**

-	 * Create the ServicesRegistry.

-	 *

-	 * @return

-	 */

-	private ServicesRegistry createServicesRegistry() {

-		// Create Services Registry

-		try {

-			ServicesRegistry servicesRegistry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);

-			// servicesRegistry.startRegistry();

-			return servicesRegistry;

-		} catch (ServiceException e) {

-			// Show log and error

-			log.error(e.getMessage(), e);

-		}

-		return null;

-	}

-

-	/**

-	 * Do nothing as we create the provider before any calls to this method.

-	 * Should not be called by subclasses.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.AbstractMultiPageSashEditor#createPageProvider()

-	 */

-	@Override

-	protected ISashWindowsContentProvider createPageProvider() {

-		throw new UnsupportedOperationException("Not implemented. Should not be called as the ContentProvider is already initialized.");

-	}

-

-	/**

-	 * Create the pageContentProvider.

-	 *

-	 * Removed since 0.10.0

-	 *

-	 * @param pageFactory

-	 * @param diResource

-	 *            Resource used to load/save the SashModel.

-	 *

-	 *

-	 */

-	// protected ISashWindowsContentProvider createPageProvider(IPageModelFactory pageFactory, Resource diResource, TransactionalEditingDomain editingDomain) {

-	//

-	// sashModelMngr = new TransactionalDiSashModelMngr(pageFactory, diResource, editingDomain);

-	//

-	// ISashWindowsContentProvider pageProvider = sashModelMngr.getISashWindowsContentProvider();

-	//

-	// return pageProvider;

-	// }

-

-	/**

-	 * Get The {@link IPageMngr} used to add, open, remove or close a diagram in

-	 * the SashWindow. This method is available as soon as the {@link CoreMultiDiagramEditor#init(IEditorSite, IEditorInput)} method is

-	 * called.

-	 *

-	 * @return

-	 */

-	protected IPageManager getIPageManager() throws IllegalStateException {

-		try {

-			return sashModelMngr.getIPageManager();

-		} catch (Exception e) {

-			throw new IllegalStateException("Method should be called after CoreMultiDiagramEditor#init(IEditorSite, IEditorInput) is called");

-		}

-	}

-

-	/**

-	 * Get the ActionBarContributorRegistry. Creates it if necessary.

-	 *

-	 * @return

-	 */

-	protected ActionBarContributorRegistry getActionBarContributorRegistry() {

-		if (actionBarContributorRegistry != null) {

-			return actionBarContributorRegistry;

-		}

-

-		// Try to got it from CoreComposedActionBarContributor

-		// Get it from the contributor.

-		IEditorActionBarContributor contributor = getEditorSite().getActionBarContributor();

-		if (contributor instanceof CoreComposedActionBarContributor) {

-			log.debug(getClass().getSimpleName() + " - ActionBarContributorRegistry loaded from CoreComposedActionBarContributor.");

-			return ((CoreComposedActionBarContributor) contributor).getActionBarContributorRegistry();

-		} else {

-			// Create a registry.

-			log.debug(getClass().getSimpleName() + " - create an ActionBarContributorRegistry.");

-			return createActionBarContributorRegistry();

-		}

-

-	}

-

-	/**

-	 * Create the ActionBarContributorRegistry.

-	 *

-	 * @return

-	 */

-	private ActionBarContributorRegistry createActionBarContributorRegistry() {

-		return new ActionBarContributorRegistry(Activator.PLUGIN_ID);

-	}

-

-	/**

-	 *

-	 *

-	 * @param adapter

-	 *

-	 * @return

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class adapter) {

-

-		if (ServicesRegistry.class == adapter) {

-			return getServicesRegistry();

-		}

-

-		if (IPageManager.class == adapter) {

-			return getIPageManager();

-		}

-

-		if (IPropertySheetPage.class == adapter) {

-			// Do not test if tabbedPropertySheetPage is null before calling new

-			// this is managed by Eclipse which only call current method when

-			// necessary

-			return getPropertySheetPage();

-		}

-

-		// Add a viewer

-		if (IContentOutlinePage.class == adapter) {

-			try {

-				ContentOutlineRegistry outlineRegistry = getContentOutlineRegistry();

-				if (outlineRegistry == null) {

-					return null;

-				}

-				IContentOutlinePage contentOutline = outlineRegistry.getContentOutline();

-				if (contentOutline != null) {

-					return contentOutline;

-				}

-			} catch (BackboneException e) {

-				// Ignore: There is not registered outline.

-			}

-		}

-

-		if (EditingDomain.class == adapter || TransactionalEditingDomain.class == adapter) {

-			return transactionalEditingDomain;

-		}

-

-		/*

-		 * Return context used for undo/redo. All papyrus views should use this

-		 * context. The prefer way to get this is to use undoContext =

-		 * servicesRegistry.getService(IUndoContext.class);

-		 */

-		if (IUndoContext.class == adapter) {

-			return undoContext;

-		}

-

-		// EMF requirements

-		if (IEditingDomainProvider.class == adapter) {

-			return this;

-		}

-

-		if (adapter == ISelection.class) {

-			return getSite().getSelectionProvider().getSelection();

-		}

-

-		if (adapter == IReloadableEditor.class) {

-			return createReloadAdapter();

-		}

-

-		return super.getAdapter(adapter);

-	}

-

-	/**

-	 * Init the editor.

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput input) throws PartInitException {

-		// Init super

-		super.init(site, input);

-

-		// Set editor name

-		setPartName(input.getName());

-

-		initContents();

-	}

-

-	@Override

-	public void createPartControl(Composite parent) {

-		super.createPartControl(parent);

-

-		// Fire the PreDisplay event synchronously, so that listeners can continue

-		// setting up the UI before the contents are actually rendered fully

-		getLifecycleManager().firePreDisplay(this);

-

-		// Fire the PostDisplay event asynchronously, to leave time to the Eclipse

-		// framework to actually display the contents of the editor

-		Display.getDefault().asyncExec(new Runnable() {

-

-			@Override

-			public void run() {

-				// Because we are asynchronous, the editor may already have been disposed

-				// (Especially in the case of tests running in the UI Thread)

-				if (servicesRegistry == null) {

-					return;

-				}

-				getLifecycleManager().firePostDisplay(CoreMultiDiagramEditor.this);

-			}

-		});

-

-	}

-

-	protected void loadModelAndServices() throws PartInitException {

-		// Create ServicesRegistry and register services

-		servicesRegistry = createServicesRegistry();

-

-		// Add itself as a service

-		servicesRegistry.add(IMultiDiagramEditor.class, 1, this);

-

-		// Create lifeCycle event provider and the event that is used when the editor fire a save event.

-		// lifeCycleEventsProvider = new LifeCycleEventsProvider();

-		// lifeCycleEvent = new DoSaveEvent(servicesRegistry, this);

-		// servicesRegistry.add(ILifeCycleEventsProvider.class, 1, lifeCycleEventsProvider);

-

-		// register services

-		servicesRegistry.add(ActionBarContributorRegistry.class, 1, getActionBarContributorRegistry());

-		// servicesRegistry.add(TransactionalEditingDomain.class, 1, transactionalEditingDomain);

-		// servicesRegistry.add(DiResourceSet.class, 1, resourceSet);

-

-		// Create and initalize editor icons service

-		// PageIconsRegistry pageIconsRegistry = new PageIconsRegistry();

-		// PluggableEditorFactoryReader editorReader = new PluggableEditorFactoryReader(Activator.PLUGIN_ID);

-		// editorReader.populate(pageIconsRegistry);

-		// servicesRegistry.add(IPageIconsRegistry.class, 1, pageIconsRegistry);

-

-

-		// Create PageModelRegistry requested by content provider.

-		// Also populate it from extensions.

-		// PageModelFactoryRegistry pageModelRegistry = new PageModelFactoryRegistry();

-		// editorReader.populate(pageModelRegistry, servicesRegistry);

-

-		// TODO : create appropriate Resource for the contentProvider, and pass it here.

-		// This will allow to remove the old sash stuff.

-		// setContentProvider(createPageProvider(pageModelRegistry, resourceSet.getDiResource(), transactionalEditingDomain));

-		// servicesRegistry.add(ISashWindowsContentProvider.class, 1, getContentProvider());

-		// servicesRegistry.add(IPageMngr.class, 1, getIPageMngr());

-

-		// register a basic label provider

-		// adapter factory used by EMF objects

-		AdapterFactory factory = null;

-		try {

-			EditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(servicesRegistry);

-			if (domain instanceof AdapterFactoryEditingDomain) {

-				// Use the adapter factory already provided by this editing domain

-				factory = ((AdapterFactoryEditingDomain) domain).getAdapterFactory();

-			}

-		} catch (ServiceException e) {

-			// OK, there's no editing domain. That's fine

-		}

-

-		if (factory == null) {

-			// Must create a new adapter factory

-			factory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-		}

-

-		/** label provider for EMF objects */

-		ILabelProvider labelProvider = new AdapterFactoryLabelProvider(factory) {

-

-			/**

-			 * This implements {@link ILabelProvider}.getText by forwarding it

-			 * to an object that implements {@link IItemLabelProvider#getText

-			 * IItemLabelProvider.getText}

-			 */

-			@Override

-			public String getText(Object object) {

-				// Get the adapter from the factory.

-				//

-				IItemLabelProvider itemLabelProvider = (IItemLabelProvider) adapterFactory.adapt(object, IItemLabelProvider.class);

-				if (object instanceof EObject) {

-					if (((EObject) object).eIsProxy()) {

-						return "Proxy - " + object;

-					}

-				}

-				return itemLabelProvider != null ? itemLabelProvider.getText(object) : object == null ? "" : object.toString();

-			}

-		};

-		servicesRegistry.add(ILabelProvider.class, 1, labelProvider);

-

-		EditorLifecycleManager lifecycleManager = new EditorLifecycleManagerImpl();

-		servicesRegistry.add(EditorLifecycleManager.class, 1, lifecycleManager, ServiceStartKind.LAZY);

-

-		// Start servicesRegistry

-		URI uri;

-		IEditorInput input = getEditorInput();

-		if (input instanceof IFileEditorInput) {

-			uri = URI.createPlatformResourceURI(((IFileEditorInput) input).getFile().getFullPath().toString(), true);

-		} else if (input instanceof URIEditorInput) {

-			uri = ((URIEditorInput) input).getURI();

-		} else {

-			uri = URI.createURI(((IURIEditorInput) input).getURI().toString());

-		}

-

-		try {

-			// Start the ModelSet first, and load if from the specified File.

-			// Also start me so that I may be retrieved from the registry by other services

-			List<Class<?>> servicesToStart = new ArrayList<Class<?>>(1);

-			servicesToStart.add(ModelSet.class);

-			servicesToStart.add(IMultiDiagramEditor.class);

-

-			servicesRegistry.startServicesByClassKeys(servicesToStart);

-

-			resourceSet = servicesRegistry.getService(ModelSet.class);

-			resourceSet.loadModels(uri);

-

-			// start remaining services

-			servicesRegistry.startRegistry();

-		} catch (ModelMultiException e) {

-			try {

-				// with the ModelMultiException it is still possible to open the

-				// editors that's why the service registry is still started

-				servicesRegistry.startRegistry();

-				warnUser(e);

-			} catch (ServiceException e1) {

-				log.error(e);

-				// throw new PartInitException("could not initialize services", e); //$NON-NLS-1$

-			}

-		} catch (ServiceException e) {

-			log.error(e);

-			// throw new PartInitException("could not initialize services", e);

-		}

-

-

-		// Get required services

-

-		try {

-			transactionalEditingDomain = servicesRegistry.getService(TransactionalEditingDomain.class);

-			sashModelMngr = servicesRegistry.getService(DiSashModelManager.class);

-

-			saveAndDirtyService = servicesRegistry.getService(ISaveAndDirtyService.class);

-			undoContext = servicesRegistry.getService(IUndoContext.class);

-

-			servicesRegistry.getService(ILanguageService.class).addLanguageChangeListener(createLanguageChangeListener());

-		} catch (ServiceException e) {

-			log.error("A required service is missing.", e);

-			// if one of the services above fail to start, the editor can't run

-			// => stop

-			throw new PartInitException("could not initialize services", e);

-		}

-

-

-		// Listen on input changed from the ISaveAndDirtyService

-		editorInputChangedListener = new EditorInputChangedListener(this);

-		saveAndDirtyService.addInputChangedListener(editorInputChangedListener);

-		getLifecycleManager().firePostInit(this);

-	}

-

-	private ILanguageChangeListener createLanguageChangeListener() {

-		return new ILanguageChangeListener() {

-

-			@Override

-			public void languagesChanged(LanguageChangeEvent event) {

-				// Re-load the editor if languages changed, because new ModelSet configurations may be required

-				if (event.getType() == LanguageChangeEvent.ADDED) {

-					new UIJob(getSite().getShell().getDisplay(), NLS.bind("Reload editor {0}", getTitle())) {

-

-						@Override

-						public IStatus runInUIThread(IProgressMonitor monitor) {

-							IStatus result = Status.OK_STATUS;

-							monitor = SubMonitor.convert(monitor, IProgressMonitor.UNKNOWN);

-

-							try {

-								ISashWindowsContainer container = getISashWindowsContainer();

-								if ((container != null) && !container.isDisposed()) {

-									IReloadableEditor.ReloadReason reason = IReloadableEditor.ReloadReason.RESOURCES_CHANGED;

-

-									DirtyPolicy dirtyPolicy = DirtyPolicy.getDefault();

-									try {

-										IReloadableEditor.Adapter.getAdapter(CoreMultiDiagramEditor.this).reloadEditor(resourceSet.getResources(), reason, dirtyPolicy);

-									} catch (CoreException e) {

-										result = e.getStatus();

-									}

-								}

-							} finally {

-								monitor.done();

-							}

-

-							return result;

-						}

-					}.schedule();

-				}

-			}

-		};

-	}

-

-	private InternalEditorLifecycleManager getLifecycleManager() {

-		// I've been disposed

-		if (servicesRegistry == null) {

-			return null;

-		}

-		try {

-			return (InternalEditorLifecycleManager) servicesRegistry.getService(EditorLifecycleManager.class);

-		} catch (ServiceException ex) {

-			Activator.log.error(ex);

-		}

-		return null;

-	}

-

-	protected void loadNestedEditors() throws PartInitException {

-		ISashWindowsContentProvider contentProvider = null;

-		try {

-			contentProvider = servicesRegistry.getService(ISashWindowsContentProvider.class);

-		} catch (ServiceException ex) {

-			log.error("A required service is missing.", ex);

-			// if one of the services above fail to start, the editor can't run

-			// => stop

-			throw new PartInitException("could not initialize services", ex);

-		}

-

-		// Set the content provider providing editors.

-		setContentProvider(contentProvider);

-

-		// Listen on contentProvider changes

-		if (contentChangedListener == null) {

-			contentChangedListener = new ContentChangedListener();

-		}

-		sashModelMngr.getSashModelContentChangedProvider().addListener(contentChangedListener);

-

-		IEditorInput input = getEditorInput();

-

-		if (input instanceof IPapyrusPageInput) {

-			IPapyrusPageInput papyrusPageInput = (IPapyrusPageInput) input;

-			final IPageManager pageManager = getIPageManager();

-

-			if (papyrusPageInput.closeOtherPages()) {

-				pageManager.closeAllOpenedPages();

-			}

-

-			for (URI pageIdentifierURI : papyrusPageInput.getPages()) {

-				final EObject pageIdentifier = resourceSet.getEObject(pageIdentifierURI, true);

-				if (!pageManager.allPages().contains(pageIdentifier)) {

-					Activator.log.warn("The object " + pageIdentifier + " does not reference an existing page");

-					continue;

-				}

-

-				if (pageManager.isOpen(pageIdentifier)) {

-					pageManager.selectPage(pageIdentifier);

-				} else {

-					pageManager.openPage(pageIdentifier);

-				}

-			}

-		}

-	}

-

-	protected void warnUser(ModelMultiException e) {

-		Activator.log.error(e);

-		MessageDialog.openError(getSite().getShell(), "Error", String.format("Your model is corrupted, invalid links have been found :\n" + "%s" + "It is recommended to fix it before editing it", e.getMessage()));

-	}

-

-	/**

-	 * Activate this editor. Called after the SWT.control is created.

-	 */

-	@Override

-	protected void activate() {

-		super.activate();

-

-		initFolderTabMenus();

-

-		try {

-			// Register ISashWindowsContainer as service

-			// Should be done only once the container is ready.

-			getServicesRegistry().add(ISashWindowsContainer.class, 1, getISashWindowsContainer());

-			getServicesRegistry().startServicesByClassKeys(ISashWindowsContainer.class);

-			// Let the IPageMngr use the ISashWindowsContainer to discover current folder

-			// This should be done after SashWindowContainer initialization.

-			// DiSashModelManager sashModelManager = getServicesRegistry().getService(DiSashModelManager.class);

-			sashModelMngr.setCurrentFolderAndPageMngr(getISashWindowsContainer());

-

-		} catch (ServiceException e) {

-			log.error(e);

-		}

-

-	}

-

-	/**

-	 * Init the contextual menu shown in the folder tabs. This popup menu is

-	 * contributed by the help of Eclipse extensions, using the Commands

-	 * framework. I.e, to add a menu item, create a menu, a command and an

-	 * handler in the extension.

-	 */

-	protected void initFolderTabMenus() {

-		ISashWindowsContainer container = getISashWindowsContainer();

-

-		// TODO : use a constant

-		MenuManager menuManager = new MenuManager("tabmenu");

-		menuManager.add(new Separator("tabcommands"));

-		menuManager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));

-		container.setFolderTabMenuManager(menuManager);

-

-		// TODO : use a constant

-		getSite().registerContextMenu("org.eclipse.papyrus.infra.core.editor.ui.tabmenu", menuManager, getSite().getSelectionProvider());

-

-	}

-

-	/**

-	 * Overrides getPropertySheetPage.

-	 *

-	 * {@inheritDoc}

-	 *

-	 * @see org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor#getPropertySheetPage()

-	 */

-	public IPropertySheetPage getPropertySheetPage() {

-		IPropertySheetPage propertiesPage = new MultiDiagramPropertySheetPage(this);

-		propertiesPages.add(propertiesPage);

-		return propertiesPage;

-	}

-

-	@Override

-	public void dispose() {

-		for (IPropertySheetPage propertiesPage : this.propertiesPages) {

-			propertiesPage.dispose();

-		}

-		propertiesPages.clear();

-

-		// Forget the outline page(s)

-		contentOutlineRegistry = null;

-

-		super.dispose();

-	}

-

-	private IReloadableEditor createReloadAdapter() {

-

-		return new IReloadableEditor() {

-

-			@Override

-			public void reloadEditor(Collection<? extends Resource> triggeringResources, ReloadReason reason, DirtyPolicy dirtyPolicy) throws CoreException {

-				// Attempt to re-load, later

-				pendingReload.set(new DeferredReload(triggeringResources, reason, dirtyPolicy));

-

-				// If I am already active, then do it now. Or, if we're not going to ask the user about it, also do it now

-				IWorkbenchPage page = getSite().getPage();

-				if ((page.getActiveEditor() == CoreMultiDiagramEditor.this) || (dirtyPolicy != DirtyPolicy.PROMPT_TO_SAVE)) {

-					pendingReload.get().reload();

-				}

-			}

-

-			@Override

-			public void addEditorReloadListener(IEditorReloadListener listener) {

-				reloadListeners.addIfAbsent(listener);

-			}

-

-			@Override

-			public void removeEditorReloadListener(IEditorReloadListener listener) {

-				reloadListeners.remove(listener);

-			}

-		};

-	}

-

-	private void addSelfReloadListener() {

-		createReloadAdapter().addEditorReloadListener(new IEditorReloadListener() {

-

-			@Override

-			public void editorAboutToReload(EditorReloadEvent event) {

-				event.putContext(new MultiDiagramEditorSelectionContext(event.getEditor()));

-			}

-

-			@Override

-			public void editorReloaded(EditorReloadEvent event) {

-				((MultiDiagramEditorSelectionContext) event.getContext()).restore(event.getEditor());

-			}

-		});

-	}

-

-	/**

-	 * Register an action to be run when I am closed. Any number of such actions may

-	 * be added. note that close actions also run on re-load, which behaves to all

-	 * outward appearances like a close and re-open.

-	 * 

-	 * @param closeAction

-	 *            an action to run when I am closed

-	 */

-	public void onClose(Runnable closeAction) {

-		closeActions.add(closeAction);

-	}

-

-	@Override

-	protected void deactivate() {

-		getLifecycleManager().fireBeforeClose(this);

-		if (sashModelMngr != null) {

-			sashModelMngr.getSashModelContentChangedProvider().removeListener(contentChangedListener);

-		}

-

-		super.deactivate();

-

-		// dispose available service

-		if (servicesRegistry != null) {

-			try {

-				servicesRegistry.disposeRegistry();

-				servicesRegistry = null;

-			} catch (ServiceMultiException e) {

-				log.error(e);

-			}

-		}

-

-		if (contentChangedListener != null) {

-			this.contentChangedListener = null;

-		}

-

-		if (editorInputChangedListener != null) {

-			this.editorInputChangedListener.dispose();

-			this.editorInputChangedListener = null;

-		}

-

-		for (Runnable next : closeActions) {

-			try {

-				next.run();

-			} catch (Exception e) {

-				Activator.log.error("Uncaught exception in close action", e); //$NON-NLS-1$

-			}

-		}

-		closeActions.clear();

-

-		transactionalEditingDomain = null;

-		resourceSet = null;

-		undoContext = null;

-		saveAndDirtyService = null;

-		sashModelMngr = null;

-	}

-

-	void initContents() throws PartInitException {

-		loadModelAndServices();

-		loadNestedEditors();

-	}

-

-	@Override

-	public void setFocus() {

-		super.setFocus();

-

-		DeferredReload reload = pendingReload.get();

-		if (reload != null) {

-			reload.reload();

-		}

-	}

-

-	private void doReload() throws CoreException {

-		final IWorkbenchPage page = getSite().getPage();

-		final IWorkbenchPart activePart = page.getActivePart();

-		final IEditorPart activeEditor = page.getActiveEditor();

-

-		final Iterable<? extends IEditorReloadListener> listeners = ImmutableList.copyOf(reloadListeners);

-		final EditorReloadEvent event = new EditorReloadEvent(CoreMultiDiagramEditor.this);

-

-		try {

-			event.dispatchEditorAboutToReload(listeners);

-

-			deactivate();

-

-			initContents();

-

-			activate();

-

-			// My self-listener will be first, to ensure that the pages are all restored before dependents run

-			event.dispatchEditorReloaded(listeners);

-		} finally {

-			event.dispose();

-

-			// Ensure that the editor previously active is active again (if it still exists)

-			if ((activeEditor != null) && page.isPartVisible(activeEditor)) {

-				page.activate(activeEditor);

-			}

-

-			// Ensure that the part previously active is active again (if it still exists and is not the active editor)

-			if ((activePart != null) && (activePart != activeEditor) && page.isPartVisible(activePart)) {

-				page.activate(activePart);

-			}

-		}

-

-	}

-

-	/**

-	 * Overrides doSave.

-	 *

-	 * {@inheritDoc}

-	 *

-	 * @see org.eclipse.ui.part.EditorPart#doSave(org.eclipse.core.runtime.IProgressMonitor)

-	 */

-	@Override

-	public void doSave(IProgressMonitor monitor) {

-

-		saveAndDirtyService.doSave(monitor);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean isDirty() {

-		// May happen if the editor has not yet been initialized. In this case, the editor cannot be dirty, so we simply return false.

-		// Bug 410286: The isDirty() method can also be called /after/ the editor has been disposed. Most likely an Eclipse bug?

-		if (saveAndDirtyService == null) {

-			return false;

-		}

-		return saveAndDirtyService.isDirty();

-	}

-

-	/**

-	 * Overrides doSaveAs.

-	 *

-	 * {@inheritDoc}

-	 *

-	 * @see org.eclipse.ui.part.EditorPart#doSaveAs()

-	 */

-	@Override

-	public void doSaveAs() {

-

-		saveAndDirtyService.doSaveAs();

-	}

-

-	/**

-	 * Overrides isSaveAsAllowed.

-	 *

-	 * {@inheritDoc}

-	 *

-	 * @see org.eclipse.ui.part.EditorPart#isSaveAsAllowed()

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * Overrides getContributorId.

-	 *

-	 * {@inheritDoc}

-	 *

-	 * @see org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor#getContributorId()

-	 */

-	@Override

-	public String getContributorId() {

-		// return Activator.PLUGIN_ID;

-		return "TreeOutlinePage";

-

-	}

-

-	// implements IDiagramWorkbenchPart to restore GMF standard behavior

-	// and delegate to the activeEditor

-

-	/**

-	 * Overrides getDiagram.

-	 *

-	 * {@inheritDoc}

-	 *

-	 * @see org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart#getDiagram()

-	 */

-	// public org.eclipse.gmf.runtime.notation.Diagram getDiagram() {

-	// IEditorPart activeEditor = getActiveEditor();

-	// if(activeEditor instanceof DiagramEditor) {

-	// return ((DiagramEditor)activeEditor).getDiagram();

-	// } else {

-	// return null;

-	// }

-	// }

-

-	/**

-	 * This method is called from a GMF diagram. It should only be called from GMF diagram code. Normally, the Diagram under the Mouse is a GMF

-	 * Diagram. The active Diagram can be another Diagram, not

-	 * under the mouse. This is a GMF issue.

-	 */

-	// public DiagramEditPart getDiagramEditPart() {

-	//

-	// // Get the editor under the mouse

-	// // IEditorPart activeEditor = rootContainer.getEditorUnderMouse();

-	// IEditorPart activeEditor = getActiveEditor();

-	// if(activeEditor == null) {

-	// return null;

-	// }

-	// // IEditorPart activeEditor = getActiveEditor();

-	// if(activeEditor instanceof DiagramEditor) {

-	// return ((DiagramEditor)activeEditor).getDiagramEditPart();

-	// } else {

-	// // This case should never happen.

-	// // Return null, as the GMF runtime now support it (since 093009)

-	// return null;

-	// }

-	// }

-

-	/**

-	 * Overrides getDiagramGraphicalViewer.

-	 *

-	 * {@inheritDoc}

-	 *

-	 * @see org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart#getDiagramGraphicalViewer()

-	 */

-	// public IDiagramGraphicalViewer getDiagramGraphicalViewer() {

-	// IEditorPart activeEditor = getActiveEditor();

-	// if(activeEditor instanceof DiagramEditor) {

-	// return ((DiagramEditor)activeEditor).getDiagramGraphicalViewer();

-	// } else {

-	// return null;

-	// }

-	// }

-

-	/**

-	 * Overrides getEditingDomain.

-	 *

-	 * {@inheritDoc}

-	 *

-	 * @see org.eclipse.emf.edit.domain.IEditingDomainProvider#getEditingDomain()

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return transactionalEditingDomain;

-	}

-

-	/**

-	 * Throws an UnsupportedOperationException.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor#getDiagramEditDomain()

-	 */

-	// public DiagramEditDomain getDiagramEditDomain() {

-	// throw new UnsupportedOperationException("Not implemented. Should not be called.");

-	// }

-

-

-	/**

-	 * Change the editor input.<BR>

-	 * <U>Note</U>: that method should be called within the UI-Thread.

-	 *

-	 * @see org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor#setEditorInput(org.eclipse.ui.IEditorInput)

-	 *

-	 * @param newInput

-	 *            The new input

-	 * @deprecated Not used anymore

-	 */

-

-	@Override

-	@Deprecated

-	public void setEditorInput(IEditorInput newInput) {

-		setInputWithNotify(newInput);

-		setPartName(newInput.getName());

-	}

-

-	@Override

-	@Deprecated

-	public void gotoMarker(IMarker marker) {

-		IWorkbench wb = PlatformUI.getWorkbench();

-		IWorkbenchPage page = wb.getActiveWorkbenchWindow().getActivePage();

-		boolean first = true;

-		for (IViewReference view : page.getViewReferences()) {

-			// no longer restrict to model explorer (see bug 387578)

-			IWorkbenchPart part = view.getPart(false);

-			if (part instanceof IGotoMarker) {

-				// activate first view implementing the IGotoMarker interface

-				if (first) {

-					page.activate(view.getPart(false));

-					first = false;

-				}

-				((IGotoMarker) part).gotoMarker(marker);

-			}

-		}

-	}

-

-	private boolean needsRefresh;

-

-	protected void scheduleRefresh() {

-		needsRefresh = true;

-		Display.getDefault().asyncExec(new Runnable() {

-

-			@Override

-			public void run() {

-				refreshTabs();

-			}

-		});

-	}

-

-	@Override

-	protected void refreshTabs() {

-		if (!needsRefresh) {

-			return;

-		}

-		needsRefresh = false;

-		super.refreshTabs();

-	}

-

-	@Override

-	public synchronized IEditorPart getActiveEditor() {

-		refreshTabs();

-		return super.getActiveEditor();

-	}

-

-	private final class DeferredReload extends IReloadableEditor.Adapter {

-

-		private final Collection<? extends Resource> triggeringResources;

-

-		private final ReloadReason reason;

-

-		private final DirtyPolicy dirtyPolicy;

-

-		DeferredReload(Collection<? extends Resource> triggeringResources, ReloadReason reason, DirtyPolicy dirtyPolicy) {

-			super(CoreMultiDiagramEditor.this);

-

-			this.triggeringResources = ImmutableSet.copyOf(triggeringResources);

-			this.reason = reason;

-			this.dirtyPolicy = dirtyPolicy;

-		}

-

-		void reload() {

-			try {

-				reloadEditor(triggeringResources, reason, dirtyPolicy);

-			} catch (CoreException e) {

-				// Failed to properly unload/load in place, so just close

-				getSite().getPage().closeEditor(CoreMultiDiagramEditor.this, false);

-

-				StatusManager.getManager().handle(e.getStatus(), StatusManager.LOG | StatusManager.SHOW);

-			}

-		}

-

-		@Override

-		public void reloadEditor(Collection<? extends Resource> triggeringResources, ReloadReason reason, DirtyPolicy dirtyPolicy) throws CoreException {

-			if (!pendingReload.compareAndSet(this, null)) {

-				return;

-			}

-

-			final DirtyPolicy action = dirtyPolicy.resolve(CoreMultiDiagramEditor.this, triggeringResources, reason);

-

-			if ((action == DirtyPolicy.SAVE) && isDirty()) {

-				doSave(new NullProgressMonitor());

-			}

-

-			switch (action) {

-			case SAVE:

-			case DO_NOT_SAVE:

-				if (reason.shouldReload(triggeringResources)) {

-					// Attempt to re-load

-					doReload();

-				} else {

-					// Just close 'er down

-					getSite().getPage().closeEditor(CoreMultiDiagramEditor.this, false);

-				}

-				break;

-			case IGNORE:

-				// Pass

-				break;

-			default:

-				throw new IllegalArgumentException("Invalid resolution of editor re-load dirty policy: " + action); //$NON-NLS-1$

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2008, 2016 LIFL, CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - manage models by URI, not IFile (CDO)
+ *  Christian W. Damus (CEA) - bug 410346
+ *  Christian W. Damus (CEA) - bug 431953 (pre-requisite refactoring of ModelSet service start-up)
+ *  Christian W. Damus (CEA) - bug 437217
+ *  Christian W. Damus - bugs 469464, 469188, 485220
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.ui.editor;
+
+import static org.eclipse.papyrus.infra.core.Activator.log;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.eclipse.core.commands.operations.IUndoContext;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.runtime.CoreException;
+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.SubMonitor;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.ui.URIEditorInput;
+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.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.editor.BackboneException;
+import org.eclipse.papyrus.infra.core.language.ILanguageChangeListener;
+import org.eclipse.papyrus.infra.core.language.ILanguageService;
+import org.eclipse.papyrus.infra.core.language.LanguageChangeEvent;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelManager;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.AbstractMultiPageSashEditor;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServiceMultiException;
+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.ui.Activator;
+import org.eclipse.papyrus.infra.ui.contentoutline.ContentOutlineRegistry;
+import org.eclipse.papyrus.infra.ui.editor.IReloadableEditor.DirtyPolicy;
+import org.eclipse.papyrus.infra.ui.editor.reload.EditorReloadEvent;
+import org.eclipse.papyrus.infra.ui.editor.reload.IEditorReloadListener;
+import org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent;
+import org.eclipse.papyrus.infra.ui.lifecycleevents.IEditorInputChangedListener;
+import org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveAndDirtyService;
+import org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor.ActionBarContributorRegistry;
+import org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor.CoreComposedActionBarContributor;
+import org.eclipse.papyrus.infra.ui.services.EditorLifecycleManager;
+import org.eclipse.papyrus.infra.ui.services.internal.EditorLifecycleManagerImpl;
+import org.eclipse.papyrus.infra.ui.services.internal.InternalEditorLifecycleManager;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorActionBarContributor;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IURIEditorInput;
+import org.eclipse.ui.IViewReference;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.progress.UIJob;
+import org.eclipse.ui.statushandlers.StatusManager;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+
+/**
+ * Multi diagram editor allowing to plug various kind of editors. Editors are
+ * registered with the help of the Eclipse extension mechanism. This
+ * implementation allows to register editors and context separately. An editor
+ * should specify which context it need to run. This multi diagram editor allows
+ * to show editor side by side in one or more sash windows.
+ *
+ * The real implementation for the generic type T of SashMultiPageEditorPart is
+ * actually di2.Diagram
+ *
+ * @author cedric dumoulin
+ * @author <a href="mailto:jerome.benois@obeo.fr">Jerome Benois</a>
+ * @author <a href="mailto:thomas.szadel@atosorigin.com">Thomas Szadel</a>
+ *         Refactoring.
+ *
+ *         TODO : remove GMF dependency !
+ */
+public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implements IMultiDiagramEditor, ITabbedPropertySheetPageContributor, IGotoMarker, IEditingDomainProvider {
+
+	/** ContentOutline registry */
+	private ContentOutlineRegistry contentOutlineRegistry;
+
+	/** Services registry. Used to get registered services */
+	private ServicesRegistry servicesRegistry;
+
+	/**
+	 * ActionBarContributor Registry. Allows to get an ActionBar by its Id. The
+	 * registry is initialized from the Eclipse extension mechanism.
+	 */
+	private ActionBarContributorRegistry actionBarContributorRegistry;
+
+	/** SashModelMngr to add pages */
+	protected DiSashModelManager sashModelMngr;
+
+	/**
+	 * Service used to maintain the dirty state and to perform save and saveAs.
+	 */
+	protected ISaveAndDirtyService saveAndDirtyService;
+
+	private final List<IPropertySheetPage> propertiesPages = new LinkedList<IPropertySheetPage>();
+
+	private final List<Runnable> closeActions = new ArrayList<>();
+
+	/**
+	 * Listener on {@link ISaveAndDirtyService#addInputChangedListener(IEditorInputChangedListener)}
+	 */
+	private static class EditorInputChangedListener implements IEditorInputChangedListener {
+
+		private CoreMultiDiagramEditor editor;
+
+		public EditorInputChangedListener(CoreMultiDiagramEditor editor) {
+			this.editor = editor;
+		}
+
+		/**
+		 * This method is called when the editor input is changed from the
+		 * ISaveAndDirtyService.
+		 *
+		 * @see org.eclipse.papyrus.infra.ui.lifecycleevents.IEditorInputChangedListener#editorInputChanged(org.eclipse.ui.part.FileEditorInput)
+		 *
+		 * @param fileEditorInput
+		 */
+		@Override
+		public void editorInputChanged(FileEditorInput fileEditorInput) {
+			// Change the editor input.
+			editor.setInputWithNotify(fileEditorInput);
+			editor.setPartName(fileEditorInput.getName());
+		}
+
+		/**
+		 * The isDirty flag has changed, reflect its new value
+		 *
+		 * @see org.eclipse.papyrus.infra.ui.lifecycleevents.IEditorInputChangedListener#isDirtyChanged()
+		 *
+		 */
+		@Override
+		public void isDirtyChanged() {
+
+			// Run it in async way.
+			editor.getSite().getShell().getDisplay().asyncExec(new Runnable() {
+
+				@Override
+				public void run() {
+					// editor can be null if this object has been finalized, but
+					// still queued in the asyncExec queue.
+					// This can happen if the editor is disposed, but some run still in
+					// the exec queue.
+					// When the method is executed asynchronously, the object is already finalized, and so
+					// editor is null.
+					if (editor == null) {
+						return;
+					}
+					editor.firePropertyChange(IEditorPart.PROP_DIRTY);
+				}
+			});
+		}
+
+		public void dispose() {
+			this.editor = null;
+		}
+	}
+
+	protected EditorInputChangedListener editorInputChangedListener;
+
+	private TransactionalEditingDomain transactionalEditingDomain;
+
+	/**
+	 * Object managing models lifeCycle.
+	 */
+	protected ModelSet resourceSet;
+
+	/**
+	 * Cached event that can be reused.
+	 */
+	protected DoSaveEvent lifeCycleEvent;
+
+	private class ContentChangedListener implements IContentChangedListener {
+
+		/**
+		 * Called when the content is changed. RefreshTabs.
+		 */
+		@Override
+		public void contentChanged(ContentEvent event) {
+			scheduleRefresh();
+		}
+	}
+
+	/**
+	 * A listener on model change events.
+	 */
+	private ContentChangedListener contentChangedListener;
+
+	/**
+	 * Undo context used to have the same undo context in all Papyrus related
+	 * views and editors. TODO : move away, use a version independent of GMF,
+	 * add a listener that will add the context to all commands modifying
+	 * attached Resources (==> linked to ModelSet ?)
+	 */
+	private IUndoContext undoContext;
+
+	/**
+	 * Editor reload listeners.
+	 */
+	private CopyOnWriteArrayList<IEditorReloadListener> reloadListeners = new CopyOnWriteArrayList<IEditorReloadListener>();
+
+	/**
+	 * A pending reload operation (awaiting next activation of the editor).
+	 */
+	private final AtomicReference<DeferredReload> pendingReload = new AtomicReference<DeferredReload>();
+
+	public CoreMultiDiagramEditor() {
+		super();
+
+		addSelfReloadListener();
+	}
+
+	/**
+	 * Get the contentOutlineRegistry. Create it if needed.
+	 *
+	 * @return the contentOutlineRegistry
+	 */
+	protected ContentOutlineRegistry getContentOutlineRegistry() {
+		if (contentOutlineRegistry == null) {
+			createContentOutlineRegistry();
+		}
+
+		return contentOutlineRegistry;
+	}
+
+	/**
+	 * Create the contentOutlineRegistry.
+	 */
+	private void createContentOutlineRegistry() {
+		contentOutlineRegistry = new ContentOutlineRegistry(this, Activator.PLUGIN_ID);
+	}
+
+	/**
+	 * Returns the service registry associated to the editor.
+	 *
+	 * @return the servicesRegistry The registry.
+	 */
+	@Override
+	public ServicesRegistry getServicesRegistry() {
+		if (servicesRegistry == null) {
+			servicesRegistry = createServicesRegistry();
+		}
+		return servicesRegistry;
+	}
+
+	/**
+	 * Create the ServicesRegistry.
+	 *
+	 * @return
+	 */
+	private ServicesRegistry createServicesRegistry() {
+		// Create Services Registry
+		try {
+			ServicesRegistry servicesRegistry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);
+			// servicesRegistry.startRegistry();
+			return servicesRegistry;
+		} catch (ServiceException e) {
+			// Show log and error
+			log.error(e.getMessage(), e);
+		}
+		return null;
+	}
+
+	/**
+	 * Do nothing as we create the provider before any calls to this method.
+	 * Should not be called by subclasses.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.sasheditor.editor.AbstractMultiPageSashEditor#createPageProvider()
+	 */
+	@Override
+	protected ISashWindowsContentProvider createPageProvider() {
+		throw new UnsupportedOperationException("Not implemented. Should not be called as the ContentProvider is already initialized.");
+	}
+
+	/**
+	 * Create the pageContentProvider.
+	 *
+	 * Removed since 0.10.0
+	 *
+	 * @param pageFactory
+	 * @param diResource
+	 *            Resource used to load/save the SashModel.
+	 *
+	 *
+	 */
+	// protected ISashWindowsContentProvider createPageProvider(IPageModelFactory pageFactory, Resource diResource, TransactionalEditingDomain editingDomain) {
+	//
+	// sashModelMngr = new TransactionalDiSashModelMngr(pageFactory, diResource, editingDomain);
+	//
+	// ISashWindowsContentProvider pageProvider = sashModelMngr.getISashWindowsContentProvider();
+	//
+	// return pageProvider;
+	// }
+
+	/**
+	 * Get The {@link IPageMngr} used to add, open, remove or close a diagram in
+	 * the SashWindow. This method is available as soon as the {@link CoreMultiDiagramEditor#init(IEditorSite, IEditorInput)} method is
+	 * called.
+	 *
+	 * @return
+	 */
+	protected IPageManager getIPageManager() throws IllegalStateException {
+		try {
+			return sashModelMngr.getIPageManager();
+		} catch (Exception e) {
+			throw new IllegalStateException("Method should be called after CoreMultiDiagramEditor#init(IEditorSite, IEditorInput) is called");
+		}
+	}
+
+	/**
+	 * Get the ActionBarContributorRegistry. Creates it if necessary.
+	 *
+	 * @return
+	 */
+	protected ActionBarContributorRegistry getActionBarContributorRegistry() {
+		if (actionBarContributorRegistry != null) {
+			return actionBarContributorRegistry;
+		}
+
+		// Try to got it from CoreComposedActionBarContributor
+		// Get it from the contributor.
+		IEditorActionBarContributor contributor = getEditorSite().getActionBarContributor();
+		if (contributor instanceof CoreComposedActionBarContributor) {
+			log.debug(getClass().getSimpleName() + " - ActionBarContributorRegistry loaded from CoreComposedActionBarContributor.");
+			return ((CoreComposedActionBarContributor) contributor).getActionBarContributorRegistry();
+		} else {
+			// Create a registry.
+			log.debug(getClass().getSimpleName() + " - create an ActionBarContributorRegistry.");
+			return createActionBarContributorRegistry();
+		}
+
+	}
+
+	/**
+	 * Create the ActionBarContributorRegistry.
+	 *
+	 * @return
+	 */
+	private ActionBarContributorRegistry createActionBarContributorRegistry() {
+		return new ActionBarContributorRegistry(Activator.PLUGIN_ID);
+	}
+
+	/**
+	 *
+	 *
+	 * @param adapter
+	 *
+	 * @return
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class adapter) {
+
+		if (ServicesRegistry.class == adapter) {
+			return getServicesRegistry();
+		}
+
+		if (IPageManager.class == adapter) {
+			return getIPageManager();
+		}
+
+		if (IPropertySheetPage.class == adapter) {
+			// Do not test if tabbedPropertySheetPage is null before calling new
+			// this is managed by Eclipse which only call current method when
+			// necessary
+			return getPropertySheetPage();
+		}
+
+		// Add a viewer
+		if (IContentOutlinePage.class == adapter) {
+			try {
+				ContentOutlineRegistry outlineRegistry = getContentOutlineRegistry();
+				if (outlineRegistry == null) {
+					return null;
+				}
+				IContentOutlinePage contentOutline = outlineRegistry.getContentOutline();
+				if (contentOutline != null) {
+					return contentOutline;
+				}
+			} catch (BackboneException e) {
+				// Ignore: There is not registered outline.
+			}
+		}
+
+		if (EditingDomain.class == adapter || TransactionalEditingDomain.class == adapter) {
+			return transactionalEditingDomain;
+		}
+
+		/*
+		 * Return context used for undo/redo. All papyrus views should use this
+		 * context. The prefer way to get this is to use undoContext =
+		 * servicesRegistry.getService(IUndoContext.class);
+		 */
+		if (IUndoContext.class == adapter) {
+			return undoContext;
+		}
+
+		// EMF requirements
+		if (IEditingDomainProvider.class == adapter) {
+			return this;
+		}
+
+		if (adapter == ISelection.class) {
+			return getSite().getSelectionProvider().getSelection();
+		}
+
+		if (adapter == IReloadableEditor.class) {
+			return createReloadAdapter();
+		}
+
+		return super.getAdapter(adapter);
+	}
+
+	/**
+	 * Init the editor.
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
+		// Init super
+		super.init(site, input);
+
+		// Set editor name
+		setPartName(input.getName());
+
+		initContents();
+	}
+
+	@Override
+	public void createPartControl(Composite parent) {
+		super.createPartControl(parent);
+
+		// Fire the PreDisplay event synchronously, so that listeners can continue
+		// setting up the UI before the contents are actually rendered fully
+		getLifecycleManager().firePreDisplay(this);
+
+		// Fire the PostDisplay event asynchronously, to leave time to the Eclipse
+		// framework to actually display the contents of the editor
+		Display.getDefault().asyncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				// Because we are asynchronous, the editor may already have been disposed
+				// (Especially in the case of tests running in the UI Thread)
+				if (servicesRegistry == null) {
+					return;
+				}
+				getLifecycleManager().firePostDisplay(CoreMultiDiagramEditor.this);
+			}
+		});
+
+	}
+
+	protected void loadModelAndServices() throws PartInitException {
+		// Create ServicesRegistry and register services
+		servicesRegistry = createServicesRegistry();
+
+		// Add itself as a service
+		servicesRegistry.add(IMultiDiagramEditor.class, 1, this);
+
+		// Create lifeCycle event provider and the event that is used when the editor fire a save event.
+		// lifeCycleEventsProvider = new LifeCycleEventsProvider();
+		// lifeCycleEvent = new DoSaveEvent(servicesRegistry, this);
+		// servicesRegistry.add(ILifeCycleEventsProvider.class, 1, lifeCycleEventsProvider);
+
+		// register services
+		servicesRegistry.add(ActionBarContributorRegistry.class, 1, getActionBarContributorRegistry());
+		// servicesRegistry.add(TransactionalEditingDomain.class, 1, transactionalEditingDomain);
+		// servicesRegistry.add(DiResourceSet.class, 1, resourceSet);
+
+		// Create and initalize editor icons service
+		// PageIconsRegistry pageIconsRegistry = new PageIconsRegistry();
+		// PluggableEditorFactoryReader editorReader = new PluggableEditorFactoryReader(Activator.PLUGIN_ID);
+		// editorReader.populate(pageIconsRegistry);
+		// servicesRegistry.add(IPageIconsRegistry.class, 1, pageIconsRegistry);
+
+
+		// Create PageModelRegistry requested by content provider.
+		// Also populate it from extensions.
+		// PageModelFactoryRegistry pageModelRegistry = new PageModelFactoryRegistry();
+		// editorReader.populate(pageModelRegistry, servicesRegistry);
+
+		// TODO : create appropriate Resource for the contentProvider, and pass it here.
+		// This will allow to remove the old sash stuff.
+		// setContentProvider(createPageProvider(pageModelRegistry, resourceSet.getDiResource(), transactionalEditingDomain));
+		// servicesRegistry.add(ISashWindowsContentProvider.class, 1, getContentProvider());
+		// servicesRegistry.add(IPageMngr.class, 1, getIPageMngr());
+
+		// register a basic label provider
+		// adapter factory used by EMF objects
+		AdapterFactory factory = null;
+		try {
+			EditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(servicesRegistry);
+			if (domain instanceof AdapterFactoryEditingDomain) {
+				// Use the adapter factory already provided by this editing domain
+				factory = ((AdapterFactoryEditingDomain) domain).getAdapterFactory();
+			}
+		} catch (ServiceException e) {
+			// OK, there's no editing domain. That's fine
+		}
+
+		if (factory == null) {
+			// Must create a new adapter factory
+			factory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+		}
+
+		/** label provider for EMF objects */
+		ILabelProvider labelProvider = new AdapterFactoryLabelProvider(factory) {
+
+			/**
+			 * This implements {@link ILabelProvider}.getText by forwarding it
+			 * to an object that implements {@link IItemLabelProvider#getText
+			 * IItemLabelProvider.getText}
+			 */
+			@Override
+			public String getText(Object object) {
+				// Get the adapter from the factory.
+				//
+				IItemLabelProvider itemLabelProvider = (IItemLabelProvider) adapterFactory.adapt(object, IItemLabelProvider.class);
+				if (object instanceof EObject) {
+					if (((EObject) object).eIsProxy()) {
+						return "Proxy - " + object;
+					}
+				}
+				return itemLabelProvider != null ? itemLabelProvider.getText(object) : object == null ? "" : object.toString();
+			}
+		};
+		servicesRegistry.add(ILabelProvider.class, 1, labelProvider);
+
+		EditorLifecycleManager lifecycleManager = new EditorLifecycleManagerImpl();
+		servicesRegistry.add(EditorLifecycleManager.class, 1, lifecycleManager, ServiceStartKind.LAZY);
+
+		// Start servicesRegistry
+		URI uri;
+		IEditorInput input = getEditorInput();
+		if (input instanceof IFileEditorInput) {
+			uri = URI.createPlatformResourceURI(((IFileEditorInput) input).getFile().getFullPath().toString(), true);
+		} else if (input instanceof URIEditorInput) {
+			uri = ((URIEditorInput) input).getURI();
+		} else {
+			uri = URI.createURI(((IURIEditorInput) input).getURI().toString());
+		}
+
+		try {
+			// Start the ModelSet first, and load if from the specified File.
+			// Also start me so that I may be retrieved from the registry by other services
+			List<Class<?>> servicesToStart = new ArrayList<Class<?>>(1);
+			servicesToStart.add(ModelSet.class);
+			servicesToStart.add(IMultiDiagramEditor.class);
+
+			servicesRegistry.startServicesByClassKeys(servicesToStart);
+
+			resourceSet = servicesRegistry.getService(ModelSet.class);
+			resourceSet.loadModels(uri);
+
+			// start remaining services
+			servicesRegistry.startRegistry();
+		} catch (ModelMultiException e) {
+			try {
+				// with the ModelMultiException it is still possible to open the
+				// editors that's why the service registry is still started
+				servicesRegistry.startRegistry();
+				warnUser(e);
+			} catch (ServiceException e1) {
+				log.error(e);
+				// throw new PartInitException("could not initialize services", e); //$NON-NLS-1$
+			}
+		} catch (ServiceException e) {
+			log.error(e);
+			// throw new PartInitException("could not initialize services", e);
+		}
+
+
+		// Get required services
+
+		try {
+			transactionalEditingDomain = servicesRegistry.getService(TransactionalEditingDomain.class);
+			sashModelMngr = servicesRegistry.getService(DiSashModelManager.class);
+
+			saveAndDirtyService = servicesRegistry.getService(ISaveAndDirtyService.class);
+			undoContext = servicesRegistry.getService(IUndoContext.class);
+
+			servicesRegistry.getService(ILanguageService.class).addLanguageChangeListener(createLanguageChangeListener());
+		} catch (ServiceException e) {
+			log.error("A required service is missing.", e);
+			// if one of the services above fail to start, the editor can't run
+			// => stop
+			throw new PartInitException("could not initialize services", e);
+		}
+
+
+		// Listen on input changed from the ISaveAndDirtyService
+		editorInputChangedListener = new EditorInputChangedListener(this);
+		saveAndDirtyService.addInputChangedListener(editorInputChangedListener);
+		getLifecycleManager().firePostInit(this);
+	}
+
+	private ILanguageChangeListener createLanguageChangeListener() {
+		return new ILanguageChangeListener() {
+
+			@Override
+			public void languagesChanged(LanguageChangeEvent event) {
+				// Re-load the editor if languages changed, because new ModelSet configurations may be required
+				if (event.getType() == LanguageChangeEvent.ADDED) {
+					new UIJob(getSite().getShell().getDisplay(), NLS.bind("Reload editor {0}", getTitle())) {
+
+						@Override
+						public IStatus runInUIThread(IProgressMonitor monitor) {
+							IStatus result = Status.OK_STATUS;
+							monitor = SubMonitor.convert(monitor, IProgressMonitor.UNKNOWN);
+
+							try {
+								ISashWindowsContainer container = getISashWindowsContainer();
+								if ((container != null) && !container.isDisposed()) {
+									IReloadableEditor.ReloadReason reason = IReloadableEditor.ReloadReason.RESOURCES_CHANGED;
+
+									DirtyPolicy dirtyPolicy = DirtyPolicy.getDefault();
+									try {
+										IReloadableEditor.Adapter.getAdapter(CoreMultiDiagramEditor.this).reloadEditor(resourceSet.getResources(), reason, dirtyPolicy);
+									} catch (CoreException e) {
+										result = e.getStatus();
+									}
+								}
+							} finally {
+								monitor.done();
+							}
+
+							return result;
+						}
+					}.schedule();
+				}
+			}
+		};
+	}
+
+	private InternalEditorLifecycleManager getLifecycleManager() {
+		// I've been disposed
+		if (servicesRegistry == null) {
+			return null;
+		}
+		try {
+			return (InternalEditorLifecycleManager) servicesRegistry.getService(EditorLifecycleManager.class);
+		} catch (ServiceException ex) {
+			Activator.log.error(ex);
+		}
+		return null;
+	}
+
+	protected void loadNestedEditors() throws PartInitException {
+		ISashWindowsContentProvider contentProvider = null;
+		try {
+			contentProvider = servicesRegistry.getService(ISashWindowsContentProvider.class);
+		} catch (ServiceException ex) {
+			log.error("A required service is missing.", ex);
+			// if one of the services above fail to start, the editor can't run
+			// => stop
+			throw new PartInitException("could not initialize services", ex);
+		}
+
+		// Set the content provider providing editors.
+		setContentProvider(contentProvider);
+
+		// Listen on contentProvider changes
+		if (contentChangedListener == null) {
+			contentChangedListener = new ContentChangedListener();
+		}
+		sashModelMngr.getSashModelContentChangedProvider().addListener(contentChangedListener);
+
+		IEditorInput input = getEditorInput();
+
+		if (input instanceof IPapyrusPageInput) {
+			IPapyrusPageInput papyrusPageInput = (IPapyrusPageInput) input;
+			final IPageManager pageManager = getIPageManager();
+
+			if (papyrusPageInput.closeOtherPages()) {
+				pageManager.closeAllOpenedPages();
+			}
+
+			for (URI pageIdentifierURI : papyrusPageInput.getPages()) {
+				final EObject pageIdentifier = resourceSet.getEObject(pageIdentifierURI, true);
+				if (!pageManager.allPages().contains(pageIdentifier)) {
+					Activator.log.warn("The object " + pageIdentifier + " does not reference an existing page");
+					continue;
+				}
+
+				if (pageManager.isOpen(pageIdentifier)) {
+					pageManager.selectPage(pageIdentifier);
+				} else {
+					pageManager.openPage(pageIdentifier);
+				}
+			}
+		}
+	}
+
+	protected void warnUser(ModelMultiException e) {
+		Activator.log.error(e);
+		MessageDialog.openError(getSite().getShell(), "Error", String.format("Your model is corrupted, invalid links have been found :\n" + "%s" + "It is recommended to fix it before editing it", e.getMessage()));
+	}
+
+	/**
+	 * Activate this editor. Called after the SWT.control is created.
+	 */
+	@Override
+	protected void activate() {
+		super.activate();
+
+		initFolderTabMenus();
+
+		try {
+			// Register ISashWindowsContainer as service
+			// Should be done only once the container is ready.
+			getServicesRegistry().add(ISashWindowsContainer.class, 1, getISashWindowsContainer());
+			getServicesRegistry().startServicesByClassKeys(ISashWindowsContainer.class);
+			// Let the IPageMngr use the ISashWindowsContainer to discover current folder
+			// This should be done after SashWindowContainer initialization.
+			// DiSashModelManager sashModelManager = getServicesRegistry().getService(DiSashModelManager.class);
+			sashModelMngr.setCurrentFolderAndPageMngr(getISashWindowsContainer());
+
+		} catch (ServiceException e) {
+			log.error(e);
+		}
+
+	}
+
+	/**
+	 * Init the contextual menu shown in the folder tabs. This popup menu is
+	 * contributed by the help of Eclipse extensions, using the Commands
+	 * framework. I.e, to add a menu item, create a menu, a command and an
+	 * handler in the extension.
+	 */
+	protected void initFolderTabMenus() {
+		ISashWindowsContainer container = getISashWindowsContainer();
+
+		// TODO : use a constant
+		MenuManager menuManager = new MenuManager("tabmenu");
+		menuManager.add(new Separator("tabcommands"));
+		menuManager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+		container.setFolderTabMenuManager(menuManager);
+
+		// TODO : use a constant
+		getSite().registerContextMenu("org.eclipse.papyrus.infra.core.editor.ui.tabmenu", menuManager, getSite().getSelectionProvider());
+
+	}
+
+	/**
+	 * Overrides getPropertySheetPage.
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor#getPropertySheetPage()
+	 */
+	public IPropertySheetPage getPropertySheetPage() {
+		IPropertySheetPage propertiesPage = new MultiDiagramPropertySheetPage(this);
+		propertiesPages.add(propertiesPage);
+		return propertiesPage;
+	}
+
+	@Override
+	public void dispose() {
+		for (IPropertySheetPage propertiesPage : this.propertiesPages) {
+			propertiesPage.dispose();
+		}
+		propertiesPages.clear();
+
+		// Forget the outline page(s)
+		contentOutlineRegistry = null;
+
+		super.dispose();
+	}
+
+	private IReloadableEditor createReloadAdapter() {
+
+		return new IReloadableEditor() {
+
+			@Override
+			public void reloadEditor(Collection<? extends Resource> triggeringResources, ReloadReason reason, DirtyPolicy dirtyPolicy) throws CoreException {
+				// Attempt to re-load, later
+				pendingReload.set(new DeferredReload(triggeringResources, reason, dirtyPolicy));
+
+				// If I am already active, then do it now. Or, if we're not going to ask the user about it, also do it now
+				IWorkbenchPage page = getSite().getPage();
+				if ((page.getActiveEditor() == CoreMultiDiagramEditor.this) || (dirtyPolicy != DirtyPolicy.PROMPT_TO_SAVE)) {
+					pendingReload.get().reload();
+				}
+			}
+
+			@Override
+			public void addEditorReloadListener(IEditorReloadListener listener) {
+				reloadListeners.addIfAbsent(listener);
+			}
+
+			@Override
+			public void removeEditorReloadListener(IEditorReloadListener listener) {
+				reloadListeners.remove(listener);
+			}
+		};
+	}
+
+	private void addSelfReloadListener() {
+		createReloadAdapter().addEditorReloadListener(new IEditorReloadListener() {
+
+			@Override
+			public void editorAboutToReload(EditorReloadEvent event) {
+				event.putContext(new MultiDiagramEditorSelectionContext(event.getEditor()));
+			}
+
+			@Override
+			public void editorReloaded(EditorReloadEvent event) {
+				((MultiDiagramEditorSelectionContext) event.getContext()).restore(event.getEditor());
+			}
+		});
+	}
+
+	/**
+	 * Register an action to be run when I am closed. Any number of such actions may
+	 * be added. note that close actions also run on re-load, which behaves to all
+	 * outward appearances like a close and re-open.
+	 * 
+	 * @param closeAction
+	 *            an action to run when I am closed
+	 */
+	public void onClose(Runnable closeAction) {
+		closeActions.add(closeAction);
+	}
+
+	@Override
+	protected void deactivate() {
+		getLifecycleManager().fireBeforeClose(this);
+		if (sashModelMngr != null) {
+			sashModelMngr.getSashModelContentChangedProvider().removeListener(contentChangedListener);
+		}
+
+		super.deactivate();
+
+		// dispose available service
+		if (servicesRegistry != null) {
+			try {
+				servicesRegistry.disposeRegistry();
+				servicesRegistry = null;
+			} catch (ServiceMultiException e) {
+				log.error(e);
+			}
+		}
+
+		if (contentChangedListener != null) {
+			this.contentChangedListener = null;
+		}
+
+		if (editorInputChangedListener != null) {
+			this.editorInputChangedListener.dispose();
+			this.editorInputChangedListener = null;
+		}
+
+		for (Runnable next : closeActions) {
+			try {
+				next.run();
+			} catch (Exception e) {
+				Activator.log.error("Uncaught exception in close action", e); //$NON-NLS-1$
+			}
+		}
+		closeActions.clear();
+
+		transactionalEditingDomain = null;
+		resourceSet = null;
+		undoContext = null;
+		saveAndDirtyService = null;
+		sashModelMngr = null;
+	}
+
+	void initContents() throws PartInitException {
+		loadModelAndServices();
+		loadNestedEditors();
+	}
+
+	@Override
+	public void setFocus() {
+		super.setFocus();
+
+		DeferredReload reload = pendingReload.get();
+		if (reload != null) {
+			reload.reload();
+		}
+	}
+
+	private void doReload() throws CoreException {
+		final IWorkbenchPage page = getSite().getPage();
+		final IWorkbenchPart activePart = page.getActivePart();
+		final IEditorPart activeEditor = page.getActiveEditor();
+
+		final Iterable<? extends IEditorReloadListener> listeners = ImmutableList.copyOf(reloadListeners);
+		final EditorReloadEvent event = new EditorReloadEvent(CoreMultiDiagramEditor.this);
+
+		try {
+			event.dispatchEditorAboutToReload(listeners);
+
+			deactivate();
+
+			initContents();
+
+			activate();
+
+			// My self-listener will be first, to ensure that the pages are all restored before dependents run
+			event.dispatchEditorReloaded(listeners);
+		} finally {
+			event.dispose();
+
+			// Ensure that the editor previously active is active again (if it still exists)
+			if ((activeEditor != null) && page.isPartVisible(activeEditor)) {
+				page.activate(activeEditor);
+			}
+
+			// Ensure that the part previously active is active again (if it still exists and is not the active editor)
+			if ((activePart != null) && (activePart != activeEditor) && page.isPartVisible(activePart)) {
+				page.activate(activePart);
+			}
+		}
+
+	}
+
+	/**
+	 * Overrides doSave.
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.ui.part.EditorPart#doSave(org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	@Override
+	public void doSave(IProgressMonitor monitor) {
+
+		saveAndDirtyService.doSave(monitor);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isDirty() {
+		// May happen if the editor has not yet been initialized. In this case, the editor cannot be dirty, so we simply return false.
+		// Bug 410286: The isDirty() method can also be called /after/ the editor has been disposed. Most likely an Eclipse bug?
+		if (saveAndDirtyService == null) {
+			return false;
+		}
+		return saveAndDirtyService.isDirty();
+	}
+
+	/**
+	 * Overrides doSaveAs.
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.ui.part.EditorPart#doSaveAs()
+	 */
+	@Override
+	public void doSaveAs() {
+
+		saveAndDirtyService.doSaveAs();
+	}
+
+	/**
+	 * Overrides isSaveAsAllowed.
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.ui.part.EditorPart#isSaveAsAllowed()
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * Overrides getContributorId.
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor#getContributorId()
+	 */
+	@Override
+	public String getContributorId() {
+		// return Activator.PLUGIN_ID;
+		return "TreeOutlinePage";
+
+	}
+
+	// implements IDiagramWorkbenchPart to restore GMF standard behavior
+	// and delegate to the activeEditor
+
+	/**
+	 * Overrides getDiagram.
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart#getDiagram()
+	 */
+	// public org.eclipse.gmf.runtime.notation.Diagram getDiagram() {
+	// IEditorPart activeEditor = getActiveEditor();
+	// if(activeEditor instanceof DiagramEditor) {
+	// return ((DiagramEditor)activeEditor).getDiagram();
+	// } else {
+	// return null;
+	// }
+	// }
+
+	/**
+	 * This method is called from a GMF diagram. It should only be called from GMF diagram code. Normally, the Diagram under the Mouse is a GMF
+	 * Diagram. The active Diagram can be another Diagram, not
+	 * under the mouse. This is a GMF issue.
+	 */
+	// public DiagramEditPart getDiagramEditPart() {
+	//
+	// // Get the editor under the mouse
+	// // IEditorPart activeEditor = rootContainer.getEditorUnderMouse();
+	// IEditorPart activeEditor = getActiveEditor();
+	// if(activeEditor == null) {
+	// return null;
+	// }
+	// // IEditorPart activeEditor = getActiveEditor();
+	// if(activeEditor instanceof DiagramEditor) {
+	// return ((DiagramEditor)activeEditor).getDiagramEditPart();
+	// } else {
+	// // This case should never happen.
+	// // Return null, as the GMF runtime now support it (since 093009)
+	// return null;
+	// }
+	// }
+
+	/**
+	 * Overrides getDiagramGraphicalViewer.
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart#getDiagramGraphicalViewer()
+	 */
+	// public IDiagramGraphicalViewer getDiagramGraphicalViewer() {
+	// IEditorPart activeEditor = getActiveEditor();
+	// if(activeEditor instanceof DiagramEditor) {
+	// return ((DiagramEditor)activeEditor).getDiagramGraphicalViewer();
+	// } else {
+	// return null;
+	// }
+	// }
+
+	/**
+	 * Overrides getEditingDomain.
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emf.edit.domain.IEditingDomainProvider#getEditingDomain()
+	 */
+	@Override
+	public EditingDomain getEditingDomain() {
+		return transactionalEditingDomain;
+	}
+
+	/**
+	 * Throws an UnsupportedOperationException.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor#getDiagramEditDomain()
+	 */
+	// public DiagramEditDomain getDiagramEditDomain() {
+	// throw new UnsupportedOperationException("Not implemented. Should not be called.");
+	// }
+
+
+	/**
+	 * Change the editor input.<BR>
+	 * <U>Note</U>: that method should be called within the UI-Thread.
+	 *
+	 * @see org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor#setEditorInput(org.eclipse.ui.IEditorInput)
+	 *
+	 * @param newInput
+	 *            The new input
+	 * @deprecated Not used anymore
+	 */
+
+	@Override
+	@Deprecated
+	public void setEditorInput(IEditorInput newInput) {
+		setInputWithNotify(newInput);
+		setPartName(newInput.getName());
+	}
+
+	@Override
+	@Deprecated
+	public void gotoMarker(IMarker marker) {
+		IWorkbench wb = PlatformUI.getWorkbench();
+		IWorkbenchPage page = wb.getActiveWorkbenchWindow().getActivePage();
+		boolean first = true;
+		for (IViewReference view : page.getViewReferences()) {
+			// no longer restrict to model explorer (see bug 387578)
+			IWorkbenchPart part = view.getPart(false);
+			if (part instanceof IGotoMarker) {
+				// activate first view implementing the IGotoMarker interface
+				if (first) {
+					page.activate(view.getPart(false));
+					first = false;
+				}
+				((IGotoMarker) part).gotoMarker(marker);
+			}
+		}
+	}
+
+	private boolean needsRefresh;
+
+	protected void scheduleRefresh() {
+		needsRefresh = true;
+		Display.getDefault().asyncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				refreshTabs();
+			}
+		});
+	}
+
+	@Override
+	protected void refreshTabs() {
+		if (!needsRefresh) {
+			return;
+		}
+		needsRefresh = false;
+		super.refreshTabs();
+	}
+
+	@Override
+	public synchronized IEditorPart getActiveEditor() {
+		refreshTabs();
+		return super.getActiveEditor();
+	}
+
+	private final class DeferredReload extends IReloadableEditor.Adapter {
+
+		private final Collection<? extends Resource> triggeringResources;
+
+		private final ReloadReason reason;
+
+		private final DirtyPolicy dirtyPolicy;
+
+		DeferredReload(Collection<? extends Resource> triggeringResources, ReloadReason reason, DirtyPolicy dirtyPolicy) {
+			super(CoreMultiDiagramEditor.this);
+
+			this.triggeringResources = ImmutableSet.copyOf(triggeringResources);
+			this.reason = reason;
+			this.dirtyPolicy = dirtyPolicy;
+		}
+
+		void reload() {
+			try {
+				reloadEditor(triggeringResources, reason, dirtyPolicy);
+			} catch (CoreException e) {
+				// Failed to properly unload/load in place, so just close
+				getSite().getPage().closeEditor(CoreMultiDiagramEditor.this, false);
+
+				StatusManager.getManager().handle(e.getStatus(), StatusManager.LOG | StatusManager.SHOW);
+			}
+		}
+
+		@Override
+		public void reloadEditor(Collection<? extends Resource> triggeringResources, ReloadReason reason, DirtyPolicy dirtyPolicy) throws CoreException {
+			if (!pendingReload.compareAndSet(this, null)) {
+				return;
+			}
+
+			final DirtyPolicy action = dirtyPolicy.resolve(CoreMultiDiagramEditor.this, triggeringResources, reason);
+
+			if ((action == DirtyPolicy.SAVE) && isDirty()) {
+				doSave(new NullProgressMonitor());
+			}
+
+			switch (action) {
+			case SAVE:
+			case DO_NOT_SAVE:
+				if (reason.shouldReload(triggeringResources)) {
+					// Attempt to re-load
+					doReload();
+				} else {
+					// Just close 'er down
+					getSite().getPage().closeEditor(CoreMultiDiagramEditor.this, false);
+				}
+				break;
+			case IGNORE:
+				// Pass
+				break;
+			default:
+				throw new IllegalArgumentException("Invalid resolution of editor re-load dirty policy: " + action); //$NON-NLS-1$
+			}
+		}
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelManagerServiceFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelManagerServiceFactory.java
index 1f13fedb84b..1f13fedb84b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelManagerServiceFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelManagerServiceFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelMngrServiceFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelMngrServiceFactory.java
index ad0806cff77..ad0806cff77 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelMngrServiceFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/DiSashModelMngrServiceFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IMultiDiagramEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IMultiDiagramEditor.java
index 7549517199e..4193c25cf3e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IMultiDiagramEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IMultiDiagramEditor.java
@@ -1,93 +1,93 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.editor;

-

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-

-/**

- * Interface implemented by the main multipage editor. This interface list the

- * methods available to diagram editors. Diagram editors can relies on this

- * interface to retrieve services from the main multi diagram editor. <br>

- * This interface should stay minimalist, as the editor is not designed to

- * handle the services itself. A service should be retrieved by using {@link #getServicesRegistry()}.

- *

- *

- * @author cedric dumoulin

- *

- *         TODO remove extends IEditingDomainProvider. This interface should be

- *         independant of any technology (EMF, GMF, ...). If the EditingDomain

- *         is required, it can be retrieved by the registry.

- *

- */

-public interface IMultiDiagramEditor extends IEditorPart {

-

-	/**

-	 * Returns the service registry associated to the editor.

-	 *

-	 * @return the servicesRegistry The registry.

-	 */

-	public ServicesRegistry getServicesRegistry();

-

-	/**

-	 * Return the editor site.

-	 *

-	 * @return

-	 */

-	@Override

-	public IEditorSite getEditorSite();

-

-	/**

-	 * Get the editor input.

-	 *

-	 * @return

-	 */

-	@Override

-	public IEditorInput getEditorInput();

-

-	/**

-	 * Change the editor input.

-	 *

-	 * @param newInput

-	 *            The new input.

-	 * @deprecated No replacement. Input can't be changed on multi editors.

-	 */

-	@Deprecated

-	public void setEditorInput(IEditorInput newInput);

-

-	/**

-	 * Returns the edit domain shared among editors

-	 *

-	 * @return the edit domain shared among editors

-	 * @deprecated Use {@link #getServicesRegistry()} or {@link #getAdapter(Class)}

-	 */

-	// FIXME Remove it (GMF dependency)

-	// public DiagramEditDomain getDiagramEditDomain();

-

-	/**

-	 * Get the currently active nested Editor.

-	 */

-	public IEditorPart getActiveEditor();

-

-	/**

-	 * Get the property sheet page associated to the Editor.

-	 *

-	 * @return the property sheet page associated to the Editor.

-	 * @deprecated Use {@link #getServicesRegistry()} or {@link #getAdapter(Class)}

-	 */

-	// @Deprecated

-	// public IPropertySheetPage getPropertySheetPage();

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.editor;
+
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+
+/**
+ * Interface implemented by the main multipage editor. This interface list the
+ * methods available to diagram editors. Diagram editors can relies on this
+ * interface to retrieve services from the main multi diagram editor. <br>
+ * This interface should stay minimalist, as the editor is not designed to
+ * handle the services itself. A service should be retrieved by using {@link #getServicesRegistry()}.
+ *
+ *
+ * @author cedric dumoulin
+ *
+ *         TODO remove extends IEditingDomainProvider. This interface should be
+ *         independant of any technology (EMF, GMF, ...). If the EditingDomain
+ *         is required, it can be retrieved by the registry.
+ *
+ */
+public interface IMultiDiagramEditor extends IEditorPart {
+
+	/**
+	 * Returns the service registry associated to the editor.
+	 *
+	 * @return the servicesRegistry The registry.
+	 */
+	public ServicesRegistry getServicesRegistry();
+
+	/**
+	 * Return the editor site.
+	 *
+	 * @return
+	 */
+	@Override
+	public IEditorSite getEditorSite();
+
+	/**
+	 * Get the editor input.
+	 *
+	 * @return
+	 */
+	@Override
+	public IEditorInput getEditorInput();
+
+	/**
+	 * Change the editor input.
+	 *
+	 * @param newInput
+	 *            The new input.
+	 * @deprecated No replacement. Input can't be changed on multi editors.
+	 */
+	@Deprecated
+	public void setEditorInput(IEditorInput newInput);
+
+	/**
+	 * Returns the edit domain shared among editors
+	 *
+	 * @return the edit domain shared among editors
+	 * @deprecated Use {@link #getServicesRegistry()} or {@link #getAdapter(Class)}
+	 */
+	// FIXME Remove it (GMF dependency)
+	// public DiagramEditDomain getDiagramEditDomain();
+
+	/**
+	 * Get the currently active nested Editor.
+	 */
+	public IEditorPart getActiveEditor();
+
+	/**
+	 * Get the property sheet page associated to the Editor.
+	 *
+	 * @return the property sheet page associated to the Editor.
+	 * @deprecated Use {@link #getServicesRegistry()} or {@link #getAdapter(Class)}
+	 */
+	// @Deprecated
+	// public IPropertySheetPage getPropertySheetPage();
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IPapyrusPageInput.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IPapyrusPageInput.java
index a56ab916ec6..50594efbec8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IPapyrusPageInput.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IPapyrusPageInput.java
@@ -1,35 +1,35 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.ui.editor;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.ui.IEditorInput;

-

-/**

- * An IEditorInput used to reference the page(s) to open

- *

- * @author Camille Letavernier

- *

- */

-public interface IPapyrusPageInput extends IEditorInput {

-

-	/**

-	 * @return the list of pages to open

-	 */

-	public URI[] getPages();

-

-	/**

-	 *

-	 * @return true if the editor should close all other pages

-	 */

-	public boolean closeOtherPages();

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.ui.editor;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.ui.IEditorInput;
+
+/**
+ * An IEditorInput used to reference the page(s) to open
+ *
+ * @author Camille Letavernier
+ *
+ */
+public interface IPapyrusPageInput extends IEditorInput {
+
+	/**
+	 * @return the list of pages to open
+	 */
+	public URI[] getPages();
+
+	/**
+	 *
+	 * @return true if the editor should close all other pages
+	 */
+	public boolean closeOtherPages();
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IReloadableEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IReloadableEditor.java
index 92bff539cf7..92bff539cf7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IReloadableEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/IReloadableEditor.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/MultiDiagramEditorSelectionContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/MultiDiagramEditorSelectionContext.java
index fc0302004dd..fc0302004dd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/MultiDiagramEditorSelectionContext.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/MultiDiagramEditorSelectionContext.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/MultiDiagramPropertySheetPage.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/MultiDiagramPropertySheetPage.java
index 9ef43cb4cd3..9ef43cb4cd3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/MultiDiagramPropertySheetPage.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/MultiDiagramPropertySheetPage.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageIconRegistryServiceFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageIconRegistryServiceFactory.java
index 21eb6a2cfdc..c35a776b83a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageIconRegistryServiceFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageIconRegistryServiceFactory.java
@@ -1,71 +1,71 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.ui.editor;

-

-import org.eclipse.papyrus.infra.core.services.IServiceFactory;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.ui.Activator;

-import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistry;

-import org.eclipse.papyrus.infra.ui.editorsfactory.PageIconsRegistry;

-import org.eclipse.papyrus.infra.ui.extension.diagrameditor.PluggableEditorFactoryReader;

-

-/**

- * Service Factory to register {@link IPageIconsRegistry}.

- *

- * @author cedric dumoulin

- *

- */

-public class PageIconRegistryServiceFactory implements IServiceFactory {

-

-	private PageIconsRegistry pageIconsRegistry;

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

-	 *

-	 * @param servicesRegistry

-	 * @throws ServiceException

-	 */

-	@Override

-	public void init(ServicesRegistry servicesRegistry) throws ServiceException {

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

-	 *

-	 * @throws ServiceException

-	 */

-	@Override

-	public void startService() throws ServiceException {

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

-	 *

-	 * @throws ServiceException

-	 */

-	@Override

-	public void disposeService() throws ServiceException {

-		if (pageIconsRegistry != null) {

-			pageIconsRegistry.dispose();

-		}

-	}

-

-	/**

-	 * Create and populate a {@link PageIconsRegistry}. Return it as the service

-	 * instance.

-	 *

-	 * @return

-	 */

-	@Override

-	public Object createServiceInstance() {

-		if (pageIconsRegistry == null) {

-			pageIconsRegistry = new PageIconsRegistry();

-			PluggableEditorFactoryReader editorReader = new PluggableEditorFactoryReader(Activator.PLUGIN_ID);

-			editorReader.populate(pageIconsRegistry);

-		}

-		return pageIconsRegistry;

-	}

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.ui.editor;
+
+import org.eclipse.papyrus.infra.core.services.IServiceFactory;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.ui.Activator;
+import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistry;
+import org.eclipse.papyrus.infra.ui.editorsfactory.PageIconsRegistry;
+import org.eclipse.papyrus.infra.ui.extension.diagrameditor.PluggableEditorFactoryReader;
+
+/**
+ * Service Factory to register {@link IPageIconsRegistry}.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class PageIconRegistryServiceFactory implements IServiceFactory {
+
+	private PageIconsRegistry pageIconsRegistry;
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)
+	 *
+	 * @param servicesRegistry
+	 * @throws ServiceException
+	 */
+	@Override
+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()
+	 *
+	 * @throws ServiceException
+	 */
+	@Override
+	public void startService() throws ServiceException {
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()
+	 *
+	 * @throws ServiceException
+	 */
+	@Override
+	public void disposeService() throws ServiceException {
+		if (pageIconsRegistry != null) {
+			pageIconsRegistry.dispose();
+		}
+	}
+
+	/**
+	 * Create and populate a {@link PageIconsRegistry}. Return it as the service
+	 * instance.
+	 *
+	 * @return
+	 */
+	@Override
+	public Object createServiceInstance() {
+		if (pageIconsRegistry == null) {
+			pageIconsRegistry = new PageIconsRegistry();
+			PluggableEditorFactoryReader editorReader = new PluggableEditorFactoryReader(Activator.PLUGIN_ID);
+			editorReader.populate(pageIconsRegistry);
+		}
+		return pageIconsRegistry;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageMngrServiceFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageMngrServiceFactory.java
index b7657e6ce1a..b7657e6ce1a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageMngrServiceFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PageMngrServiceFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PapyrusPageInput.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PapyrusPageInput.java
index 7b69d7863d9..84d317fc793 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PapyrusPageInput.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PapyrusPageInput.java
@@ -1,62 +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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.editor;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.ui.part.FileEditorInput;

-

-/**

- * Basic implementation of {@link IPapyrusPageInput}

- *

- * @author Camille Letavernier

- */

-public class PapyrusPageInput extends FileEditorInput implements IPapyrusPageInput {

-

-	private final URI[] pages;

-

-	private final boolean closeOtherPages;

-

-	/**

-	 * Creates a new PapyrusPageInput

-	 *

-	 * @param diFile

-	 *            The file resource

-	 * @param pages

-	 *            The pageIdentifiers of the pages to open

-	 * @param closeOtherPages

-	 *            True if only the selected pages should be opened. All other pages will be closed.

-	 */

-	public PapyrusPageInput(IFile diFile, URI[] pages, boolean closeOtherPages) {

-		super(diFile);

-		this.pages = pages;

-		this.closeOtherPages = closeOtherPages;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public URI[] getPages() {

-		return pages;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean closeOtherPages() {

-		return closeOtherPages;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.ui.editor;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.ui.part.FileEditorInput;
+
+/**
+ * Basic implementation of {@link IPapyrusPageInput}
+ *
+ * @author Camille Letavernier
+ */
+public class PapyrusPageInput extends FileEditorInput implements IPapyrusPageInput {
+
+	private final URI[] pages;
+
+	private final boolean closeOtherPages;
+
+	/**
+	 * Creates a new PapyrusPageInput
+	 *
+	 * @param diFile
+	 *            The file resource
+	 * @param pages
+	 *            The pageIdentifiers of the pages to open
+	 * @param closeOtherPages
+	 *            True if only the selected pages should be opened. All other pages will be closed.
+	 */
+	public PapyrusPageInput(IFile diFile, URI[] pages, boolean closeOtherPages) {
+		super(diFile);
+		this.pages = pages;
+		this.closeOtherPages = closeOtherPages;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public URI[] getPages() {
+		return pages;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean closeOtherPages() {
+		return closeOtherPages;
+	}
+
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/CompositeReloadContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/CompositeReloadContext.java
index 3eabad5cbf3..3eabad5cbf3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/CompositeReloadContext.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/CompositeReloadContext.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/DelegatingReloadContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/DelegatingReloadContext.java
index 718b376c2ba..718b376c2ba 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/DelegatingReloadContext.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/DelegatingReloadContext.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFSelectionContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFSelectionContext.java
index e8eea1033cc..e8eea1033cc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFSelectionContext.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFSelectionContext.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFTreeViewerContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFTreeViewerContext.java
index a6f99008f06..a6f99008f06 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFTreeViewerContext.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EMFTreeViewerContext.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadAdapter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadAdapter.java
index 5015f26011e..5015f26011e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadAdapter.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadAdapter.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadEvent.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadEvent.java
index c4d13f721b4..c4d13f721b4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadEvent.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/EditorReloadEvent.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IDisposableReloadContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IDisposableReloadContext.java
index 8aff9ccf83b..8aff9ccf83b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IDisposableReloadContext.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IDisposableReloadContext.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IEditorReloadListener.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IEditorReloadListener.java
index 2114d555152..2114d555152 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IEditorReloadListener.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IEditorReloadListener.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IInternalEMFSelectionContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IInternalEMFSelectionContext.java
index f8bda865a97..f8bda865a97 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IInternalEMFSelectionContext.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IInternalEMFSelectionContext.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IReloadContextProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IReloadContextProvider.java
index f3449f59be9..f3449f59be9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IReloadContextProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/IReloadContextProvider.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/SelectionContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/SelectionContext.java
index 15d58b5c4a1..15d58b5c4a1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/SelectionContext.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/SelectionContext.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/TreeViewerContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/TreeViewerContext.java
index 6d70788326c..6d70788326c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/TreeViewerContext.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/reload/TreeViewerContext.java
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/AbstractGetEditorIconQuery.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/AbstractGetEditorIconQuery.java
new file mode 100644
index 00000000000..9c02a4bf35d
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/AbstractGetEditorIconQuery.java
@@ -0,0 +1,74 @@
+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.ui.editorsfactory;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistry;
+import org.eclipse.papyrus.infra.ui.editorsfactory.IPageIconsRegistryExtended;
+import org.eclipse.papyrus.infra.ui.editorsfactory.PageIconsRegistry;
+
+/**
+ *
+ * An abstract class to get the iconRegistery
+ *
+ */
+public abstract class AbstractGetEditorIconQuery {// we don't need to implements IJavaModelQuery here
+
+	/**
+	 * the icon registry
+	 */
+	private static IPageIconsRegistry editorRegistry;
+
+	/**
+	 * Get the EditorRegistry used to create editor instances. This default
+	 * implementation return the singleton eINSTANCE. This method can be
+	 * subclassed to return another registry.
+	 *
+	 * @return the singleton eINSTANCE of editor registry
+	 */
+	protected IPageIconsRegistryExtended getEditorRegistry(EObject context) {
+		try {
+			return (IPageIconsRegistryExtended) ServiceUtilsForEObject.getInstance().getService(IPageIconsRegistry.class, context);
+		} catch (Exception ex) {
+			// Skip
+		}
+		if (editorRegistry == null) {
+			editorRegistry = createEditorRegistry(context);
+		}
+		if (!(editorRegistry instanceof IPageIconsRegistryExtended)) {
+			throw new RuntimeException("The editor registry do not implement IPageIconsRegistryExtended");////$NON-NLS-1$
+		}
+		return (IPageIconsRegistryExtended) editorRegistry;
+	}
+
+	/**
+	 * Return the EditorRegistry for nested editor descriptors. Subclass should
+	 * implements this method in order to return the registry associated to the
+	 * extension point namespace.
+	 *
+	 * @return the EditorRegistry for nested editor descriptors
+	 */
+	protected IPageIconsRegistry createEditorRegistry(EObject context) {
+		try {
+			return ServiceUtilsForEObject.getInstance().getService(IPageIconsRegistry.class, context);
+		} catch (ServiceException e) {
+			// Not found, return an empty one which return null for each
+			// request.
+			return new PageIconsRegistry();
+		}
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorFactory.java
index 182c962b822..a107a8e53ff 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorFactory.java
@@ -1,57 +1,57 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.ui.editorsfactory;

-

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;

-

-/**

- * Factory used to get the Icon associated to the editor used to render the

- * specified pageIdentifier.

- *

- *

- * @author cedric dumoulin

- *

- */

-public interface IEditorFactory {

-

-	/**

-	 * Create the {@link IPageModel} for the specified identifier. TODO throw an

-	 * exception encapsulating problems encountered while creating the model.

-	 *

-	 * @param pageIdentifier

-	 *            Object identifying an Editor.

-	 * @return PageModel allowing to create the editor.

-	 */

-	public IPageModel createIPageModel(Object pageIdentifier);

-

-	/**

-	 * Return true if the factory can create an IPageModel for the specified

-	 * pageIdentifier. Return false otherwise TODO throw an exception

-	 * encapsulating problems encountered while creating the model.

-	 *

-	 * @param pageIdentifier

-	 *            The object representing the page to test

-	 * @return

-	 */

-	public boolean isPageModelFactoryFor(Object pageIdentifier);

-

-	/**

-	 * The ID of this factory

-	 * 

-	 * @return

-	 */

-	default String getFactoryID() {

-		return getClass().getName();

-	}

-

-	/**

-	 * The display label of this factory

-	 * 

-	 * @return

-	 */

-	default String getLabel() {

-		return getClass().getSimpleName();

-	}

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.ui.editorsfactory;
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+
+/**
+ * Factory used to get the Icon associated to the editor used to render the
+ * specified pageIdentifier.
+ *
+ *
+ * @author cedric dumoulin
+ *
+ */
+public interface IEditorFactory {
+
+	/**
+	 * Create the {@link IPageModel} for the specified identifier. TODO throw an
+	 * exception encapsulating problems encountered while creating the model.
+	 *
+	 * @param pageIdentifier
+	 *            Object identifying an Editor.
+	 * @return PageModel allowing to create the editor.
+	 */
+	public IPageModel createIPageModel(Object pageIdentifier);
+
+	/**
+	 * Return true if the factory can create an IPageModel for the specified
+	 * pageIdentifier. Return false otherwise TODO throw an exception
+	 * encapsulating problems encountered while creating the model.
+	 *
+	 * @param pageIdentifier
+	 *            The object representing the page to test
+	 * @return
+	 */
+	public boolean isPageModelFactoryFor(Object pageIdentifier);
+
+	/**
+	 * The ID of this factory
+	 * 
+	 * @return
+	 */
+	default String getFactoryID() {
+		return getClass().getName();
+	}
+
+	/**
+	 * The display label of this factory
+	 * 
+	 * @return
+	 */
+	default String getLabel() {
+		return getClass().getSimpleName();
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactory.java
index 9ccf1af0cfe..16ea36ce42b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactory.java
@@ -1,64 +1,64 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.ui.editorsfactory;

-

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;

-import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelMngr;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * Factory used to create an {@link IPageModel} used by the {@link ISashWindowsContainer} to create an instance of the editor represented

- * by the provided Object. Such factory is required by the {@link DiSashModelMngr}. It is called whenever the ISashWindowsContainer need

- * to create an editor from an EObject representing this editor in the Di

- * implementation of the {@link ISashWindowsContentProvider}

- *

- *

- * @author cedric dumoulin

- *

- */

-public interface IEditorIconFactory {

-

-	/**

-	 * Get the icon associated to the editor used to render the model. Model

-	 * represent the top level object of a model editor. Can return a cached

-	 * Image.

-	 *

-	 * @param pageIdentifier

-	 *            the pageIdentifier representing the Editor. This is usually

-	 *            the EObject used to reconstruct the editor.

-	 * @return the icon representing the editor

-	 */

-	public Image getEditorIcon(Object pageIdentifier);

-

-	/**

-	 * Create the icon associated to the editor used to render the model. Model

-	 * represent the top level object of a model editor. Always return a newly

-	 * created Image.

-	 *

-	 * @param pageIdentifier

-	 *            the pageIdentifier representing the Editor. This is usually

-	 *            the EObject used to reconstruct the editor.

-	 * @return the icon representing the editor

-	 */

-	public Image createEditorIcon(Object pageIdentifier);

-

-	/**

-	 * Return true if the factory can create an IPageModel for the specified

-	 * pageIdentifier. Return false otherwise TODO throw an exception

-	 * encapsulating problems encountered while creating the model.

-	 *

-	 * @param pageIdentifier

-	 *            The object representing the page to test

-	 * @return

-	 */

-	public boolean isPageModelFactoryFor(Object pageIdentifier);

-

-	/**

-	 * Dispose this factory

-	 */

-	public void dispose();

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.ui.editorsfactory;
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelMngr;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Factory used to create an {@link IPageModel} used by the {@link ISashWindowsContainer} to create an instance of the editor represented
+ * by the provided Object. Such factory is required by the {@link DiSashModelMngr}. It is called whenever the ISashWindowsContainer need
+ * to create an editor from an EObject representing this editor in the Di
+ * implementation of the {@link ISashWindowsContentProvider}
+ *
+ *
+ * @author cedric dumoulin
+ *
+ */
+public interface IEditorIconFactory {
+
+	/**
+	 * Get the icon associated to the editor used to render the model. Model
+	 * represent the top level object of a model editor. Can return a cached
+	 * Image.
+	 *
+	 * @param pageIdentifier
+	 *            the pageIdentifier representing the Editor. This is usually
+	 *            the EObject used to reconstruct the editor.
+	 * @return the icon representing the editor
+	 */
+	public Image getEditorIcon(Object pageIdentifier);
+
+	/**
+	 * Create the icon associated to the editor used to render the model. Model
+	 * represent the top level object of a model editor. Always return a newly
+	 * created Image.
+	 *
+	 * @param pageIdentifier
+	 *            the pageIdentifier representing the Editor. This is usually
+	 *            the EObject used to reconstruct the editor.
+	 * @return the icon representing the editor
+	 */
+	public Image createEditorIcon(Object pageIdentifier);
+
+	/**
+	 * Return true if the factory can create an IPageModel for the specified
+	 * pageIdentifier. Return false otherwise TODO throw an exception
+	 * encapsulating problems encountered while creating the model.
+	 *
+	 * @param pageIdentifier
+	 *            The object representing the page to test
+	 * @return
+	 */
+	public boolean isPageModelFactoryFor(Object pageIdentifier);
+
+	/**
+	 * Dispose this factory
+	 */
+	public void dispose();
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactoryExtended.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactoryExtended.java
index 06d9344e865..52faed51ce4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactoryExtended.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IEditorIconFactoryExtended.java
@@ -1,30 +1,30 @@
-/**

- *  Copyright (c) 2011 Atos.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Atos - Initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.ui.editorsfactory;

-

-/**

- *

- * @author "Arthur Daussy <a href="mailto:arthur.daussy@atos.net">arthur.daussy@atos.net</a>"

- *

- */

-public interface IEditorIconFactoryExtended extends IEditorIconFactory {

-

-	/**

-	 * Return the icon URL associated to the editor used to render the model. Model represent the top level

-	 * object of a model editor.

-	 *

-	 * @param pageIdentifier

-	 * @return

-	 */

-	public String getURLMainIcon(Object pageIdentifier);

-}

+/**
+ *  Copyright (c) 2011 Atos.
+ *
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Atos - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.ui.editorsfactory;
+
+/**
+ *
+ * @author "Arthur Daussy <a href="mailto:arthur.daussy@atos.net">arthur.daussy@atos.net</a>"
+ *
+ */
+public interface IEditorIconFactoryExtended extends IEditorIconFactory {
+
+	/**
+	 * Return the icon URL associated to the editor used to render the model. Model represent the top level
+	 * object of a model editor.
+	 *
+	 * @param pageIdentifier
+	 * @return
+	 */
+	public String getURLMainIcon(Object pageIdentifier);
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistry.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistry.java
index 6b117ecbeaa..4063f28288c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistry.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistry.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.editorsfactory;

-

-import org.eclipse.swt.graphics.Image;

-

-/**

- * Registry used to get Icons associated to an editor.

- *

- * @author cedric dumoulin

- */

-public interface IPageIconsRegistry {

-

-	/**

-	 * Get the icon associated to the editor used to render the model. Model

-	 * represent the top level object of a model editor.

-	 *

-	 * @param model

-	 *            the model representing the Editor. This is usually the EObject

-	 *            used to reconstruct the editor.

-	 * @return the icon representing the editor

-	 */

-	public Image getEditorIcon(Object model);

-

-	/**

-	 * Dispose this registry

-	 */

-	public void dispose();

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.editorsfactory;
+
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Registry used to get Icons associated to an editor.
+ *
+ * @author cedric dumoulin
+ */
+public interface IPageIconsRegistry {
+
+	/**
+	 * Get the icon associated to the editor used to render the model. Model
+	 * represent the top level object of a model editor.
+	 *
+	 * @param model
+	 *            the model representing the Editor. This is usually the EObject
+	 *            used to reconstruct the editor.
+	 * @return the icon representing the editor
+	 */
+	public Image getEditorIcon(Object model);
+
+	/**
+	 * Dispose this registry
+	 */
+	public void dispose();
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistryExtended.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistryExtended.java
index c8153b3bef4..a11b5f5e7ff 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistryExtended.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/IPageIconsRegistryExtended.java
@@ -1,32 +1,32 @@
-/**

- *  Copyright (c) 2011 Atos Origin.

- *

- *  All rights reserved. This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License v1.0

- *  which accompanies this distribution, and is available at

- *  http://www.eclipse.org/legal/epl-v10.html

- *

- *  Contributors:

- *  Atos Origin - Initial API and implementation

- *

- */

-package org.eclipse.papyrus.infra.ui.editorsfactory;

-

-/**

- * Extends IPageIconsRegistry in order to offer a second methods which will give back the URL of the requested Icon

- *

- * @author "Arthur Daussy <a href="mailto:arthur.daussy@atos.net">arthur.daussy@atos.net</a>"

- *

- */

-public interface IPageIconsRegistryExtended extends IPageIconsRegistry {

-

-	/**

-	 * Get the URL icon associated to the editor used to render the model. Model represent the top level

-	 * object of a model editor.

-	 *

-	 * @param model

-	 * @return {@link String} which represent the URL of the resource

-	 */

-	public String getEditorURLIcon(Object model);

-

-}

+/**
+ *  Copyright (c) 2011 Atos Origin.
+ *
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Atos Origin - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.ui.editorsfactory;
+
+/**
+ * Extends IPageIconsRegistry in order to offer a second methods which will give back the URL of the requested Icon
+ *
+ * @author "Arthur Daussy <a href="mailto:arthur.daussy@atos.net">arthur.daussy@atos.net</a>"
+ *
+ */
+public interface IPageIconsRegistryExtended extends IPageIconsRegistry {
+
+	/**
+	 * Get the URL icon associated to the editor used to render the model. Model represent the top level
+	 * object of a model editor.
+	 *
+	 * @param model
+	 * @return {@link String} which represent the URL of the resource
+	 */
+	public String getEditorURLIcon(Object model);
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageIconsRegistry.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageIconsRegistry.java
index d60e8f71f96..d60e8f71f96 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageIconsRegistry.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageIconsRegistry.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageModelFactoryRegistry.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageModelFactoryRegistry.java
index 32774bb7a25..32774bb7a25 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageModelFactoryRegistry.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/PageModelFactoryRegistry.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/anytype/AnyTypeEditorFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/anytype/AnyTypeEditorFactory.java
index cbb70c2e4e1..137c3c533ef 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/anytype/AnyTypeEditorFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editorsfactory/anytype/AnyTypeEditorFactory.java
@@ -1,135 +1,135 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2014 CEA LIST and others.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 392301

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.editorsfactory.anytype;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.xml.type.AnyType;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IComponentModel;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.infra.ui.extension.diagrameditor.AbstractEditorFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.ISharedImages;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * An EditorFactory for "AnyType", i.e. EObject deserialized from unknown Packages

- *

- * Allows recovery and manipulation of models containing optional EMF components

- *

- * @author Camille Letavernier

- */

-public class AnyTypeEditorFactory extends AbstractEditorFactory {

-

-	public AnyTypeEditorFactory() {

-		super(null, "AnyTypeHandler");

-	}

-

-	@Override

-	public IPageModel createIPageModel(Object pageIdentifier) {

-

-		final AnyType anyTypeModel = (AnyType) pageIdentifier;

-

-		return new IComponentModel() {

-

-			private AnyType anyType = anyTypeModel;

-

-			@Override

-			public void dispose() {

-				// Pass. The tab icon is a workbench-shared image

-			}

-

-			@Override

-			public String getTabTitle() {

-				EClass eClass = anyType.eClass();

-				String label;

-				if (eClass == null) {

-					label = "component";

-				} else {

-					label = eClass.getName();

-				}

-				return "Missing " + label;

-			}

-

-			private String getTypeLabel() {

-				EClass eClass = anyType.eClass();

-				String className = eClass == null ? "None" : eClass.getName();

-				return className;

-			}

-

-			private String getNsURI() {

-				EClass eClass = anyType.eClass();

-				EPackage ePackage = eClass == null ? null : eClass.getEPackage();

-				String ePackageName = ePackage == null ? "None" : ePackage.getNsURI();

-

-				return ePackageName;

-			}

-

-			public Image getComponentIcon() {

-				return Display.getDefault().getSystemImage(SWT.ICON_WARNING);

-			}

-

-			@Override

-			public Image getTabIcon() {

-				return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);

-			}

-

-			@Override

-			public Object getRawModel() {

-				return anyType;

-			}

-

-			public String getErrorText() {

-				String typeLabel = getTypeLabel();

-				String packageURI = getNsURI();

-				String message = "A component is missing. The following Model cannot be loaded: " + typeLabel + " (from " + packageURI + ")\n";

-				message += "Changes to the model won't be reflected in this editor. This editor will be saved in the current state, i.e. without any data loss. ";

-				message += "However, this may result in an inconsistent state of this editor when the missing component will be restored\n";

-				return message;

-			}

-

-			@Override

-			public Composite createPartControl(Composite parent) {

-				Composite tabComposite = new Composite(parent, SWT.NONE);

-				tabComposite.setLayout(new GridLayout(2, false));

-

-				Image componentIcon = getComponentIcon();

-				if (componentIcon != null) {

-					Label errorImageLabel = new Label(tabComposite, SWT.NONE);

-					errorImageLabel.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));

-					errorImageLabel.setImage(componentIcon);

-				}

-

-				Label label = new Label(tabComposite, SWT.WRAP);

-				label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));

-				label.setText(getErrorText());

-

-				return tabComposite;

-			}

-		};

-	}

-

-	@Override

-	public boolean isPageModelFactoryFor(Object pageIdentifier) {

-		return pageIdentifier instanceof AnyType;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 392301
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.editorsfactory.anytype;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.xml.type.AnyType;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IComponentModel;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.ui.extension.diagrameditor.AbstractEditorFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * An EditorFactory for "AnyType", i.e. EObject deserialized from unknown Packages
+ *
+ * Allows recovery and manipulation of models containing optional EMF components
+ *
+ * @author Camille Letavernier
+ */
+public class AnyTypeEditorFactory extends AbstractEditorFactory {
+
+	public AnyTypeEditorFactory() {
+		super(null, "AnyTypeHandler");
+	}
+
+	@Override
+	public IPageModel createIPageModel(Object pageIdentifier) {
+
+		final AnyType anyTypeModel = (AnyType) pageIdentifier;
+
+		return new IComponentModel() {
+
+			private AnyType anyType = anyTypeModel;
+
+			@Override
+			public void dispose() {
+				// Pass. The tab icon is a workbench-shared image
+			}
+
+			@Override
+			public String getTabTitle() {
+				EClass eClass = anyType.eClass();
+				String label;
+				if (eClass == null) {
+					label = "component";
+				} else {
+					label = eClass.getName();
+				}
+				return "Missing " + label;
+			}
+
+			private String getTypeLabel() {
+				EClass eClass = anyType.eClass();
+				String className = eClass == null ? "None" : eClass.getName();
+				return className;
+			}
+
+			private String getNsURI() {
+				EClass eClass = anyType.eClass();
+				EPackage ePackage = eClass == null ? null : eClass.getEPackage();
+				String ePackageName = ePackage == null ? "None" : ePackage.getNsURI();
+
+				return ePackageName;
+			}
+
+			public Image getComponentIcon() {
+				return Display.getDefault().getSystemImage(SWT.ICON_WARNING);
+			}
+
+			@Override
+			public Image getTabIcon() {
+				return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);
+			}
+
+			@Override
+			public Object getRawModel() {
+				return anyType;
+			}
+
+			public String getErrorText() {
+				String typeLabel = getTypeLabel();
+				String packageURI = getNsURI();
+				String message = "A component is missing. The following Model cannot be loaded: " + typeLabel + " (from " + packageURI + ")\n";
+				message += "Changes to the model won't be reflected in this editor. This editor will be saved in the current state, i.e. without any data loss. ";
+				message += "However, this may result in an inconsistent state of this editor when the missing component will be restored\n";
+				return message;
+			}
+
+			@Override
+			public Composite createPartControl(Composite parent) {
+				Composite tabComposite = new Composite(parent, SWT.NONE);
+				tabComposite.setLayout(new GridLayout(2, false));
+
+				Image componentIcon = getComponentIcon();
+				if (componentIcon != null) {
+					Label errorImageLabel = new Label(tabComposite, SWT.NONE);
+					errorImageLabel.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+					errorImageLabel.setImage(componentIcon);
+				}
+
+				Label label = new Label(tabComposite, SWT.WRAP);
+				label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+				label.setText(getErrorText());
+
+				return tabComposite;
+			}
+		};
+	}
+
+	@Override
+	public boolean isPageModelFactoryFor(Object pageIdentifier) {
+		return pageIdentifier instanceof AnyType;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/ICreationCondition.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/ICreationCondition.java
index 575b769e3ec..035cfbfda70 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/ICreationCondition.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/ICreationCondition.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2009 ATOS ORIGIN.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- *  Tristan Faure (ATOS ORIGIN) tristan.faure@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.extension.commands;

-

-import org.eclipse.emf.ecore.EObject;

-

-public interface ICreationCondition {

-

-	/**

-	 * This method returns true if the diagram creation is allowed

-	 *

-	 * @param selectedElement

-	 *            the element where the diagram is provided

-	 * @return true if the diagram can be created

-	 */

-	boolean create(EObject selectedElement);

-

-	/**

-	 * set the command ID in order to take account the environment in order to

-	 * create a diagram

-	 *

-	 * @param commandID

-	 */

-	public void setCommand(String commandID);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2009 ATOS ORIGIN.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Tristan Faure (ATOS ORIGIN) tristan.faure@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.extension.commands;
+
+import org.eclipse.emf.ecore.EObject;
+
+public interface ICreationCondition {
+
+	/**
+	 * This method returns true if the diagram creation is allowed
+	 *
+	 * @param selectedElement
+	 *            the element where the diagram is provided
+	 * @return true if the diagram can be created
+	 */
+	boolean create(EObject selectedElement);
+
+	/**
+	 * set the command ID in order to take account the environment in order to
+	 * create a diagram
+	 *
+	 * @param commandID
+	 */
+	public void setCommand(String commandID);
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/IModelCreationCommand.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/IModelCreationCommand.java
index beb200f6086..8b7f371b28e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/IModelCreationCommand.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/IModelCreationCommand.java
@@ -1,31 +1,31 @@
-/*****************************************************************************

- * 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:

- *  Tatiana Fesenko (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.extension.commands;

-

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-

-/**

- * The Interface IModelCreationCommand.

- */

-public interface IModelCreationCommand {

-

-	/**

-	 * Creates the model.

-	 *

-	 * @param modelSet

-	 *            the modelSet set

-	 */

-	void createModel(final ModelSet modelSet);

-

-}

+/*****************************************************************************
+ * 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:
+ *  Tatiana Fesenko (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.extension.commands;
+
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+
+/**
+ * The Interface IModelCreationCommand.
+ */
+public interface IModelCreationCommand {
+
+	/**
+	 * Creates the model.
+	 *
+	 * @param modelSet
+	 *            the modelSet set
+	 */
+	void createModel(final ModelSet modelSet);
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/PerspectiveContextDependence.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/PerspectiveContextDependence.java
index 7d6d993c982..0c8b0a9d9fe 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/PerspectiveContextDependence.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/commands/PerspectiveContextDependence.java
@@ -1,51 +1,51 @@
-/*****************************************************************************

- * 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.ui.extension.commands;

-

-import org.eclipse.emf.ecore.EObject;

-

-//FIXME  Refactoring Juno : I don't know how to migrate this code

-public class PerspectiveContextDependence implements ICreationCondition {

-

-	protected String commandID = null;

-

-	public PerspectiveContextDependence() {

-		// TODO Auto-generated constructor stub

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean create(EObject selectedElement) {

-		// FIXME Refactoring Juno : I don't know how to migrate this code

-		// // Get the perspective

-		// Perspective perspective = ((WorkbenchPage)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()).getActivePerspective();

-		// // look for the perspective

-		// // verify if the command has to be displayed

-		// if(perspective.getHiddenMenuItems().contains(commandID) && perspective.getHiddenToolbarItems().contains(commandID)) {

-		// return false;

-		// }

-		return true;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void setCommand(String commandID) {

-		this.commandID = commandID;

-	}

-

-}

+/*****************************************************************************
+ * 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.ui.extension.commands;
+
+import org.eclipse.emf.ecore.EObject;
+
+//FIXME  Refactoring Juno : I don't know how to migrate this code
+public class PerspectiveContextDependence implements ICreationCondition {
+
+	protected String commandID = null;
+
+	public PerspectiveContextDependence() {
+		// TODO Auto-generated constructor stub
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean create(EObject selectedElement) {
+		// FIXME Refactoring Juno : I don't know how to migrate this code
+		// // Get the perspective
+		// Perspective perspective = ((WorkbenchPage)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()).getActivePerspective();
+		// // look for the perspective
+		// // verify if the command has to be displayed
+		// if(perspective.getHiddenMenuItems().contains(commandID) && perspective.getHiddenToolbarItems().contains(commandID)) {
+		// return false;
+		// }
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setCommand(String commandID) {
+		this.commandID = commandID;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/AbstractEditorFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/AbstractEditorFactory.java
index bde8a69767e..89ace2da204 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/AbstractEditorFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/AbstractEditorFactory.java
@@ -1,109 +1,109 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.extension.diagrameditor;

-

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory;

-

-/**

- * Abstract base class for Factory of editors. See {@link IEditorFactory}.

- *

- *

- * @author Remi Schnekenburger

- * @author Patrick Tessier

- * @author cedric dumoulin

- */

-public abstract class AbstractEditorFactory implements IPluggableEditorFactory {

-

-	/**

-	 * Expected Class of the diagram to create.

-	 */

-	private Class<?> diagramClass;

-

-	/** Expected diagram type (@see {@link Diagram#getType()}) */

-	private String expectedType;

-

-	/**

-	 * EditorDescriptor associated to the factory. TODO : Maybe use individual

-	 * setters to set the requested data (ContributorId and Icon).

-	 */

-	protected EditorDescriptor editorDescriptor;

-

-	/**

-	 * ServiceRegistry that can be provided to created editors.

-	 */

-	private ServicesRegistry serviceRegistry;

-

-	/**

-	 * Creates a new AbstractEditorFactory.

-	 *

-	 * @param diagramClass

-	 *            expected Class of the diagram to create.

-	 * @param expectedType

-	 *            expected diagram type (@see {@link Diagram#getType()})

-	 */

-	public AbstractEditorFactory(Class<?> diagramClass, String expectedType) {

-		assert (expectedType != null);

-		this.diagramClass = diagramClass;

-		this.expectedType = expectedType;

-	}

-

-	/**

-	 * Initialize the factory with useful Classes.

-	 *

-	 * @param serviceRegistry

-	 *            Service registry that will be provided to created editor.

-	 * @param editorDescriptor

-	 *            Descriptor containing data from the Eclipse Extension.

-	 */

-	@Override

-	public void init(ServicesRegistry serviceRegistry, EditorDescriptor editorDescriptor) {

-		this.editorDescriptor = editorDescriptor;

-		this.serviceRegistry = serviceRegistry;

-

-	}

-

-	/**

-	 * @return the serviceRegistry

-	 */

-	public ServicesRegistry getServiceRegistry() {

-		return serviceRegistry;

-	}

-

-	/**

-	 * Returns the expected class for the diagram implementation

-	 *

-	 * @return the expected class for the diagram implementation

-	 */

-	public Class<?> getDiagramClass() {

-		return diagramClass;

-	}

-

-	/**

-	 * Returns the expected type of the diagram

-	 *

-	 * @return the expected diagram type (@see {@link Diagram#getType()})

-	 */

-	public String getExpectedType() {

-		return expectedType;

-	}

-

-	/**

-	 * @return the editorDescriptor

-	 */

-	public EditorDescriptor getEditorDescriptor() {

-		return editorDescriptor;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.extension.diagrameditor;
+
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory;
+
+/**
+ * Abstract base class for Factory of editors. See {@link IEditorFactory}.
+ *
+ *
+ * @author Remi Schnekenburger
+ * @author Patrick Tessier
+ * @author cedric dumoulin
+ */
+public abstract class AbstractEditorFactory implements IPluggableEditorFactory {
+
+	/**
+	 * Expected Class of the diagram to create.
+	 */
+	private Class<?> diagramClass;
+
+	/** Expected diagram type (@see {@link Diagram#getType()}) */
+	private String expectedType;
+
+	/**
+	 * EditorDescriptor associated to the factory. TODO : Maybe use individual
+	 * setters to set the requested data (ContributorId and Icon).
+	 */
+	protected EditorDescriptor editorDescriptor;
+
+	/**
+	 * ServiceRegistry that can be provided to created editors.
+	 */
+	private ServicesRegistry serviceRegistry;
+
+	/**
+	 * Creates a new AbstractEditorFactory.
+	 *
+	 * @param diagramClass
+	 *            expected Class of the diagram to create.
+	 * @param expectedType
+	 *            expected diagram type (@see {@link Diagram#getType()})
+	 */
+	public AbstractEditorFactory(Class<?> diagramClass, String expectedType) {
+		assert (expectedType != null);
+		this.diagramClass = diagramClass;
+		this.expectedType = expectedType;
+	}
+
+	/**
+	 * Initialize the factory with useful Classes.
+	 *
+	 * @param serviceRegistry
+	 *            Service registry that will be provided to created editor.
+	 * @param editorDescriptor
+	 *            Descriptor containing data from the Eclipse Extension.
+	 */
+	@Override
+	public void init(ServicesRegistry serviceRegistry, EditorDescriptor editorDescriptor) {
+		this.editorDescriptor = editorDescriptor;
+		this.serviceRegistry = serviceRegistry;
+
+	}
+
+	/**
+	 * @return the serviceRegistry
+	 */
+	public ServicesRegistry getServiceRegistry() {
+		return serviceRegistry;
+	}
+
+	/**
+	 * Returns the expected class for the diagram implementation
+	 *
+	 * @return the expected class for the diagram implementation
+	 */
+	public Class<?> getDiagramClass() {
+		return diagramClass;
+	}
+
+	/**
+	 * Returns the expected type of the diagram
+	 *
+	 * @return the expected diagram type (@see {@link Diagram#getType()})
+	 */
+	public String getExpectedType() {
+		return expectedType;
+	}
+
+	/**
+	 * @return the editorDescriptor
+	 */
+	public EditorDescriptor getEditorDescriptor() {
+		return editorDescriptor;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptor.java
index 502360c09d7..d7aa6d558eb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptor.java
@@ -1,168 +1,168 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.extension.diagrameditor;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-

-/**

- * This descriptor describes a nested diagram. It is used by MultiDiagramEditor

- * to know about the nested diagram. It is fill by an extension.

- *

- * @author Cedric Dumoulin

- *

- */

-public class EditorDescriptor {

-

-	/**

-	 * Editor factory implementation class.

-	 */

-	private Class<IPluggableEditorFactory> editorFactoryClass;

-

-	/**

-	 * EditorActionBarContributor Id used to search the

-	 * EditorActionBarContributor requested by the editor.

-	 */

-	private String actionBarContributorId;

-

-	/**

-	 * The icon representing the diagram

-	 */

-	private ImageDescriptor icon;

-

-	/**

-	 * Resource path to the icon

-	 */

-	private String iconPath;

-

-	/**

-	 * The order of this factory. Used when several factories match the same element (Diagram...)

-	 * The lower the order, the higher the priority of this factory

-	 */

-	private int order;

-

-	/**

-	 * Constructor.

-	 */

-	public EditorDescriptor() {

-

-	}

-

-	/**

-	 *

-	 * @param attribute

-	 */

-	public void setActionBarContributorId(String actionBarContributorId) {

-		this.actionBarContributorId = actionBarContributorId;

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.extension.diagrameditor.IEditorDescriptor#getActionBarContributorId()

-	 * @return

-	 *

-	 */

-	public String getActionBarContributorId() {

-		return actionBarContributorId;

-	}

-

-	/**

-	 * get the editor icon path

-	 *

-	 * @return the editor icon path

-	 */

-	public ImageDescriptor getIcon() {

-		return icon;

-	}

-

-	/**

-	 * set the editor icon

-	 *

-	 * @param icon

-	 *            the icon path

-	 */

-	public void setIcon(ImageDescriptor icon) {

-		this.icon = icon;

-	}

-

-	/**

-	 * get the class of the editor factory

-	 *

-	 * @return the class of the editor

-	 */

-	public Class<IPluggableEditorFactory> getEditorFactoryClass() {

-		return editorFactoryClass;

-	}

-

-	/**

-	 * set the editor facoty to this descriptor

-	 *

-	 * @param editorFactoryClass

-	 *            the class that represents the editor factory

-	 */

-	public void setEditorFactoryClass(Class<IPluggableEditorFactory> editorFactoryClass) {

-		this.editorFactoryClass = editorFactoryClass;

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	public String toString() {

-		if (editorFactoryClass == null || editorFactoryClass.getName() == null) {

-			return "[nestedEditor  editorFactory:" + editorFactoryClass + "(null)]";

-		}

-		return "[nestedEditor  editorFactory:" + editorFactoryClass.getName() + "]";

-	}

-

-	public int getOrder() {

-		return order;

-	}

-

-	public void setOrder(int order) {

-		this.order = order;

-	}

-

-	/**

-	 * Set the URL of the Icon

-	 *

-	 * @param iconPath

-	 *            path of the Icon

-	 */

-	public void setIconURL(String iconPath) {

-		this.iconPath = iconPath;

-	}

-

-	/**

-	 * Get the URL of the based images

-	 *

-	 * @return the path of the mai image. can return null if this property is not set

-	 */

-	public String getIconURL() {

-		return iconPath;

-	}

-

-	/**

-	 * set the Icon thanks to a {@link IConfigurationElement} and {@link String}which represent the path of the Icon

-	 *

-	 * @param element

-	 * @param iconPath

-	 */

-	public void setIcon(IConfigurationElement element, String iconPath, String pluginID) {

-		setIcon(AbstractUIPlugin.imageDescriptorFromPlugin(element.getNamespaceIdentifier(), iconPath));

-		setIconURL(element.getNamespaceIdentifier() + '/' + iconPath);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.extension.diagrameditor;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+
+/**
+ * This descriptor describes a nested diagram. It is used by MultiDiagramEditor
+ * to know about the nested diagram. It is fill by an extension.
+ *
+ * @author Cedric Dumoulin
+ *
+ */
+public class EditorDescriptor {
+
+	/**
+	 * Editor factory implementation class.
+	 */
+	private Class<IPluggableEditorFactory> editorFactoryClass;
+
+	/**
+	 * EditorActionBarContributor Id used to search the
+	 * EditorActionBarContributor requested by the editor.
+	 */
+	private String actionBarContributorId;
+
+	/**
+	 * The icon representing the diagram
+	 */
+	private ImageDescriptor icon;
+
+	/**
+	 * Resource path to the icon
+	 */
+	private String iconPath;
+
+	/**
+	 * The order of this factory. Used when several factories match the same element (Diagram...)
+	 * The lower the order, the higher the priority of this factory
+	 */
+	private int order;
+
+	/**
+	 * Constructor.
+	 */
+	public EditorDescriptor() {
+
+	}
+
+	/**
+	 *
+	 * @param attribute
+	 */
+	public void setActionBarContributorId(String actionBarContributorId) {
+		this.actionBarContributorId = actionBarContributorId;
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.extension.diagrameditor.IEditorDescriptor#getActionBarContributorId()
+	 * @return
+	 *
+	 */
+	public String getActionBarContributorId() {
+		return actionBarContributorId;
+	}
+
+	/**
+	 * get the editor icon path
+	 *
+	 * @return the editor icon path
+	 */
+	public ImageDescriptor getIcon() {
+		return icon;
+	}
+
+	/**
+	 * set the editor icon
+	 *
+	 * @param icon
+	 *            the icon path
+	 */
+	public void setIcon(ImageDescriptor icon) {
+		this.icon = icon;
+	}
+
+	/**
+	 * get the class of the editor factory
+	 *
+	 * @return the class of the editor
+	 */
+	public Class<IPluggableEditorFactory> getEditorFactoryClass() {
+		return editorFactoryClass;
+	}
+
+	/**
+	 * set the editor facoty to this descriptor
+	 *
+	 * @param editorFactoryClass
+	 *            the class that represents the editor factory
+	 */
+	public void setEditorFactoryClass(Class<IPluggableEditorFactory> editorFactoryClass) {
+		this.editorFactoryClass = editorFactoryClass;
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String toString() {
+		if (editorFactoryClass == null || editorFactoryClass.getName() == null) {
+			return "[nestedEditor  editorFactory:" + editorFactoryClass + "(null)]";
+		}
+		return "[nestedEditor  editorFactory:" + editorFactoryClass.getName() + "]";
+	}
+
+	public int getOrder() {
+		return order;
+	}
+
+	public void setOrder(int order) {
+		this.order = order;
+	}
+
+	/**
+	 * Set the URL of the Icon
+	 *
+	 * @param iconPath
+	 *            path of the Icon
+	 */
+	public void setIconURL(String iconPath) {
+		this.iconPath = iconPath;
+	}
+
+	/**
+	 * Get the URL of the based images
+	 *
+	 * @return the path of the mai image. can return null if this property is not set
+	 */
+	public String getIconURL() {
+		return iconPath;
+	}
+
+	/**
+	 * set the Icon thanks to a {@link IConfigurationElement} and {@link String}which represent the path of the Icon
+	 *
+	 * @param element
+	 * @param iconPath
+	 */
+	public void setIcon(IConfigurationElement element, String iconPath, String pluginID) {
+		setIcon(AbstractUIPlugin.imageDescriptorFromPlugin(element.getNamespaceIdentifier(), iconPath));
+		setIconURL(element.getNamespaceIdentifier() + '/' + iconPath);
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptorExtensionFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptorExtensionFactory.java
index 8d57b2fe3ab..8d57b2fe3ab 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptorExtensionFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorDescriptorExtensionFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorFactoryProxy.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorFactoryProxy.java
index 05fafa58c5d..8a80509bda2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorFactoryProxy.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorFactoryProxy.java
@@ -1,137 +1,137 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.ui.extension.diagrameditor;

-

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory;

-

-/**

- * A proxy implementation of {@link IEditorFactory} used to do lazy

- * instantiation of concrete {@link IPluggableEditorFactory}. This class is used

- * by the {@link PluggableEditorFactoryReader}

- *

- * @author cedric dumoulin

- *

- */

-public class EditorFactoryProxy implements IEditorFactory {

-

-	/**

-	 * The concrete implementation.

-	 */

-	private IPluggableEditorFactory editorFactory;

-

-	/**

-	 * EditorDescriptor associated to the factory.

-	 */

-	protected EditorDescriptor editorDescriptor;

-

-	/**

-	 * ServiceRegistry that can be provided to created editors.

-	 */

-	private ServicesRegistry serviceRegistry;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param serviceRegistry

-	 * @param editorDescriptor

-	 */

-	public EditorFactoryProxy(ServicesRegistry serviceRegistry, EditorDescriptor editorDescriptor) {

-		this.serviceRegistry = serviceRegistry;

-		this.editorDescriptor = editorDescriptor;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory#createIPageModel(java.lang.Object)

-	 *

-	 * @param pageIdentifier

-	 * @return

-	 */

-	@Override

-	public IPageModel createIPageModel(Object pageIdentifier) {

-		try {

-			return getEditorFactory().createIPageModel(pageIdentifier);

-		} catch (Exception ex) {

-			// An error occurred in a contribution. Do not use this factory

-			return null;

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory#isPageModelFactoryFor(java.lang.Object)

-	 *

-	 * @param pageIdentifier

-	 * @return

-	 */

-	@Override

-	public boolean isPageModelFactoryFor(Object pageIdentifier) {

-		try {

-			return getEditorFactory().isPageModelFactoryFor(pageIdentifier);

-		} catch (Exception ex) {

-			// An error occurred in a contribution. Do not use this factory

-			return false;

-		}

-	}

-

-	/**

-	 * @return the editorFactory

-	 */

-	protected IPluggableEditorFactory getEditorFactory() {

-

-		if (editorFactory == null) {

-			editorFactory = createEditorFactory();

-		}

-

-		return editorFactory;

-

-	}

-

-	/**

-	 * Create an instance of IPluggableEditorFactory as described in the

-	 * editorDescriptor. TODO let propagate the exceptions.

-	 *

-	 * @return

-	 */

-	private IPluggableEditorFactory createEditorFactory() {

-		// Create the requested class.

-		try {

-			editorFactory = editorDescriptor.getEditorFactoryClass().newInstance();

-			// Set the descriptor. USed by the factory to get the ActionBarId

-			// and Icon

-			editorFactory.init(serviceRegistry, editorDescriptor);

-			return editorFactory;

-		} catch (InstantiationException e) {

-			// Lets propagate. This is an implementation problem that should be

-			// solved by programmer.

-			throw new RuntimeException(e);

-		} catch (IllegalAccessException e) {

-			// Lets propagate. This is an implementation problem that should be

-			// solved by programmer.

-			throw new RuntimeException(e);

-		}

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory#getFactoryID()

-	 *

-	 * @return

-	 */

-	@Override

-	public String getFactoryID() {

-		return getEditorFactory().getFactoryID();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory#getLabel()

-	 *

-	 * @return

-	 */

-	@Override

-	public String getLabel() {

-		return getEditorFactory().getLabel();

-	}

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.ui.extension.diagrameditor;
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory;
+
+/**
+ * A proxy implementation of {@link IEditorFactory} used to do lazy
+ * instantiation of concrete {@link IPluggableEditorFactory}. This class is used
+ * by the {@link PluggableEditorFactoryReader}
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class EditorFactoryProxy implements IEditorFactory {
+
+	/**
+	 * The concrete implementation.
+	 */
+	private IPluggableEditorFactory editorFactory;
+
+	/**
+	 * EditorDescriptor associated to the factory.
+	 */
+	protected EditorDescriptor editorDescriptor;
+
+	/**
+	 * ServiceRegistry that can be provided to created editors.
+	 */
+	private ServicesRegistry serviceRegistry;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param serviceRegistry
+	 * @param editorDescriptor
+	 */
+	public EditorFactoryProxy(ServicesRegistry serviceRegistry, EditorDescriptor editorDescriptor) {
+		this.serviceRegistry = serviceRegistry;
+		this.editorDescriptor = editorDescriptor;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory#createIPageModel(java.lang.Object)
+	 *
+	 * @param pageIdentifier
+	 * @return
+	 */
+	@Override
+	public IPageModel createIPageModel(Object pageIdentifier) {
+		try {
+			return getEditorFactory().createIPageModel(pageIdentifier);
+		} catch (Exception ex) {
+			// An error occurred in a contribution. Do not use this factory
+			return null;
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory#isPageModelFactoryFor(java.lang.Object)
+	 *
+	 * @param pageIdentifier
+	 * @return
+	 */
+	@Override
+	public boolean isPageModelFactoryFor(Object pageIdentifier) {
+		try {
+			return getEditorFactory().isPageModelFactoryFor(pageIdentifier);
+		} catch (Exception ex) {
+			// An error occurred in a contribution. Do not use this factory
+			return false;
+		}
+	}
+
+	/**
+	 * @return the editorFactory
+	 */
+	protected IPluggableEditorFactory getEditorFactory() {
+
+		if (editorFactory == null) {
+			editorFactory = createEditorFactory();
+		}
+
+		return editorFactory;
+
+	}
+
+	/**
+	 * Create an instance of IPluggableEditorFactory as described in the
+	 * editorDescriptor. TODO let propagate the exceptions.
+	 *
+	 * @return
+	 */
+	private IPluggableEditorFactory createEditorFactory() {
+		// Create the requested class.
+		try {
+			editorFactory = editorDescriptor.getEditorFactoryClass().newInstance();
+			// Set the descriptor. USed by the factory to get the ActionBarId
+			// and Icon
+			editorFactory.init(serviceRegistry, editorDescriptor);
+			return editorFactory;
+		} catch (InstantiationException e) {
+			// Lets propagate. This is an implementation problem that should be
+			// solved by programmer.
+			throw new RuntimeException(e);
+		} catch (IllegalAccessException e) {
+			// Lets propagate. This is an implementation problem that should be
+			// solved by programmer.
+			throw new RuntimeException(e);
+		}
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory#getFactoryID()
+	 *
+	 * @return
+	 */
+	@Override
+	public String getFactoryID() {
+		return getEditorFactory().getFactoryID();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory#getLabel()
+	 *
+	 * @return
+	 */
+	@Override
+	public String getLabel() {
+		return getEditorFactory().getLabel();
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorIconFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorIconFactory.java
index 6449012db9b..94038633af4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorIconFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorIconFactory.java
@@ -1,152 +1,152 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.ui.extension.diagrameditor;

-

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.infra.ui.editorsfactory.IEditorIconFactoryExtended;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * A factory used to create the Icon associated to an editor TODO Lets have a

- * common ancestor for {@link EditorIconFactory} and {@link EditorFactoryProxy}

- *

- * @author cedric dumoulin

- *

- */

-public class EditorIconFactory implements IEditorIconFactoryExtended {

-

-	/**

-	 * The concrete implementation.

-	 */

-	private IPluggableEditorFactory editorFactory;

-

-	/**

-	 * EditorDescriptor associated to the factory.

-	 */

-	protected EditorDescriptor editorDescriptor;

-

-	/**

-	 * Cached image for reuse.

-	 */

-	protected Image cachedImage;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param serviceRegistry

-	 * @param editorDescriptor

-	 */

-	public EditorIconFactory(EditorDescriptor editorDescriptor) {

-		this.editorDescriptor = editorDescriptor;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorIconFactory#getEditorIcon(java.lang.Object)

-	 *

-	 * @param pageIdentifier

-	 * @return

-	 */

-	@Override

-	public Image getEditorIcon(Object pageIdentifier) {

-

-		if (cachedImage == null) {

-			cachedImage = createEditorIcon(pageIdentifier);

-		}

-

-		return cachedImage;

-	}

-

-	/**

-	 * Create an Image associated to the editor used to render the specified

-	 * pageIdentifier

-	 *

-	 * @return

-	 */

-	@Override

-	public Image createEditorIcon(Object pageIdentifier) {

-		ImageDescriptor imageDescriptor = editorDescriptor.getIcon();

-		if (imageDescriptor == null) {

-			return null;

-		}

-		Image image = imageDescriptor.createImage();

-		return image;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory#isPageModelFactoryFor(java.lang.Object)

-	 *

-	 * @param pageIdentifier

-	 * @return

-	 */

-	@Override

-	public boolean isPageModelFactoryFor(Object pageIdentifier) {

-		return getEditorFactory().isPageModelFactoryFor(pageIdentifier);

-	}

-

-	/**

-	 * @return the editorFactory

-	 */

-	protected IPluggableEditorFactory getEditorFactory() {

-

-		if (editorFactory == null) {

-			editorFactory = createEditorFactory();

-		}

-

-		return editorFactory;

-

-	}

-

-	/**

-	 * Create an instance of IPluggableEditorFactory as described in the

-	 * editorDescriptor. TODO let propagate the exceptions.

-	 *

-	 * @return

-	 */

-	private IPluggableEditorFactory createEditorFactory() {

-		// Create the requested class.

-		try {

-			editorFactory = editorDescriptor.getEditorFactoryClass().newInstance();

-			// Set the descriptor. USed by the factory to get the ActionBarId

-			// and Icon

-			// editorFactory.init(serviceRegistry, editorDescriptor);

-			return editorFactory;

-		} catch (InstantiationException e) {

-			// Lets propagate. This is an implementation problem that should be

-			// solved by programmer.

-			throw new RuntimeException(e);

-		} catch (IllegalAccessException e) {

-			// Lets propagate. This is an implementation problem that should be

-			// solved by programmer.

-			throw new RuntimeException(e);

-		}

-

-	}

-

-	/**

-	 * Return the URL of the main icon used to create this icon

-	 *

-	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorIconFactory#getURLMainIcon(java.lang.Object)

-	 *

-	 * @param pageIdentifier

-	 * @return

-	 */

-	@Override

-	public String getURLMainIcon(Object pageIdentifier) {

-		return editorDescriptor.getIconURL();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * Dispose the cached image

-	 */

-	@Override

-	public void dispose() {

-		if (cachedImage != null) {

-			cachedImage.dispose();

-			cachedImage = null;

-		}

-	}

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.ui.extension.diagrameditor;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.infra.ui.editorsfactory.IEditorIconFactoryExtended;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * A factory used to create the Icon associated to an editor TODO Lets have a
+ * common ancestor for {@link EditorIconFactory} and {@link EditorFactoryProxy}
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class EditorIconFactory implements IEditorIconFactoryExtended {
+
+	/**
+	 * The concrete implementation.
+	 */
+	private IPluggableEditorFactory editorFactory;
+
+	/**
+	 * EditorDescriptor associated to the factory.
+	 */
+	protected EditorDescriptor editorDescriptor;
+
+	/**
+	 * Cached image for reuse.
+	 */
+	protected Image cachedImage;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param serviceRegistry
+	 * @param editorDescriptor
+	 */
+	public EditorIconFactory(EditorDescriptor editorDescriptor) {
+		this.editorDescriptor = editorDescriptor;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorIconFactory#getEditorIcon(java.lang.Object)
+	 *
+	 * @param pageIdentifier
+	 * @return
+	 */
+	@Override
+	public Image getEditorIcon(Object pageIdentifier) {
+
+		if (cachedImage == null) {
+			cachedImage = createEditorIcon(pageIdentifier);
+		}
+
+		return cachedImage;
+	}
+
+	/**
+	 * Create an Image associated to the editor used to render the specified
+	 * pageIdentifier
+	 *
+	 * @return
+	 */
+	@Override
+	public Image createEditorIcon(Object pageIdentifier) {
+		ImageDescriptor imageDescriptor = editorDescriptor.getIcon();
+		if (imageDescriptor == null) {
+			return null;
+		}
+		Image image = imageDescriptor.createImage();
+		return image;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory#isPageModelFactoryFor(java.lang.Object)
+	 *
+	 * @param pageIdentifier
+	 * @return
+	 */
+	@Override
+	public boolean isPageModelFactoryFor(Object pageIdentifier) {
+		return getEditorFactory().isPageModelFactoryFor(pageIdentifier);
+	}
+
+	/**
+	 * @return the editorFactory
+	 */
+	protected IPluggableEditorFactory getEditorFactory() {
+
+		if (editorFactory == null) {
+			editorFactory = createEditorFactory();
+		}
+
+		return editorFactory;
+
+	}
+
+	/**
+	 * Create an instance of IPluggableEditorFactory as described in the
+	 * editorDescriptor. TODO let propagate the exceptions.
+	 *
+	 * @return
+	 */
+	private IPluggableEditorFactory createEditorFactory() {
+		// Create the requested class.
+		try {
+			editorFactory = editorDescriptor.getEditorFactoryClass().newInstance();
+			// Set the descriptor. USed by the factory to get the ActionBarId
+			// and Icon
+			// editorFactory.init(serviceRegistry, editorDescriptor);
+			return editorFactory;
+		} catch (InstantiationException e) {
+			// Lets propagate. This is an implementation problem that should be
+			// solved by programmer.
+			throw new RuntimeException(e);
+		} catch (IllegalAccessException e) {
+			// Lets propagate. This is an implementation problem that should be
+			// solved by programmer.
+			throw new RuntimeException(e);
+		}
+
+	}
+
+	/**
+	 * Return the URL of the main icon used to create this icon
+	 *
+	 * @see org.eclipse.papyrus.infra.ui.editorsfactory.IEditorIconFactory#getURLMainIcon(java.lang.Object)
+	 *
+	 * @param pageIdentifier
+	 * @return
+	 */
+	@Override
+	public String getURLMainIcon(Object pageIdentifier) {
+		return editorDescriptor.getIconURL();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * Dispose the cached image
+	 */
+	@Override
+	public void dispose() {
+		if (cachedImage != null) {
+			cachedImage.dispose();
+			cachedImage = null;
+		}
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorNotFoundException.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorNotFoundException.java
index 6600a83af1b..f0e189ae4e1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorNotFoundException.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/EditorNotFoundException.java
@@ -1,53 +1,53 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.extension.diagrameditor;

-

-/**

- * Editor was not found.

- *

- * @author dumoulin

- *

- */

-@SuppressWarnings("serial")

-public class EditorNotFoundException extends MultiDiagramException {

-

-	/**

-	 *

-	 */

-	public EditorNotFoundException() {

-	}

-

-	/**

-	 * @param arg0

-	 */

-	public EditorNotFoundException(String arg0) {

-		super(arg0);

-	}

-

-	/**

-	 * @param arg0

-	 */

-	public EditorNotFoundException(Throwable arg0) {

-		super(arg0);

-	}

-

-	/**

-	 * @param arg0

-	 * @param arg1

-	 */

-	public EditorNotFoundException(String arg0, Throwable arg1) {

-		super(arg0, arg1);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.extension.diagrameditor;
+
+/**
+ * Editor was not found.
+ *
+ * @author dumoulin
+ *
+ */
+@SuppressWarnings("serial")
+public class EditorNotFoundException extends MultiDiagramException {
+
+	/**
+	 *
+	 */
+	public EditorNotFoundException() {
+	}
+
+	/**
+	 * @param arg0
+	 */
+	public EditorNotFoundException(String arg0) {
+		super(arg0);
+	}
+
+	/**
+	 * @param arg0
+	 */
+	public EditorNotFoundException(Throwable arg0) {
+		super(arg0);
+	}
+
+	/**
+	 * @param arg0
+	 * @param arg1
+	 */
+	public EditorNotFoundException(String arg0, Throwable arg1) {
+		super(arg0, arg1);
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/IPluggableEditorFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/IPluggableEditorFactory.java
index ee69f2442a5..87f1cde5d2b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/IPluggableEditorFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/IPluggableEditorFactory.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.extension.diagrameditor;

-

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory;

-

-/**

- * This interface should be implemented by Editor Factories that can be declared

- * as Eclipse extension. It extends the {@link IEditorFactory} by adding methods

- * to initialize the factory with multieditor ServiceRegistry and associated

- * editor data.

- *

- * @author C�dric Dumoulin

- *

- */

-public interface IPluggableEditorFactory extends IEditorFactory {

-

-	/**

-	 * Initialize the factory with useful Classes.

-	 *

-	 * @param serviceRegistry

-	 *            Service registry that will be provided to created editor.

-	 * @param editorDescriptor

-	 *            Descriptor containing data from the Eclipse Extension.

-	 */

-	public void init(ServicesRegistry serviceRegistry, EditorDescriptor editorDescriptor);

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.extension.diagrameditor;
+
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.ui.editorsfactory.IEditorFactory;
+
+/**
+ * This interface should be implemented by Editor Factories that can be declared
+ * as Eclipse extension. It extends the {@link IEditorFactory} by adding methods
+ * to initialize the factory with multieditor ServiceRegistry and associated
+ * editor data.
+ *
+ * @author C�dric Dumoulin
+ *
+ */
+public interface IPluggableEditorFactory extends IEditorFactory {
+
+	/**
+	 * Initialize the factory with useful Classes.
+	 *
+	 * @param serviceRegistry
+	 *            Service registry that will be provided to created editor.
+	 * @param editorDescriptor
+	 *            Descriptor containing data from the Eclipse Extension.
+	 */
+	public void init(ServicesRegistry serviceRegistry, EditorDescriptor editorDescriptor);
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/MultiDiagramException.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/MultiDiagramException.java
index 81f1f7ccac4..fd6a89ff037 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/MultiDiagramException.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/MultiDiagramException.java
@@ -1,53 +1,53 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.extension.diagrameditor;

-

-/**

- * Root Exception of MultiDiagram exception

- *

- * @author dumoulin

- *

- */

-@SuppressWarnings("serial")

-public class MultiDiagramException extends Exception {

-

-	/**

-	 *

-	 */

-	public MultiDiagramException() {

-	}

-

-	/**

-	 * @param arg0

-	 */

-	public MultiDiagramException(String arg0) {

-		super(arg0);

-	}

-

-	/**

-	 * @param arg0

-	 */

-	public MultiDiagramException(Throwable arg0) {

-		super(arg0);

-	}

-

-	/**

-	 * @param arg0

-	 * @param arg1

-	 */

-	public MultiDiagramException(String arg0, Throwable arg1) {

-		super(arg0, arg1);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.extension.diagrameditor;
+
+/**
+ * Root Exception of MultiDiagram exception
+ *
+ * @author dumoulin
+ *
+ */
+@SuppressWarnings("serial")
+public class MultiDiagramException extends Exception {
+
+	/**
+	 *
+	 */
+	public MultiDiagramException() {
+	}
+
+	/**
+	 * @param arg0
+	 */
+	public MultiDiagramException(String arg0) {
+		super(arg0);
+	}
+
+	/**
+	 * @param arg0
+	 */
+	public MultiDiagramException(Throwable arg0) {
+		super(arg0);
+	}
+
+	/**
+	 * @param arg0
+	 * @param arg1
+	 */
+	public MultiDiagramException(String arg0, Throwable arg1) {
+		super(arg0, arg1);
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/PluggableEditorFactoryReader.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/PluggableEditorFactoryReader.java
index 75dc1d7cc96..75dc1d7cc96 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/PluggableEditorFactoryReader.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/extension/diagrameditor/PluggableEditorFactoryReader.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/commands/PageLayoutStorageState.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/commands/PageLayoutStorageState.java
index 6e604a90914..6e604a90914 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/commands/PageLayoutStorageState.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/commands/PageLayoutStorageState.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/commands/SashLayoutCommandFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/commands/SashLayoutCommandFactory.java
index 61c931b1ec4..61c931b1ec4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/commands/SashLayoutCommandFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/commands/SashLayoutCommandFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/commands/TogglePageLayoutStorageHandler.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/commands/TogglePageLayoutStorageHandler.java
index 12fa47811e9..12fa47811e9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/commands/TogglePageLayoutStorageHandler.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/commands/TogglePageLayoutStorageHandler.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/EditorPreferencePage.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/EditorPreferencePage.java
index bff4950d394..bff4950d394 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/EditorPreferencePage.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/EditorPreferencePage.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/EditorPreferences.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/EditorPreferences.java
index 0b8748f6032..0b8748f6032 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/EditorPreferences.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/EditorPreferences.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/Messages.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/Messages.java
index 4fbebcf89bc..4fbebcf89bc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/Messages.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/Messages.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/YesNo.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/YesNo.java
index a9ee87d9e4f..a9ee87d9e4f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/YesNo.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/YesNo.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/messages.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/messages.properties
index a34a57ddfbe..a34a57ddfbe 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/messages.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/internal/preferences/messages.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/DoSaveEvent.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/DoSaveEvent.java
index d11eb1bc59c..51e34e85d83 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/DoSaveEvent.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/DoSaveEvent.java
@@ -1,66 +1,66 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.ui.lifecycleevents;

-

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

-

-/**

- * Event sent whith a Save or SaveAs.

- *

- * @author cedric dumoulin

- *

- */

-public class DoSaveEvent {

-

-	final protected ServicesRegistry serviceRegistry;

-

-	final protected IMultiDiagramEditor multiDiagramEditor;

-

-	final protected boolean isAutoSave;

-

-	/**

-	 * Create an Event that is sent with a Save or SaveAs. The same event can be

-	 * reused. Constructor.

-	 *

-	 * @param serviceRegistry

-	 * @param multiDiagramEditor

-	 */

-	public DoSaveEvent(ServicesRegistry serviceRegistry, IMultiDiagramEditor multiDiagramEditor) {

-		this(serviceRegistry, multiDiagramEditor, false);

-	}

-

-	/**

-	 * Create an Event that is sent with a Save or SaveAs. The same event can be

-	 * reused. Constructor.

-	 *

-	 * @param serviceRegistry

-	 * @param multiDiagramEditor

-	 * @param isAutoSave

-	 */

-	public DoSaveEvent(ServicesRegistry serviceRegistry, IMultiDiagramEditor multiDiagramEditor, boolean isAutoSave) {

-		this.serviceRegistry = serviceRegistry;

-		this.multiDiagramEditor = multiDiagramEditor;

-		this.isAutoSave = isAutoSave;

-	}

-

-	/**

-	 * @return the serviceRegistry

-	 */

-	public ServicesRegistry getServiceRegistry() {

-		return serviceRegistry;

-	}

-

-	/**

-	 * @return the multiDiagramEditor

-	 */

-	public IMultiDiagramEditor getMultiDiagramEditor() {

-		return multiDiagramEditor;

-	}

-

-	public boolean isAutoSave() {

-		return isAutoSave;

-	}

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.ui.lifecycleevents;
+
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+
+/**
+ * Event sent whith a Save or SaveAs.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class DoSaveEvent {
+
+	final protected ServicesRegistry serviceRegistry;
+
+	final protected IMultiDiagramEditor multiDiagramEditor;
+
+	final protected boolean isAutoSave;
+
+	/**
+	 * Create an Event that is sent with a Save or SaveAs. The same event can be
+	 * reused. Constructor.
+	 *
+	 * @param serviceRegistry
+	 * @param multiDiagramEditor
+	 */
+	public DoSaveEvent(ServicesRegistry serviceRegistry, IMultiDiagramEditor multiDiagramEditor) {
+		this(serviceRegistry, multiDiagramEditor, false);
+	}
+
+	/**
+	 * Create an Event that is sent with a Save or SaveAs. The same event can be
+	 * reused. Constructor.
+	 *
+	 * @param serviceRegistry
+	 * @param multiDiagramEditor
+	 * @param isAutoSave
+	 */
+	public DoSaveEvent(ServicesRegistry serviceRegistry, IMultiDiagramEditor multiDiagramEditor, boolean isAutoSave) {
+		this.serviceRegistry = serviceRegistry;
+		this.multiDiagramEditor = multiDiagramEditor;
+		this.isAutoSave = isAutoSave;
+	}
+
+	/**
+	 * @return the serviceRegistry
+	 */
+	public ServicesRegistry getServiceRegistry() {
+		return serviceRegistry;
+	}
+
+	/**
+	 * @return the multiDiagramEditor
+	 */
+	public IMultiDiagramEditor getMultiDiagramEditor() {
+		return multiDiagramEditor;
+	}
+
+	public boolean isAutoSave() {
+		return isAutoSave;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/IEditorInputChangedListener.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/IEditorInputChangedListener.java
index 575e2013934..64835143e55 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/IEditorInputChangedListener.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/IEditorInputChangedListener.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

- * Copyright (c) 2010 LIFL & CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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 (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.ui.lifecycleevents;

-

-import org.eclipse.ui.part.FileEditorInput;

-

-/**

- * Interface implemented by classes wishing to be notified of the inputChanged

- * event after a call to {@link ISaveAndDirtyService#doSaveAs()}.

- *

- * @author cedric dumoulin

- *

- */

-public interface IEditorInputChangedListener {

-

-	/**

-	 *

-	 * @param fileEditorInput

-	 *            The new value of EditorInput

-	 */

-	public void editorInputChanged(FileEditorInput fileEditorInput);

-

-	/**

-	 * Called when the value of the isDirty() flag has changed.

-	 */

-	public void isDirtyChanged();

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 LIFL & CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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 (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.ui.lifecycleevents;
+
+import org.eclipse.ui.part.FileEditorInput;
+
+/**
+ * Interface implemented by classes wishing to be notified of the inputChanged
+ * event after a call to {@link ISaveAndDirtyService#doSaveAs()}.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public interface IEditorInputChangedListener {
+
+	/**
+	 *
+	 * @param fileEditorInput
+	 *            The new value of EditorInput
+	 */
+	public void editorInputChanged(FileEditorInput fileEditorInput);
+
+	/**
+	 * Called when the value of the isDirty() flag has changed.
+	 */
+	public void isDirtyChanged();
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ILifeCycleEventsProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ILifeCycleEventsProvider.java
index cf0bbeee92e..31f2afae670 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ILifeCycleEventsProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ILifeCycleEventsProvider.java
@@ -1,57 +1,57 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.ui.lifecycleevents;

-

-/**

- * Concrete implementation of this interface allows to listen on various

- * lifecycle events. This interface is the "public" part of the {@link LifeCycleEventsProvider}.

- *

- * @author cedric dumoulin

- *

- */

-public interface ILifeCycleEventsProvider {

-

-	/**

-	 * Add specified listener.

-	 *

-	 * @param listener

-	 */

-	public void addDoSaveListener(ISaveEventListener listener);

-

-	/**

-	 * Remove specified listener.

-	 *

-	 * @param listener

-	 */

-	public void removeDoSaveListener(ISaveEventListener listener);

-

-	/**

-	 * Add specified listener.

-	 *

-	 * @param listener

-	 */

-	public void addAboutToDoSaveListener(ISaveEventListener listener);

-

-	/**

-	 * Remove specified listener.

-	 *

-	 * @param listener

-	 */

-	public void removeAboutToDoSaveListener(ISaveEventListener listener);

-

-	/**

-	 * Add specified listener.

-	 *

-	 * @param listener

-	 */

-	public void addPostDoSaveListener(ISaveEventListener listener);

-

-	/**

-	 * Remove specified listener.

-	 *

-	 * @param listener

-	 */

-	public void removePostDoSaveListener(ISaveEventListener listener);

-

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.ui.lifecycleevents;
+
+/**
+ * Concrete implementation of this interface allows to listen on various
+ * lifecycle events. This interface is the "public" part of the {@link LifeCycleEventsProvider}.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public interface ILifeCycleEventsProvider {
+
+	/**
+	 * Add specified listener.
+	 *
+	 * @param listener
+	 */
+	public void addDoSaveListener(ISaveEventListener listener);
+
+	/**
+	 * Remove specified listener.
+	 *
+	 * @param listener
+	 */
+	public void removeDoSaveListener(ISaveEventListener listener);
+
+	/**
+	 * Add specified listener.
+	 *
+	 * @param listener
+	 */
+	public void addAboutToDoSaveListener(ISaveEventListener listener);
+
+	/**
+	 * Remove specified listener.
+	 *
+	 * @param listener
+	 */
+	public void removeAboutToDoSaveListener(ISaveEventListener listener);
+
+	/**
+	 * Add specified listener.
+	 *
+	 * @param listener
+	 */
+	public void addPostDoSaveListener(ISaveEventListener listener);
+
+	/**
+	 * Remove specified listener.
+	 *
+	 * @param listener
+	 */
+	public void removePostDoSaveListener(ISaveEventListener listener);
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveAndDirtyService.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveAndDirtyService.java
index 14f6f12d0d3..a93b164ea0d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveAndDirtyService.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveAndDirtyService.java
@@ -1,56 +1,56 @@
-/*****************************************************************************

- * Copyright (c) 2010 LIFL & CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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 (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.ui.lifecycleevents;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.ui.ISaveablePart;

-

-/**

- * @author dumoulin

- *

- */

-public interface ISaveAndDirtyService extends ISaveablePart {

-

-	/**

-	 * Register a nested {@link ISaveablePart} as a listener that will be

-	 * notified each time a {@link #doSave(IProgressMonitor)} or {@link #doSaveAs()} is performed. Also, it will be asked for the

-	 * dirtyState.

-	 *

-	 * @param saveablePart

-	 */

-	public abstract void registerIsaveablePart(ISaveablePart saveablePart);

-

-	/**

-	 * Remove the specified {@link ISaveablePart} from the list of listeners.

-	 *

-	 * @param saveablePart

-	 */

-	public abstract void removeIsaveablePart(ISaveablePart saveablePart);

-

-	/**

-	 * Add a listeners on input changed event.

-	 *

-	 * @param inputChangedListener

-	 */

-	public void addInputChangedListener(IEditorInputChangedListener inputChangedListener);

-

-	/**

-	 * Remove a listeners on input changed event.

-	 *

-	 * @param inputChangedListener

-	 */

-	public void removeInputChangedListener(IEditorInputChangedListener inputChangedListener);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 LIFL & CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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 (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.ui.lifecycleevents;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.ui.ISaveablePart;
+
+/**
+ * @author dumoulin
+ *
+ */
+public interface ISaveAndDirtyService extends ISaveablePart {
+
+	/**
+	 * Register a nested {@link ISaveablePart} as a listener that will be
+	 * notified each time a {@link #doSave(IProgressMonitor)} or {@link #doSaveAs()} is performed. Also, it will be asked for the
+	 * dirtyState.
+	 *
+	 * @param saveablePart
+	 */
+	public abstract void registerIsaveablePart(ISaveablePart saveablePart);
+
+	/**
+	 * Remove the specified {@link ISaveablePart} from the list of listeners.
+	 *
+	 * @param saveablePart
+	 */
+	public abstract void removeIsaveablePart(ISaveablePart saveablePart);
+
+	/**
+	 * Add a listeners on input changed event.
+	 *
+	 * @param inputChangedListener
+	 */
+	public void addInputChangedListener(IEditorInputChangedListener inputChangedListener);
+
+	/**
+	 * Remove a listeners on input changed event.
+	 *
+	 * @param inputChangedListener
+	 */
+	public void removeInputChangedListener(IEditorInputChangedListener inputChangedListener);
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveEventListener.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveEventListener.java
index d936304bcb5..03d6aaa6a02 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveEventListener.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/ISaveEventListener.java
@@ -1,27 +1,27 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.ui.lifecycleevents;

-

-/**

- * Interface used to listen on open, save and saveAs events.

- *

- * @author cedric dumoulin

- *

- * @param <T>

- *            Type of event passed to methods.

- */

-public interface ISaveEventListener {

-

-	/**

-	 *

-	 * @param editor

-	 */

-	public void doSave(DoSaveEvent event);

-

-	/**

-	 *

-	 * @param editor

-	 */

-	public void doSaveAs(DoSaveEvent event);

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.ui.lifecycleevents;
+
+/**
+ * Interface used to listen on open, save and saveAs events.
+ *
+ * @author cedric dumoulin
+ *
+ * @param <T>
+ *            Type of event passed to methods.
+ */
+public interface ISaveEventListener {
+
+	/**
+	 *
+	 * @param editor
+	 */
+	public void doSave(DoSaveEvent event);
+
+	/**
+	 *
+	 * @param editor
+	 */
+	public void doSaveAs(DoSaveEvent event);
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProvider.java
index 7dd9dda4c92..3fb4e594271 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProvider.java
@@ -1,291 +1,291 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.ui.lifecycleevents;

-

-import java.util.ArrayList;

-import java.util.List;

-

-/**

- * This class provides events about the life cycle of a MultiEditor. Not all

- * life cycle events are available. Available events:

- * <ul>

- * <li>aboutToDoSave, aboutToDoSaveAs - SaveEventListener</li>

- * <li>doSave, doSaveAs - SaveEventListener</li>

- * <li>afterDoSave, afterDoSaveAs - SaveEventListener</li>

- * <li></li>

- * <li></li>

- * </ul>

- *

- *

- * @author cedric dumoulin

- *

- */

-public class LifeCycleEventsProvider implements ILifeCycleEventsProvider {

-

-	/**

-	 *

-	 */

-	protected SaveEventListenerLazyList preSaveListeners = new SaveEventListenerLazyList();

-

-	/**

-	 *

-	 */

-	protected SaveEventListenerLazyList saveListeners = new SaveEventListenerLazyList();

-

-	/**

-	 *

-	 */

-	protected SaveEventListenerLazyList postSaveListeners = new SaveEventListenerLazyList();

-

-	/**

-	 * Add specified listener.

-	 *

-	 * @param listener

-	 */

-	@Override

-	public void addDoSaveListener(ISaveEventListener listener) {

-

-		saveListeners.addListener(listener);

-	}

-

-	/**

-	 * Remove specified listener.

-	 *

-	 * @param listener

-	 */

-	@Override

-	public void removeDoSaveListener(ISaveEventListener listener) {

-		saveListeners.removeListener(listener);

-	}

-

-	/**

-	 * Add specified listener.

-	 *

-	 * @param listener

-	 */

-	@Override

-	public void addAboutToDoSaveListener(ISaveEventListener listener) {

-

-		preSaveListeners.addListener(listener);

-	}

-

-	/**

-	 * Remove specified listener.

-	 *

-	 * @param listener

-	 */

-	@Override

-	public void removeAboutToDoSaveListener(ISaveEventListener listener) {

-		preSaveListeners.removeListener(listener);

-	}

-

-	/**

-	 * Add specified listener.

-	 *

-	 * @param listener

-	 */

-	@Override

-	public void addPostDoSaveListener(ISaveEventListener listener) {

-

-		postSaveListeners.addListener(listener);

-	}

-

-	/**

-	 * Remove specified listener.

-	 *

-	 * @param listener

-	 */

-	@Override

-	public void removePostDoSaveListener(ISaveEventListener listener) {

-		postSaveListeners.removeListener(listener);

-	}

-

-	// ****************************************************** //

-	// Fire events methods //

-	// ****************************************************** //

-

-	/**

-	 * Fire AboutToSaveEvent to registered Listeners.

-	 *

-	 * @param editorPart

-	 */

-	public void fireAboutToDoSaveEvent(DoSaveEvent event) {

-		preSaveListeners.fireSaveEvent(event);

-	}

-

-	/**

-	 * Fire AboutToSaveAs to registered Listeners.

-	 *

-	 * @param editorPart

-	 */

-	public void fireAboutToDoSaveAsEvent(DoSaveEvent event) {

-		preSaveListeners.fireSaveAsEvent(event);

-	}

-

-	/**

-	 * Fire AboutToSaveEvent to registered Listeners.

-	 *

-	 * @param editorPart

-	 */

-	public void fireDoSaveEvent(DoSaveEvent event) {

-		saveListeners.fireSaveEvent(event);

-	}

-

-	/**

-	 * Fire AboutToSaveAs to registered Listeners.

-	 *

-	 * @param editorPart

-	 */

-	public void fireDoSaveAsEvent(DoSaveEvent event) {

-		saveListeners.fireSaveAsEvent(event);

-	}

-

-	/**

-	 * Fire AboutToSaveEvent to registered Listeners.

-	 *

-	 * @param editorPart

-	 */

-	public void firePostDoSaveEvent(DoSaveEvent event) {

-		postSaveListeners.fireSaveEvent(event);

-	}

-

-	/**

-	 * Fire AboutToSaveAs to registered Listeners.

-	 *

-	 * @param editorPart

-	 */

-	public void firePostDoSaveAsEvent(DoSaveEvent event) {

-		postSaveListeners.fireSaveAsEvent(event);

-	}

-

-	/**

-	 * Fire all Save events (about, events, post) to registered Listeners.

-	 * Exceptions from listeners are propagated and stop the event chain.

-	 *

-	 * @param editorPart

-	 */

-	public void fireAllDoSaveEvent(DoSaveEvent event) {

-		fireAboutToDoSaveEvent(event);

-		fireDoSaveEvent(event);

-		firePostDoSaveEvent(event);

-	}

-

-	/**

-	 * Fire all SaveAs events (about, events, post) to registered Listeners. If

-	 * one of the saveAs event fail, post events are not sent.

-	 *

-	 * @param editorPart

-	 */

-	public void fireAllDoSaveAsEvent(DoSaveEvent event) {

-		fireAboutToDoSaveAsEvent(event);

-		fireDoSaveAsEvent(event);

-		firePostDoSaveAsEvent(event);

-	}

-

-	/**

-	 * Base class encapsulating a lazy creation list.

-	 *

-	 * @author cedric dumoulin

-	 *

-	 * @param <T>

-	 */

-	abstract protected class AbstractEventListenersLazyList<T> {

-

-		List<T> listeners;

-

-		/**

-		 * Add specified listener.

-		 *

-		 * @param listener

-		 */

-		public void addListener(T listener) {

-			// Lazy creation

-			if (listeners == null) {

-				listeners = new ArrayList<T>();

-			}

-

-			// do not add if already present.

-			if (listeners.contains(listener)) {

-				return;

-			}

-

-			listeners.add(listener);

-		}

-

-		/**

-		 * Remove specified listener.

-		 *

-		 * @param listener

-		 */

-		public void removeListener(T listener) {

-			// Lazy creation

-			if (listeners == null) {

-				return;

-			}

-

-			listeners.remove(listener);

-		}

-

-		/**

-		 * @return the listeners

-		 */

-		protected List<T> getListeners() {

-			return listeners;

-		}

-

-		/**

-		 * Remove all listeners.

-		 */

-		protected void clear() {

-			if (listeners != null) {

-				listeners.clear();

-			}

-		}

-	}

-

-	/**

-	 * List of {@link ISaveEventListener}.

-	 *

-	 * @author cedric dumoulin

-	 *

-	 */

-	protected class SaveEventListenerLazyList extends AbstractEventListenersLazyList<ISaveEventListener> {

-

-		/**

-		 * Fire OpenEvent to registered Listeners. If a listener throw an

-		 * exception, remaining listeners are called, and then the exception is

-		 * resent.

-		 *

-		 * @param editorPart

-		 */

-		public void fireSaveEvent(DoSaveEvent event) {

-			// Lazy creation

-			if (listeners == null) {

-				return;

-			}

-

-			for (ISaveEventListener listener : listeners) {

-				listener.doSave(event);

-			}

-		}

-

-		/**

-		 * Fire OpenEvent to registered Listeners.

-		 *

-		 * @param editorPart

-		 */

-		public void fireSaveAsEvent(DoSaveEvent event) {

-			// Lazy creation

-			if (listeners == null) {

-				return;

-			}

-

-			for (ISaveEventListener listener : listeners) {

-				listener.doSaveAs(event);

-			}

-

-		}

-

-	}

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.ui.lifecycleevents;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This class provides events about the life cycle of a MultiEditor. Not all
+ * life cycle events are available. Available events:
+ * <ul>
+ * <li>aboutToDoSave, aboutToDoSaveAs - SaveEventListener</li>
+ * <li>doSave, doSaveAs - SaveEventListener</li>
+ * <li>afterDoSave, afterDoSaveAs - SaveEventListener</li>
+ * <li></li>
+ * <li></li>
+ * </ul>
+ *
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class LifeCycleEventsProvider implements ILifeCycleEventsProvider {
+
+	/**
+	 *
+	 */
+	protected SaveEventListenerLazyList preSaveListeners = new SaveEventListenerLazyList();
+
+	/**
+	 *
+	 */
+	protected SaveEventListenerLazyList saveListeners = new SaveEventListenerLazyList();
+
+	/**
+	 *
+	 */
+	protected SaveEventListenerLazyList postSaveListeners = new SaveEventListenerLazyList();
+
+	/**
+	 * Add specified listener.
+	 *
+	 * @param listener
+	 */
+	@Override
+	public void addDoSaveListener(ISaveEventListener listener) {
+
+		saveListeners.addListener(listener);
+	}
+
+	/**
+	 * Remove specified listener.
+	 *
+	 * @param listener
+	 */
+	@Override
+	public void removeDoSaveListener(ISaveEventListener listener) {
+		saveListeners.removeListener(listener);
+	}
+
+	/**
+	 * Add specified listener.
+	 *
+	 * @param listener
+	 */
+	@Override
+	public void addAboutToDoSaveListener(ISaveEventListener listener) {
+
+		preSaveListeners.addListener(listener);
+	}
+
+	/**
+	 * Remove specified listener.
+	 *
+	 * @param listener
+	 */
+	@Override
+	public void removeAboutToDoSaveListener(ISaveEventListener listener) {
+		preSaveListeners.removeListener(listener);
+	}
+
+	/**
+	 * Add specified listener.
+	 *
+	 * @param listener
+	 */
+	@Override
+	public void addPostDoSaveListener(ISaveEventListener listener) {
+
+		postSaveListeners.addListener(listener);
+	}
+
+	/**
+	 * Remove specified listener.
+	 *
+	 * @param listener
+	 */
+	@Override
+	public void removePostDoSaveListener(ISaveEventListener listener) {
+		postSaveListeners.removeListener(listener);
+	}
+
+	// ****************************************************** //
+	// Fire events methods //
+	// ****************************************************** //
+
+	/**
+	 * Fire AboutToSaveEvent to registered Listeners.
+	 *
+	 * @param editorPart
+	 */
+	public void fireAboutToDoSaveEvent(DoSaveEvent event) {
+		preSaveListeners.fireSaveEvent(event);
+	}
+
+	/**
+	 * Fire AboutToSaveAs to registered Listeners.
+	 *
+	 * @param editorPart
+	 */
+	public void fireAboutToDoSaveAsEvent(DoSaveEvent event) {
+		preSaveListeners.fireSaveAsEvent(event);
+	}
+
+	/**
+	 * Fire AboutToSaveEvent to registered Listeners.
+	 *
+	 * @param editorPart
+	 */
+	public void fireDoSaveEvent(DoSaveEvent event) {
+		saveListeners.fireSaveEvent(event);
+	}
+
+	/**
+	 * Fire AboutToSaveAs to registered Listeners.
+	 *
+	 * @param editorPart
+	 */
+	public void fireDoSaveAsEvent(DoSaveEvent event) {
+		saveListeners.fireSaveAsEvent(event);
+	}
+
+	/**
+	 * Fire AboutToSaveEvent to registered Listeners.
+	 *
+	 * @param editorPart
+	 */
+	public void firePostDoSaveEvent(DoSaveEvent event) {
+		postSaveListeners.fireSaveEvent(event);
+	}
+
+	/**
+	 * Fire AboutToSaveAs to registered Listeners.
+	 *
+	 * @param editorPart
+	 */
+	public void firePostDoSaveAsEvent(DoSaveEvent event) {
+		postSaveListeners.fireSaveAsEvent(event);
+	}
+
+	/**
+	 * Fire all Save events (about, events, post) to registered Listeners.
+	 * Exceptions from listeners are propagated and stop the event chain.
+	 *
+	 * @param editorPart
+	 */
+	public void fireAllDoSaveEvent(DoSaveEvent event) {
+		fireAboutToDoSaveEvent(event);
+		fireDoSaveEvent(event);
+		firePostDoSaveEvent(event);
+	}
+
+	/**
+	 * Fire all SaveAs events (about, events, post) to registered Listeners. If
+	 * one of the saveAs event fail, post events are not sent.
+	 *
+	 * @param editorPart
+	 */
+	public void fireAllDoSaveAsEvent(DoSaveEvent event) {
+		fireAboutToDoSaveAsEvent(event);
+		fireDoSaveAsEvent(event);
+		firePostDoSaveAsEvent(event);
+	}
+
+	/**
+	 * Base class encapsulating a lazy creation list.
+	 *
+	 * @author cedric dumoulin
+	 *
+	 * @param <T>
+	 */
+	abstract protected class AbstractEventListenersLazyList<T> {
+
+		List<T> listeners;
+
+		/**
+		 * Add specified listener.
+		 *
+		 * @param listener
+		 */
+		public void addListener(T listener) {
+			// Lazy creation
+			if (listeners == null) {
+				listeners = new ArrayList<T>();
+			}
+
+			// do not add if already present.
+			if (listeners.contains(listener)) {
+				return;
+			}
+
+			listeners.add(listener);
+		}
+
+		/**
+		 * Remove specified listener.
+		 *
+		 * @param listener
+		 */
+		public void removeListener(T listener) {
+			// Lazy creation
+			if (listeners == null) {
+				return;
+			}
+
+			listeners.remove(listener);
+		}
+
+		/**
+		 * @return the listeners
+		 */
+		protected List<T> getListeners() {
+			return listeners;
+		}
+
+		/**
+		 * Remove all listeners.
+		 */
+		protected void clear() {
+			if (listeners != null) {
+				listeners.clear();
+			}
+		}
+	}
+
+	/**
+	 * List of {@link ISaveEventListener}.
+	 *
+	 * @author cedric dumoulin
+	 *
+	 */
+	protected class SaveEventListenerLazyList extends AbstractEventListenersLazyList<ISaveEventListener> {
+
+		/**
+		 * Fire OpenEvent to registered Listeners. If a listener throw an
+		 * exception, remaining listeners are called, and then the exception is
+		 * resent.
+		 *
+		 * @param editorPart
+		 */
+		public void fireSaveEvent(DoSaveEvent event) {
+			// Lazy creation
+			if (listeners == null) {
+				return;
+			}
+
+			for (ISaveEventListener listener : listeners) {
+				listener.doSave(event);
+			}
+		}
+
+		/**
+		 * Fire OpenEvent to registered Listeners.
+		 *
+		 * @param editorPart
+		 */
+		public void fireSaveAsEvent(DoSaveEvent event) {
+			// Lazy creation
+			if (listeners == null) {
+				return;
+			}
+
+			for (ISaveEventListener listener : listeners) {
+				listener.doSaveAs(event);
+			}
+
+		}
+
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProviderServiceFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProviderServiceFactory.java
index 8bdfb550d1c..b9126079262 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProviderServiceFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/LifeCycleEventsProviderServiceFactory.java
@@ -1,79 +1,79 @@
-/*****************************************************************************

- * Copyright (c) 2010 LIFL & CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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 (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.ui.lifecycleevents;

-

-import org.eclipse.papyrus.infra.core.services.IServiceFactory;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-

-/**

- * A service factory to create the {@link ILifeCycleEventsProvider} service.

- * This provide a nickname for {@link SaveAndDirtyService} service. This

- * serviceFactory depends on {@link SaveAndDirtyService} service.

- *

- * @author cedric dumoulin

- *

- */

-public class LifeCycleEventsProviderServiceFactory implements IServiceFactory {

-

-	/**

-	 * The sashModelMangr.

-	 */

-	private SaveAndDirtyService saveAndDirtyService;

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

-	 *

-	 * @param servicesRegistry

-	 * @throws ServiceException

-	 */

-	@Override

-	public void init(ServicesRegistry servicesRegistry) throws ServiceException {

-		// Get required services

-		// This rely on the real implementation.

-		saveAndDirtyService = (SaveAndDirtyService) servicesRegistry.getService(ISaveAndDirtyService.class);

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

-	 *

-	 * @throws ServiceException

-	 */

-	@Override

-	public void startService() throws ServiceException {

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

-	 *

-	 * @throws ServiceException

-	 */

-	@Override

-	public void disposeService() throws ServiceException {

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance()

-	 *

-	 * @return

-	 * @throws ServiceException

-	 */

-	@Override

-	public Object createServiceInstance() throws ServiceException {

-		return saveAndDirtyService;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 LIFL & CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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 (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.ui.lifecycleevents;
+
+import org.eclipse.papyrus.infra.core.services.IServiceFactory;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+
+/**
+ * A service factory to create the {@link ILifeCycleEventsProvider} service.
+ * This provide a nickname for {@link SaveAndDirtyService} service. This
+ * serviceFactory depends on {@link SaveAndDirtyService} service.
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class LifeCycleEventsProviderServiceFactory implements IServiceFactory {
+
+	/**
+	 * The sashModelMangr.
+	 */
+	private SaveAndDirtyService saveAndDirtyService;
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)
+	 *
+	 * @param servicesRegistry
+	 * @throws ServiceException
+	 */
+	@Override
+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+		// Get required services
+		// This rely on the real implementation.
+		saveAndDirtyService = (SaveAndDirtyService) servicesRegistry.getService(ISaveAndDirtyService.class);
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()
+	 *
+	 * @throws ServiceException
+	 */
+	@Override
+	public void startService() throws ServiceException {
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()
+	 *
+	 * @throws ServiceException
+	 */
+	@Override
+	public void disposeService() throws ServiceException {
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.core.services.IServiceFactory#createServiceInstance()
+	 *
+	 * @return
+	 * @throws ServiceException
+	 */
+	@Override
+	public Object createServiceInstance() throws ServiceException {
+		return saveAndDirtyService;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/SaveAndDirtyService.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/SaveAndDirtyService.java
index 7e858153695..7e858153695 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/SaveAndDirtyService.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/lifecycleevents/SaveAndDirtyService.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/AbstractCommonCommandHandler.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/AbstractCommonCommandHandler.java
index deb6799a923..deb6799a923 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/AbstractCommonCommandHandler.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/AbstractCommonCommandHandler.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/AbstractEMFParametricOnSelectedElementsAction.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/AbstractEMFParametricOnSelectedElementsAction.java
index 857d4373055..001b9b50bc4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/AbstractEMFParametricOnSelectedElementsAction.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/AbstractEMFParametricOnSelectedElementsAction.java
@@ -1,61 +1,61 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.menu;

-

-import java.util.List;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.ui.menu.AbstractParametricOnSelectedElementsAction;

-

-

-public abstract class AbstractEMFParametricOnSelectedElementsAction extends AbstractParametricOnSelectedElementsAction {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parameter

-	 *            parameter for the action

-	 * @param selectedEditPart

-	 *            the selectedEditPart for the action

-	 */

-	public AbstractEMFParametricOnSelectedElementsAction(String parameter, List<EObject> selectedEditPart) {

-		super(parameter, selectedEditPart);

-	}

-

-	/**

-	 * Returns the command for this action

-	 *

-	 * @return

-	 *         the command for this action

-	 */

-	public Command getCommand() {

-		if (isEnabled()) {

-			Command cmd = getBuildedCommand();

-			if (cmd != null && cmd.canExecute()) {

-				return cmd;

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the command for this action

-	 */

-	protected abstract Command getBuildedCommand();

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.menu;
+
+import java.util.List;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.UnexecutableCommand;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.ui.menu.AbstractParametricOnSelectedElementsAction;
+
+
+public abstract class AbstractEMFParametricOnSelectedElementsAction extends AbstractParametricOnSelectedElementsAction {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parameter
+	 *            parameter for the action
+	 * @param selectedEditPart
+	 *            the selectedEditPart for the action
+	 */
+	public AbstractEMFParametricOnSelectedElementsAction(String parameter, List<EObject> selectedEditPart) {
+		super(parameter, selectedEditPart);
+	}
+
+	/**
+	 * Returns the command for this action
+	 *
+	 * @return
+	 *         the command for this action
+	 */
+	public Command getCommand() {
+		if (isEnabled()) {
+			Command cmd = getBuildedCommand();
+			if (cmd != null && cmd.canExecute()) {
+				return cmd;
+			}
+		}
+		return UnexecutableCommand.INSTANCE;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the command for this action
+	 */
+	protected abstract Command getBuildedCommand();
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/AbstractParametricOnSelectedElementsAction.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/AbstractParametricOnSelectedElementsAction.java
index 72f3fbe87b6..5aa80a0b054 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/AbstractParametricOnSelectedElementsAction.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/AbstractParametricOnSelectedElementsAction.java
@@ -1,115 +1,115 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.menu;

-

-import java.util.List;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.ui.Activator;

-import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForActionHandlers;

-

-

-public abstract class AbstractParametricOnSelectedElementsAction {

-

-	/**

-	 * parameter for the action

-	 */

-	protected String parameter;

-

-	/**

-	 * selected EditPart

-	 */

-	private List<EObject> selection;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parameter

-	 *            parameter for the action

-	 * @param selectedEditPart

-	 *            the selectedEditPart for the action

-	 */

-	public AbstractParametricOnSelectedElementsAction(String parameter, List<EObject> selectedEditPart) {

-		this.parameter = parameter;

-		this.selection = selectedEditPart;

-	}

-

-	/**

-	 * Returns the selected Editparts for this action

-	 *

-	 * @return

-	 *         {@link #selection}

-	 */

-	protected List<EObject> getSelection() {

-		return selection;

-	}

-

-	/**

-	 * Test if the command can be build

-	 *

-	 * @return

-	 *         <code>true</code> if the command can be build

-	 */

-	public boolean isEnabled() {

-		return true;

-		//return !selection.isEmpty();

-	}

-

-	/**

-	 * Gets the parameter.

-	 *

-	 * @return the parameter

-	 */

-	public String getParameter() {

-		return parameter;

-	}

-

-

-	/**

-	 * Sets the parameter.

-	 *

-	 * @param parameter

-	 *            the new parameter

-	 */

-	public void setParameter(String parameter) {

-		this.parameter = parameter;

-	}

-

-	/**

-	 * executes the action

-	 */

-	public void doRun(IProgressMonitor progressMonitor) {

-		// may be implemented by inherited class

-	};

-

-	

-	/**

-	 * Returns the {@link TransactionalEditingDomain}

-	 *

-	 * @return the {@link TransactionalEditingDomain} or <code>null</code> if it can not be found

-	 */

-	protected TransactionalEditingDomain getEditingDomain() {

-		TransactionalEditingDomain editingDomain = null;

-		try {

-			editingDomain = ServiceUtilsForActionHandlers.getInstance().getTransactionalEditingDomain();

-		} catch (ServiceException e) {

-			Activator.log.error(e);

-		}

-		return editingDomain;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.menu;
+
+import java.util.List;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.ui.Activator;
+import org.eclipse.papyrus.infra.ui.util.ServiceUtilsForActionHandlers;
+
+
+public abstract class AbstractParametricOnSelectedElementsAction {
+
+	/**
+	 * parameter for the action
+	 */
+	protected String parameter;
+
+	/**
+	 * selected EditPart
+	 */
+	private List<EObject> selection;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parameter
+	 *            parameter for the action
+	 * @param selectedEditPart
+	 *            the selectedEditPart for the action
+	 */
+	public AbstractParametricOnSelectedElementsAction(String parameter, List<EObject> selectedEditPart) {
+		this.parameter = parameter;
+		this.selection = selectedEditPart;
+	}
+
+	/**
+	 * Returns the selected Editparts for this action
+	 *
+	 * @return
+	 *         {@link #selection}
+	 */
+	protected List<EObject> getSelection() {
+		return selection;
+	}
+
+	/**
+	 * Test if the command can be build
+	 *
+	 * @return
+	 *         <code>true</code> if the command can be build
+	 */
+	public boolean isEnabled() {
+		return true;
+		//return !selection.isEmpty();
+	}
+
+	/**
+	 * Gets the parameter.
+	 *
+	 * @return the parameter
+	 */
+	public String getParameter() {
+		return parameter;
+	}
+
+
+	/**
+	 * Sets the parameter.
+	 *
+	 * @param parameter
+	 *            the new parameter
+	 */
+	public void setParameter(String parameter) {
+		this.parameter = parameter;
+	}
+
+	/**
+	 * executes the action
+	 */
+	public void doRun(IProgressMonitor progressMonitor) {
+		// may be implemented by inherited class
+	};
+
+	
+	/**
+	 * Returns the {@link TransactionalEditingDomain}
+	 *
+	 * @return the {@link TransactionalEditingDomain} or <code>null</code> if it can not be found
+	 */
+	protected TransactionalEditingDomain getEditingDomain() {
+		TransactionalEditingDomain editingDomain = null;
+		try {
+			editingDomain = ServiceUtilsForActionHandlers.getInstance().getTransactionalEditingDomain();
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+		}
+		return editingDomain;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/NameNormalization.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/NameNormalization.java
index 44d3711682d..44d3711682d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/NameNormalization.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/NameNormalization.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/NameNormalizationCommand.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/NameNormalizationCommand.java
index 563cb346a83..563cb346a83 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/NameNormalizationCommand.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/NameNormalizationCommand.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/NamePropertyTester.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/NamePropertyTester.java
index d8d10a71890..70287ddb3a3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/NamePropertyTester.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/menu/NamePropertyTester.java
@@ -1,41 +1,41 @@
-/*****************************************************************************

- * 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:

- *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.menu;

-

-import org.eclipse.core.expressions.PropertyTester;

-import org.eclipse.jface.viewers.IStructuredSelection;

-

-public abstract class NamePropertyTester extends PropertyTester {

-	/**

-	 * property associated with the parameter linked to the command in the plugin.xml

-	 */

-	public static final String PARAMETER_ID = new String("org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"); //$NON-NLS-1$

-	/**

-	 * property to test if a diagram has the required edit policy

-	 */

-	public static final String IS_NAME_CHANGEABLE = "isNameChangeable"; //$NON-NLS-1$

-

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {

-		if (IS_NAME_CHANGEABLE.equals(property) && receiver instanceof IStructuredSelection) {

-			boolean answer = isNameChangeable((IStructuredSelection) receiver);

-			return new Boolean(answer).equals(expectedValue);

-		}

-		return false;

-	}

-	

-	protected abstract boolean isNameChangeable(IStructuredSelection selection);

-}

+/*****************************************************************************
+ * 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:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.menu;
+
+import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.jface.viewers.IStructuredSelection;
+
+public abstract class NamePropertyTester extends PropertyTester {
+	/**
+	 * property associated with the parameter linked to the command in the plugin.xml
+	 */
+	public static final String PARAMETER_ID = new String("org.eclipse.papyrus.infra.ui.menu.quickformatcommandParameter"); //$NON-NLS-1$
+	/**
+	 * property to test if a diagram has the required edit policy
+	 */
+	public static final String IS_NAME_CHANGEABLE = "isNameChangeable"; //$NON-NLS-1$
+
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
+		if (IS_NAME_CHANGEABLE.equals(property) && receiver instanceof IStructuredSelection) {
+			boolean answer = isNameChangeable((IStructuredSelection) receiver);
+			return new Boolean(answer).equals(expectedValue);
+		}
+		return false;
+	}
+	
+	protected abstract boolean isNameChangeable(IStructuredSelection selection);
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/messages/Messages.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/messages/Messages.java
index 4ece10f8d24..4ece10f8d24 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/messages/Messages.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/messages/Messages.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/messages/messages.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/messages/messages.properties
index 845a45e10ab..845a45e10ab 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/messages/messages.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/messages/messages.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java
index 731fffe79dc..3af4448ed36 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java
@@ -1,72 +1,72 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor;

-

-import org.eclipse.papyrus.infra.core.editor.BackboneException;

-import org.eclipse.ui.part.EditorActionBarContributor;

-

-/**

- * Descriptor of an ActionBarContributor. This descriptor is usually loaded from

- * the Eclipse extension mechanism.

- *

- * @author Cedric Dumoulin

- * @author Patrick Tessier

- *

- */

-public class ActionBarContributorDescriptor {

-

-	protected Class<? extends EditorActionBarContributor> contextClass;

-

-	protected String contextId;

-

-	/**

-	 * Instance is created when requested.

-	 */

-	protected EditorActionBarContributor instance = null;

-

-	/**

-	 * constructor.

-	 *

-	 * @return the context descriptor

-	 * @throws BackboneException

-	 */

-	protected EditorActionBarContributor getActionBarContributor() throws BackboneException {

-		if (instance == null) {

-			instance = createActionBarContributor();

-		}

-

-		return instance;

-	}

-

-	private EditorActionBarContributor createActionBarContributor() throws BackboneException {

-		try {

-			EditorActionBarContributor context = contextClass.newInstance();

-			return context;

-

-		} catch (SecurityException e) {

-			// Lets propagate. This is an implementation problem that should be

-			// solved by programmer.

-			throw new RuntimeException(e);

-		} catch (InstantiationException e) {

-			// Lets propagate. This is an implementation problem that should be

-			// solved by programmer.

-			throw new RuntimeException(e);

-		} catch (IllegalAccessException e) {

-			// Lets propagate. This is an implementation problem that should be

-			// solved by programmer.

-			throw new RuntimeException(e);

-		}

-	}

-

-} // end class

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor;
+
+import org.eclipse.papyrus.infra.core.editor.BackboneException;
+import org.eclipse.ui.part.EditorActionBarContributor;
+
+/**
+ * Descriptor of an ActionBarContributor. This descriptor is usually loaded from
+ * the Eclipse extension mechanism.
+ *
+ * @author Cedric Dumoulin
+ * @author Patrick Tessier
+ *
+ */
+public class ActionBarContributorDescriptor {
+
+	protected Class<? extends EditorActionBarContributor> contextClass;
+
+	protected String contextId;
+
+	/**
+	 * Instance is created when requested.
+	 */
+	protected EditorActionBarContributor instance = null;
+
+	/**
+	 * constructor.
+	 *
+	 * @return the context descriptor
+	 * @throws BackboneException
+	 */
+	protected EditorActionBarContributor getActionBarContributor() throws BackboneException {
+		if (instance == null) {
+			instance = createActionBarContributor();
+		}
+
+		return instance;
+	}
+
+	private EditorActionBarContributor createActionBarContributor() throws BackboneException {
+		try {
+			EditorActionBarContributor context = contextClass.newInstance();
+			return context;
+
+		} catch (SecurityException e) {
+			// Lets propagate. This is an implementation problem that should be
+			// solved by programmer.
+			throw new RuntimeException(e);
+		} catch (InstantiationException e) {
+			// Lets propagate. This is an implementation problem that should be
+			// solved by programmer.
+			throw new RuntimeException(e);
+		} catch (IllegalAccessException e) {
+			// Lets propagate. This is an implementation problem that should be
+			// solved by programmer.
+			throw new RuntimeException(e);
+		}
+	}
+
+} // end class
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java
index fbcda9b915c..da949ab92ae 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorExtensionFactory.java
@@ -1,72 +1,72 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.papyrus.infra.core.extension.BadNameExtensionException;

-import org.eclipse.papyrus.infra.core.extension.ExtensionException;

-import org.eclipse.papyrus.infra.core.extension.ExtensionUtils;

-import org.eclipse.ui.part.EditorActionBarContributor;

-

-/**

- * A factory used to create ActionBarContributor object from Eclipse extensions

- * points elements.

- *

- * @author Cedric Dumoulin

- * @auhtor Patrick Tessier

- */

-public class ActionBarContributorExtensionFactory extends ExtensionUtils {

-

-	/** singleton eINSTANCE of this class */

-	public final static ActionBarContributorExtensionFactory eINSTANCE = new ActionBarContributorExtensionFactory();

-

-	/** constant for the editor diagram **/

-	public final static String EDITOR_ACTIONBARCONTRIBUTOR_EXTENSIONPOINT = "" + "actionBarContributor";

-

-	/** constant for the attribute factoryClass **/

-	public final static String CONTEXTCLASS_ATTRIBUTE = "implementingClass";

-

-	/** constant for the attribute contextId **/

-	public final static String ID_ATTRIBUTE = "id";

-

-	/**

-	 * @return the eINSTANCE

-	 */

-	public static ActionBarContributorExtensionFactory getInstance() {

-		return eINSTANCE;

-	}

-

-	/**

-	 * Create a ContextDescriptor instance corresponding to the

-	 * ConfigurationElement.

-	 *

-	 * @param element

-	 *            an {@link IConfigurationElement} see eclipse extension point

-	 * @return a ContextDescriptor structure that contains information to the

-	 *         diagram context

-	 * @throws BadNameExtensionException

-	 **/

-	public ActionBarContributorDescriptor createActionBarContributorDescriptor(IConfigurationElement element) throws ExtensionException {

-		ActionBarContributorDescriptor res;

-

-		checkTagName(element, EDITOR_ACTIONBARCONTRIBUTOR_EXTENSIONPOINT);

-

-		res = new ActionBarContributorDescriptor();

-		res.contextClass = (Class<EditorActionBarContributor>) parseClass(element, CONTEXTCLASS_ATTRIBUTE, EDITOR_ACTIONBARCONTRIBUTOR_EXTENSIONPOINT);

-		res.contextId = element.getAttribute(ID_ATTRIBUTE);

-

-		return res;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.papyrus.infra.core.extension.BadNameExtensionException;
+import org.eclipse.papyrus.infra.core.extension.ExtensionException;
+import org.eclipse.papyrus.infra.core.extension.ExtensionUtils;
+import org.eclipse.ui.part.EditorActionBarContributor;
+
+/**
+ * A factory used to create ActionBarContributor object from Eclipse extensions
+ * points elements.
+ *
+ * @author Cedric Dumoulin
+ * @auhtor Patrick Tessier
+ */
+public class ActionBarContributorExtensionFactory extends ExtensionUtils {
+
+	/** singleton eINSTANCE of this class */
+	public final static ActionBarContributorExtensionFactory eINSTANCE = new ActionBarContributorExtensionFactory();
+
+	/** constant for the editor diagram **/
+	public final static String EDITOR_ACTIONBARCONTRIBUTOR_EXTENSIONPOINT = "" + "actionBarContributor";
+
+	/** constant for the attribute factoryClass **/
+	public final static String CONTEXTCLASS_ATTRIBUTE = "implementingClass";
+
+	/** constant for the attribute contextId **/
+	public final static String ID_ATTRIBUTE = "id";
+
+	/**
+	 * @return the eINSTANCE
+	 */
+	public static ActionBarContributorExtensionFactory getInstance() {
+		return eINSTANCE;
+	}
+
+	/**
+	 * Create a ContextDescriptor instance corresponding to the
+	 * ConfigurationElement.
+	 *
+	 * @param element
+	 *            an {@link IConfigurationElement} see eclipse extension point
+	 * @return a ContextDescriptor structure that contains information to the
+	 *         diagram context
+	 * @throws BadNameExtensionException
+	 **/
+	public ActionBarContributorDescriptor createActionBarContributorDescriptor(IConfigurationElement element) throws ExtensionException {
+		ActionBarContributorDescriptor res;
+
+		checkTagName(element, EDITOR_ACTIONBARCONTRIBUTOR_EXTENSIONPOINT);
+
+		res = new ActionBarContributorDescriptor();
+		res.contextClass = (Class<EditorActionBarContributor>) parseClass(element, CONTEXTCLASS_ATTRIBUTE, EDITOR_ACTIONBARCONTRIBUTOR_EXTENSIONPOINT);
+		res.contextId = element.getAttribute(ID_ATTRIBUTE);
+
+		return res;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java
index 5c28baf01e9..347e1e0d5c7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java
@@ -1,176 +1,176 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor;

-

-import static org.eclipse.papyrus.infra.core.Activator.log;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.infra.core.editor.BackboneException;

-import org.eclipse.papyrus.infra.core.extension.ExtensionException;

-import org.eclipse.papyrus.infra.core.extension.NotFoundException;

-import org.eclipse.papyrus.infra.core.services.IService;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.ui.part.EditorActionBarContributor;

-

-/**

- * A factory managing ActionBarContributor creation. The factory is loaded from

- * ActionBarContributor declared in Eclipse extension mechanism.

- *

- * @author dumoulin

- *

- */

-public class ActionBarContributorRegistry implements IActionBarContributorFactory, IService {

-

-	/** ID of the editor extension (schema filename) */

-	public static final String EDITOR_EXTENSION_ID = "papyrusDiagram";

-

-	/** Namespace where to look for the extension points. */

-	protected String extensionPointNamespace;

-

-	/**

-	 * Registered context descriptors.

-	 */

-	private Map<Object, ActionBarContributorDescriptor> editorContextDescriptors;

-

-	/**

-	 * Constructor. defaultContext, input and site are explicitly required in

-	 * order be sure that they are initialized. The multiEditor should be

-	 * initialized. In particular, getEditorSite(), getEditorInput() and

-	 * getDefaultContext() should return initialized values.

-	 *

-	 * @param multiEditor

-	 *            the multieditor

-	 * @param extensionPointNamespace

-	 */

-	public ActionBarContributorRegistry(String extensionPointNamespace) {

-

-		this.extensionPointNamespace = extensionPointNamespace;

-		initializeEditorContextDescriptors();

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	@Override

-	public EditorActionBarContributor getActionBarContributor(Object key) throws BackboneException {

-		try {

-			ActionBarContributorDescriptor desc = editorContextDescriptors.get(key);

-			return desc.getActionBarContributor();

-		} catch (NullPointerException e) {

-			// no context found.

-			throw new NotFoundException("No ActionBarContributor registered under id '" + key + "'.");

-		}

-	}

-

-	/**

-	 * Get the list of descriptors.

-	 *

-	 * @return

-	 * @throws BackboneException

-	 *             If a contributor fail to be loaded.

-	 */

-	public List<EditorActionBarContributor> getActionBarContributors() throws BackboneException {

-		List<EditorActionBarContributor> res = new ArrayList<EditorActionBarContributor>();

-		for (ActionBarContributorDescriptor desc : editorContextDescriptors.values()) {

-			res.add(desc.getActionBarContributor());

-		}

-		return res;

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	public void registerActionBarContributor(String contextKey, EditorActionBarContributor contributor) {

-		ActionBarContributorDescriptor desc = new ActionBarContributorDescriptor();

-		desc.contextId = contextKey;

-		desc.instance = contributor;

-		desc.contextClass = contributor.getClass();

-

-		editorContextDescriptors.put(contextKey, desc);

-	}

-

-	/**

-	 * Read context descriptors from extension points.

-	 */

-	private void initializeEditorContextDescriptors() {

-

-		editorContextDescriptors = new HashMap<Object, ActionBarContributorDescriptor>();

-		// Reading data from plugins

-		IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(extensionPointNamespace, EDITOR_EXTENSION_ID);

-

-		ActionBarContributorExtensionFactory extensionReader = new ActionBarContributorExtensionFactory();

-

-		for (IConfigurationElement ele : configElements) {

-			ActionBarContributorDescriptor desc;

-			try {

-				if (ActionBarContributorExtensionFactory.EDITOR_ACTIONBARCONTRIBUTOR_EXTENSIONPOINT.equals(ele.getName())) {

-					desc = extensionReader.createActionBarContributorDescriptor(ele);

-					// Check double

-					if (editorContextDescriptors.get(desc.contextId) != null) {

-						// Already exists. Check if it is the same

-						ActionBarContributorDescriptor existingDesc = editorContextDescriptors.get(desc.contextId);

-						if (desc.equals(existingDesc)) {

-							log.warn("More than one ActionBarContributor is registered under the name '" + desc.contextId + "', with different parameters. Extra declaration are discarded.");

-						}

-					} else {

-						editorContextDescriptors.put(desc.contextId, desc);

-					}

-				}

-			} catch (ExtensionException e) {

-				log.error(e.getMessage(), e);

-			}

-		}

-

-		if (log.isDebugEnabled()) {

-			log.debug(this.getClass().getSimpleName() + " : contributors desc loaded  [" + editorContextDescriptors.size() + "]");

-		}

-	}

-

-	/**

-	 * Initialize the service. Do nothing here.

-	 *

-	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

-	 *

-	 * @param servicesRegistry

-	 */

-	@Override

-	public void init(ServicesRegistry servicesRegistry) {

-

-	}

-

-	/**

-	 * Do nothing in this implementation. {@inheritDoc}

-	 *

-	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

-	 */

-	@Override

-	public void startService() {

-	}

-

-	/**

-	 * Do nothing in this implementation.

-	 */

-	@Override

-	public void disposeService() {

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor;
+
+import static org.eclipse.papyrus.infra.core.Activator.log;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.papyrus.infra.core.editor.BackboneException;
+import org.eclipse.papyrus.infra.core.extension.ExtensionException;
+import org.eclipse.papyrus.infra.core.extension.NotFoundException;
+import org.eclipse.papyrus.infra.core.services.IService;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.ui.part.EditorActionBarContributor;
+
+/**
+ * A factory managing ActionBarContributor creation. The factory is loaded from
+ * ActionBarContributor declared in Eclipse extension mechanism.
+ *
+ * @author dumoulin
+ *
+ */
+public class ActionBarContributorRegistry implements IActionBarContributorFactory, IService {
+
+	/** ID of the editor extension (schema filename) */
+	public static final String EDITOR_EXTENSION_ID = "papyrusDiagram";
+
+	/** Namespace where to look for the extension points. */
+	protected String extensionPointNamespace;
+
+	/**
+	 * Registered context descriptors.
+	 */
+	private Map<Object, ActionBarContributorDescriptor> editorContextDescriptors;
+
+	/**
+	 * Constructor. defaultContext, input and site are explicitly required in
+	 * order be sure that they are initialized. The multiEditor should be
+	 * initialized. In particular, getEditorSite(), getEditorInput() and
+	 * getDefaultContext() should return initialized values.
+	 *
+	 * @param multiEditor
+	 *            the multieditor
+	 * @param extensionPointNamespace
+	 */
+	public ActionBarContributorRegistry(String extensionPointNamespace) {
+
+		this.extensionPointNamespace = extensionPointNamespace;
+		initializeEditorContextDescriptors();
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public EditorActionBarContributor getActionBarContributor(Object key) throws BackboneException {
+		try {
+			ActionBarContributorDescriptor desc = editorContextDescriptors.get(key);
+			return desc.getActionBarContributor();
+		} catch (NullPointerException e) {
+			// no context found.
+			throw new NotFoundException("No ActionBarContributor registered under id '" + key + "'.");
+		}
+	}
+
+	/**
+	 * Get the list of descriptors.
+	 *
+	 * @return
+	 * @throws BackboneException
+	 *             If a contributor fail to be loaded.
+	 */
+	public List<EditorActionBarContributor> getActionBarContributors() throws BackboneException {
+		List<EditorActionBarContributor> res = new ArrayList<EditorActionBarContributor>();
+		for (ActionBarContributorDescriptor desc : editorContextDescriptors.values()) {
+			res.add(desc.getActionBarContributor());
+		}
+		return res;
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	public void registerActionBarContributor(String contextKey, EditorActionBarContributor contributor) {
+		ActionBarContributorDescriptor desc = new ActionBarContributorDescriptor();
+		desc.contextId = contextKey;
+		desc.instance = contributor;
+		desc.contextClass = contributor.getClass();
+
+		editorContextDescriptors.put(contextKey, desc);
+	}
+
+	/**
+	 * Read context descriptors from extension points.
+	 */
+	private void initializeEditorContextDescriptors() {
+
+		editorContextDescriptors = new HashMap<Object, ActionBarContributorDescriptor>();
+		// Reading data from plugins
+		IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(extensionPointNamespace, EDITOR_EXTENSION_ID);
+
+		ActionBarContributorExtensionFactory extensionReader = new ActionBarContributorExtensionFactory();
+
+		for (IConfigurationElement ele : configElements) {
+			ActionBarContributorDescriptor desc;
+			try {
+				if (ActionBarContributorExtensionFactory.EDITOR_ACTIONBARCONTRIBUTOR_EXTENSIONPOINT.equals(ele.getName())) {
+					desc = extensionReader.createActionBarContributorDescriptor(ele);
+					// Check double
+					if (editorContextDescriptors.get(desc.contextId) != null) {
+						// Already exists. Check if it is the same
+						ActionBarContributorDescriptor existingDesc = editorContextDescriptors.get(desc.contextId);
+						if (desc.equals(existingDesc)) {
+							log.warn("More than one ActionBarContributor is registered under the name '" + desc.contextId + "', with different parameters. Extra declaration are discarded.");
+						}
+					} else {
+						editorContextDescriptors.put(desc.contextId, desc);
+					}
+				}
+			} catch (ExtensionException e) {
+				log.error(e.getMessage(), e);
+			}
+		}
+
+		if (log.isDebugEnabled()) {
+			log.debug(this.getClass().getSimpleName() + " : contributors desc loaded  [" + editorContextDescriptors.size() + "]");
+		}
+	}
+
+	/**
+	 * Initialize the service. Do nothing here.
+	 *
+	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)
+	 *
+	 * @param servicesRegistry
+	 */
+	@Override
+	public void init(ServicesRegistry servicesRegistry) {
+
+	}
+
+	/**
+	 * Do nothing in this implementation. {@inheritDoc}
+	 *
+	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()
+	 */
+	@Override
+	public void startService() {
+	}
+
+	/**
+	 * Do nothing in this implementation.
+	 */
+	@Override
+	public void disposeService() {
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java
index 0bf82998e36..2e8459fe5cf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java
@@ -1,122 +1,122 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor;

-

-import java.util.List;

-

-import org.eclipse.papyrus.infra.core.editor.BackboneException;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor.ComposedActionBarContributor;

-import org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor.IMultiPageEditorActionBarContributor;

-import org.eclipse.papyrus.infra.ui.Activator;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.part.EditorActionBarContributor;

-

-/**

- *

- * An ActionBarContributor composed of ActionBarContributor from multi editor.

- * This ActionBarContributor switch to the contributor dedicated to the active

- * editor in a MultiPageEditor environement.

- *

- * @author dumoulin

- *

- */

-public class CoreComposedActionBarContributor extends ComposedActionBarContributor implements IMultiPageEditorActionBarContributor {

-

-	/**

-	 * The registry. Used to initialize the registered actionBars.

-	 */

-	protected ActionBarContributorRegistry actionBarContributorRegistry;

-

-	protected List<EditorActionBarContributor> contributors;

-

-	/**

-	 * Constructor.

-	 *

-	 * @throws BackboneException

-	 */

-	public CoreComposedActionBarContributor() throws BackboneException {

-		// Init the contributors

-		loadContributors();

-	}

-

-	/**

-	 *

-	 * @throws BackboneException

-	 */

-	private void loadContributors() throws BackboneException {

-		actionBarContributorRegistry = new ActionBarContributorRegistry(Activator.PLUGIN_ID);

-

-		contributors = actionBarContributorRegistry.getActionBarContributors();

-	}

-

-	/**

-	 * @return the actionBarContributorRegistry

-	 */

-	public ActionBarContributorRegistry getActionBarContributorRegistry() {

-		return actionBarContributorRegistry;

-	}

-

-	/**

-	 * Dispose all nested ActionBarContributors.

-	 */

-	@Override

-	public void dispose() {

-		// Dispose nested contributors.

-		for (EditorActionBarContributor contributor : contributors) {

-			contributor.dispose();

-		}

-		super.dispose();

-	}

-

-	/**

-	 * Call the same method on each registered nested ActionBarContributors.

-	 */

-	@Override

-	public void init(IActionBars bars, IWorkbenchPage page) {

-		super.init(bars, page);

-		buildActions();

-

-		// init nested contributors.

-		for (EditorActionBarContributor contributor : contributors) {

-			contributor.init(bars, page);

-			// remove GMF GlobalSaveAction from bar, fix bug 407854 - [Editor] The save action is disabled in Papyrus

-			bars.setGlobalActionHandler("save", null); // GMF is not using IWorkbenchCommandConstants.FILE_SAVE as ID //$NON-NLS-1$

-		}

-

-	}

-

-	/**

-	 * Load default actions (undo/redo/delete)

-	 *

-	 * @see org.eclipse.gef.ui.actions.ActionBarContributor#buildActions()

-	 */

-	protected void buildActions() {

-		// getActionBars().getToolBarManager().add(new UndoRetargetAction());

-		// getActionBars().getToolBarManager().add(new RedoRetargetAction());

-	}

-

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		for (EditorActionBarContributor contributor : contributors) {

-			if (part != null) {

-				contributor.setActiveEditor(part);

-			}

-		}

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor;
+
+import java.util.List;
+
+import org.eclipse.papyrus.infra.core.editor.BackboneException;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor.ComposedActionBarContributor;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.actionbarcontributor.IMultiPageEditorActionBarContributor;
+import org.eclipse.papyrus.infra.ui.Activator;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.part.EditorActionBarContributor;
+
+/**
+ *
+ * An ActionBarContributor composed of ActionBarContributor from multi editor.
+ * This ActionBarContributor switch to the contributor dedicated to the active
+ * editor in a MultiPageEditor environement.
+ *
+ * @author dumoulin
+ *
+ */
+public class CoreComposedActionBarContributor extends ComposedActionBarContributor implements IMultiPageEditorActionBarContributor {
+
+	/**
+	 * The registry. Used to initialize the registered actionBars.
+	 */
+	protected ActionBarContributorRegistry actionBarContributorRegistry;
+
+	protected List<EditorActionBarContributor> contributors;
+
+	/**
+	 * Constructor.
+	 *
+	 * @throws BackboneException
+	 */
+	public CoreComposedActionBarContributor() throws BackboneException {
+		// Init the contributors
+		loadContributors();
+	}
+
+	/**
+	 *
+	 * @throws BackboneException
+	 */
+	private void loadContributors() throws BackboneException {
+		actionBarContributorRegistry = new ActionBarContributorRegistry(Activator.PLUGIN_ID);
+
+		contributors = actionBarContributorRegistry.getActionBarContributors();
+	}
+
+	/**
+	 * @return the actionBarContributorRegistry
+	 */
+	public ActionBarContributorRegistry getActionBarContributorRegistry() {
+		return actionBarContributorRegistry;
+	}
+
+	/**
+	 * Dispose all nested ActionBarContributors.
+	 */
+	@Override
+	public void dispose() {
+		// Dispose nested contributors.
+		for (EditorActionBarContributor contributor : contributors) {
+			contributor.dispose();
+		}
+		super.dispose();
+	}
+
+	/**
+	 * Call the same method on each registered nested ActionBarContributors.
+	 */
+	@Override
+	public void init(IActionBars bars, IWorkbenchPage page) {
+		super.init(bars, page);
+		buildActions();
+
+		// init nested contributors.
+		for (EditorActionBarContributor contributor : contributors) {
+			contributor.init(bars, page);
+			// remove GMF GlobalSaveAction from bar, fix bug 407854 - [Editor] The save action is disabled in Papyrus
+			bars.setGlobalActionHandler("save", null); // GMF is not using IWorkbenchCommandConstants.FILE_SAVE as ID //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 * Load default actions (undo/redo/delete)
+	 *
+	 * @see org.eclipse.gef.ui.actions.ActionBarContributor#buildActions()
+	 */
+	protected void buildActions() {
+		// getActionBars().getToolBarManager().add(new UndoRetargetAction());
+		// getActionBars().getToolBarManager().add(new RedoRetargetAction());
+	}
+
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		for (EditorActionBarContributor contributor : contributors) {
+			if (part != null) {
+				contributor.setActiveEditor(part);
+			}
+		}
+
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/IActionBarContributorFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/IActionBarContributorFactory.java
index d5aa13ef15a..e296d88deab 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/IActionBarContributorFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/IActionBarContributorFactory.java
@@ -1,25 +1,25 @@
-/**

- *

- */

-package org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor;

-

-import org.eclipse.papyrus.infra.core.editor.BackboneException;

-import org.eclipse.ui.part.EditorActionBarContributor;

-

-/**

- * Interface used to get an ActionBarContributor from its ID.

- *

- * @author dumoulin

- *

- */

-public interface IActionBarContributorFactory {

-

-	/**

-	 * Get an ActionBarContributor by its key. If an ActionBarContributor

-	 * already exists for this key, return it.

-	 *

-	 * @param key

-	 * @return

-	 */

-	public EditorActionBarContributor getActionBarContributor(Object key) throws BackboneException;

-}

+/**
+ *
+ */
+package org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor;
+
+import org.eclipse.papyrus.infra.core.editor.BackboneException;
+import org.eclipse.ui.part.EditorActionBarContributor;
+
+/**
+ * Interface used to get an ActionBarContributor from its ID.
+ *
+ * @author dumoulin
+ *
+ */
+public interface IActionBarContributorFactory {
+
+	/**
+	 * Get an ActionBarContributor by its key. If an ActionBarContributor
+	 * already exists for this key, return it.
+	 *
+	 * @param key
+	 * @return
+	 */
+	public EditorActionBarContributor getActionBarContributor(Object key) throws BackboneException;
+}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferencePage.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferencePage.java
new file mode 100644
index 00000000000..13426ddc474
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferencePage.java
@@ -0,0 +1,237 @@
+/****************************************************************************
+ * Copyright (c) 2008, 2016 Atos Origin, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *	 Thibault Landre (Atos Origin) - Initial API and implementation
+ *   Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.preferences;
+
+import java.util.HashSet;
+import java.util.Set;
+
+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.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.eclipse.ui.IWorkbenchPropertyPage;
+import org.eclipse.ui.preferences.ScopedPreferenceStore;
+
+/**
+ * An abstract implementation of a Preference page.
+ *
+ * This preference page allows clients to define preference page in the preference of Eclipse, and
+ * in the properties of a project in the workspace.
+ * <p>
+ * Clients must implement :
+ * <ul>
+ * <li>{@link #getBundleId()} method in order to define the preference scope (Project or Instance) of the preference page.</li>
+ * <li>{@link #createPageContents(Composite)} method to populate the preference page with the different {@link AbstractPreferenceGroup}s. </br>
+ * Each group added has to be declared through the {@link #addPreferenceGroup(AbstractPreferenceGroup)}</code> method</li>
+ * </ul>
+ * </p>
+ */
+public abstract class AbstractPapyrusPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, IWorkbenchPropertyPage, IPapyrusPreferencePage {
+
+	private IProject project;
+
+	private Set<AbstractPreferenceGroup> groupSet;
+
+	private String key;
+
+	/**
+	 * @see org.eclipse.ui.IWorkbenchPropertyPage#getElement()
+	 */
+	@Override
+	public IAdaptable getElement() {
+		return project;
+	}
+
+	protected void setPreferenceKey(String aKey) {
+		this.key = aKey;
+	}
+
+	protected String getPreferenceKey() {
+		return this.key;
+	}
+
+	/**
+	 * @see org.eclipse.ui.IWorkbenchPropertyPage#setElement(org.eclipse.core.runtime.IAdaptable)
+	 */
+	@Override
+	public void setElement(IAdaptable element) {
+		project = (IProject) element.getAdapter(IResource.class);
+	}
+
+	/**
+	 * @see org.eclipse.jface.preference.PreferencePage#doGetPreferenceStore()
+	 */
+	@Override
+	protected IPreferenceStore doGetPreferenceStore() {
+		IPreferenceStore store;
+		if (project != null) {
+			store = new ScopedPreferenceStore(new ProjectScope(project), getBundleId());
+		} else {
+			store = new ScopedPreferenceStore(InstanceScope.INSTANCE, getBundleId());
+		}
+		return store;
+	}
+
+	/**
+	 * Initializes this preference page for the given workbench.
+	 *
+	 * @param workbench
+	 *            the workbench
+	 *
+	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
+	 *
+	 */
+	@Override
+	public void init(IWorkbench workbench) {
+		// Do nothing
+	}
+
+	/**
+	 * Create the Papyrus preference page and inits the different fields editor contained in the
+	 * page.
+	 * <p>
+	 * This method shouldn't be overriden by sub-classes
+	 * </p>
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected Control createContents(Composite parent) {
+		// Create the container composite
+		Composite container = new Composite(parent, SWT.NONE);
+		GridLayout containerLayout = new GridLayout();
+		container.setLayout(containerLayout);
+
+		createPageContents(container);
+
+		initGroup();
+
+		return container;
+	}
+
+	/**
+	 * Populate the preference page with the different field editor.
+	 * <p>
+	 * Each field added has to be declared through the <code>addEditorFields(FieldEditor fe)</code> method
+	 * </p>
+	 *
+	 * @param parent
+	 *            the parent composite
+	 */
+	protected abstract void createPageContents(Composite parent);
+
+	/**
+	 * Add the given field editor to the page.
+	 */
+	protected void addPreferenceGroup(AbstractPreferenceGroup fe) {
+		if (groupSet == null) {
+			groupSet = new HashSet<>();
+		}
+		groupSet.add(fe);
+	}
+
+	@Override
+	public boolean performOk() {
+		VisiblePageSingleton.getInstance().store();
+		return super.performOk();
+	}
+
+	/**
+	 * Stores the values of the fields contained in this page into the preference store.
+	 */
+	protected void storePreferences() {
+		if (groupSet != null) {
+			for (AbstractPreferenceGroup gs : groupSet) {
+				gs.storePreferences();
+			}
+		}
+	}
+
+	/**
+	 * Store all preferences
+	 */
+	@Override
+	public void storeAllPreferences() {
+		storePreferences();
+
+	}
+
+	@Override
+	protected void performDefaults() {
+		loadDefaultPreferences();
+		super.performDefaults();
+	}
+
+	/**
+	 * Load the default preferences of the fields contained in this page
+	 */
+	private void loadDefaultPreferences() {
+		if (groupSet != null) {
+			for (AbstractPreferenceGroup gs : groupSet) {
+				gs.loadDefault();
+			}
+		}
+
+	}
+
+	/**
+	 * Init groups contained in this page.
+	 */
+	private void initGroup() {
+		if (groupSet != null) {
+			for (AbstractPreferenceGroup gs : groupSet) {
+				gs.setPreferenceStore(getPreferenceStore());
+				gs.load();
+			}
+		}
+	}
+
+	@Override
+	public void dispose() {
+		super.dispose();
+		if (groupSet != null) {
+			for (AbstractPreferenceGroup gs : groupSet) {
+				gs.dispose();
+			}
+		}
+
+
+	}
+
+	@Override
+	public void setVisible(boolean visible) {
+		if (visible == true) {
+			VisiblePageSingleton.getInstance().setVisiblePage(this);
+			initGroup();
+		}
+		super.setVisible(visible);
+
+	}
+
+	/**
+	 * The bundle ID used to defined the preference store
+	 *
+	 * @return String
+	 */
+	protected abstract String getBundleId();
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferenceStore.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferenceStore.java
index 3b529b2e091..922fd74b9c3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferenceStore.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPapyrusPreferenceStore.java
@@ -1,300 +1,300 @@
-/*****************************************************************************

- * 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.ui.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.ui.Activator;

-import org.eclipse.papyrus.infra.ui.preferences.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 = 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

-	 */

-	@Override

-	protected String internalGet(String key) {

-		String newKey = findKeyWithAValue(key);

-		// System.err.println("-->Initial Key "+key+"--> "+ newKey);

-		return Platform.getPreferencesService().get(newKey, null, getPreferenceNodes(true));

-	}

-

-	@Override

-	public boolean getDefaultBoolean(String name) {

-

-		return super.getDefaultBoolean(findKeyWithADefaultValue(name));

-	}

-

-	@Override

-	public double getDefaultDouble(String name) {

-		return super.getDefaultDouble(findKeyWithADefaultValue(name));

-	}

-

-	@Override

-	public float getDefaultFloat(String name) {

-		return super.getDefaultFloat(findKeyWithADefaultValue(name));

-	};

-

-	@Override

-	public int getDefaultInt(String name) {

-		return super.getDefaultInt(findKeyWithADefaultValue(name));

-	}

-

-	@Override

-	public long getDefaultLong(String name) {

-		return super.getDefaultLong(findKeyWithADefaultValue(name));

-	}

-

-	@Override

-	public String getDefaultString(String name) {

-		return super.getDefaultString(findKeyWithADefaultValue(name));

-	}

-}

+/*****************************************************************************
+ * 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.ui.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.ui.Activator;
+import org.eclipse.papyrus.infra.ui.preferences.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 = 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
+	 */
+	@Override
+	protected String internalGet(String key) {
+		String newKey = findKeyWithAValue(key);
+		// System.err.println("-->Initial Key "+key+"--> "+ newKey);
+		return Platform.getPreferencesService().get(newKey, null, getPreferenceNodes(true));
+	}
+
+	@Override
+	public boolean getDefaultBoolean(String name) {
+
+		return super.getDefaultBoolean(findKeyWithADefaultValue(name));
+	}
+
+	@Override
+	public double getDefaultDouble(String name) {
+		return super.getDefaultDouble(findKeyWithADefaultValue(name));
+	}
+
+	@Override
+	public float getDefaultFloat(String name) {
+		return super.getDefaultFloat(findKeyWithADefaultValue(name));
+	};
+
+	@Override
+	public int getDefaultInt(String name) {
+		return super.getDefaultInt(findKeyWithADefaultValue(name));
+	}
+
+	@Override
+	public long getDefaultLong(String name) {
+		return super.getDefaultLong(findKeyWithADefaultValue(name));
+	}
+
+	@Override
+	public String getDefaultString(String name) {
+		return super.getDefaultString(findKeyWithADefaultValue(name));
+	}
+}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPreferenceGroup.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPreferenceGroup.java
new file mode 100644
index 00000000000..b90d098e54b
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/AbstractPreferenceGroup.java
@@ -0,0 +1,161 @@
+/*****************************************************************************
+ * Copyright (c) 2009, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr
+ *  Thibault Landre (Atos Origin)
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.preferences;
+
+import java.util.HashSet;
+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.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * The Class AbstractPreferenceGroup.
+ */
+public abstract class AbstractPreferenceGroup extends Composite {
+
+	/** The key to find preference */
+	private String key;
+
+	/**
+	 * The fieldsEditor : a set that will contain all editor in the composite. It is in charge of
+	 * loading / storing / setting the preference store / loading default of all its contained field
+	 * editor
+	 */
+	private Set<FieldEditor> fieldsEditor;
+
+	/**
+	 * Gets the dialog page.
+	 *
+	 * @return the dialogPage
+	 */
+	protected DialogPage getDialogPage() {
+		return dialogPage;
+	}
+
+	/** The dialog page. */
+	protected DialogPage dialogPage;
+
+	/**
+	 * Gets the title.
+	 *
+	 * @return the title
+	 */
+	public String getKey() {
+		return key;
+	}
+
+	/**
+	 * Sets the title.
+	 *
+	 * @param title
+	 *            the title to set
+	 */
+	protected void setKey(String title) {
+		this.key = title;
+	}
+
+	/**
+	 * Instantiates a new abstract group.
+	 *
+	 * @param parent
+	 *            the parent of the composite
+	 * @param String
+	 *            the title of the page
+	 * @param dialogPage
+	 *            to set the page in field editor
+	 */
+	public AbstractPreferenceGroup(Composite parent, String key, DialogPage dialogPage) {
+		super(parent, SWT.None);
+		this.key = key;
+		this.dialogPage = dialogPage;
+		this.setLayout(new GridLayout());
+		fieldsEditor = new HashSet<FieldEditor>();
+	}
+
+	/**
+	 * Gets an encapsulated composite. This composite is used to contain a FieldEditor and to allow
+	 * developers to work with a FieldEditor like Composite element.
+	 *
+	 * @param parent
+	 *            the parent
+	 *
+	 * @return the encapsulated compo
+	 */
+	protected final Composite getEncapsulatedComposite(Composite parent) {
+		Composite compo = new Composite(parent, SWT.NONE);
+		compo.setLayout(new GridLayout());
+		return compo;
+	}
+
+	/**
+	 * Register field editor. It will add the fieldEditor to a map that will be used to
+	 * store/load/loadDefault/set the PreferenceStore of contained fieldEditor
+	 *
+	 * @param fieldEditor
+	 *            the fieldEditor to add.
+	 */
+	protected void addFieldEditor(FieldEditor fieldEditor) {
+		fieldsEditor.add(fieldEditor);
+	}
+
+	/**
+	 * Load preferences of all registered fieldEditors.
+	 *
+	 * @see org.eclipse.papyrus.infra.AbstractPreferenceGroup.preferences.ui.AbstractGroup#addFieldEditor(FieldEditor)
+	 */
+	public void load() {
+		for (FieldEditor fe : fieldsEditor) {
+			fe.load();
+		}
+	}
+
+	/**
+	 * Set the preference store of all registered fieldEditors.
+	 *
+	 * @see org.eclipse.papyrus.infra.AbstractPreferenceGroup.preferences.ui.AbstractGroup#addFieldEditor(FieldEditor)
+	 */
+	public final void setPreferenceStore(IPreferenceStore store) {
+		for (FieldEditor fe : fieldsEditor) {
+			fe.setPreferenceStore(store);
+		}
+	}
+
+	/**
+	 * Load default preferences of all registered fieldEditors.
+	 *
+	 * @see org.eclipse.papyrus.infra.AbstractPreferenceGroup.preferences.ui.AbstractGroup#addFieldEditor(FieldEditor)
+	 */
+	public final void loadDefault() {
+		for (FieldEditor fe : fieldsEditor) {
+			fe.loadDefault();
+		}
+	}
+
+	/**
+	 * Store preferences of the registered fieldEditors.
+	 *
+	 * @see org.eclipse.papyrus.infra.AbstractPreferenceGroup.preferences.ui.AbstractGroup#addFieldEditor(FieldEditor)
+	 */
+	public final void storePreferences() {
+		for (FieldEditor fe : fieldsEditor) {
+			fe.store();
+		}
+	}
+
+}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/IPapyrusPreferencePage.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/IPapyrusPreferencePage.java
new file mode 100644
index 00000000000..4a82d671fef
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/IPapyrusPreferencePage.java
@@ -0,0 +1,28 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   Christian W. Damus - bug 485220
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.ui.preferences;
+
+import org.eclipse.jface.preference.IPreferencePage;
+
+/**
+ * Specialized protocol for preference pages participating in the {@link VisiblePageSingleton}
+ * mechanism.
+ */
+public interface IPapyrusPreferencePage extends IPreferencePage {
+	/**
+	 * Requests the page to store all of its preferences in the preference store.
+	 */
+	void storeAllPreferences();
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/PapyrusScopedPreferenceStore.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/PapyrusScopedPreferenceStore.java
index f3ec34c88c1..f3ec34c88c1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/PapyrusScopedPreferenceStore.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/PapyrusScopedPreferenceStore.java
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/VisiblePageSingleton.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/VisiblePageSingleton.java
new file mode 100644
index 00000000000..7fafd1364aa
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/VisiblePageSingleton.java
@@ -0,0 +1,67 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.preferences;
+
+import org.eclipse.jface.preference.IPreferencePage;
+
+/**
+ * This singleton has bee created to manage the button ok and apply of preference page.
+ * In the case of button ok pressed, the behavior of eclipse try of apply in the first preference page found.
+ * Here each page has a specific behavior. So to store the preference, the active page is called
+ *
+ */
+public class VisiblePageSingleton {
+
+	private static VisiblePageSingleton instance;
+
+	private IPreferencePage page;
+
+	/**
+	 *
+	 * @return the instance of the {@link VisiblePageSingleton}
+	 */
+	public static VisiblePageSingleton getInstance() {
+		if (instance == null) {
+			instance = new VisiblePageSingleton();
+		}
+		return instance;
+	}
+
+	/**
+	 * set the visible page
+	 *
+	 * @param page
+	 *            a {@link IPreferencePage} --> {@link DiagramPreferencePage} or {@link AbstractPapyrusPreferencePage}
+	 */
+	public void setVisiblePage(IPreferencePage page) {
+		this.page = page;
+	}
+
+	/**
+	 *
+	 * @return the Visible Page
+	 */
+	public IPreferencePage getVisiblePage() {
+		return this.page;
+	}
+
+	/**
+	 * call the visisble page in order to store preferences
+	 */
+	public void store() {
+		if (this.page instanceof IPapyrusPreferencePage) {
+			((IPapyrusPreferencePage) (this.page)).storeAllPreferences();
+		}
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractApplyValueOnPreferenceKeyDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractApplyValueOnPreferenceKeyDialog.java
index f21f02085d6..3b4a3791000 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractApplyValueOnPreferenceKeyDialog.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractApplyValueOnPreferenceKeyDialog.java
@@ -1,71 +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.ui.preferences.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>();

-	}

-}

+/*****************************************************************************
+ * 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.ui.preferences.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.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractPreferenceKeyDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractPreferenceKeyDialog.java
index 9265a692051..14b07d5d618 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractPreferenceKeyDialog.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/preferences/dialog/AbstractPreferenceKeyDialog.java
@@ -1,105 +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.ui.preferences.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.ui.Activator;

-import org.eclipse.papyrus.infra.ui.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();

-

-}

+/*****************************************************************************
+ * 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.ui.preferences.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.ui.Activator;
+import org.eclipse.papyrus.infra.ui.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.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositePapyrusContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositePapyrusContentProvider.java
index b667228dde5..b667228dde5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositePapyrusContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositePapyrusContentProvider.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositeSemanticContentProviderFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositeSemanticContentProviderFactory.java
index 71616365e59..71616365e59 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositeSemanticContentProviderFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/CompositeSemanticContentProviderFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/DelegatingPapyrusContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/DelegatingPapyrusContentProvider.java
index de1ddcce51f..de1ddcce51f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/DelegatingPapyrusContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/DelegatingPapyrusContentProvider.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/ISemanticContentProviderFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/ISemanticContentProviderFactory.java
index 05eecf9f087..05eecf9f087 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/ISemanticContentProviderFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/providers/ISemanticContentProviderFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleEventListener.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleEventListener.java
index 7264ae39750..fb55dabd681 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleEventListener.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleEventListener.java
@@ -1,55 +1,55 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * 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

- *  Christian W. Damus - bug 469188

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.services;

-

-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

-

-/**

- * Listens to the Lifecycle of an {@link IMultiDiagramEditor}

- *

- * @author Camille Letavernier

- *

- */

-public interface EditorLifecycleEventListener {

-

-	/**

-	 * The ServicesRegistry is successfully started

-	 *

-	 * @param editor

-	 */

-	public void postInit(IMultiDiagramEditor editor);

-

-	/**

-	 * All the editors are constructed, but not yet displayed

-	 *

-	 * @param editor

-	 */

-	public default void preDisplay(IMultiDiagramEditor editor) {

-		// Pass

-	}

-

-	/**

-	 * All the editors are displayed

-	 *

-	 * @param editor

-	 */

-	public void postDisplay(IMultiDiagramEditor editor);

-

-	/**

-	 * The editor is about to be closed

-	 *

-	 * @param editor

-	 */

-	public void beforeClose(IMultiDiagramEditor editor);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * 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
+ *  Christian W. Damus - bug 469188
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.services;
+
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+
+/**
+ * Listens to the Lifecycle of an {@link IMultiDiagramEditor}
+ *
+ * @author Camille Letavernier
+ *
+ */
+public interface EditorLifecycleEventListener {
+
+	/**
+	 * The ServicesRegistry is successfully started
+	 *
+	 * @param editor
+	 */
+	public void postInit(IMultiDiagramEditor editor);
+
+	/**
+	 * All the editors are constructed, but not yet displayed
+	 *
+	 * @param editor
+	 */
+	public default void preDisplay(IMultiDiagramEditor editor) {
+		// Pass
+	}
+
+	/**
+	 * All the editors are displayed
+	 *
+	 * @param editor
+	 */
+	public void postDisplay(IMultiDiagramEditor editor);
+
+	/**
+	 * The editor is about to be closed
+	 *
+	 * @param editor
+	 */
+	public void beforeClose(IMultiDiagramEditor editor);
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleManager.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleManager.java
index 2866903aa39..d018ab385d1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleManager.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/EditorLifecycleManager.java
@@ -1,30 +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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.services;

-

-import org.eclipse.papyrus.infra.core.services.IService;

-

-/**

- * The LifecycleManager for IMultiDiagramEditor

- *

- * It notifies its listeners when the state of the editor changes

- *

- * @author Camille Letavernier

- *

- */

-public interface EditorLifecycleManager extends IService {

-

-	public void addEditorLifecycleEventsListener(EditorLifecycleEventListener listener);

-

-	public void removeEditorLifecycleEventsListener(EditorLifecycleEventListener listener);

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.ui.services;
+
+import org.eclipse.papyrus.infra.core.services.IService;
+
+/**
+ * The LifecycleManager for IMultiDiagramEditor
+ *
+ * It notifies its listeners when the state of the editor changes
+ *
+ * @author Camille Letavernier
+ *
+ */
+public interface EditorLifecycleManager extends IService {
+
+	public void addEditorLifecycleEventsListener(EditorLifecycleEventListener listener);
+
+	public void removeEditorLifecycleEventsListener(EditorLifecycleEventListener listener);
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/Messages.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/Messages.java
index 0b8d66d2056..0b8d66d2056 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/Messages.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/Messages.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/ResourceUpdateService.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/ResourceUpdateService.java
index 423727e534f..c83e251e17c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/ResourceUpdateService.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/ResourceUpdateService.java
@@ -1,292 +1,292 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2014 CEA LIST and others.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 437217

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.services;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.concurrent.ConcurrentMap;

-

-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.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.core.runtime.SubMonitor;

-import org.eclipse.core.runtime.jobs.Job;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.services.IService;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.ui.Activator;

-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

-import org.eclipse.papyrus.infra.ui.editor.IReloadableEditor;

-import org.eclipse.papyrus.infra.ui.editor.IReloadableEditor.DirtyPolicy;

-import org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent;

-import org.eclipse.papyrus.infra.ui.lifecycleevents.ILifeCycleEventsProvider;

-import org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchPartSite;

-import org.eclipse.ui.progress.IWorkbenchSiteProgressService;

-import org.eclipse.ui.progress.UIJob;

-

-import com.google.common.collect.Maps;

-

-/**

- * A Service to check workspace modifications on current resources

- *

- * @author Camille Letavernier

- *

- */

-public class ResourceUpdateService implements IService, IPartListener {

-

-	protected ServicesRegistry registry;

-

-	protected ModelSet modelSet;

-

-	static int[] handledTypes = new int[] { IResourceChangeEvent.POST_CHANGE, IResourceChangeEvent.PRE_DELETE, IResourceChangeEvent.PRE_CLOSE };

-

-	protected boolean isSaving;

-

-	protected ConcurrentMap<IMultiDiagramEditor, Job> pendingEditorCloseJobs = Maps.newConcurrentMap();

-

-	private final ISaveEventListener preSaveListener = new ISaveEventListener() {

-

-		@Override

-		public void doSaveAs(DoSaveEvent event) {

-			isSaving = true;

-		}

-

-		@Override

-		public void doSave(DoSaveEvent event) {

-			isSaving = true;

-		}

-	};

-

-	private final ISaveEventListener postSaveListener = new ISaveEventListener() {

-

-		@Override

-		public void doSaveAs(DoSaveEvent event) {

-			isSaving = false;

-		}

-

-		@Override

-		public void doSave(DoSaveEvent event) {

-			isSaving = false;

-		}

-	};

-

-	@Override

-	public void init(ServicesRegistry servicesRegistry) throws ServiceException {

-		this.registry = servicesRegistry;

-	}

-

-	@Override

-	public void startService() throws ServiceException {

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-		modelSet = registry.getService(ModelSet.class);

-		registry.getService(ILifeCycleEventsProvider.class).addAboutToDoSaveListener(preSaveListener);

-		registry.getService(ILifeCycleEventsProvider.class).addPostDoSaveListener(postSaveListener);

-	}

-

-	@Override

-	public void disposeService() throws ServiceException {

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-		modelSet = null;

-	}

-

-	protected void closeEditor() {

-		closeEditor(Collections.<Resource> emptyList(), false);

-	}

-

-	protected void closeEditor(final Collection<? extends Resource> triggeringResources, final boolean reopen) {

-		try {

-			if (!reopen) {

-				registry.remove(SaveLayoutBeforeClose.class.getName());

-			}

-

-			final IMultiDiagramEditor editor = registry.getService(IMultiDiagramEditor.class);

-			if (editor != null) {

-				final IWorkbenchPartSite site = editor.getSite();

-				UIJob closeEditorJob = new UIJob(site.getShell().getDisplay(), NLS.bind("Reload editor {0}", editor.getTitle())) {

-

-					@Override

-					public IStatus runInUIThread(IProgressMonitor monitor) {

-						// Remove the pending job

-						pendingEditorCloseJobs.remove(editor);

-

-						IStatus result = Status.OK_STATUS;

-						monitor = SubMonitor.convert(monitor, IProgressMonitor.UNKNOWN);

-

-						try {

-							IReloadableEditor.ReloadReason reason = reopen ? IReloadableEditor.ReloadReason.RESOURCES_CHANGED : IReloadableEditor.ReloadReason.RESOURCES_DELETED;

-

-							DirtyPolicy dirtyPolicy = DirtyPolicy.getDefault();

-							if (!reopen && !editor.isDirty()) {

-								// Check whether we're deleting one of our own resources. If so, just close

-								URI principalURI = modelSet.getURIWithoutExtension();

-								for (Resource next : triggeringResources) {

-									if (next.getURI().trimFileExtension().equals(principalURI)) {

-										dirtyPolicy = DirtyPolicy.DO_NOT_SAVE;

-										break;

-									}

-								}

-							}

-

-							try {

-								IReloadableEditor.Adapter.getAdapter(editor).reloadEditor(triggeringResources, reason, dirtyPolicy);

-							} catch (CoreException e) {

-								result = e.getStatus();

-							}

-						} finally {

-							monitor.done();

-						}

-

-						return result;

-					}

-				};

-

-				// We are notified usually of at least three resources (*.di, *.notation, *.uml) that are unloaded, but

-				// there's no need to close and re-open the same editor three times

-				if (pendingEditorCloseJobs.putIfAbsent(editor, closeEditorJob) == null) {

-					// Async execution to avoid lock conflicts on the Workspace (Probably owned by this thread, and not the UI thread)

-					IWorkbenchSiteProgressService progressService = site.getService(IWorkbenchSiteProgressService.class);

-					progressService.schedule(closeEditorJob);

-				}

-			}

-		} catch (ServiceException ex) {

-			// Nothing

-		}

-	}

-

-	protected void handleResourcesRemoved(Collection<Resource> emfResources) {

-		closeEditor(emfResources, false);

-	}

-

-	protected void handleResourceChanged(Collection<Resource> emfResources) {

-		closeEditor(emfResources, true);

-	}

-

-	// Copied from org.eclipse.emf.ecore.presentation.EcoreEditor

-	protected IResourceChangeListener resourceChangeListener = new IResourceChangeListener() {

-

-		@Override

-		public void resourceChanged(IResourceChangeEvent event) {

-			IResourceDelta delta = event.getDelta();

-			try {

-				class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-

-					protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-					protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-					@Override

-					public boolean visit(final IResourceDelta delta) {

-						if (delta.getResource().getType() == IResource.FILE) {

-							if (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED) {

-								URI resourceURI = URI.createPlatformResourceURI(delta.getFullPath().toString(), true);

-								Resource resource = modelSet.getResource(resourceURI, false);

-								if (resource == null) {

-									// try again, with a pluginURI, see bug 418428

-									URI pluginURI = URI.createPlatformPluginURI(delta.getFullPath().toString(), true);

-									resource = modelSet.getResource(pluginURI, false);

-								}

-								if (resource != null) {

-

-									if (delta.getKind() == IResourceDelta.REMOVED) {

-										removedResources.add(resource);

-									} else {

-										if ((delta.getFlags() & IResourceDelta.MARKERS) != 0) {

-											// Skip markers

-											// DiagnosticDecorator.DiagnosticAdapter.update(resource, markerHelper.getMarkerDiagnostics(resource, (IFile)delta.getResource()));

-										}

-										if ((delta.getFlags() & IResourceDelta.CONTENT) != 0) {

-											// if(!savedResources.remove(resource)) {

-											// changedResources.add(resource);

-											// }

-											if (!isSaving) {

-												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()) {

-					handleResourcesRemoved(visitor.getRemovedResources());

-				}

-

-				if (!visitor.getChangedResources().isEmpty()) {

-					handleResourceChanged(visitor.getChangedResources());

-				}

-			} catch (CoreException exception) {

-				Activator.log.error(exception);

-			}

-		}

-	};

-

-	@Override

-	public void partActivated(IWorkbenchPart part) {

-		// Nothing

-	}

-

-	@Override

-	public void partBroughtToTop(IWorkbenchPart part) {

-		// Nothing

-	}

-

-	@Override

-	public void partClosed(IWorkbenchPart part) {

-		// Nothing

-	}

-

-	@Override

-	public void partDeactivated(IWorkbenchPart part) {

-		// Nothing

-	}

-

-	@Override

-	public void partOpened(IWorkbenchPart part) {

-		// Nothing

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 437217
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.services;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.concurrent.ConcurrentMap;
+
+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.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.SubMonitor;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.IService;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.ui.Activator;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.ui.editor.IReloadableEditor;
+import org.eclipse.papyrus.infra.ui.editor.IReloadableEditor.DirtyPolicy;
+import org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent;
+import org.eclipse.papyrus.infra.ui.lifecycleevents.ILifeCycleEventsProvider;
+import org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveEventListener;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchPartSite;
+import org.eclipse.ui.progress.IWorkbenchSiteProgressService;
+import org.eclipse.ui.progress.UIJob;
+
+import com.google.common.collect.Maps;
+
+/**
+ * A Service to check workspace modifications on current resources
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class ResourceUpdateService implements IService, IPartListener {
+
+	protected ServicesRegistry registry;
+
+	protected ModelSet modelSet;
+
+	static int[] handledTypes = new int[] { IResourceChangeEvent.POST_CHANGE, IResourceChangeEvent.PRE_DELETE, IResourceChangeEvent.PRE_CLOSE };
+
+	protected boolean isSaving;
+
+	protected ConcurrentMap<IMultiDiagramEditor, Job> pendingEditorCloseJobs = Maps.newConcurrentMap();
+
+	private final ISaveEventListener preSaveListener = new ISaveEventListener() {
+
+		@Override
+		public void doSaveAs(DoSaveEvent event) {
+			isSaving = true;
+		}
+
+		@Override
+		public void doSave(DoSaveEvent event) {
+			isSaving = true;
+		}
+	};
+
+	private final ISaveEventListener postSaveListener = new ISaveEventListener() {
+
+		@Override
+		public void doSaveAs(DoSaveEvent event) {
+			isSaving = false;
+		}
+
+		@Override
+		public void doSave(DoSaveEvent event) {
+			isSaving = false;
+		}
+	};
+
+	@Override
+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+		this.registry = servicesRegistry;
+	}
+
+	@Override
+	public void startService() throws ServiceException {
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+		modelSet = registry.getService(ModelSet.class);
+		registry.getService(ILifeCycleEventsProvider.class).addAboutToDoSaveListener(preSaveListener);
+		registry.getService(ILifeCycleEventsProvider.class).addPostDoSaveListener(postSaveListener);
+	}
+
+	@Override
+	public void disposeService() throws ServiceException {
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+		modelSet = null;
+	}
+
+	protected void closeEditor() {
+		closeEditor(Collections.<Resource> emptyList(), false);
+	}
+
+	protected void closeEditor(final Collection<? extends Resource> triggeringResources, final boolean reopen) {
+		try {
+			if (!reopen) {
+				registry.remove(SaveLayoutBeforeClose.class.getName());
+			}
+
+			final IMultiDiagramEditor editor = registry.getService(IMultiDiagramEditor.class);
+			if (editor != null) {
+				final IWorkbenchPartSite site = editor.getSite();
+				UIJob closeEditorJob = new UIJob(site.getShell().getDisplay(), NLS.bind("Reload editor {0}", editor.getTitle())) {
+
+					@Override
+					public IStatus runInUIThread(IProgressMonitor monitor) {
+						// Remove the pending job
+						pendingEditorCloseJobs.remove(editor);
+
+						IStatus result = Status.OK_STATUS;
+						monitor = SubMonitor.convert(monitor, IProgressMonitor.UNKNOWN);
+
+						try {
+							IReloadableEditor.ReloadReason reason = reopen ? IReloadableEditor.ReloadReason.RESOURCES_CHANGED : IReloadableEditor.ReloadReason.RESOURCES_DELETED;
+
+							DirtyPolicy dirtyPolicy = DirtyPolicy.getDefault();
+							if (!reopen && !editor.isDirty()) {
+								// Check whether we're deleting one of our own resources. If so, just close
+								URI principalURI = modelSet.getURIWithoutExtension();
+								for (Resource next : triggeringResources) {
+									if (next.getURI().trimFileExtension().equals(principalURI)) {
+										dirtyPolicy = DirtyPolicy.DO_NOT_SAVE;
+										break;
+									}
+								}
+							}
+
+							try {
+								IReloadableEditor.Adapter.getAdapter(editor).reloadEditor(triggeringResources, reason, dirtyPolicy);
+							} catch (CoreException e) {
+								result = e.getStatus();
+							}
+						} finally {
+							monitor.done();
+						}
+
+						return result;
+					}
+				};
+
+				// We are notified usually of at least three resources (*.di, *.notation, *.uml) that are unloaded, but
+				// there's no need to close and re-open the same editor three times
+				if (pendingEditorCloseJobs.putIfAbsent(editor, closeEditorJob) == null) {
+					// Async execution to avoid lock conflicts on the Workspace (Probably owned by this thread, and not the UI thread)
+					IWorkbenchSiteProgressService progressService = site.getService(IWorkbenchSiteProgressService.class);
+					progressService.schedule(closeEditorJob);
+				}
+			}
+		} catch (ServiceException ex) {
+			// Nothing
+		}
+	}
+
+	protected void handleResourcesRemoved(Collection<Resource> emfResources) {
+		closeEditor(emfResources, false);
+	}
+
+	protected void handleResourceChanged(Collection<Resource> emfResources) {
+		closeEditor(emfResources, true);
+	}
+
+	// Copied from org.eclipse.emf.ecore.presentation.EcoreEditor
+	protected IResourceChangeListener resourceChangeListener = new IResourceChangeListener() {
+
+		@Override
+		public void resourceChanged(IResourceChangeEvent event) {
+			IResourceDelta delta = event.getDelta();
+			try {
+				class ResourceDeltaVisitor implements IResourceDeltaVisitor {
+
+					protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+					protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+					@Override
+					public boolean visit(final IResourceDelta delta) {
+						if (delta.getResource().getType() == IResource.FILE) {
+							if (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED) {
+								URI resourceURI = URI.createPlatformResourceURI(delta.getFullPath().toString(), true);
+								Resource resource = modelSet.getResource(resourceURI, false);
+								if (resource == null) {
+									// try again, with a pluginURI, see bug 418428
+									URI pluginURI = URI.createPlatformPluginURI(delta.getFullPath().toString(), true);
+									resource = modelSet.getResource(pluginURI, false);
+								}
+								if (resource != null) {
+
+									if (delta.getKind() == IResourceDelta.REMOVED) {
+										removedResources.add(resource);
+									} else {
+										if ((delta.getFlags() & IResourceDelta.MARKERS) != 0) {
+											// Skip markers
+											// DiagnosticDecorator.DiagnosticAdapter.update(resource, markerHelper.getMarkerDiagnostics(resource, (IFile)delta.getResource()));
+										}
+										if ((delta.getFlags() & IResourceDelta.CONTENT) != 0) {
+											// if(!savedResources.remove(resource)) {
+											// changedResources.add(resource);
+											// }
+											if (!isSaving) {
+												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()) {
+					handleResourcesRemoved(visitor.getRemovedResources());
+				}
+
+				if (!visitor.getChangedResources().isEmpty()) {
+					handleResourceChanged(visitor.getChangedResources());
+				}
+			} catch (CoreException exception) {
+				Activator.log.error(exception);
+			}
+		}
+	};
+
+	@Override
+	public void partActivated(IWorkbenchPart part) {
+		// Nothing
+	}
+
+	@Override
+	public void partBroughtToTop(IWorkbenchPart part) {
+		// Nothing
+	}
+
+	@Override
+	public void partClosed(IWorkbenchPart part) {
+		// Nothing
+	}
+
+	@Override
+	public void partDeactivated(IWorkbenchPart part) {
+		// Nothing
+	}
+
+	@Override
+	public void partOpened(IWorkbenchPart part) {
+		// Nothing
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/SaveLayoutBeforeClose.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/SaveLayoutBeforeClose.java
index 0243ca859b1..5b84eadb2cb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/SaveLayoutBeforeClose.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/SaveLayoutBeforeClose.java
@@ -1,218 +1,218 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * 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

- *  Christian W. Damus - bug 434983

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.services;

-

-import java.io.IOException;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.jface.dialogs.IDialogConstants;

-import org.eclipse.jface.dialogs.MessageDialogWithToggle;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;

-import org.eclipse.papyrus.infra.core.services.IService;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.ui.Activator;

-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

-import org.eclipse.papyrus.infra.ui.internal.commands.TogglePageLayoutStorageHandler;

-import org.eclipse.papyrus.infra.ui.internal.preferences.EditorPreferences;

-import org.eclipse.papyrus.infra.ui.internal.preferences.YesNo;

-import org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent;

-import org.eclipse.papyrus.infra.ui.lifecycleevents.ILifeCycleEventsProvider;

-import org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider;

-

-/**

- * This service automatically saves the current SashModel before closing the Papyrus editor

- *

- * This is useful, as modifications to the SashModel do not dirty the editor

- *

- * The save action is not executed if the editor is dirty when it is closed (To ensure model consistency)

- *

- * Bug 430976: [SashEditor] Editor layout is not exactly the same when reopening the model

- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=430976

- *

- * @author Camille Letavernier

- */

-public class SaveLayoutBeforeClose implements IService {

-

-	private ServicesRegistry registry;

-

-	private EditorLifecycleManager lifecycleManager;

-

-	private EditorLifecycleEventListener lifecycleListener;

-

-	@Override

-	public void init(ServicesRegistry servicesRegistry) throws ServiceException {

-		this.registry = servicesRegistry;

-	}

-

-	@Override

-	public void startService() throws ServiceException {

-		installSaveOnClose();

-	}

-

-	protected void installSaveOnClose() {

-		try {

-			lifecycleManager = registry.getService(EditorLifecycleManager.class);

-			if (lifecycleManager == null) {

-				return;

-			}

-		} catch (ServiceException ex) {

-			return;

-		}

-

-		lifecycleListener = new EditorLifecycleEventListener() {

-

-			@Override

-			public void postInit(IMultiDiagramEditor editor) {

-				// Nothing

-			}

-

-			@Override

-			public void postDisplay(IMultiDiagramEditor editor) {

-				checkSharedLayout(editor);

-			}

-

-			@Override

-			public void beforeClose(IMultiDiagramEditor editor) {

-				saveBeforeClose(editor);

-			}

-		};

-

-		lifecycleManager.addEditorLifecycleEventsListener(lifecycleListener);

-	}

-

-	public void saveBeforeClose(IMultiDiagramEditor editor) {

-		if (editor.isDirty()) {

-			return; // User explicitly quit without saving. Do nothing (And if user wants to save during exit, the sashmodel will be saved anyway)

-		}

-

-		ModelSet modelSet; // Required

-		LifeCycleEventsProvider internalLifecycleEventsProvider = null; // Optional

-

-		try {

-			modelSet = registry.getService(ModelSet.class);

-		} catch (ServiceException ex) {

-			return;

-		}

-

-		try {

-			ILifeCycleEventsProvider eventsProvider = registry.getService(ILifeCycleEventsProvider.class);

-			if (eventsProvider instanceof LifeCycleEventsProvider) {

-				internalLifecycleEventsProvider = (LifeCycleEventsProvider) eventsProvider;

-			}

-		} catch (ServiceException ex) {

-			// Ignore: the service is optional

-		}

-

-		SashModel sashModel = (SashModel) modelSet.getModel(SashModel.MODEL_ID);

-

-		try {

-			// We need to send pre- and post-save events, but we can only do that with the internal LifecycleEventsProvider

-			// The ISaveAndDirtyService can only save the whole model, but we just want to save the sash

-			DoSaveEvent event = new DoSaveEvent(registry, editor, true);

-			if (internalLifecycleEventsProvider != null) {

-				internalLifecycleEventsProvider.fireAboutToDoSaveEvent(event);

-				internalLifecycleEventsProvider.fireDoSaveEvent(event);

-			}

-			sashModel.saveModel();

-			if (internalLifecycleEventsProvider != null) {

-				internalLifecycleEventsProvider.firePostDoSaveEvent(event);

-			}

-		} catch (IOException ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	private void checkSharedLayout(IMultiDiagramEditor editor) {

-		try {

-			ModelSet modelSet = registry.getService(ModelSet.class);

-			SashModel sashModel = (SashModel) modelSet.getModel(SashModel.MODEL_ID);

-

-			if (sashModel.isLegacyMode()) {

-				// Have we ever created the private sash model file?

-				URI privateURI = sashModel.getPrivateResourceURI();

-				if (!modelSet.getURIConverter().exists(privateURI, null)) {

-					// Prompt the user

-					promptToEnablePrivateStorage(editor);

-				}

-			}

-		} catch (ServiceException ex) {

-			// Shared layout doesn't matter if there's no model-set

-		}

-	}

-

-	private void promptToEnablePrivateStorage(IMultiDiagramEditor editor) {

-		YesNo preference = EditorPreferences.getInstance().getConvertSharedPageLayoutToPrivate();

-

-		if (preference == YesNo.PROMPT) {

-			MessageDialogWithToggle dlg = MessageDialogWithToggle.openYesNoCancelQuestion(editor.getSite().getShell(),

-					Messages.SaveLayoutBeforeClose_0,

-					Messages.SaveLayoutBeforeClose_1,

-					Messages.SaveLayoutBeforeClose_2, false, null, null);

-

-			switch (dlg.getReturnCode()) {

-			case IDialogConstants.YES_ID:

-				preference = YesNo.YES;

-				break;

-			case IDialogConstants.NO_ID:

-				preference = YesNo.NO;

-				break;

-			default:

-				// User cancelled

-				preference = YesNo.PROMPT;

-				break;

-			}

-

-			if (dlg.getToggleState()) {

-				EditorPreferences.getInstance().setConvertSharedPageLayoutToPrivate(preference);

-			}

-		}

-

-		switch (preference) {

-		case YES:

-			// Change the storage to private

-			new TogglePageLayoutStorageHandler().togglePrivatePageLayout(editor);

-

-			// And save the new layout scheme

-			saveBeforeClose(editor);

-			break;

-		case NO:

-			// Just create the empty resource and save it

-			try {

-				ModelSet modelSet = editor.getServicesRegistry().getService(ModelSet.class);

-				SashModel sashModel = (SashModel) modelSet.getModel(SashModel.MODEL_ID);

-				modelSet.createResource(sashModel.getPrivateResourceURI());

-				saveBeforeClose(editor);

-			} catch (ServiceException e) {

-				// Without a model-set, much else is going wrong, so there's no need to deal

-				// with this here

-			}

-			break;

-		default:

-			// User cancelled

-			break;

-		}

-	}

-

-	@Override

-	public void disposeService() throws ServiceException {

-		registry = null;

-		if (lifecycleManager != null) {

-			lifecycleManager.removeEditorLifecycleEventsListener(lifecycleListener);

-			lifecycleListener = null;

-			lifecycleManager = null;

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * 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
+ *  Christian W. Damus - bug 434983
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.services;
+
+import java.io.IOException;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialogWithToggle;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;
+import org.eclipse.papyrus.infra.core.services.IService;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.ui.Activator;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.ui.internal.commands.TogglePageLayoutStorageHandler;
+import org.eclipse.papyrus.infra.ui.internal.preferences.EditorPreferences;
+import org.eclipse.papyrus.infra.ui.internal.preferences.YesNo;
+import org.eclipse.papyrus.infra.ui.lifecycleevents.DoSaveEvent;
+import org.eclipse.papyrus.infra.ui.lifecycleevents.ILifeCycleEventsProvider;
+import org.eclipse.papyrus.infra.ui.lifecycleevents.LifeCycleEventsProvider;
+
+/**
+ * This service automatically saves the current SashModel before closing the Papyrus editor
+ *
+ * This is useful, as modifications to the SashModel do not dirty the editor
+ *
+ * The save action is not executed if the editor is dirty when it is closed (To ensure model consistency)
+ *
+ * Bug 430976: [SashEditor] Editor layout is not exactly the same when reopening the model
+ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=430976
+ *
+ * @author Camille Letavernier
+ */
+public class SaveLayoutBeforeClose implements IService {
+
+	private ServicesRegistry registry;
+
+	private EditorLifecycleManager lifecycleManager;
+
+	private EditorLifecycleEventListener lifecycleListener;
+
+	@Override
+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+		this.registry = servicesRegistry;
+	}
+
+	@Override
+	public void startService() throws ServiceException {
+		installSaveOnClose();
+	}
+
+	protected void installSaveOnClose() {
+		try {
+			lifecycleManager = registry.getService(EditorLifecycleManager.class);
+			if (lifecycleManager == null) {
+				return;
+			}
+		} catch (ServiceException ex) {
+			return;
+		}
+
+		lifecycleListener = new EditorLifecycleEventListener() {
+
+			@Override
+			public void postInit(IMultiDiagramEditor editor) {
+				// Nothing
+			}
+
+			@Override
+			public void postDisplay(IMultiDiagramEditor editor) {
+				checkSharedLayout(editor);
+			}
+
+			@Override
+			public void beforeClose(IMultiDiagramEditor editor) {
+				saveBeforeClose(editor);
+			}
+		};
+
+		lifecycleManager.addEditorLifecycleEventsListener(lifecycleListener);
+	}
+
+	public void saveBeforeClose(IMultiDiagramEditor editor) {
+		if (editor.isDirty()) {
+			return; // User explicitly quit without saving. Do nothing (And if user wants to save during exit, the sashmodel will be saved anyway)
+		}
+
+		ModelSet modelSet; // Required
+		LifeCycleEventsProvider internalLifecycleEventsProvider = null; // Optional
+
+		try {
+			modelSet = registry.getService(ModelSet.class);
+		} catch (ServiceException ex) {
+			return;
+		}
+
+		try {
+			ILifeCycleEventsProvider eventsProvider = registry.getService(ILifeCycleEventsProvider.class);
+			if (eventsProvider instanceof LifeCycleEventsProvider) {
+				internalLifecycleEventsProvider = (LifeCycleEventsProvider) eventsProvider;
+			}
+		} catch (ServiceException ex) {
+			// Ignore: the service is optional
+		}
+
+		SashModel sashModel = (SashModel) modelSet.getModel(SashModel.MODEL_ID);
+
+		try {
+			// We need to send pre- and post-save events, but we can only do that with the internal LifecycleEventsProvider
+			// The ISaveAndDirtyService can only save the whole model, but we just want to save the sash
+			DoSaveEvent event = new DoSaveEvent(registry, editor, true);
+			if (internalLifecycleEventsProvider != null) {
+				internalLifecycleEventsProvider.fireAboutToDoSaveEvent(event);
+				internalLifecycleEventsProvider.fireDoSaveEvent(event);
+			}
+			sashModel.saveModel();
+			if (internalLifecycleEventsProvider != null) {
+				internalLifecycleEventsProvider.firePostDoSaveEvent(event);
+			}
+		} catch (IOException ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	private void checkSharedLayout(IMultiDiagramEditor editor) {
+		try {
+			ModelSet modelSet = registry.getService(ModelSet.class);
+			SashModel sashModel = (SashModel) modelSet.getModel(SashModel.MODEL_ID);
+
+			if (sashModel.isLegacyMode()) {
+				// Have we ever created the private sash model file?
+				URI privateURI = sashModel.getPrivateResourceURI();
+				if (!modelSet.getURIConverter().exists(privateURI, null)) {
+					// Prompt the user
+					promptToEnablePrivateStorage(editor);
+				}
+			}
+		} catch (ServiceException ex) {
+			// Shared layout doesn't matter if there's no model-set
+		}
+	}
+
+	private void promptToEnablePrivateStorage(IMultiDiagramEditor editor) {
+		YesNo preference = EditorPreferences.getInstance().getConvertSharedPageLayoutToPrivate();
+
+		if (preference == YesNo.PROMPT) {
+			MessageDialogWithToggle dlg = MessageDialogWithToggle.openYesNoCancelQuestion(editor.getSite().getShell(),
+					Messages.SaveLayoutBeforeClose_0,
+					Messages.SaveLayoutBeforeClose_1,
+					Messages.SaveLayoutBeforeClose_2, false, null, null);
+
+			switch (dlg.getReturnCode()) {
+			case IDialogConstants.YES_ID:
+				preference = YesNo.YES;
+				break;
+			case IDialogConstants.NO_ID:
+				preference = YesNo.NO;
+				break;
+			default:
+				// User cancelled
+				preference = YesNo.PROMPT;
+				break;
+			}
+
+			if (dlg.getToggleState()) {
+				EditorPreferences.getInstance().setConvertSharedPageLayoutToPrivate(preference);
+			}
+		}
+
+		switch (preference) {
+		case YES:
+			// Change the storage to private
+			new TogglePageLayoutStorageHandler().togglePrivatePageLayout(editor);
+
+			// And save the new layout scheme
+			saveBeforeClose(editor);
+			break;
+		case NO:
+			// Just create the empty resource and save it
+			try {
+				ModelSet modelSet = editor.getServicesRegistry().getService(ModelSet.class);
+				SashModel sashModel = (SashModel) modelSet.getModel(SashModel.MODEL_ID);
+				modelSet.createResource(sashModel.getPrivateResourceURI());
+				saveBeforeClose(editor);
+			} catch (ServiceException e) {
+				// Without a model-set, much else is going wrong, so there's no need to deal
+				// with this here
+			}
+			break;
+		default:
+			// User cancelled
+			break;
+		}
+	}
+
+	@Override
+	public void disposeService() throws ServiceException {
+		registry = null;
+		if (lifecycleManager != null) {
+			lifecycleManager.removeEditorLifecycleEventsListener(lifecycleListener);
+			lifecycleListener = null;
+			lifecycleManager = null;
+		}
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/internal/EditorLifecycleManagerImpl.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/internal/EditorLifecycleManagerImpl.java
index b37b131962a..99a102093f5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/internal/EditorLifecycleManagerImpl.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/internal/EditorLifecycleManagerImpl.java
@@ -1,128 +1,128 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * 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

- *  Christian W. Damus - bug 469188

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.services.internal;

-

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.core.runtime.ISafeRunnable;

-import org.eclipse.core.runtime.SafeRunner;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

-import org.eclipse.papyrus.infra.ui.services.EditorLifecycleEventListener;

-import org.eclipse.papyrus.infra.ui.services.EditorLifecycleManager;

-

-

-public class EditorLifecycleManagerImpl implements EditorLifecycleManager, InternalEditorLifecycleManager {

-

-	private final Set<EditorLifecycleEventListener> listeners = new HashSet<EditorLifecycleEventListener>();

-

-	@Override

-	public void init(ServicesRegistry servicesRegistry) throws ServiceException {

-		// Nothing

-	}

-

-	@Override

-	public void startService() throws ServiceException {

-		// Nothing

-	}

-

-	@Override

-	public void disposeService() throws ServiceException {

-		listeners.clear();

-	}

-

-	@Override

-	public void addEditorLifecycleEventsListener(EditorLifecycleEventListener listener) {

-		listeners.add(listener);

-	}

-

-	@Override

-	public void removeEditorLifecycleEventsListener(EditorLifecycleEventListener listener) {

-		listeners.remove(listener);

-	}

-

-	@Override

-	public void firePostInit(final IMultiDiagramEditor editor) {

-		for (final EditorLifecycleEventListener listener : listeners) {

-			SafeRunner.run(new ISafeRunnable() {

-

-				@Override

-				public void run() throws Exception {

-					listener.postInit(editor);

-				}

-

-				@Override

-				public void handleException(Throwable exception) {

-					// Already logged by the SafeRunner

-				}

-			});

-		}

-	}

-

-	@Override

-	public void firePreDisplay(final IMultiDiagramEditor editor) {

-		for (final EditorLifecycleEventListener listener : listeners) {

-			SafeRunner.run(new ISafeRunnable() {

-

-				@Override

-				public void run() throws Exception {

-					listener.preDisplay(editor);

-				}

-

-				@Override

-				public void handleException(Throwable exception) {

-					// Already logged by the SafeRunner

-				}

-			});

-		}

-	}

-

-	@Override

-	public void firePostDisplay(final IMultiDiagramEditor editor) {

-		for (final EditorLifecycleEventListener listener : listeners) {

-			SafeRunner.run(new ISafeRunnable() {

-

-				@Override

-				public void run() throws Exception {

-					listener.postDisplay(editor);

-				}

-

-				@Override

-				public void handleException(Throwable exception) {

-					// Already logged by the SafeRunner

-				}

-			});

-		}

-	}

-

-	@Override

-	public void fireBeforeClose(final IMultiDiagramEditor editor) {

-		for (final EditorLifecycleEventListener listener : listeners) {

-			SafeRunner.run(new ISafeRunnable() {

-

-				@Override

-				public void run() throws Exception {

-					listener.beforeClose(editor);

-				}

-

-				@Override

-				public void handleException(Throwable exception) {

-					// Already logged by the SafeRunner

-				}

-			});

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * 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
+ *  Christian W. Damus - bug 469188
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.services.internal;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.core.runtime.ISafeRunnable;
+import org.eclipse.core.runtime.SafeRunner;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.ui.services.EditorLifecycleEventListener;
+import org.eclipse.papyrus.infra.ui.services.EditorLifecycleManager;
+
+
+public class EditorLifecycleManagerImpl implements EditorLifecycleManager, InternalEditorLifecycleManager {
+
+	private final Set<EditorLifecycleEventListener> listeners = new HashSet<EditorLifecycleEventListener>();
+
+	@Override
+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
+		// Nothing
+	}
+
+	@Override
+	public void startService() throws ServiceException {
+		// Nothing
+	}
+
+	@Override
+	public void disposeService() throws ServiceException {
+		listeners.clear();
+	}
+
+	@Override
+	public void addEditorLifecycleEventsListener(EditorLifecycleEventListener listener) {
+		listeners.add(listener);
+	}
+
+	@Override
+	public void removeEditorLifecycleEventsListener(EditorLifecycleEventListener listener) {
+		listeners.remove(listener);
+	}
+
+	@Override
+	public void firePostInit(final IMultiDiagramEditor editor) {
+		for (final EditorLifecycleEventListener listener : listeners) {
+			SafeRunner.run(new ISafeRunnable() {
+
+				@Override
+				public void run() throws Exception {
+					listener.postInit(editor);
+				}
+
+				@Override
+				public void handleException(Throwable exception) {
+					// Already logged by the SafeRunner
+				}
+			});
+		}
+	}
+
+	@Override
+	public void firePreDisplay(final IMultiDiagramEditor editor) {
+		for (final EditorLifecycleEventListener listener : listeners) {
+			SafeRunner.run(new ISafeRunnable() {
+
+				@Override
+				public void run() throws Exception {
+					listener.preDisplay(editor);
+				}
+
+				@Override
+				public void handleException(Throwable exception) {
+					// Already logged by the SafeRunner
+				}
+			});
+		}
+	}
+
+	@Override
+	public void firePostDisplay(final IMultiDiagramEditor editor) {
+		for (final EditorLifecycleEventListener listener : listeners) {
+			SafeRunner.run(new ISafeRunnable() {
+
+				@Override
+				public void run() throws Exception {
+					listener.postDisplay(editor);
+				}
+
+				@Override
+				public void handleException(Throwable exception) {
+					// Already logged by the SafeRunner
+				}
+			});
+		}
+	}
+
+	@Override
+	public void fireBeforeClose(final IMultiDiagramEditor editor) {
+		for (final EditorLifecycleEventListener listener : listeners) {
+			SafeRunner.run(new ISafeRunnable() {
+
+				@Override
+				public void run() throws Exception {
+					listener.beforeClose(editor);
+				}
+
+				@Override
+				public void handleException(Throwable exception) {
+					// Already logged by the SafeRunner
+				}
+			});
+		}
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/internal/InternalEditorLifecycleManager.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/internal/InternalEditorLifecycleManager.java
index 301557028d9..97420afd721 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/internal/InternalEditorLifecycleManager.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/internal/InternalEditorLifecycleManager.java
@@ -1,48 +1,48 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * 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

- *  Christian W. Damus - bug 469188

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.services.internal;

-

-import org.eclipse.papyrus.infra.core.services.IService;

-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

-

-

-public interface InternalEditorLifecycleManager extends IService {

-

-	/**

-	 * Sends the postInit notification for this editor

-	 *

-	 * @param editor

-	 */

-	void firePostInit(IMultiDiagramEditor editor);

-

-	/**

-	 * Sets the preDisplay notification for this editor

-	 * 

-	 * @param editor

-	 */

-	void firePreDisplay(IMultiDiagramEditor editor);

-

-	/**

-	 * Sends the postDisplay notification for this editor

-	 *

-	 * @param editor

-	 */

-	void firePostDisplay(IMultiDiagramEditor editor);

-

-	/**

-	 * Sends the beforeClose notification for this Editor

-	 *

-	 * @param editor

-	 */

-	void fireBeforeClose(IMultiDiagramEditor editor);

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * 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
+ *  Christian W. Damus - bug 469188
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.services.internal;
+
+import org.eclipse.papyrus.infra.core.services.IService;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+
+
+public interface InternalEditorLifecycleManager extends IService {
+
+	/**
+	 * Sends the postInit notification for this editor
+	 *
+	 * @param editor
+	 */
+	void firePostInit(IMultiDiagramEditor editor);
+
+	/**
+	 * Sets the preDisplay notification for this editor
+	 * 
+	 * @param editor
+	 */
+	void firePreDisplay(IMultiDiagramEditor editor);
+
+	/**
+	 * Sends the postDisplay notification for this editor
+	 *
+	 * @param editor
+	 */
+	void firePostDisplay(IMultiDiagramEditor editor);
+
+	/**
+	 * Sends the beforeClose notification for this Editor
+	 *
+	 * @param editor
+	 */
+	void fireBeforeClose(IMultiDiagramEditor editor);
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/messages.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/messages.properties
index a6f77150932..a6f77150932 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/messages.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/services/messages.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/AbstractCreateMenuFromCommandCategory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/AbstractCreateMenuFromCommandCategory.java
index 82ef8983d95..c392791147e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/AbstractCreateMenuFromCommandCategory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/AbstractCreateMenuFromCommandCategory.java
@@ -1,135 +1,135 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.ui.util;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.List;

-import java.util.Set;

-import java.util.TreeSet;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.commands.Category;

-import org.eclipse.core.commands.Command;

-import org.eclipse.core.commands.IHandler;

-import org.eclipse.core.commands.common.NotDefinedException;

-import org.eclipse.core.expressions.EvaluationResult;

-import org.eclipse.core.expressions.Expression;

-import org.eclipse.core.expressions.IEvaluationContext;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.papyrus.infra.ui.Activator;

-import org.eclipse.swt.SWT;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.commands.ICommandService;

-import org.eclipse.ui.menus.CommandContributionItem;

-import org.eclipse.ui.menus.CommandContributionItemParameter;

-import org.eclipse.ui.menus.ExtensionContributionFactory;

-import org.eclipse.ui.menus.IContributionRoot;

-import org.eclipse.ui.services.IServiceLocator;

-

-/**

- * Abstract Class to create menu from an Eclipse Command category

- *

- * @author VL222926

- *

- */

-public abstract class AbstractCreateMenuFromCommandCategory extends ExtensionContributionFactory {

-

-	/** the category of the command contributing to this menu */

-	protected final String commandCateogyId;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param commandCategoryId

-	 *            the category of the command contributing to this menu

-	 */

-	public AbstractCreateMenuFromCommandCategory(final String commandCategoryId) {

-		this.commandCateogyId = commandCategoryId;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.ui.menus.AbstractContributionFactory#createContributionItems(org.eclipse.ui.services.IServiceLocator, org.eclipse.ui.menus.IContributionRoot)

-	 *

-	 * @param serviceLocator

-	 * @param additions

-	 */

-	@Override

-	public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {

-		// test to know if we can create elements if it is possible...

-		Expression visibleWhen = new Expression() {

-

-			@Override

-			public EvaluationResult evaluate(IEvaluationContext context) throws CoreException {

-				return EvaluationResult.TRUE;

-			}

-		};

-		for (final CommandContributionItem item : addCreationItems(serviceLocator, additions, null)) {

-			additions.addContributionItem(item, visibleWhen);

-		}

-	}

-

-	/**

-	 *

-	 * @param serviceLocator

-	 * @param additions

-	 * @param parent

-	 * @return

-	 */

-	protected List<CommandContributionItem> addCreationItems(final IServiceLocator serviceLocator, final IContributionRoot additions, IContributionManager parent) {

-		final ICommandService commandService = PlatformUI.getWorkbench().getService(ICommandService.class);

-		final List<CommandContributionItem> items = new ArrayList<CommandContributionItem>();

-		final Category category = commandService.getCategory(this.commandCateogyId);

-		final Set<Command> commands = new TreeSet<Command>();

-		commands.addAll(Arrays.asList(commandService.getDefinedCommands()));

-		for (Command command : commands) {

-			Category currentCategory = null;

-			try {

-				currentCategory = command.getCategory();

-			} catch (NotDefinedException e) {

-				Activator.log.debug(e.getLocalizedMessage());

-				continue;

-			}

-			if (command.isDefined() && category.equals(currentCategory)) {

-				final IHandler handler = command.getHandler();

-				if (handler instanceof AbstractHandler) {

-

-					// required!?!?! in some case can avoid the message for handler conflicting (ex : Allocate in SysML NatTable Allocation

-					((AbstractHandler) handler).setEnabled(null);

-					boolean isEnabled = handler.isEnabled();

-					command.setEnabled(null);

-					((AbstractHandler) handler).setEnabled(null);

-

-					isEnabled = handler.isEnabled();

-					try {

-						if (isEnabled) {

-							CommandContributionItemParameter p = new CommandContributionItemParameter(serviceLocator, "", command.getId(), SWT.PUSH); //$NON-NLS-1$

-							p.label = command.getDescription();

-							p.icon = EclipseCommandUtils.getCommandIcon(command);

-							CommandContributionItem item = new CommandContributionItem(p);

-							items.add(item);

-						}

-					} catch (NotDefinedException e) {

-						Activator.log.debug(e.getLocalizedMessage());

-					}

-				}

-			}

-		}

-		return items;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.ui.util;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.Category;
+import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.common.NotDefinedException;
+import org.eclipse.core.expressions.EvaluationResult;
+import org.eclipse.core.expressions.Expression;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.papyrus.infra.ui.Activator;
+import org.eclipse.swt.SWT;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.ICommandService;
+import org.eclipse.ui.menus.CommandContributionItem;
+import org.eclipse.ui.menus.CommandContributionItemParameter;
+import org.eclipse.ui.menus.ExtensionContributionFactory;
+import org.eclipse.ui.menus.IContributionRoot;
+import org.eclipse.ui.services.IServiceLocator;
+
+/**
+ * Abstract Class to create menu from an Eclipse Command category
+ *
+ * @author VL222926
+ *
+ */
+public abstract class AbstractCreateMenuFromCommandCategory extends ExtensionContributionFactory {
+
+	/** the category of the command contributing to this menu */
+	protected final String commandCateogyId;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param commandCategoryId
+	 *            the category of the command contributing to this menu
+	 */
+	public AbstractCreateMenuFromCommandCategory(final String commandCategoryId) {
+		this.commandCateogyId = commandCategoryId;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.ui.menus.AbstractContributionFactory#createContributionItems(org.eclipse.ui.services.IServiceLocator, org.eclipse.ui.menus.IContributionRoot)
+	 *
+	 * @param serviceLocator
+	 * @param additions
+	 */
+	@Override
+	public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {
+		// test to know if we can create elements if it is possible...
+		Expression visibleWhen = new Expression() {
+
+			@Override
+			public EvaluationResult evaluate(IEvaluationContext context) throws CoreException {
+				return EvaluationResult.TRUE;
+			}
+		};
+		for (final CommandContributionItem item : addCreationItems(serviceLocator, additions, null)) {
+			additions.addContributionItem(item, visibleWhen);
+		}
+	}
+
+	/**
+	 *
+	 * @param serviceLocator
+	 * @param additions
+	 * @param parent
+	 * @return
+	 */
+	protected List<CommandContributionItem> addCreationItems(final IServiceLocator serviceLocator, final IContributionRoot additions, IContributionManager parent) {
+		final ICommandService commandService = PlatformUI.getWorkbench().getService(ICommandService.class);
+		final List<CommandContributionItem> items = new ArrayList<CommandContributionItem>();
+		final Category category = commandService.getCategory(this.commandCateogyId);
+		final Set<Command> commands = new TreeSet<Command>();
+		commands.addAll(Arrays.asList(commandService.getDefinedCommands()));
+		for (Command command : commands) {
+			Category currentCategory = null;
+			try {
+				currentCategory = command.getCategory();
+			} catch (NotDefinedException e) {
+				Activator.log.debug(e.getLocalizedMessage());
+				continue;
+			}
+			if (command.isDefined() && category.equals(currentCategory)) {
+				final IHandler handler = command.getHandler();
+				if (handler instanceof AbstractHandler) {
+
+					// required!?!?! in some case can avoid the message for handler conflicting (ex : Allocate in SysML NatTable Allocation
+					((AbstractHandler) handler).setEnabled(null);
+					boolean isEnabled = handler.isEnabled();
+					command.setEnabled(null);
+					((AbstractHandler) handler).setEnabled(null);
+
+					isEnabled = handler.isEnabled();
+					try {
+						if (isEnabled) {
+							CommandContributionItemParameter p = new CommandContributionItemParameter(serviceLocator, "", command.getId(), SWT.PUSH); //$NON-NLS-1$
+							p.label = command.getDescription();
+							p.icon = EclipseCommandUtils.getCommandIcon(command);
+							CommandContributionItem item = new CommandContributionItem(p);
+							items.add(item);
+						}
+					} catch (NotDefinedException e) {
+						Activator.log.debug(e.getLocalizedMessage());
+					}
+				}
+			}
+		}
+		return items;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/DisplayUtils.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/DisplayUtils.java
index 0781c1d0ce7..27bc70bb5bc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/DisplayUtils.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/DisplayUtils.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * 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:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.util;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.ui.Activator;

-

-

-/**

- * Util class for display in Papyrus (label providers, etc...)

- *

- * @deprecated Use the LabelProviderService instead

- */

-@Deprecated

-public class DisplayUtils {

-

-	/**

-	 * Gets the shared label provider.

-	 *

-	 * @return Get the current {@link ILabelProvider} or <code>null</code> if

-	 *         not found

-	 */

-	public static ILabelProvider getLabelProvider() {

-		try {

-			ServicesRegistry registry = EditorUtils.getServiceRegistry();

-			return registry == null ? null : registry.getService(ILabelProvider.class);

-		} catch (IllegalStateException e) {

-			// Registry can't be found, do nothing.

-			Activator.log.error(e);

-		} catch (ServiceException e) {

-			Activator.log.error(e);

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.util;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.ui.Activator;
+
+
+/**
+ * Util class for display in Papyrus (label providers, etc...)
+ *
+ * @deprecated Use the LabelProviderService instead
+ */
+@Deprecated
+public class DisplayUtils {
+
+	/**
+	 * Gets the shared label provider.
+	 *
+	 * @return Get the current {@link ILabelProvider} or <code>null</code> if
+	 *         not found
+	 */
+	public static ILabelProvider getLabelProvider() {
+		try {
+			ServicesRegistry registry = EditorUtils.getServiceRegistry();
+			return registry == null ? null : registry.getService(ILabelProvider.class);
+		} catch (IllegalStateException e) {
+			// Registry can't be found, do nothing.
+			Activator.log.error(e);
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EclipseCommandUtils.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EclipseCommandUtils.java
index d7d462e82ca..ace809b60a5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EclipseCommandUtils.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EclipseCommandUtils.java
@@ -1,137 +1,137 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.ui.util;

-

-import java.util.Collection;

-import java.util.Set;

-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.ui.Activator;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.commands.ICommandImageService;

-import org.eclipse.ui.commands.ICommandService;

-

-/**

- * This class provides useful methods to manipulate Eclipse Command

- *

- * @author vl222926

- *

- */

-public class EclipseCommandUtils {

-

-	private 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$

-

-	public static final String DELETE_COMMAND = "org.eclipse.ui.edit.delete"; //$NON-NLS-1$

-

-	/**

-	 *

-	 * @param categoryId

-	 *            a category id

-	 * @return

-	 * 		all commands defined for this category

-	 */

-	public static final Collection<Command> getAllExistingCommandsInCategory(final String categoryId) {

-		final Set<Command> commands = new TreeSet<Command>();

-		final ICommandService commandService = PlatformUI.getWorkbench().getService(ICommandService.class);

-		final Category category = commandService.getCategory(categoryId);

-		for (final Command command : commandService.getDefinedCommands()) {

-			Category currentCategory = null;

-			try {

-				currentCategory = command.getCategory();

-			} catch (NotDefinedException e) {

-				Activator.log.debug(e.getLocalizedMessage());

-				continue;

-			}

-			if (/* command.isDefined() && */category.equals(currentCategory)) {

-				commands.add(command);

-			}

-		}

-		return commands;

-	}

-

-	/**

-	 *

-	 * @param command

-	 *            an Eclipse command

-	 * @return

-	 * 		the image descriptor associated to this command

-	 */

-	public static final ImageDescriptor getCommandIcon(final Command command) {

-		final IWorkbench workbench = PlatformUI.getWorkbench();

-		final ICommandImageService service = workbench.getService(ICommandImageService.class);

-		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

-	 */

-	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

-	 */

-	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);

-			}

-		}

-	}

-

-	/**

-	 * 

-	 * @return

-	 * 		the eclipse command service

-	 */

-	public static final ICommandService getCommandService() {

-		IWorkbench wb = PlatformUI.getWorkbench();

-		if (wb != null) {

-			IWorkbenchWindow ww = wb.getActiveWorkbenchWindow();

-			if (ww != null) {

-				return ww.getService(ICommandService.class);

-			}

-		}

-		return null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.ui.util;
+
+import java.util.Collection;
+import java.util.Set;
+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.ui.Activator;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.ICommandImageService;
+import org.eclipse.ui.commands.ICommandService;
+
+/**
+ * This class provides useful methods to manipulate Eclipse Command
+ *
+ * @author vl222926
+ *
+ */
+public class EclipseCommandUtils {
+
+	private 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$
+
+	public static final String DELETE_COMMAND = "org.eclipse.ui.edit.delete"; //$NON-NLS-1$
+
+	/**
+	 *
+	 * @param categoryId
+	 *            a category id
+	 * @return
+	 * 		all commands defined for this category
+	 */
+	public static final Collection<Command> getAllExistingCommandsInCategory(final String categoryId) {
+		final Set<Command> commands = new TreeSet<Command>();
+		final ICommandService commandService = PlatformUI.getWorkbench().getService(ICommandService.class);
+		final Category category = commandService.getCategory(categoryId);
+		for (final Command command : commandService.getDefinedCommands()) {
+			Category currentCategory = null;
+			try {
+				currentCategory = command.getCategory();
+			} catch (NotDefinedException e) {
+				Activator.log.debug(e.getLocalizedMessage());
+				continue;
+			}
+			if (/* command.isDefined() && */category.equals(currentCategory)) {
+				commands.add(command);
+			}
+		}
+		return commands;
+	}
+
+	/**
+	 *
+	 * @param command
+	 *            an Eclipse command
+	 * @return
+	 * 		the image descriptor associated to this command
+	 */
+	public static final ImageDescriptor getCommandIcon(final Command command) {
+		final IWorkbench workbench = PlatformUI.getWorkbench();
+		final ICommandImageService service = workbench.getService(ICommandImageService.class);
+		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
+	 */
+	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
+	 */
+	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);
+			}
+		}
+	}
+
+	/**
+	 * 
+	 * @return
+	 * 		the eclipse command service
+	 */
+	public static final ICommandService getCommandService() {
+		IWorkbench wb = PlatformUI.getWorkbench();
+		if (wb != null) {
+			IWorkbenchWindow ww = wb.getActiveWorkbenchWindow();
+			if (ww != null) {
+				return ww.getService(ICommandService.class);
+			}
+		}
+		return null;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorHelper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorHelper.java
index be7a0d1dbaa..01802f176fa 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorHelper.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorHelper.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * 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:

- *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.util;

-

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PlatformUI;

-

-/**

- *

- * a helper for the Editor

- *

- */

-public class EditorHelper {

-

-	private EditorHelper() {

-		// nothing to do

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the current editor or <code>null</code> if not found

-	 */

-	public static final IEditorPart getCurrentEditor() {

-		final IWorkbench workbench = PlatformUI.getWorkbench();

-		if (workbench != null) {

-			final IWorkbenchWindow activeWorkbench = workbench.getActiveWorkbenchWindow();

-			if (activeWorkbench != null) {

-				final IWorkbenchPage activePage = activeWorkbench.getActivePage();

-				if (activePage != null) {

-					return activePage.getActiveEditor();

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the current active part or <code>null</code> if not found

-	 */

-	public static final IWorkbenchPart getActivePart() {

-		final IWorkbench workbench = PlatformUI.getWorkbench();

-		if (workbench != null) {

-			final IWorkbenchWindow activeWorkbench = workbench.getActiveWorkbenchWindow();

-			if (activeWorkbench != null) {

-				final IWorkbenchPage activePage = activeWorkbench.getActivePage();

-				if (activePage != null) {

-					return activePage.getActivePart();

-				}

-			}

-		}

-		return null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.util;
+
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ *
+ * a helper for the Editor
+ *
+ */
+public class EditorHelper {
+
+	private EditorHelper() {
+		// nothing to do
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the current editor or <code>null</code> if not found
+	 */
+	public static final IEditorPart getCurrentEditor() {
+		final IWorkbench workbench = PlatformUI.getWorkbench();
+		if (workbench != null) {
+			final IWorkbenchWindow activeWorkbench = workbench.getActiveWorkbenchWindow();
+			if (activeWorkbench != null) {
+				final IWorkbenchPage activePage = activeWorkbench.getActivePage();
+				if (activePage != null) {
+					return activePage.getActiveEditor();
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the current active part or <code>null</code> if not found
+	 */
+	public static final IWorkbenchPart getActivePart() {
+		final IWorkbench workbench = PlatformUI.getWorkbench();
+		if (workbench != null) {
+			final IWorkbenchWindow activeWorkbench = workbench.getActiveWorkbenchWindow();
+			if (activeWorkbench != null) {
+				final IWorkbenchPage activePage = activeWorkbench.getActivePage();
+				if (activePage != null) {
+					return activePage.getActivePart();
+				}
+			}
+		}
+		return null;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorUtils.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorUtils.java
index 6918f42b92d..6918f42b92d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorUtils.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/EditorUtils.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ICallableWithProgress.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ICallableWithProgress.java
index bfcafbe8284..08d3f1d857b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ICallableWithProgress.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ICallableWithProgress.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2014 Christian W. Damus and others.
+ * Copyright (c) 2014, 2016 Christian W. Damus and others.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -19,11 +19,15 @@ import java.util.concurrent.Callable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.operation.IRunnableContext;
 import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.papyrus.infra.tools.util.IProgressCallable;
 
 /**
  * The {@link Callable} analogue of an {@link IRunnableWithProgress}.
+ * 
+ * @deprecated Use the {@link IProgressCallable} API, instead.
  */
-public interface ICallableWithProgress<V> {
+@Deprecated
+public interface ICallableWithProgress<V> extends IProgressCallable<V> {
 	/**
 	 * Invokes me in a runnable context with a progress monitor.
 	 * 
@@ -41,5 +45,6 @@ public interface ICallableWithProgress<V> {
 	 * @see UIUtil#call(IRunnableContext, ICallableWithProgress)
 	 * @see IRunnableContext#run
 	 */
+	@Override
 	V call(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException;
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/LocalMemento.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/LocalMemento.java
index 309542ee425..309542ee425 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/LocalMemento.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/LocalMemento.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/PapyrusImageUtils.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/PapyrusImageUtils.java
index ee0d9fb314f..ee0d9fb314f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/PapyrusImageUtils.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/PapyrusImageUtils.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/SelectionHelper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/SelectionHelper.java
index c642bc534fe..5132a841f4c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/SelectionHelper.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/SelectionHelper.java
@@ -1,119 +1,119 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.ui.util;

-

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.ui.ISelectionService;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * @author VL222926

- *

- */

-public class SelectionHelper {

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	private SelectionHelper() {

-		// to avoid instanciation

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the selection service or <code>null</code> if not found

-	 * 

-	 */

-	public static final ISelectionService getSelectionService() {

-		IWorkbench wb = PlatformUI.getWorkbench();

-		if (wb != null) {

-			// don't work

-			// ISelectionService s1 = (ISelectionService) wb.getService(ISelectionService.class);

-			IWorkbenchWindow ww = wb.getActiveWorkbenchWindow();

-			if (ww != null) {

-				return (ISelectionService) ww.getService(ISelectionService.class);

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the current selection or an empty selection. can't be <code>null</code>

-	 */

-	public static final ISelection getCurrentSelection() {

-		ISelectionService selectionService = getSelectionService();

-		if (selectionService != null) {

-			ISelection currentSelection = selectionService.getSelection();

-			if (currentSelection != null) {

-				return currentSelection;

-			}

-		}

-		return StructuredSelection.EMPTY;

-	}

-

-	/**

-	 * 

-	 * @param viewId

-	 *            the id of the view for which we want the selection

-	 * @return

-	 *         the current selection for the view, the returned value can't be <code>null</code>

-	 */

-	public static final ISelection getCurrentSelection(String viewId) {

-		ISelectionService selectionService = getSelectionService();

-		if (selectionService != null) {

-			ISelection currentSelection = selectionService.getSelection(viewId);

-			if (currentSelection != null) {

-				return currentSelection;

-			}

-		}

-		return StructuredSelection.EMPTY;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         a structured selection.

-	 *         the returned value can't be <code>null</code>

-	 */

-	public static final IStructuredSelection getCurrentStructuredSelection() {

-		ISelection selection = getCurrentSelection();

-		if (selection instanceof IStructuredSelection) {

-			return (IStructuredSelection) selection;

-		}

-		return StructuredSelection.EMPTY;

-	}

-

-	/**

-	 * 

-	 * @param viewId

-	 *            the id of the view for which we want the selection

-	 * @return

-	 *         the current selection for the view, the returned value can't be <code>null</code>

-	 */

-	public static final IStructuredSelection getCurrentStructuredSelection(String viewId) {

-		ISelection selection = getCurrentSelection(viewId);

-		if (selection instanceof IStructuredSelection) {

-			return (IStructuredSelection) selection;

-		}

-		return StructuredSelection.EMPTY;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.ui.util;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.ui.ISelectionService;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * @author VL222926
+ *
+ */
+public class SelectionHelper {
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	private SelectionHelper() {
+		// to avoid instanciation
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         the selection service or <code>null</code> if not found
+	 * 
+	 */
+	public static final ISelectionService getSelectionService() {
+		IWorkbench wb = PlatformUI.getWorkbench();
+		if (wb != null) {
+			// don't work
+			// ISelectionService s1 = (ISelectionService) wb.getService(ISelectionService.class);
+			IWorkbenchWindow ww = wb.getActiveWorkbenchWindow();
+			if (ww != null) {
+				return (ISelectionService) ww.getService(ISelectionService.class);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         the current selection or an empty selection. can't be <code>null</code>
+	 */
+	public static final ISelection getCurrentSelection() {
+		ISelectionService selectionService = getSelectionService();
+		if (selectionService != null) {
+			ISelection currentSelection = selectionService.getSelection();
+			if (currentSelection != null) {
+				return currentSelection;
+			}
+		}
+		return StructuredSelection.EMPTY;
+	}
+
+	/**
+	 * 
+	 * @param viewId
+	 *            the id of the view for which we want the selection
+	 * @return
+	 *         the current selection for the view, the returned value can't be <code>null</code>
+	 */
+	public static final ISelection getCurrentSelection(String viewId) {
+		ISelectionService selectionService = getSelectionService();
+		if (selectionService != null) {
+			ISelection currentSelection = selectionService.getSelection(viewId);
+			if (currentSelection != null) {
+				return currentSelection;
+			}
+		}
+		return StructuredSelection.EMPTY;
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         a structured selection.
+	 *         the returned value can't be <code>null</code>
+	 */
+	public static final IStructuredSelection getCurrentStructuredSelection() {
+		ISelection selection = getCurrentSelection();
+		if (selection instanceof IStructuredSelection) {
+			return (IStructuredSelection) selection;
+		}
+		return StructuredSelection.EMPTY;
+	}
+
+	/**
+	 * 
+	 * @param viewId
+	 *            the id of the view for which we want the selection
+	 * @return
+	 *         the current selection for the view, the returned value can't be <code>null</code>
+	 */
+	public static final IStructuredSelection getCurrentStructuredSelection(String viewId) {
+		ISelection selection = getCurrentSelection(viewId);
+		if (selection instanceof IStructuredSelection) {
+			return (IStructuredSelection) selection;
+		}
+		return StructuredSelection.EMPTY;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForActionHandlers.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForActionHandlers.java
index 917a41e8688..917a41e8688 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForActionHandlers.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForActionHandlers.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForHandlers.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForHandlers.java
index c6b5742312e..aec185cc30e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForHandlers.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForHandlers.java
@@ -57,6 +57,10 @@ public class ServiceUtilsForHandlers extends AbstractServiceUtils<ExecutionEvent
 	@Override
 	public ServicesRegistry getServiceRegistry(ExecutionEvent from) throws ServiceException {
 
+		if (from == null) {
+			return getContextualServiceRegistry();
+		}
+
 		Object context = from.getApplicationContext();
 
 		if (context instanceof IEvaluationContext) {
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForIEvaluationContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForIEvaluationContext.java
index eda497bdc83..015a5e5076e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForIEvaluationContext.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForIEvaluationContext.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2012 Cedric Dumoulin.
+ * Copyright (c) 2012, 2016 Cedric Dumoulin, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,6 +8,8 @@
  *
  * Contributors:
  *  Cedric Dumoulin - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
  *****************************************************************************/
 package org.eclipse.papyrus.infra.ui.util;
 
@@ -47,6 +49,10 @@ public class ServiceUtilsForIEvaluationContext extends AbstractServiceUtils<IEva
 	@Override
 	public ServicesRegistry getServiceRegistry(IEvaluationContext from) throws ServiceException {
 
+		if (from == null) {
+			return getContextualServiceRegistry();
+		}
+
 		IEvaluationContext evaluationContext = from;
 
 		// Search for the IWorkbenchPartSite from which the ExecutionEvent is sent (May be different that the Active one)
@@ -88,7 +94,7 @@ public class ServiceUtilsForIEvaluationContext extends AbstractServiceUtils<IEva
 		Object _part = evaluationContext.getVariable(ISources.ACTIVE_PART_NAME);
 		if (_part instanceof IWorkbenchPart) {
 			IWorkbenchPart part = (IWorkbenchPart) _part;
-			registry = (ServicesRegistry) (part).getAdapter(ServicesRegistry.class);
+			registry = (part).getAdapter(ServicesRegistry.class);
 			if (registry != null) {
 				return registry;
 			}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForSelection.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForSelection.java
index f3a799d303a..f3a799d303a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForSelection.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForSelection.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForWorkbenchPage.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForWorkbenchPage.java
index 624257964cc..624257964cc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForWorkbenchPage.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/ServiceUtilsForWorkbenchPage.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/TransactionUIHelper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/TransactionUIHelper.java
index 825a99386a3..825a99386a3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/TransactionUIHelper.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/TransactionUIHelper.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java
index 1dd62db4ff5..343bcdeba56 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.AbstractExecutorService;
 import java.util.concurrent.Callable;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
@@ -38,16 +39,28 @@ import java.util.concurrent.locks.ReentrantLock;
 
 import org.eclipse.core.databinding.observable.Realm;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.emf.common.util.AbstractTreeIterator;
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.jface.operation.IRunnableContext;
 import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.IServiceRegistryProvider;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
 import org.eclipse.papyrus.infra.tools.util.IExecutorService;
+import org.eclipse.papyrus.infra.tools.util.IProgressCallable;
+import org.eclipse.papyrus.infra.tools.util.IProgressRunnable;
 import org.eclipse.papyrus.infra.tools.util.Iterators2;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IMemento;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.progress.IProgressService;
+import org.eclipse.ui.progress.IWorkbenchSiteProgressService;
 
 import com.google.common.collect.Iterators;
 
@@ -182,20 +195,55 @@ public class UIUtil {
 	 *                propagated by the context if the runnable
 	 *                acknowledges cancellation by throwing this exception. This should not be thrown
 	 *                if {@code cancelable} is {@code false}.
+	 * 
+	 * @deprecated Use the {@link #call(IRunnableContext, boolean, boolean, IProgressCallable)} or
+	 *             {@link IExecutorService#submit(IProgressCallable)} API, instead.
 	 */
+	@Deprecated
 	public static <V> V call(IRunnableContext context, boolean fork, boolean cancelable, ICallableWithProgress<V> callable) throws InvocationTargetException, InterruptedException {
+		return call(context, fork, cancelable, (IProgressCallable<V>) callable);
+	}
+
+	/**
+	 * Calls a {@code callable} in the given {@code context}.
+	 *
+	 * @param fork
+	 *            {@code true} if the runnable should be run in a separate thread,
+	 *            and {@code false} to run in the same thread
+	 * @param cancelable
+	 *            {@code true} to enable the cancellation, and {@code false} to make the operation uncancellable
+	 * @param runnable
+	 *            the runnable to run
+	 *
+	 * @exception InvocationTargetException
+	 *                wraps any exception or error which occurs
+	 *                while running the runnable
+	 * @exception InterruptedException
+	 *                propagated by the context if the runnable
+	 *                acknowledges cancellation by throwing this exception. This should not be thrown
+	 *                if {@code cancelable} is {@code false}.
+	 */
+	public static <V> V call(IRunnableContext context, boolean fork, boolean cancelable, IProgressCallable<V> callable) throws InvocationTargetException, InterruptedException {
 		class RunnableWrapper implements IRunnableWithProgress {
-			final ICallableWithProgress<V> delegate;
+			final IProgressCallable<V> delegate;
 
 			V result;
 
-			RunnableWrapper(ICallableWithProgress<V> delegate) {
+			RunnableWrapper(IProgressCallable<V> delegate) {
 				this.delegate = delegate;
 			}
 
 			@Override
 			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				result = delegate.call(monitor);
+				try {
+					result = delegate.call(monitor);
+				} catch (OperationCanceledException e) {
+					throw new InterruptedException(e.getMessage());
+				} catch (RuntimeException e) {
+					throw e;
+				} catch (Exception e) {
+					throw new InvocationTargetException(e);
+				}
 			}
 		}
 
@@ -453,6 +501,46 @@ public class UIUtil {
 			return result;
 		}
 
+		@Override
+		public Future<?> submit(IProgressRunnable task) {
+			return submit(new IProgressCallable<Void>() {
+				@Override
+				public Void call(IProgressMonitor monitor) {
+					task.run(monitor);
+					return null;
+				}
+			});
+		}
+
+		@Override
+		public void syncExec(IProgressRunnable task) throws InterruptedException, ExecutionException {
+			syncCall(new IProgressCallable<Void>() {
+				@Override
+				public Void call(IProgressMonitor monitor) {
+					task.run(monitor);
+					return null;
+				}
+			});
+		}
+
+		IProgressService getProgressService(IProgressCallable<?> callable) {
+			IProgressService result;
+
+			try {
+				ServicesRegistry registry = (callable instanceof IServiceRegistryProvider)
+						? ((IServiceRegistryProvider) callable).getServiceRegistry()
+						: null;
+				IMultiDiagramEditor editor = ServiceUtils.getInstance().getService(
+						IMultiDiagramEditor.class, registry);
+				result = editor.getEditorSite().getService(IWorkbenchSiteProgressService.class);
+			} catch (ServiceException e) {
+				// Fine, there's no editor
+				result = PlatformUI.getWorkbench().getProgressService();
+			}
+
+			return result;
+		}
+
 		//
 		// Nested types
 		//
@@ -493,6 +581,39 @@ public class UIUtil {
 		public void syncExec(Runnable task) {
 			display.syncExec(task);
 		}
+
+		@Override
+		public <V> Future<V> submit(IProgressCallable<V> callable) {
+			IProgressService service = getProgressService(callable);
+			IWorkbenchSiteProgressService wbService = (service instanceof IWorkbenchSiteProgressService) ? (IWorkbenchSiteProgressService) service : null;
+
+			FutureProgress<V> result = new FutureProgress<>(callable, wbService);
+
+			try {
+				service.run(true, true, result);
+			} catch (Exception e) {
+				// This shouldn't happen when running asynchronously
+				result.completeExceptionally(e);
+			}
+
+			return result;
+		}
+
+		@Override
+		public <V> V syncCall(IProgressCallable<V> callable) throws InterruptedException, ExecutionException {
+			IProgressService service = getProgressService(callable);
+			IWorkbenchSiteProgressService wbService = (service instanceof IWorkbenchSiteProgressService) ? (IWorkbenchSiteProgressService) service : null;
+
+			FutureProgress<V> result = new FutureProgress<>(callable, wbService);
+
+			try {
+				service.busyCursorWhile(result);
+			} catch (Exception e) {
+				result.completeExceptionally(e);
+			}
+
+			return result.get(); // It really should be completed, by now
+		}
 	}
 
 	private static class RealmExecutorService extends UIExecutorService {
@@ -513,5 +634,73 @@ public class UIUtil {
 		public void syncExec(Runnable task) {
 			realm.exec(task);
 		}
+
+		@Override
+		public <V> Future<V> submit(IProgressCallable<V> callable) {
+			// No place to report progress in this case
+			FutureTask<V> result = new FutureTask<V>(() -> callable.call(new NullProgressMonitor()));
+			asyncExec(result);
+			return result;
+		}
+
+		@Override
+		public <V> V syncCall(IProgressCallable<V> callable) throws InterruptedException, ExecutionException {
+			// No place to report progress in this case
+			FutureTask<V> result = new FutureTask<V>(() -> callable.call(new NullProgressMonitor()));
+			syncExec(result);
+			return result.get(); // It really should be completed, by now
+		}
+	}
+
+	private static class FutureProgress<V> extends CompletableFuture<V> implements IRunnableWithProgress {
+		private final IProgressCallable<V> delegate;
+		private final IWorkbenchSiteProgressService service;
+
+		private volatile IProgressMonitor monitor;
+
+		FutureProgress(IProgressCallable<V> delegate, IWorkbenchSiteProgressService service) {
+			super();
+
+			this.delegate = delegate;
+			this.service = service;
+		}
+
+		@Override
+		public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+			try {
+				this.monitor = monitor;
+
+				if (service != null) {
+					service.incrementBusy();
+				}
+
+				try {
+					complete(delegate.call(monitor));
+				} finally {
+					this.monitor = null;
+
+					if (service != null) {
+						service.decrementBusy();
+					}
+				}
+			} catch (OperationCanceledException e) {
+				throw new InterruptedException(e.getMessage());
+			} catch (RuntimeException e) {
+				throw e;
+			} catch (Exception e) {
+				throw new InvocationTargetException(e);
+			}
+		}
+
+		@Override
+		public boolean cancel(boolean mayInterruptIfRunning) {
+			IProgressMonitor monitor = this.monitor;
+			if (monitor != null) {
+				monitor.setCanceled(true);
+			}
+
+			return super.cancel(mayInterruptIfRunning);
+		}
+
 	}
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/WorkbenchPartHelper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/WorkbenchPartHelper.java
index c94256dd8f5..4ecdc94d48f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/WorkbenchPartHelper.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/WorkbenchPartHelper.java
@@ -1,71 +1,71 @@
-/*****************************************************************************

- * 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:

- *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.ui.util;

-

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PlatformUI;

-

-/**

- *

- * a helper for the Eclipse workbench part

- *

- */

-public class WorkbenchPartHelper {

-

-	private WorkbenchPartHelper() {

-		// nothing to do

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the current IWorkbenchPart or <code>null</code> if not found

-	 */

-	public static final IWorkbenchPart getCurrentActiveWorkbenchPart() {

-		final IWorkbench workbench = PlatformUI.getWorkbench();

-		if (workbench != null) {

-			final IWorkbenchWindow activeWorkbench = workbench.getActiveWorkbenchWindow();

-			if (activeWorkbench != null) {

-				final IWorkbenchPage activePage = activeWorkbench.getActivePage();

-				if (activePage != null) {

-					return activePage.getActivePart();

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the current IEditorPart or <code>null</code> if not found

-	 */

-	public static final IEditorPart getCurrentActiveEditorPart() {

-		final IWorkbench workbench = PlatformUI.getWorkbench();

-		if (workbench != null) {

-			final IWorkbenchWindow activeWorkbench = workbench.getActiveWorkbenchWindow();

-			if (activeWorkbench != null) {

-				final IWorkbenchPage activePage = activeWorkbench.getActivePage();

-				if (activePage != null) {

-					return activePage.getActiveEditor();

-				}

-			}

-		}

-		return null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.ui.util;
+
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ *
+ * a helper for the Eclipse workbench part
+ *
+ */
+public class WorkbenchPartHelper {
+
+	private WorkbenchPartHelper() {
+		// nothing to do
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the current IWorkbenchPart or <code>null</code> if not found
+	 */
+	public static final IWorkbenchPart getCurrentActiveWorkbenchPart() {
+		final IWorkbench workbench = PlatformUI.getWorkbench();
+		if (workbench != null) {
+			final IWorkbenchWindow activeWorkbench = workbench.getActiveWorkbenchWindow();
+			if (activeWorkbench != null) {
+				final IWorkbenchPage activePage = activeWorkbench.getActivePage();
+				if (activePage != null) {
+					return activePage.getActivePart();
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the current IEditorPart or <code>null</code> if not found
+	 */
+	public static final IEditorPart getCurrentActiveEditorPart() {
+		final IWorkbench workbench = PlatformUI.getWorkbench();
+		if (workbench != null) {
+			final IWorkbenchWindow activeWorkbench = workbench.getActiveWorkbenchWindow();
+			if (activeWorkbench != null) {
+				final IWorkbenchPage activePage = activeWorkbench.getActivePage();
+				if (activePage != null) {
+					return activePage.getActiveEditor();
+				}
+			}
+		}
+		return null;
+	}
+}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.classpath b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.classpath
new file mode 100644
index 00000000000..eca7bdba8f0
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.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.8"/>
+	<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/widget/org.eclipse.papyrus.infra.widgets.toolbox/.project b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.project
index 52b91e0485e..339688bbd54 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/.project
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.widgets.toolbox</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>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.widgets.toolbox</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/ui/org.eclipse.papyrus.infra.widgets.toolbox/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..b3aa6d60f94
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF
index d97f48dfce7..1aea866730d 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF
@@ -1,27 +1,28 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.widgets.toolbox,

- org.eclipse.papyrus.infra.widgets.toolbox.dialog,

- org.eclipse.papyrus.infra.widgets.toolbox.draw2d,

- org.eclipse.papyrus.infra.widgets.toolbox.notification,

- org.eclipse.papyrus.infra.widgets.toolbox.notification.builders,

- org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs,

- org.eclipse.papyrus.infra.widgets.toolbox.notification.exception,

- org.eclipse.papyrus.infra.widgets.toolbox.notification.popups,

- org.eclipse.papyrus.infra.widgets.toolbox.notification.utils,

- org.eclipse.papyrus.infra.widgets.toolbox.notification.view,

- org.eclipse.papyrus.infra.widgets.toolbox.utils

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.ui,

- org.eclipse.ui.forms;bundle-version="3.5.100",

- org.eclipse.draw2d;bundle-version="3.8.1",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-Activator: org.eclipse.papyrus.infra.widgets.toolbox.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.widgets.toolbox;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.widgets.toolbox,
+ org.eclipse.papyrus.infra.widgets.toolbox.dialog,
+ org.eclipse.papyrus.infra.widgets.toolbox.draw2d,
+ org.eclipse.papyrus.infra.widgets.toolbox.notification,
+ org.eclipse.papyrus.infra.widgets.toolbox.notification.builders,
+ org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs,
+ org.eclipse.papyrus.infra.widgets.toolbox.notification.exception,
+ org.eclipse.papyrus.infra.widgets.toolbox.notification.popups,
+ org.eclipse.papyrus.infra.widgets.toolbox.notification.utils,
+ org.eclipse.papyrus.infra.widgets.toolbox.notification.view,
+ org.eclipse.papyrus.infra.widgets.toolbox.utils
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ui,
+ org.eclipse.ui.forms;bundle-version="3.5.100",
+ org.eclipse.draw2d;bundle-version="3.8.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.2.0";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-Activator: org.eclipse.papyrus.infra.widgets.toolbox.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.widgets.toolbox;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/about.html b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/about.html
new file mode 100644
index 00000000000..d35d5aed64c
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/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/widget/org.eclipse.papyrus.infra.widgets.toolbox/build.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/build.properties
index a491a4cb7bd..a491a4cb7bd 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/build.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/build.properties
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/icons/run.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/icons/run.gif
index 57f410224cf..57f410224cf 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/icons/run.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/icons/run.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/icons/sample.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/icons/sample.gif
index a32f4b1b572..a32f4b1b572 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/icons/sample.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/icons/sample.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/plugin.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/plugin.properties
index d401eb3564a..aff1171d040 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/plugin.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/plugin.properties
@@ -1,12 +1,12 @@
-################################################################################

-# Copyright (c) 2008 CEA LIST.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     Patrick.tessier (CEA LIST) Patrick.Tessier@cea.fr - initial API and implementation

-##################################################################################

-pluginName=Papyrus UI Toolbox

-providerName=Eclipse Modeling Project

+################################################################################
+# Copyright (c) 2008 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Patrick.tessier (CEA LIST) Patrick.Tessier@cea.fr - initial API and implementation
+##################################################################################
+pluginName=Papyrus UI Toolbox
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/plugin.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/plugin.xml
index d9b8f0fc162..d9b8f0fc162 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/plugin.xml
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/plugin.xml
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/pom.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/pom.xml
index eaa51fd73f0..ab60287d84d 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/pom.xml
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-ui</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.widgets.toolbox</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/schema/papyrusNotificationBuilder.exsd b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/schema/papyrusNotificationBuilder.exsd
index 0a4b77c3cb3..977b7eb10be 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/schema/papyrusNotificationBuilder.exsd
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/schema/papyrusNotificationBuilder.exsd
@@ -1,121 +1,121 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.widgets.toolbox" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.widgets.toolbox" id="papyrusNotificationBuilder" name="Papyrus Notification Builder"/>

-      </appInfo>

-      <documentation>

-         This extension point allows developers to define custom IBuilder instance to be managed by notification Builder.

-An IBuider has to define the methods accept and build.

-Take care to not always return true in the method accept to avoid intercepting all the notifications

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appInfo>

-            <meta.element />

-         </appInfo>

-      </annotation>

-      <complexType>

-         <sequence minOccurs="1" maxOccurs="unbounded">

-            <element ref="BuilderInstance"/>

-         </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="BuilderInstance">

-      <complexType>

-         <attribute name="builder" type="string" use="required">

-            <annotation>

-               <documentation>

-                  the builder instance. The implementation shall implement the methods to recognize and run a notification.

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         0.7.0

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiinfo"/>

-      </appInfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         /*******************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     ATOS ORIGIN - initial API and implementation

- *******************************************************************************/

-      </documentation>

-   </annotation>

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.widgets.toolbox" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.widgets.toolbox" id="papyrusNotificationBuilder" name="Papyrus Notification Builder"/>
+      </appInfo>
+      <documentation>
+         This extension point allows developers to define custom IBuilder instance to be managed by notification Builder.
+An IBuider has to define the methods accept and build.
+Take care to not always return true in the method accept to avoid intercepting all the notifications
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="BuilderInstance"/>
+         </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="BuilderInstance">
+      <complexType>
+         <attribute name="builder" type="string" use="required">
+            <annotation>
+               <documentation>
+                  the builder instance. The implementation shall implement the methods to recognize and run a notification.
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         0.7.0
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiinfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         /*******************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     ATOS ORIGIN - initial API and implementation
+ *******************************************************************************/
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/Activator.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/Activator.java
index 1d776222929..68a7cbf3ba1 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/Activator.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/Activator.java
@@ -1,99 +1,99 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox;

-

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.resource.ImageRegistry;

-import org.eclipse.swt.graphics.Image;

-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.widgets.toolbox";

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	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;

-	}

-

-	/**

-	 * This method returns an <code>org.eclipse.swt.graphics.Image</code> identified by its pluginId and iconPath.<BR>

-	 *

-	 * By default, it returns a default image. This image is the image placed in

-	 * the directory <em>resources/icons/default.gif</em>

-	 *

-	 * @param pluginId

-	 *            id of plugin

-	 * @param iconpPath

-	 *            the path of the icon image relative to the plugin

-	 * @return the Image

-	 */

-	public static Image getImage(String iconPath, String defaultPlugin) {

-		// see if the path is using platform:/... to get icon in the fragment, if it is in a fragment

-		String key = defaultPlugin + iconPath;

-		ImageRegistry registry = getDefault().getImageRegistry();

-		Image image = registry.get(key);

-

-		if (image == null) {

-

-			ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(defaultPlugin, iconPath);

-			registry.put(key, desc);

-			image = registry.get(key);

-

-		}

-		return image;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2008, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.papyrus.infra.tools.spi.INotificationBuilderFactory;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+
+/**
+ * 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.widgets.toolbox";
+
+	// The shared instance
+	private static Activator plugin;
+
+	private ServiceRegistration<INotificationBuilderFactory> notificationBuilderReg;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+
+		notificationBuilderReg = context.registerService(INotificationBuilderFactory.class, NotificationBuilder::new, null);
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		notificationBuilderReg.unregister();
+		notificationBuilderReg = null;
+
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * This method returns an <code>org.eclipse.swt.graphics.Image</code> identified by its pluginId and iconPath.<BR>
+	 *
+	 * By default, it returns a default image. This image is the image placed in
+	 * the directory <em>resources/icons/default.gif</em>
+	 *
+	 * @param pluginId
+	 *            id of plugin
+	 * @param iconpPath
+	 *            the path of the icon image relative to the plugin
+	 * @return the Image
+	 */
+	public static Image getImage(String iconPath, String defaultPlugin) {
+		// see if the path is using platform:/... to get icon in the fragment, if it is in a fragment
+		String key = defaultPlugin + iconPath;
+		ImageRegistry registry = getDefault().getImageRegistry();
+		Image image = registry.get(key);
+
+		if (image == null) {
+
+			ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(defaultPlugin, iconPath);
+			registry.put(key, desc);
+			image = registry.get(key);
+
+		}
+		return image;
+	}
+
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/SwtUtil.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/SwtUtil.java
index 9781b4ab85b..f7ea106c770 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/SwtUtil.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/SwtUtil.java
@@ -1,167 +1,167 @@
-/*****************************************************************************

- * Copyright (c) Eclipse.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mik Kersten

- *  Steffen Pingel

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox;

-

-import java.util.Set;

-

-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.swt.widgets.Display;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.swt.widgets.TreeItem;

-

-/**

- * @author Mik Kersten

- * @author Steffen Pingel

- */

-public class SwtUtil {

-

-	public static final long FADE_RESCHEDULE_DELAY = 80;

-

-	public static final int FADE_IN_INCREMENT = 15;

-

-	public static final int FADE_OUT_INCREMENT = -20;

-

-	public static void collectItemData(TreeItem[] items, Set<Object> allVisible) {

-		for (TreeItem item : items) {

-			allVisible.add(item.getData());

-			collectItemData(item.getItems(), allVisible);

-		}

-	}

-

-	public static FadeJob fastFadeIn(Shell shell, SwtUtil.IFadeListener listener) {

-		return new FadeJob(shell, 2 * FADE_IN_INCREMENT, FADE_RESCHEDULE_DELAY, listener);

-	}

-

-	public static FadeJob fadeIn(Shell shell, SwtUtil.IFadeListener listener) {

-		return new FadeJob(shell, FADE_IN_INCREMENT, FADE_RESCHEDULE_DELAY, listener);

-	}

-

-	public static FadeJob fadeOut(Shell shell, SwtUtil.IFadeListener listener) {

-		return new FadeJob(shell, FADE_OUT_INCREMENT, FADE_RESCHEDULE_DELAY, listener);

-	}

-

-	public static class FadeJob extends Job {

-

-		private final Shell shell;

-

-		private final int increment;

-

-		private volatile boolean stopped;

-

-		private volatile int currentAlpha;

-

-		private final long delay;

-

-		private final IFadeListener fadeListener;

-

-		public FadeJob(Shell shell, int increment, long delay, IFadeListener fadeListener) {

-			super("Fading");

-			if (increment < -255 || increment == 0 || increment > 255) {

-				throw new IllegalArgumentException("-255 <= increment <= 255 && increment != 0"); //$NON-NLS-1$

-			}

-			if (delay < 1) {

-				throw new IllegalArgumentException("delay must be > 0"); //$NON-NLS-1$

-			}

-			this.currentAlpha = shell.getAlpha();

-			this.shell = shell;

-			this.increment = increment;

-			this.delay = delay;

-			this.fadeListener = fadeListener;

-

-			setSystem(true);

-			schedule(delay);

-		}

-

-		@Override

-		protected void canceling() {

-			stopped = true;

-		}

-

-		private void reschedule() {

-			if (stopped) {

-				return;

-			}

-			schedule(delay);

-		}

-

-		public void cancelAndWait(final boolean setAlpha) {

-			if (stopped) {

-				return;

-			}

-			cancel();

-			Display.getDefault().syncExec(new Runnable() {

-

-				public void run() {

-					if (setAlpha) {

-						shell.setAlpha(getLastAlpha());

-					}

-				}

-			});

-		}

-

-		@Override

-		protected IStatus run(IProgressMonitor monitor) {

-			if (stopped) {

-				return Status.OK_STATUS;

-			}

-

-			currentAlpha += increment;

-			if (currentAlpha <= 0) {

-				currentAlpha = 0;

-			} else if (currentAlpha >= 255) {

-				currentAlpha = 255;

-			}

-

-			Display.getDefault().syncExec(new Runnable() {

-

-				public void run() {

-					if (stopped) {

-						return;

-					}

-

-					if (shell.isDisposed()) {

-						stopped = true;

-						return;

-					}

-

-					shell.setAlpha(currentAlpha);

-

-					if (fadeListener != null) {

-						fadeListener.faded(shell, currentAlpha);

-					}

-				}

-			});

-

-			if (currentAlpha == 0 || currentAlpha == 255) {

-				stopped = true;

-			}

-

-			reschedule();

-			return Status.OK_STATUS;

-		}

-

-		private int getLastAlpha() {

-			return (increment < 0) ? 0 : 255;

-		}

-

-	}

-

-	public static interface IFadeListener {

-

-		public void faded(Shell shell, int alpha);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) Eclipse.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Mik Kersten
+ *  Steffen Pingel
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox;
+
+import java.util.Set;
+
+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.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.TreeItem;
+
+/**
+ * @author Mik Kersten
+ * @author Steffen Pingel
+ */
+public class SwtUtil {
+
+	public static final long FADE_RESCHEDULE_DELAY = 80;
+
+	public static final int FADE_IN_INCREMENT = 15;
+
+	public static final int FADE_OUT_INCREMENT = -20;
+
+	public static void collectItemData(TreeItem[] items, Set<Object> allVisible) {
+		for (TreeItem item : items) {
+			allVisible.add(item.getData());
+			collectItemData(item.getItems(), allVisible);
+		}
+	}
+
+	public static FadeJob fastFadeIn(Shell shell, SwtUtil.IFadeListener listener) {
+		return new FadeJob(shell, 2 * FADE_IN_INCREMENT, FADE_RESCHEDULE_DELAY, listener);
+	}
+
+	public static FadeJob fadeIn(Shell shell, SwtUtil.IFadeListener listener) {
+		return new FadeJob(shell, FADE_IN_INCREMENT, FADE_RESCHEDULE_DELAY, listener);
+	}
+
+	public static FadeJob fadeOut(Shell shell, SwtUtil.IFadeListener listener) {
+		return new FadeJob(shell, FADE_OUT_INCREMENT, FADE_RESCHEDULE_DELAY, listener);
+	}
+
+	public static class FadeJob extends Job {
+
+		private final Shell shell;
+
+		private final int increment;
+
+		private volatile boolean stopped;
+
+		private volatile int currentAlpha;
+
+		private final long delay;
+
+		private final IFadeListener fadeListener;
+
+		public FadeJob(Shell shell, int increment, long delay, IFadeListener fadeListener) {
+			super("Fading");
+			if (increment < -255 || increment == 0 || increment > 255) {
+				throw new IllegalArgumentException("-255 <= increment <= 255 && increment != 0"); //$NON-NLS-1$
+			}
+			if (delay < 1) {
+				throw new IllegalArgumentException("delay must be > 0"); //$NON-NLS-1$
+			}
+			this.currentAlpha = shell.getAlpha();
+			this.shell = shell;
+			this.increment = increment;
+			this.delay = delay;
+			this.fadeListener = fadeListener;
+
+			setSystem(true);
+			schedule(delay);
+		}
+
+		@Override
+		protected void canceling() {
+			stopped = true;
+		}
+
+		private void reschedule() {
+			if (stopped) {
+				return;
+			}
+			schedule(delay);
+		}
+
+		public void cancelAndWait(final boolean setAlpha) {
+			if (stopped) {
+				return;
+			}
+			cancel();
+			Display.getDefault().syncExec(new Runnable() {
+
+				public void run() {
+					if (setAlpha) {
+						shell.setAlpha(getLastAlpha());
+					}
+				}
+			});
+		}
+
+		@Override
+		protected IStatus run(IProgressMonitor monitor) {
+			if (stopped) {
+				return Status.OK_STATUS;
+			}
+
+			currentAlpha += increment;
+			if (currentAlpha <= 0) {
+				currentAlpha = 0;
+			} else if (currentAlpha >= 255) {
+				currentAlpha = 255;
+			}
+
+			Display.getDefault().syncExec(new Runnable() {
+
+				public void run() {
+					if (stopped) {
+						return;
+					}
+
+					if (shell.isDisposed()) {
+						stopped = true;
+						return;
+					}
+
+					shell.setAlpha(currentAlpha);
+
+					if (fadeListener != null) {
+						fadeListener.faded(shell, currentAlpha);
+					}
+				}
+			});
+
+			if (currentAlpha == 0 || currentAlpha == 255) {
+				stopped = true;
+			}
+
+			reschedule();
+			return Status.OK_STATUS;
+		}
+
+		private int getLastAlpha() {
+			return (increment < 0) ? 0 : 255;
+		}
+
+	}
+
+	public static interface IFadeListener {
+
+		public void faded(Shell shell, int alpha);
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/dialog/InformationDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/dialog/InformationDialog.java
index d34fa14d0e5..78a2033b03d 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/dialog/InformationDialog.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/dialog/InformationDialog.java
@@ -1,133 +1,133 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.dialog;

-

-import org.eclipse.jface.dialogs.IDialogConstants;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.jface.window.Window;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Shell;

-

-/**

- * A JFace dialog used to show information to the end user.<br>

- * This dialog is able to store the user choice into a preference store.<br>

- *

- */

-public class InformationDialog extends MessageDialog {

-

-	private IPreferenceStore ps;

-

-	private String preference;

-

-	private Button rememberChoice;

-

-	/**

-	 * The Constructor.

-	 *

-	 * @param parentShell

-	 *            the parent shell

-	 * @param dialogTitle

-	 *            the dialog title

-	 * @param message

-	 *            the message

-	 * @param pso

-	 *            the preference store

-	 * @param preference

-	 *            the preference

-	 */

-	public InformationDialog(Shell parentShell, String dialogTitle,

-			String message, IPreferenceStore ps, String preference) {

-		this(parentShell, dialogTitle, message, ps, preference, SWT.OK,

-				MessageDialog.INFORMATION,

-				new String[] { IDialogConstants.OK_LABEL });

-	}

-

-	/**

-	 * The Constructor.

-	 *

-	 * @param parentShell

-	 *            the parent shell

-	 * @param dialogTitle

-	 *            the dialog title

-	 * @param message

-	 *            the message

-	 * @param ps

-	 *            the ps the preference store

-	 * @param preference

-	 *            the preference string to store the choice

-	 * @param style

-	 *            the style for buttons : SWT.OK, SWT.YES

-	 * @param messageDialogType

-	 *            : MessageDialog.INFORMATION, MessageDialog.WARNING

-	 * @param labels

-	 *            the labels, for example IDialogConstants.OK_LABEL

-	 */

-	public InformationDialog(Shell parentShell, String dialogTitle,

-			String message, IPreferenceStore ps, String preference, int style,

-			int messageDialogType, String[] labels) {

-		super(parentShell, dialogTitle, null, message, messageDialogType,

-				labels, style);

-		this.ps = ps;

-		this.preference = preference;

-	}

-

-	/**

-	 * @see org.eclipse.jface.dialogs.MessageDialog#createDialogArea(org.eclipse.swt.widgets.Composite)

-	 */

-	@Override

-	protected Control createDialogArea(Composite parent) {

-		Composite container = (Composite) super.createDialogArea(parent);

-

-		if (ps != null && preference != null && preference.length() > 0) {

-			rememberChoice = new Button(container, SWT.CHECK);

-			rememberChoice.setText("Do not show again");

-		}

-		return container;

-	}

-

-	/**

-	 * @see org.eclipse.jface.window.Window#open() return Window.OK if it's

-	 *      valid

-	 */

-	@Override

-	public int open() {

-		// Do not open the dialog if the preference is true

-		if (ps != null && preference != null && preference.length() > 0) {

-			if (ps.getBoolean(preference)) {

-				return Window.OK;

-			}

-		}

-		return super.open();

-	}

-

-	/**

-	 * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int)

-	 */

-	@Override

-	protected void buttonPressed(int buttonId) {

-		// OK pressed

-		if (buttonId == Window.OK && rememberChoice != null && rememberChoice.getSelection()) {

-			if (ps != null && preference != null && preference.length() > 0) {

-				// Store the preference

-				ps.setValue(preference, true);

-			}

-		}

-		super.buttonPressed(buttonId);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.dialog;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * A JFace dialog used to show information to the end user.<br>
+ * This dialog is able to store the user choice into a preference store.<br>
+ *
+ */
+public class InformationDialog extends MessageDialog {
+
+	private IPreferenceStore ps;
+
+	private String preference;
+
+	private Button rememberChoice;
+
+	/**
+	 * The Constructor.
+	 *
+	 * @param parentShell
+	 *            the parent shell
+	 * @param dialogTitle
+	 *            the dialog title
+	 * @param message
+	 *            the message
+	 * @param pso
+	 *            the preference store
+	 * @param preference
+	 *            the preference
+	 */
+	public InformationDialog(Shell parentShell, String dialogTitle,
+			String message, IPreferenceStore ps, String preference) {
+		this(parentShell, dialogTitle, message, ps, preference, SWT.OK,
+				MessageDialog.INFORMATION,
+				new String[] { IDialogConstants.OK_LABEL });
+	}
+
+	/**
+	 * The Constructor.
+	 *
+	 * @param parentShell
+	 *            the parent shell
+	 * @param dialogTitle
+	 *            the dialog title
+	 * @param message
+	 *            the message
+	 * @param ps
+	 *            the ps the preference store
+	 * @param preference
+	 *            the preference string to store the choice
+	 * @param style
+	 *            the style for buttons : SWT.OK, SWT.YES
+	 * @param messageDialogType
+	 *            : MessageDialog.INFORMATION, MessageDialog.WARNING
+	 * @param labels
+	 *            the labels, for example IDialogConstants.OK_LABEL
+	 */
+	public InformationDialog(Shell parentShell, String dialogTitle,
+			String message, IPreferenceStore ps, String preference, int style,
+			int messageDialogType, String[] labels) {
+		super(parentShell, dialogTitle, null, message, messageDialogType,
+				labels, style);
+		this.ps = ps;
+		this.preference = preference;
+	}
+
+	/**
+	 * @see org.eclipse.jface.dialogs.MessageDialog#createDialogArea(org.eclipse.swt.widgets.Composite)
+	 */
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite container = (Composite) super.createDialogArea(parent);
+
+		if (ps != null && preference != null && preference.length() > 0) {
+			rememberChoice = new Button(container, SWT.CHECK);
+			rememberChoice.setText("Do not show again");
+		}
+		return container;
+	}
+
+	/**
+	 * @see org.eclipse.jface.window.Window#open() return Window.OK if it's
+	 *      valid
+	 */
+	@Override
+	public int open() {
+		// Do not open the dialog if the preference is true
+		if (ps != null && preference != null && preference.length() > 0) {
+			if (ps.getBoolean(preference)) {
+				return Window.OK;
+			}
+		}
+		return super.open();
+	}
+
+	/**
+	 * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int)
+	 */
+	@Override
+	protected void buttonPressed(int buttonId) {
+		// OK pressed
+		if (buttonId == Window.OK && rememberChoice != null && rememberChoice.getSelection()) {
+			if (ps != null && preference != null && preference.length() > 0) {
+				// Store the preference
+				ps.setValue(preference, true);
+			}
+		}
+		super.buttonPressed(buttonId);
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/draw2d/ManuallyDrawnShortcutDecorationFigure.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/draw2d/ManuallyDrawnShortcutDecorationFigure.java
index 09711f396b1..09711f396b1 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/draw2d/ManuallyDrawnShortcutDecorationFigure.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/draw2d/ManuallyDrawnShortcutDecorationFigure.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/IBuilder.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/IBuilder.java
index 32d6e92e8cc..80862cde3ce 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/IBuilder.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/IBuilder.java
@@ -1,47 +1,47 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification;

-

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.PropertyWrapper;

-import org.eclipse.ui.forms.widgets.FormToolkit;

-

-

-/**

- * An IBuilder helps the notification builder to create a notification

- *

- * @author tfaure

- *

- */

-public interface IBuilder {

-

-	/**

-	 * This method displays the notification message

-	 *

-	 * @param wrapper

-	 *            , a wrapper containing all the options to create the message

-	 * @param toolkit

-	 *            , the toolkit for form creation

-	 */

-	INotification build(PropertyWrapper wrapper, FormToolkit toolkit);

-

-	/**

-	 * Determines if the IBuilder can manage the parameter with its value

-	 *

-	 * @param parameterName

-	 *            , the name of the parameter (see constants in {@link NotificationBuilder} calss

-	 * @param value

-	 *            , the value of the corresponding parameter

-	 * @return true if the parameterName or the value can be managed by the builder

-	 */

-	boolean accept(String parameterName, Object value);

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification;
+
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.PropertyWrapper;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+
+/**
+ * An IBuilder helps the notification builder to create a notification
+ *
+ * @author tfaure
+ *
+ */
+public interface IBuilder {
+
+	/**
+	 * This method displays the notification message
+	 *
+	 * @param wrapper
+	 *            , a wrapper containing all the options to create the message
+	 * @param toolkit
+	 *            , the toolkit for form creation
+	 */
+	INotification build(PropertyWrapper wrapper, FormToolkit toolkit);
+
+	/**
+	 * Determines if the IBuilder can manage the parameter with its value
+	 *
+	 * @param parameterName
+	 *            , the name of the parameter (see constants in {@link NotificationBuilder} calss
+	 * @param value
+	 *            , the value of the corresponding parameter
+	 * @return true if the parameterName or the value can be managed by the builder
+	 */
+	boolean accept(String parameterName, Object value);
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/ICallBack.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/ICallBack.java
index 993907665b6..d8edf6394e3 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/ICallBack.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/ICallBack.java
@@ -1,29 +1,29 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification;

-

-

-/**

- * A class providing services to be called back

- *

- * @author tristan faure

- *

- */

-public interface ICallBack {

-

-	/**

-	 * This method is called by the callee

-	 *

-	 * @param element

-	 */

-	void callBack(Object element);

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification;
+
+
+/**
+ * A class providing services to be called back
+ *
+ * @author tristan faure
+ *
+ */
+public interface ICallBack {
+
+	/**
+	 * This method is called by the callee
+	 *
+	 * @param element
+	 */
+	void callBack(Object element);
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/ICompositeCreator.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/ICompositeCreator.java
index d367b455bed..3c0e1cf45ce 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/ICompositeCreator.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/ICompositeCreator.java
@@ -1,35 +1,35 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification;

-

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.ui.forms.widgets.FormToolkit;

-

-

-/**

- * A composite creator can create a specific composite in the notification

- *

- * @author tfaure

- */

-public interface ICompositeCreator {

-

-	/**

-	 * Create the composite in the parent using the toolkit

-	 *

-	 * @param parent

-	 *            , the parent of the composite

-	 * @param toolkit

-	 *            , the toolkit to use

-	 * @return the composite created

-	 */

-	Composite createComposite(Composite parent, FormToolkit toolkit);

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification;
+
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+
+/**
+ * A composite creator can create a specific composite in the notification
+ *
+ * @author tfaure
+ */
+public interface ICompositeCreator {
+
+	/**
+	 * Create the composite in the parent using the toolkit
+	 *
+	 * @param parent
+	 *            , the parent of the composite
+	 * @param toolkit
+	 *            , the toolkit to use
+	 * @return the composite created
+	 */
+	Composite createComposite(Composite parent, FormToolkit toolkit);
+}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/INotification.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/INotification.java
new file mode 100644
index 00000000000..80082dee0da
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/INotification.java
@@ -0,0 +1,23 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 ATOS ORIGIN, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification;
+
+
+/**
+ * The Interface INotification.
+ * offers some services for a notification
+ */
+public interface INotification extends org.eclipse.papyrus.infra.tools.notify.INotification {
+	// No additional API
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/NotificationRunnable.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/NotificationRunnable.java
index f510267e787..6cbec8b5325 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/NotificationRunnable.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/NotificationRunnable.java
@@ -1,36 +1,36 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification;

-

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.IContext;

-

-/**

- * a runnable

- *

- */

-public interface NotificationRunnable {

-

-	/**

-	 * Run the runnable

-	 *

-	 * @param context

-	 *            , used to fill properties, can contain data

-	 */

-	void run(IContext context);

-

-	/**

-	 * The label of the runnable

-	 *

-	 * @return the label

-	 */

-	String getLabel();

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification;
+
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.IContext;
+
+/**
+ * a runnable
+ *
+ */
+public interface NotificationRunnable {
+
+	/**
+	 * Run the runnable
+	 *
+	 * @param context
+	 *            , used to fill properties, can contain data
+	 */
+	void run(IContext context);
+
+	/**
+	 * The label of the runnable
+	 *
+	 * @return the label
+	 */
+	String getLabel();
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/PapyrusToolkit.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/PapyrusToolkit.java
index 57b5c73be8c..ea919c936f5 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/PapyrusToolkit.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/PapyrusToolkit.java
@@ -1,48 +1,48 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification;

-

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.forms.widgets.ExpandableComposite;

-import org.eclipse.ui.forms.widgets.FormToolkit;

-import org.eclipse.ui.forms.widgets.Section;

-

-

-/**

- * This class allows specific toolkit for component creation

- *

- * @author tfaure

- *

- */

-public class PapyrusToolkit extends FormToolkit {

-

-	public static int DEFAULT_STYLE = -1;

-

-	/**

-	 * The unique instance of the papyrus toolkit

-	 */

-	public static PapyrusToolkit INSTANCE = new PapyrusToolkit(Display.getDefault());

-

-	private PapyrusToolkit(Display display) {

-		super(display);

-	}

-

-	@Override

-	public Section createSection(Composite parent, int sectionStyle) {

-		if (sectionStyle == DEFAULT_STYLE) {

-			return super.createSection(parent, ExpandableComposite.EXPANDED | ExpandableComposite.TITLE_BAR);

-		}

-		return super.createSection(parent, sectionStyle);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification;
+
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.Section;
+
+
+/**
+ * This class allows specific toolkit for component creation
+ *
+ * @author tfaure
+ *
+ */
+public class PapyrusToolkit extends FormToolkit {
+
+	public static int DEFAULT_STYLE = -1;
+
+	/**
+	 * The unique instance of the papyrus toolkit
+	 */
+	public static PapyrusToolkit INSTANCE = new PapyrusToolkit(Display.getDefault());
+
+	private PapyrusToolkit(Display display) {
+		super(display);
+	}
+
+	@Override
+	public Section createSection(Composite parent, int sectionStyle) {
+		if (sectionStyle == DEFAULT_STYLE) {
+			return super.createSection(parent, ExpandableComposite.EXPANDED | ExpandableComposite.TITLE_BAR);
+		}
+		return super.createSection(parent, sectionStyle);
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/Type.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/Type.java
index ac3d86e4997..90dd825d5a7 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/Type.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/Type.java
@@ -1,23 +1,23 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification;

-

-

-/**

- * The different types of Notifications <li>INFO</i> <li>WARNING</i> <li>ERROR</i> <li>QUESTION</i>

- *

- * @author tristan faure

- *

- */

-public enum Type {

-	INFO, WARNING, ERROR, QUESTION

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification;
+
+
+/**
+ * The different types of Notifications <li>INFO</i> <li>WARNING</i> <li>ERROR</i> <li>QUESTION</i>
+ *
+ * @author tristan faure
+ *
+ */
+public enum Type {
+	INFO, WARNING, ERROR, QUESTION
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/AsyncNotifierBuilder.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/AsyncNotifierBuilder.java
index 0f269abb255..4f67eeba1a0 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/AsyncNotifierBuilder.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/AsyncNotifierBuilder.java
@@ -1,128 +1,128 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification.builders;

-

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.AsyncNotification;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.ImagePapyrusAsyncNotificationPopup;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.PapyrusAsyncNotificationPopup;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.utils.PapyrusControlsFactory;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.forms.widgets.FormToolkit;

-

-

-/**

- * A Builder able to create {@link PapyrusAsyncNotificationPopup} instances

- *

- * @author tristan faure

- *

- */

-public class AsyncNotifierBuilder implements IBuilder {

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#build(org.eclipse.papyrus.infra.widgets.toolbox.notification.PropertyWrapper,

-	 * org.eclipse.ui.forms.widgets.FormToolkit)

-	 */

-	public INotification build(PropertyWrapper wrapper, final FormToolkit toolkit) {

-		PapyrusAsyncNotificationPopup popup = null;

-		if (wrapper.getComposite() != null) {

-			final ICompositeCreator composite = wrapper.getComposite();

-			// use the creator to a notification with image

-			if (wrapper.getType() != null) {

-				popup = new ImagePapyrusAsyncNotificationPopup(Display.getDefault(), toolkit, wrapper.getType()) {

-

-					@Override

-					protected void doCreateClient(Composite parent) {

-						PapyrusControlsFactory.createCompositeWithType(getShell(), null, parent, type, image, text, false, composite, context);

-					}

-

-				};

-			} else {

-				// use the creator to a notification without image

-				popup = new PapyrusAsyncNotificationPopup(Display.getDefault(), toolkit) {

-

-					@Override

-					protected void doCreateClient(Composite parent) {

-						Composite compo = composite.createComposite(parent, toolkit);

-						setCompositeCreated(compo);

-					}

-				};

-			}

-		} else {

-			if (wrapper.getType() != null) {

-				popup = new ImagePapyrusAsyncNotificationPopup(Display.getDefault(), toolkit, wrapper.getType());

-			} else {

-				popup = new PapyrusAsyncNotificationPopup(Display.getDefault(), toolkit);

-			}

-			String text = wrapper.getMessage();

-			if (text == null) {

-				text = "no text";

-			}

-			popup.setText(text);

-		}

-		if (wrapper.getDelay() != null) {

-			popup.setDelayClose(wrapper.getDelay());

-		}

-		if (wrapper.getActions() != null) {

-			popup.addAllRunnable(wrapper.getActions());

-		}

-		popup.setTitle(wrapper.getTitle() == null ? "Papyrus" : wrapper.getTitle());

-		AsyncNotification notification = new AsyncNotification(popup);

-		popup.setINotification(notification);

-		popup.open();

-		return notification;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#accept(java.lang.String, java.lang.Object)

-	 */

-	public boolean accept(String parameterName, Object value) {

-		if (NotificationBuilder.ASYNCHRONOUS.equals(parameterName)) {

-			return value instanceof Boolean && ((Boolean) value);

-		}

-		if (NotificationBuilder.TEMPORARY.equals(parameterName)) {

-			return value instanceof Boolean && (Boolean) value;

-		}

-		if (NotificationBuilder.MESSAGE.equals(parameterName)) {

-			return true;

-		}

-		if (NotificationBuilder.COMPOSITE.equals(parameterName)) {

-			return true;

-		}

-		if (NotificationBuilder.ACTION.equals(parameterName)) {

-			return true;

-		}

-		if (NotificationBuilder.DELAY.equals(parameterName)) {

-			return true;

-		}

-		if (NotificationBuilder.IMAGE.equals(parameterName)) {

-			return true;

-		}

-		if (NotificationBuilder.TYPE.equals(parameterName)) {

-			return true;

-		}

-		if (NotificationBuilder.HTML.equals(parameterName)) {

-			return value instanceof Boolean && !(Boolean) value;

-		}

-		if (NotificationBuilder.TITLE.equals(parameterName)) {

-			return true;

-		}

-		return false;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.builders;
+
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.AsyncNotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.ImagePapyrusAsyncNotificationPopup;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.PapyrusAsyncNotificationPopup;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.utils.PapyrusControlsFactory;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+
+/**
+ * A Builder able to create {@link PapyrusAsyncNotificationPopup} instances
+ *
+ * @author tristan faure
+ *
+ */
+public class AsyncNotifierBuilder implements IBuilder {
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#build(org.eclipse.papyrus.infra.widgets.toolbox.notification.PropertyWrapper,
+	 * org.eclipse.ui.forms.widgets.FormToolkit)
+	 */
+	public INotification build(PropertyWrapper wrapper, final FormToolkit toolkit) {
+		PapyrusAsyncNotificationPopup popup = null;
+		if (wrapper.getComposite() != null) {
+			final ICompositeCreator composite = wrapper.getComposite();
+			// use the creator to a notification with image
+			if (wrapper.getType() != null) {
+				popup = new ImagePapyrusAsyncNotificationPopup(Display.getDefault(), toolkit, wrapper.getType()) {
+
+					@Override
+					protected void doCreateClient(Composite parent) {
+						PapyrusControlsFactory.createCompositeWithType(getShell(), null, parent, type, image, text, false, composite, context);
+					}
+
+				};
+			} else {
+				// use the creator to a notification without image
+				popup = new PapyrusAsyncNotificationPopup(Display.getDefault(), toolkit) {
+
+					@Override
+					protected void doCreateClient(Composite parent) {
+						Composite compo = composite.createComposite(parent, toolkit);
+						setCompositeCreated(compo);
+					}
+				};
+			}
+		} else {
+			if (wrapper.getType() != null) {
+				popup = new ImagePapyrusAsyncNotificationPopup(Display.getDefault(), toolkit, wrapper.getType());
+			} else {
+				popup = new PapyrusAsyncNotificationPopup(Display.getDefault(), toolkit);
+			}
+			String text = wrapper.getMessage();
+			if (text == null) {
+				text = "no text";
+			}
+			popup.setText(text);
+		}
+		if (wrapper.getDelay() != null) {
+			popup.setDelayClose(wrapper.getDelay());
+		}
+		if (wrapper.getActions() != null) {
+			popup.addAllRunnable(wrapper.getActions());
+		}
+		popup.setTitle(wrapper.getTitle() == null ? "Papyrus" : wrapper.getTitle());
+		AsyncNotification notification = new AsyncNotification(popup);
+		popup.setINotification(notification);
+		popup.open();
+		return notification;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#accept(java.lang.String, java.lang.Object)
+	 */
+	public boolean accept(String parameterName, Object value) {
+		if (NotificationBuilder.ASYNCHRONOUS.equals(parameterName)) {
+			return value instanceof Boolean && ((Boolean) value);
+		}
+		if (NotificationBuilder.TEMPORARY.equals(parameterName)) {
+			return value instanceof Boolean && (Boolean) value;
+		}
+		if (NotificationBuilder.MESSAGE.equals(parameterName)) {
+			return true;
+		}
+		if (NotificationBuilder.COMPOSITE.equals(parameterName)) {
+			return true;
+		}
+		if (NotificationBuilder.ACTION.equals(parameterName)) {
+			return true;
+		}
+		if (NotificationBuilder.DELAY.equals(parameterName)) {
+			return true;
+		}
+		if (NotificationBuilder.IMAGE.equals(parameterName)) {
+			return true;
+		}
+		if (NotificationBuilder.TYPE.equals(parameterName)) {
+			return true;
+		}
+		if (NotificationBuilder.HTML.equals(parameterName)) {
+			return value instanceof Boolean && !(Boolean) value;
+		}
+		if (NotificationBuilder.TITLE.equals(parameterName)) {
+			return true;
+		}
+		return false;
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/CombinedPopupAndViewBuilder.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/CombinedPopupAndViewBuilder.java
index f9870a64442..f6621f36983 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/CombinedPopupAndViewBuilder.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/CombinedPopupAndViewBuilder.java
@@ -1,147 +1,147 @@
-/*****************************************************************************

- * 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.widgets.toolbox.notification.builders;

-

-import java.util.HashSet;

-

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.AsyncNotification;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.ImagePapyrusAsyncNotificationPopup;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.PapyrusAsyncNotificationPopup;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.utils.PapyrusControlsFactory;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.view.AbstractInsideComposite;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.view.PapyrusNotificationView;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.view.ViewNotification;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.forms.widgets.FormToolkit;

-

-/**

- * <pre>

- * This builder creates notification both in a temporary pop-up and in Papyrus notification view.

- * It is not supposed to be registered in extension point as its implementation can possibly interfere with existing ones

- * ({@link ViewBuilder}, {@link AsyncNotifierBuilder}).

- *

- * It is assumed the title, message and type are set before use.

- *

- * Usage example : new NotificationBuilder().setBuilderClass(MyBuilder.class).setType(type).setTitle(title).setMessage(message).run();

- *

- * The expected behavior is the following :

- * - if the notification view is not active, a popup is shown and a notification is added in the view.

- * - if the notification view is active the notification is added in the view (no popup).

- * - if the notification view is not opened, it get created but do not get the focus so that the active view does not switch automatically.

- * </pre>

- */

-public class CombinedPopupAndViewBuilder implements IBuilder {

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#build(org.eclipse.papyrus.infra.widgets.toolbox.notification.PropertyWrapper,

-	 * org.eclipse.ui.forms.widgets.FormToolkit)

-	 */

-	public INotification build(PropertyWrapper wrapper, FormToolkit toolkit) {

-

-		// Find PapyrusNotificationView or create it but do not give it the focus, let the user decide when to consult these

-		// informations.

-		PapyrusNotificationView notificationView = (PapyrusNotificationView) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(PapyrusNotificationView.ID);

-		if (notificationView == null) {

-			try {

-				notificationView = (PapyrusNotificationView) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(PapyrusNotificationView.ID, null, IWorkbenchPage.VIEW_CREATE);

-			} catch (PartInitException e) {

-				// log error - unable to create notification view

-				return null;

-			}

-		}

-

-		// If the Notification view is not visible show temporary notification

-		if ((notificationView != null) && !(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().isPartVisible(notificationView))) {

-			createNotificationPopup(wrapper, toolkit);

-		}

-

-		// In any case, log the notification in the PapyrusNotificationView so that the user can consult this later.

-		return createNotificationLog(notificationView, wrapper, toolkit);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#accept(java.lang.String, java.lang.Object)

-	 */

-	public boolean accept(String parameterName, Object value) {

-		return true;

-	}

-

-	/**

-	 * This method creates the notification as a temporary popup.

-	 *

-	 * @param wrapper

-	 *            the notification property wrapper.

-	 * @param toolkit

-	 *            the form toolkit.

-	 * @return the notification.

-	 */

-	private INotification createNotificationPopup(final PropertyWrapper wrapper, FormToolkit toolkit) {

-

-		PapyrusAsyncNotificationPopup popup = new ImagePapyrusAsyncNotificationPopup(Display.getDefault(), toolkit, wrapper.getType());

-		popup.setTitle(wrapper.getTitle());

-		popup.setText(wrapper.getMessage());

-		popup.addAllRunnable(wrapper.getActions() == null ? new HashSet<NotificationRunnable>() : wrapper.getActions());

-

-		AsyncNotification notification = new AsyncNotification(popup);

-		popup.setINotification(notification);

-

-		popup.open();

-

-		return notification;

-	}

-

-	/**

-	 * This method add notifications in the notification view.

-	 *

-	 * @param notificationView

-	 *            the notification view.

-	 * @param wrapper

-	 *            the notification property wrapper.

-	 * @param toolkit

-	 *            the form toolkit.

-	 * @return the notification.

-	 */

-	private INotification createNotificationLog(PapyrusNotificationView notificationView, final PropertyWrapper wrapper, final FormToolkit toolkit) {

-

-		ICompositeCreator compositeCreator = wrapper.getComposite();

-		if (compositeCreator == null) {

-

-			compositeCreator = new ICompositeCreator() {

-

-				public Composite createComposite(Composite parent, FormToolkit toolkit) {

-					return PapyrusControlsFactory.createCompositeWithType(Display.getDefault().getActiveShell(), toolkit, parent, wrapper.getType(), wrapper.getImage(), wrapper.getMessage(), false);

-				}

-

-			};

-		}

-

-		AbstractInsideComposite compositeNotification = notificationView.setComposite(compositeCreator, wrapper.getTitle(), wrapper.getActions());

-		ViewNotification notification = new ViewNotification(compositeNotification);

-		compositeNotification.setINotification(notification);

-

-		return notification;

-	}

-}

+/*****************************************************************************
+ * 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.widgets.toolbox.notification.builders;
+
+import java.util.HashSet;
+
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.AsyncNotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.ImagePapyrusAsyncNotificationPopup;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.PapyrusAsyncNotificationPopup;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.utils.PapyrusControlsFactory;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.view.AbstractInsideComposite;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.view.PapyrusNotificationView;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.view.ViewNotification;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+/**
+ * <pre>
+ * This builder creates notification both in a temporary pop-up and in Papyrus notification view.
+ * It is not supposed to be registered in extension point as its implementation can possibly interfere with existing ones
+ * ({@link ViewBuilder}, {@link AsyncNotifierBuilder}).
+ *
+ * It is assumed the title, message and type are set before use.
+ *
+ * Usage example : new NotificationBuilder().setBuilderClass(MyBuilder.class).setType(type).setTitle(title).setMessage(message).run();
+ *
+ * The expected behavior is the following :
+ * - if the notification view is not active, a popup is shown and a notification is added in the view.
+ * - if the notification view is active the notification is added in the view (no popup).
+ * - if the notification view is not opened, it get created but do not get the focus so that the active view does not switch automatically.
+ * </pre>
+ */
+public class CombinedPopupAndViewBuilder implements IBuilder {
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#build(org.eclipse.papyrus.infra.widgets.toolbox.notification.PropertyWrapper,
+	 * org.eclipse.ui.forms.widgets.FormToolkit)
+	 */
+	public INotification build(PropertyWrapper wrapper, FormToolkit toolkit) {
+
+		// Find PapyrusNotificationView or create it but do not give it the focus, let the user decide when to consult these
+		// informations.
+		PapyrusNotificationView notificationView = (PapyrusNotificationView) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(PapyrusNotificationView.ID);
+		if (notificationView == null) {
+			try {
+				notificationView = (PapyrusNotificationView) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(PapyrusNotificationView.ID, null, IWorkbenchPage.VIEW_CREATE);
+			} catch (PartInitException e) {
+				// log error - unable to create notification view
+				return null;
+			}
+		}
+
+		// If the Notification view is not visible show temporary notification
+		if ((notificationView != null) && !(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().isPartVisible(notificationView))) {
+			createNotificationPopup(wrapper, toolkit);
+		}
+
+		// In any case, log the notification in the PapyrusNotificationView so that the user can consult this later.
+		return createNotificationLog(notificationView, wrapper, toolkit);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#accept(java.lang.String, java.lang.Object)
+	 */
+	public boolean accept(String parameterName, Object value) {
+		return true;
+	}
+
+	/**
+	 * This method creates the notification as a temporary popup.
+	 *
+	 * @param wrapper
+	 *            the notification property wrapper.
+	 * @param toolkit
+	 *            the form toolkit.
+	 * @return the notification.
+	 */
+	private INotification createNotificationPopup(final PropertyWrapper wrapper, FormToolkit toolkit) {
+
+		PapyrusAsyncNotificationPopup popup = new ImagePapyrusAsyncNotificationPopup(Display.getDefault(), toolkit, wrapper.getType());
+		popup.setTitle(wrapper.getTitle());
+		popup.setText(wrapper.getMessage());
+		popup.addAllRunnable(wrapper.getActions() == null ? new HashSet<NotificationRunnable>() : wrapper.getActions());
+
+		AsyncNotification notification = new AsyncNotification(popup);
+		popup.setINotification(notification);
+
+		popup.open();
+
+		return notification;
+	}
+
+	/**
+	 * This method add notifications in the notification view.
+	 *
+	 * @param notificationView
+	 *            the notification view.
+	 * @param wrapper
+	 *            the notification property wrapper.
+	 * @param toolkit
+	 *            the form toolkit.
+	 * @return the notification.
+	 */
+	private INotification createNotificationLog(PapyrusNotificationView notificationView, final PropertyWrapper wrapper, final FormToolkit toolkit) {
+
+		ICompositeCreator compositeCreator = wrapper.getComposite();
+		if (compositeCreator == null) {
+
+			compositeCreator = new ICompositeCreator() {
+
+				public Composite createComposite(Composite parent, FormToolkit toolkit) {
+					return PapyrusControlsFactory.createCompositeWithType(Display.getDefault().getActiveShell(), toolkit, parent, wrapper.getType(), wrapper.getImage(), wrapper.getMessage(), false);
+				}
+
+			};
+		}
+
+		AbstractInsideComposite compositeNotification = notificationView.setComposite(compositeCreator, wrapper.getTitle(), wrapper.getActions());
+		ViewNotification notification = new ViewNotification(compositeNotification);
+		compositeNotification.setINotification(notification);
+
+		return notification;
+	}
+}
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/IContext.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/IContext.java
new file mode 100644
index 00000000000..8c40affaa39
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/IContext.java
@@ -0,0 +1,41 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 ATOS ORIGIN, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.builders;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * The Class Context.
+ */
+public interface IContext extends org.eclipse.papyrus.infra.tools.notify.IContext {
+
+	class Context implements IContext {
+
+		private Map<String, Object> objects = new HashMap<String, Object>();;
+
+		@Override
+		public void put(String s, Object o) {
+			objects.put(s, o);
+		}
+
+		@Override
+		public Object get(String s) {
+			return objects.get(s);
+		}
+
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/NotificationBuilder.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/NotificationBuilder.java
index 487e95a0d5a..db46f76958c 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/NotificationBuilder.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/NotificationBuilder.java
@@ -1,515 +1,546 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification.builders;

-

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.Map;

-import java.util.Set;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.PapyrusToolkit;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.popups.PopupNotification;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.forms.widgets.FormToolkit;

-

-

-/**

- * A class creating a notification,

- * the run method launch the message according to the value of the attributes

- *

- * @author tristan faure

- *

- */

-public class NotificationBuilder {

-

-	private FormToolkit toolkit = PapyrusToolkit.INSTANCE;

-

-	/** The parameters of the notification with the corresponding values */

-	protected Map<String, Object> parameters = new HashMap<String, Object>();

-

-

-

-	/** The builders creating the notification */

-	protected static Map<Class<? extends IBuilder>, IBuilder> builders = getBuilders();

-

-	/** asynchronous, determines if the message needs or not to be synchronous with the notification */

-	static String ASYNCHRONOUS = "asynchronous";

-

-	/** a message displayed in the notification */

-	static String MESSAGE = "message";

-

-	/** a composite creator for the element */

-	static String COMPOSITE = "composite";

-

-	/** a default action in the notification */

-	static String ACTION = "default_action";

-

-	/** a delay to display if it is a temporary notification */

-	static String DELAY = "delay";

-

-	/** determines if the notification is temporary */

-	static String TEMPORARY = "temporary";

-

-	/** a title displayed in the notification */

-	static String TITLE = "title";

-

-	/** determines if there is html content in the notification */

-	static String HTML = "html";

-

-	/** determines the type according to {@link Type} */

-	static String TYPE = "type";

-

-	/** an image displayed generally at the left of the notification */

-	static String IMAGE = "image";

-

-	/**

-	 * Determine a specific builder class, if it is filled, it is forced to it

-	 */

-	protected Class<? extends IBuilder> builderClass;

-

-

-	/**

-	 * Returns the ibuilders able to create notifications

-	 *

-	 * @return the list of {@link IBuilder}

-	 */

-	private static Map<Class<? extends IBuilder>, IBuilder> getBuilders() {

-		Map<Class<? extends IBuilder>, IBuilder> result = new HashMap<Class<? extends IBuilder>, IBuilder>();

-		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.papyrus.infra.widgets.toolbox.papyrusNotificationBuilder");

-		for (IConfigurationElement e : elements) {

-			IBuilder instance;

-			try {

-				instance = (IBuilder) e.createExecutableExtension("builder");

-				result.put(instance.getClass(), instance);

-			} catch (CoreException e1) {

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * Set a message for the notification

-	 *

-	 * @param message

-	 *            , the message to display

-	 * @return this

-	 */

-	public NotificationBuilder setMessage(String message) {

-		parameters.put(MESSAGE, message);

-		return this;

-	}

-

-	/**

-	 * Determines if the notification is asynchronous (don't force the user to read the notification immediately)

-	 *

-	 * @param asynchronous

-	 *            , true if it asynchronous

-	 * @return this

-	 */

-	public NotificationBuilder setAsynchronous(boolean asynchronous) {

-		parameters.put(ASYNCHRONOUS, asynchronous);

-		return this;

-	}

-

-	/**

-	 * Set a default action for the notification

-	 *

-	 * @param runnable

-	 *            , a runnable triggered when default action of the notification is selected

-	 *            The first action added is the default One

-	 * @return this

-	 */

-	@SuppressWarnings("unchecked")

-	public NotificationBuilder addAction(NotificationRunnable runnable) {

-		Collection<NotificationRunnable> runnables = (Collection<NotificationRunnable>) parameters.get(ACTION);

-		if (runnables == null) {

-			runnables = new LinkedList<NotificationRunnable>();

-			parameters.put(ACTION, runnables);

-		}

-		runnables.add(runnable);

-		return this;

-	}

-

-	/**

-	 * Set a composite creator, able to fill a notification

-	 *

-	 * @param creator

-	 *            , the composite creator

-	 * @return this

-	 */

-	public NotificationBuilder setComposite(ICompositeCreator creator) {

-		parameters.put(COMPOSITE, creator);

-		return this;

-	}

-

-	/**

-	 * Set a delay if the notification is temporary

-	 *

-	 * @param delayMs

-	 *            , the delay in ms for visibility

-	 * @return this

-	 */

-	public NotificationBuilder setDelay(long delayMs) {

-		parameters.put(DELAY, delayMs);

-		return this;

-	}

-

-	/**

-	 * Set true if the notification is temporary

-	 *

-	 * @param temporary

-	 * @return this

-	 */

-	public NotificationBuilder setTemporary(boolean temporary) {

-		parameters.put(TEMPORARY, temporary);

-		return this;

-	}

-

-	/**

-	 * Set a title for the notification

-	 *

-	 * @param title

-	 *            , the title

-	 * @return this

-	 */

-	public NotificationBuilder setTitle(String title) {

-		parameters.put(TITLE, title);

-		return this;

-	}

-

-	/**

-	 * Set if the notification has to understand HTML

-	 *

-	 * @param useHTML

-	 * @return this

-	 */

-	public NotificationBuilder setHTML(boolean useHTML) {

-		parameters.put(HTML, useHTML);

-		return this;

-	}

-

-	/**

-	 * Set the type of the notification according to {@link Type}

-	 *

-	 * @param type

-	 *            , the desired type

-	 * @return this

-	 */

-	public NotificationBuilder setType(Type type) {

-		parameters.put(TYPE, type);

-		return this;

-	}

-

-	/**

-	 * Set an image for the notification

-	 *

-	 * @param image

-	 *            , the desired image

-	 * @return this

-	 */

-	public NotificationBuilder setImage(Image image) {

-		parameters.put(IMAGE, image);

-		return this;

-	}

-

-	/**

-	 * Force a builder class

-	 *

-	 * @param builderClass

-	 *            , a class which inherits from {@link IBuilder}

-	 * @return this

-	 */

-	public NotificationBuilder setBuilderClass(Class<? extends IBuilder> builderClass) {

-		this.builderClass = builderClass;

-		return this;

-	}

-

-	/**

-	 * Allows the developer to use a specific parameter

-	 *

-	 * @param name

-	 *            , the key of the parameter

-	 * @param value

-	 *            , the value

-	 * @return this

-	 */

-	public NotificationBuilder setParameter(String name, Object value) {

-		parameters.put(name, value);

-		return this;

-	}

-

-	/**

-	 * Creates a notification according to different parameters

-	 */

-	public INotification run() {

-		Set<IBuilder> copy = null;

-		if (builderClass != null) {

-			copy = new HashSet<IBuilder>();

-			try {

-				copy.add(builderClass.newInstance());

-			} catch (InstantiationException e) {

-			} catch (IllegalAccessException e) {

-			}

-		} else {

-			copy = new HashSet<IBuilder>(builders.values());

-		}

-		for (Iterator<IBuilder> i = copy.iterator(); i.hasNext();) {

-			IBuilder b = i.next();

-			for (String string : parameters.keySet()) {

-				if (!b.accept(string, parameters.get(string))) {

-					i.remove();

-					break;

-				}

-			}

-		}

-		INotification result = null;

-		PropertyWrapper wrapper = new PropertyWrapper(parameters);

-		if (copy.size() >= 1) {

-			result = copy.iterator().next().build(wrapper, toolkit);

-			// default case : the popup

-		} else if (copy.isEmpty()) {

-			result = builders.get(PopupBuilder.class).build(wrapper, toolkit);

-		}

-		return result;

-	}

-

-	/**

-	 * Creates a notification builder already configured to display an information builder

-	 *

-	 * @return a notification builder

-	 */

-	public static NotificationBuilder createInformationBuilder() {

-		NotificationBuilder builder = new NotificationBuilder();

-		return builder;

-	}

-

-	/**

-	 * Creates a notification builder already configured to display an asynchronous popup

-	 *

-	 * @param text

-	 *            , the text to display

-	 * @return a notification builder

-	 */

-	public static NotificationBuilder createAsyncPopup(String text) {

-		return new NotificationBuilder().setAsynchronous(true).setTemporary(true).setMessage(text).setDelay(2000);

-	}

-

-	/**

-	 * Creates a notification builder already configured to display an asynchronous popup with a specified title

-	 *

-	 * @param text

-	 *            , the text to display

-	 * @param title

-	 *            , the title of the popup

-	 * @return a notification builder

-	 */

-	public static NotificationBuilder createAsyncPopup(String title, String text) {

-		return new NotificationBuilder().setAsynchronous(true).setTemporary(true).setMessage(text).setTitle(title).setDelay(2000);

-	}

-

-	/**

-	 * Creates a notification builder already configured to display an information popup

-	 *

-	 * @param text

-	 *            , the text to display

-	 * @return a notification builder

-	 */

-	public static NotificationBuilder createInfoPopup(String text) {

-		return new NotificationBuilder().setAsynchronous(false).setTemporary(false).setMessage(text).setType(Type.INFO);

-	}

-

-	/**

-	 * Creates a notification builder already configured to display an warning popup

-	 *

-	 * @param text

-	 *            , the text to display

-	 * @return a notification builder

-	 */

-	public static NotificationBuilder createWarningPopup(String text) {

-		return new NotificationBuilder().setAsynchronous(false).setTemporary(false).setMessage(text).setType(Type.WARNING);

-	}

-

-	/**

-	 * Creates a notification builder already configured to display a popup with question icon

-	 *

-	 * @param text

-	 *            , the text to display

-	 * @return a notification builder

-	 */

-	public static NotificationBuilder createQuestionPopup(String text) {

-		return new NotificationBuilder().setAsynchronous(false).setTemporary(false).setMessage(text).setType(Type.QUESTION);

-	}

-

-	/**

-	 * Creates a notification builder already configured to display a popup with error icon

-	 *

-	 * @param text

-	 *            , the text to display

-	 * @return a notification builder

-	 */

-	public static NotificationBuilder createErrorPopup(String text) {

-		return new NotificationBuilder().setAsynchronous(false).setTemporary(false).setMessage(text).setType(Type.ERROR);

-	}

-

-	/**

-	 * Creates a notification builder already configured to display a yes no question

-	 *

-	 * @param yes

-	 *            , the action to launch if yes is selected

-	 * @param no

-	 *            , the action to launch if no is selected

-	 * @return a notification builder

-	 */

-	public static NotificationBuilder createYesNo(String message, final Runnable yes, final Runnable no) {

-		return new NotificationBuilder().setType(Type.QUESTION).setAsynchronous(false).setTemporary(false).setMessage(message).addAction(new NotificationRunnable() {

-

-			public void run(IContext context) {

-				if (yes != null) {

-					context.put(IContext.ACTION_ID, SWT.YES);

-					yes.run();

-				}

-			}

-

-			public String getLabel() {

-				return "Yes";

-			}

-		}).addAction(new NotificationRunnable() {

-

-			public void run(IContext context) {

-				if (no != null) {

-					context.put(IContext.ACTION_ID, SWT.NO);

-					no.run();

-				}

-			}

-

-			public String getLabel() {

-				return "No";

-			}

-		});

-	}

-

-	/**

-	 * Creates a notification builder already configured to display a yes no question, no runnables are necesary as the user just want the

-	 * PopupNotification result

-	 * This NotificationRunnable is not intended to be changed to an asynchronous notification for example

-	 * When the run method is called use getRsult method in {@link PopupNotification} and test if the value is SWT.YES or SWT.NO

-	 *

-	 * @param message

-	 *            , the message to display

-	 *

-	 * @return a notification builder

-	 */

-	public static NotificationBuilder createYesNo(String message) {

-		return new NotificationBuilder().setType(Type.QUESTION).setAsynchronous(false).setTemporary(false).setMessage(message).addAction(new NotificationRunnable() {

-

-			public void run(IContext context) {

-				context.put(IContext.ACTION_ID, SWT.YES);

-			}

-

-			public String getLabel() {

-				return "Yes";

-			}

-		}).addAction(new NotificationRunnable() {

-

-			public void run(IContext context) {

-				context.put(IContext.ACTION_ID, SWT.NO);

-			}

-

-			public String getLabel() {

-				return "No";

-			}

-		});

-	}

-

-	/**

-	 * Creates a notification builder already configured to display a yes no question

-	 *

-	 * @param yes

-	 *            , the action to launch if yes is selected

-	 * @param no

-	 *            , the action to launch if no is selected

-	 * @return a notification builder

-	 */

-	public static NotificationBuilder createYesNo(String message, final NotificationRunnable yes, final NotificationRunnable no) {

-		return new NotificationBuilder().setType(Type.QUESTION).setAsynchronous(false).setTemporary(false).setMessage(message).addAction(new NotificationRunnable() {

-

-			public void run(IContext context) {

-				if (yes != null) {

-					context.put(IContext.ACTION_ID, SWT.YES);

-					yes.run(context);

-				}

-			}

-

-			public String getLabel() {

-				return "Yes";

-			}

-		}).addAction(new NotificationRunnable() {

-

-			public void run(IContext context) {

-				if (no != null) {

-					context.put(IContext.ACTION_ID, SWT.NO);

-					no.run(context);

-				}

-			}

-

-			public String getLabel() {

-				return "No";

-			}

-		});

-	}

-

-	/**

-	 * Return the system image according to the imageID

-	 *

-	 * @param imageID

-	 * @param shell

-	 * @return

-	 */

-	public static Image getSWTImage(final int imageID, Shell shell) {

-		final Display display;

-		if (shell == null || shell.isDisposed()) {

-			display = Display.getCurrent();

-			// The dialog should be always instantiated in UI thread.

-			// However it was possible to instantiate it in other threads

-			// (the code worked in most cases) so the assertion covers

-			// only the failing scenario. See bug 107082 for details.

-			Assert.isNotNull(display, "The dialog should be created in UI thread"); //$NON-NLS-1$

-		} else {

-			display = shell.getDisplay();

-		}

-

-		final Image[] image = new Image[1];

-		display.syncExec(new Runnable() {

-

-			public void run() {

-				image[0] = display.getSystemImage(imageID);

-			}

-		});

-

-		return image[0];

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2016 ATOS ORIGIN, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.builders;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.papyrus.infra.tools.notify.INotificationBuilder;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.PapyrusToolkit;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.popups.PopupNotification;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+
+/**
+ * <p>
+ * A class creating a notification.
+ * The {@link #run()} method launches the message according to the value of the attributes.
+ * </p>
+ * <p>
+ * Consider using the headless-compatible {@link org.eclipse.papyrus.infra.tools.notify.NotificationBuilder API}
+ * if you don't need to specify an {@linkplain #setImage(Image) image} or a
+ * {@linkplain #setComposite(ICompositeCreator) composite} for your notification.
+ *
+ * @author tristan faure
+ *
+ */
+public class NotificationBuilder implements INotificationBuilder {
+
+	private FormToolkit toolkit = PapyrusToolkit.INSTANCE;
+
+	/** The parameters of the notification with the corresponding values */
+	protected Map<String, Object> parameters = new HashMap<String, Object>();
+
+	/** a composite creator for the element */
+	static String COMPOSITE = "composite";
+
+	/** an image displayed generally at the left of the notification */
+	static String IMAGE = "image";
+
+	/** The builders creating the notification */
+	protected static Map<Class<? extends IBuilder>, IBuilder> builders = getBuilders();
+
+	/**
+	 * Determine a specific builder class, if it is filled, it is forced to it
+	 */
+	protected Class<? extends IBuilder> builderClass;
+
+
+	/**
+	 * Returns the ibuilders able to create notifications
+	 *
+	 * @return the list of {@link IBuilder}
+	 */
+	private static Map<Class<? extends IBuilder>, IBuilder> getBuilders() {
+		Map<Class<? extends IBuilder>, IBuilder> result = new HashMap<Class<? extends IBuilder>, IBuilder>();
+		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.papyrus.infra.widgets.toolbox.papyrusNotificationBuilder");
+		for (IConfigurationElement e : elements) {
+			IBuilder instance;
+			try {
+				instance = (IBuilder) e.createExecutableExtension("builder");
+				result.put(instance.getClass(), instance);
+			} catch (CoreException e1) {
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Set a message for the notification
+	 *
+	 * @param message
+	 *            , the message to display
+	 * @return this
+	 */
+	@Override
+	public NotificationBuilder setMessage(String message) {
+		parameters.put(MESSAGE, message);
+		return this;
+	}
+
+	/**
+	 * Determines if the notification is asynchronous (don't force the user to read the notification immediately)
+	 *
+	 * @param asynchronous
+	 *            , true if it asynchronous
+	 * @return this
+	 */
+	@Override
+	public NotificationBuilder setAsynchronous(boolean asynchronous) {
+		parameters.put(ASYNCHRONOUS, asynchronous);
+		return this;
+	}
+
+	/**
+	 * Set a default action for the notification
+	 *
+	 * @param runnable
+	 *            , a runnable triggered when default action of the notification is selected
+	 *            The first action added is the default One
+	 * @return this
+	 */
+	@SuppressWarnings("unchecked")
+	public NotificationBuilder addAction(NotificationRunnable runnable) {
+		Collection<NotificationRunnable> runnables = (Collection<NotificationRunnable>) parameters.get(ACTION);
+		if (runnables == null) {
+			runnables = new LinkedList<NotificationRunnable>();
+			parameters.put(ACTION, runnables);
+		}
+		runnables.add(runnable);
+		return this;
+	}
+
+	@Override
+	public NotificationBuilder addAction(final org.eclipse.papyrus.infra.tools.notify.NotificationRunnable runnable) {
+		return addAction(new NotificationRunnable() {
+
+			@Override
+			public void run(IContext context) {
+				runnable.run(context);
+			}
+
+			@Override
+			public String getLabel() {
+				return runnable.getLabel();
+			}
+		});
+	}
+
+	/**
+	 * Set a composite creator, able to fill a notification
+	 *
+	 * @param creator
+	 *            , the composite creator
+	 * @return this
+	 */
+	public NotificationBuilder setComposite(ICompositeCreator creator) {
+		parameters.put(COMPOSITE, creator);
+		return this;
+	}
+
+	/**
+	 * Set a delay if the notification is temporary
+	 *
+	 * @param delayMs
+	 *            , the delay in ms for visibility
+	 * @return this
+	 */
+	@Override
+	public NotificationBuilder setDelay(long delayMs) {
+		parameters.put(DELAY, delayMs);
+		return this;
+	}
+
+	/**
+	 * Set true if the notification is temporary
+	 *
+	 * @param temporary
+	 * @return this
+	 */
+	@Override
+	public NotificationBuilder setTemporary(boolean temporary) {
+		parameters.put(TEMPORARY, temporary);
+		return this;
+	}
+
+	/**
+	 * Set a title for the notification
+	 *
+	 * @param title
+	 *            , the title
+	 * @return this
+	 */
+	@Override
+	public NotificationBuilder setTitle(String title) {
+		parameters.put(TITLE, title);
+		return this;
+	}
+
+	/**
+	 * Set if the notification has to understand HTML
+	 *
+	 * @param useHTML
+	 * @return this
+	 */
+	@Override
+	public NotificationBuilder setHTML(boolean useHTML) {
+		parameters.put(HTML, useHTML);
+		return this;
+	}
+
+	/**
+	 * Set the type of the notification according to {@link Type}
+	 *
+	 * @param type
+	 *            , the desired type
+	 * @return this
+	 */
+	public NotificationBuilder setType(Type type) {
+		parameters.put(TYPE, type);
+		return this;
+	}
+
+	@Override
+	public NotificationBuilder setType(org.eclipse.papyrus.infra.tools.notify.Type type) {
+		return setType(Type.valueOf(type.name()));
+	}
+
+	/**
+	 * Set an image for the notification
+	 *
+	 * @param image
+	 *            , the desired image
+	 * @return this
+	 */
+	public NotificationBuilder setImage(Image image) {
+		parameters.put(IMAGE, image);
+		return this;
+	}
+
+	/**
+	 * Force a builder class
+	 *
+	 * @param builderClass
+	 *            , a class which inherits from {@link IBuilder}
+	 * @return this
+	 */
+	public NotificationBuilder setBuilderClass(Class<? extends IBuilder> builderClass) {
+		this.builderClass = builderClass;
+		return this;
+	}
+
+	/**
+	 * Allows the developer to use a specific parameter
+	 *
+	 * @param name
+	 *            , the key of the parameter
+	 * @param value
+	 *            , the value
+	 * @return this
+	 */
+	@Override
+	public NotificationBuilder setParameter(String name, Object value) {
+		if (TYPE.equals(name)) {
+			if (value instanceof org.eclipse.papyrus.infra.tools.notify.Type) {
+				value = Type.valueOf(((org.eclipse.papyrus.infra.tools.notify.Type) value).name());
+			}
+		}
+
+		parameters.put(name, value);
+		return this;
+	}
+
+	/**
+	 * Creates a notification according to different parameters
+	 */
+	@Override
+	public INotification run() {
+		Set<IBuilder> copy = null;
+		if (builderClass != null) {
+			copy = new HashSet<IBuilder>();
+			try {
+				copy.add(builderClass.newInstance());
+			} catch (InstantiationException e) {
+			} catch (IllegalAccessException e) {
+			}
+		} else {
+			copy = new HashSet<IBuilder>(builders.values());
+		}
+		for (Iterator<IBuilder> i = copy.iterator(); i.hasNext();) {
+			IBuilder b = i.next();
+			for (String string : parameters.keySet()) {
+				if (!b.accept(string, parameters.get(string))) {
+					i.remove();
+					break;
+				}
+			}
+		}
+		INotification result = null;
+		PropertyWrapper wrapper = new PropertyWrapper(parameters);
+		if (copy.size() >= 1) {
+			result = copy.iterator().next().build(wrapper, toolkit);
+			// default case : the popup
+		} else if (copy.isEmpty()) {
+			result = builders.get(PopupBuilder.class).build(wrapper, toolkit);
+		}
+		return result;
+	}
+
+	/**
+	 * Creates a notification builder already configured to display an information builder
+	 *
+	 * @return a notification builder
+	 */
+	public static NotificationBuilder createInformationBuilder() {
+		NotificationBuilder builder = new NotificationBuilder();
+		return builder;
+	}
+
+	/**
+	 * Creates a notification builder already configured to display an asynchronous popup
+	 *
+	 * @param text
+	 *            , the text to display
+	 * @return a notification builder
+	 */
+	public static NotificationBuilder createAsyncPopup(String text) {
+		return new NotificationBuilder().setAsynchronous(true).setTemporary(true).setMessage(text).setDelay(2000);
+	}
+
+	/**
+	 * Creates a notification builder already configured to display an asynchronous popup with a specified title
+	 *
+	 * @param text
+	 *            , the text to display
+	 * @param title
+	 *            , the title of the popup
+	 * @return a notification builder
+	 */
+	public static NotificationBuilder createAsyncPopup(String title, String text) {
+		return new NotificationBuilder().setAsynchronous(true).setTemporary(true).setMessage(text).setTitle(title).setDelay(2000);
+	}
+
+	/**
+	 * Creates a notification builder already configured to display an information popup
+	 *
+	 * @param text
+	 *            , the text to display
+	 * @return a notification builder
+	 */
+	public static NotificationBuilder createInfoPopup(String text) {
+		return new NotificationBuilder().setAsynchronous(false).setTemporary(false).setMessage(text).setType(Type.INFO);
+	}
+
+	/**
+	 * Creates a notification builder already configured to display an warning popup
+	 *
+	 * @param text
+	 *            , the text to display
+	 * @return a notification builder
+	 */
+	public static NotificationBuilder createWarningPopup(String text) {
+		return new NotificationBuilder().setAsynchronous(false).setTemporary(false).setMessage(text).setType(Type.WARNING);
+	}
+
+	/**
+	 * Creates a notification builder already configured to display a popup with question icon
+	 *
+	 * @param text
+	 *            , the text to display
+	 * @return a notification builder
+	 */
+	public static NotificationBuilder createQuestionPopup(String text) {
+		return new NotificationBuilder().setAsynchronous(false).setTemporary(false).setMessage(text).setType(Type.QUESTION);
+	}
+
+	/**
+	 * Creates a notification builder already configured to display a popup with error icon
+	 *
+	 * @param text
+	 *            , the text to display
+	 * @return a notification builder
+	 */
+	public static NotificationBuilder createErrorPopup(String text) {
+		return new NotificationBuilder().setAsynchronous(false).setTemporary(false).setMessage(text).setType(Type.ERROR);
+	}
+
+	/**
+	 * Creates a notification builder already configured to display a yes no question
+	 *
+	 * @param yes
+	 *            , the action to launch if yes is selected
+	 * @param no
+	 *            , the action to launch if no is selected
+	 * @return a notification builder
+	 */
+	public static NotificationBuilder createYesNo(String message, final Runnable yes, final Runnable no) {
+		return new NotificationBuilder().setType(Type.QUESTION).setAsynchronous(false).setTemporary(false).setMessage(message).addAction(new NotificationRunnable() {
+
+			@Override
+			public void run(IContext context) {
+				if (yes != null) {
+					context.put(IContext.ACTION_ID, SWT.YES);
+					yes.run();
+				}
+			}
+
+			@Override
+			public String getLabel() {
+				return "Yes";
+			}
+		}).addAction(new NotificationRunnable() {
+
+			@Override
+			public void run(IContext context) {
+				if (no != null) {
+					context.put(IContext.ACTION_ID, SWT.NO);
+					no.run();
+				}
+			}
+
+			@Override
+			public String getLabel() {
+				return "No";
+			}
+		});
+	}
+
+	/**
+	 * Creates a notification builder already configured to display a yes no question, no runnables are necesary as the user just want the
+	 * PopupNotification result
+	 * This NotificationRunnable is not intended to be changed to an asynchronous notification for example
+	 * When the run method is called use getRsult method in {@link PopupNotification} and test if the value is SWT.YES or SWT.NO
+	 *
+	 * @param message
+	 *            , the message to display
+	 *
+	 * @return a notification builder
+	 */
+	public static NotificationBuilder createYesNo(String message) {
+		return new NotificationBuilder().setType(Type.QUESTION).setAsynchronous(false).setTemporary(false).setMessage(message).addAction(new NotificationRunnable() {
+
+			@Override
+			public void run(IContext context) {
+				context.put(IContext.ACTION_ID, SWT.YES);
+			}
+
+			@Override
+			public String getLabel() {
+				return "Yes";
+			}
+		}).addAction(new NotificationRunnable() {
+
+			@Override
+			public void run(IContext context) {
+				context.put(IContext.ACTION_ID, SWT.NO);
+			}
+
+			@Override
+			public String getLabel() {
+				return "No";
+			}
+		});
+	}
+
+	/**
+	 * Creates a notification builder already configured to display a yes no question
+	 *
+	 * @param yes
+	 *            , the action to launch if yes is selected
+	 * @param no
+	 *            , the action to launch if no is selected
+	 * @return a notification builder
+	 */
+	public static NotificationBuilder createYesNo(String message, final NotificationRunnable yes, final NotificationRunnable no) {
+		return new NotificationBuilder().setType(Type.QUESTION).setAsynchronous(false).setTemporary(false).setMessage(message).addAction(new NotificationRunnable() {
+
+			@Override
+			public void run(IContext context) {
+				if (yes != null) {
+					context.put(IContext.ACTION_ID, SWT.YES);
+					yes.run(context);
+				}
+			}
+
+			@Override
+			public String getLabel() {
+				return "Yes";
+			}
+		}).addAction(new NotificationRunnable() {
+
+			@Override
+			public void run(IContext context) {
+				if (no != null) {
+					context.put(IContext.ACTION_ID, SWT.NO);
+					no.run(context);
+				}
+			}
+
+			@Override
+			public String getLabel() {
+				return "No";
+			}
+		});
+	}
+
+	/**
+	 * Return the system image according to the imageID
+	 *
+	 * @param imageID
+	 * @param shell
+	 * @return
+	 */
+	public static Image getSWTImage(final int imageID, Shell shell) {
+		final Display display;
+		if (shell == null || shell.isDisposed()) {
+			display = Display.getCurrent();
+			// The dialog should be always instantiated in UI thread.
+			// However it was possible to instantiate it in other threads
+			// (the code worked in most cases) so the assertion covers
+			// only the failing scenario. See bug 107082 for details.
+			Assert.isNotNull(display, "The dialog should be created in UI thread"); //$NON-NLS-1$
+		} else {
+			display = shell.getDisplay();
+		}
+
+		final Image[] image = new Image[1];
+		display.syncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				image[0] = display.getSystemImage(imageID);
+			}
+		});
+
+		return image[0];
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/PopupBuilder.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/PopupBuilder.java
index 75d8cff4852..b2dea10ae00 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/PopupBuilder.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/PopupBuilder.java
@@ -1,112 +1,112 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification.builders;

-

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.PapyrusPopup;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.popups.IconAndMessagePapyrusPopup;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.popups.MessagePapyrusPopup;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.popups.PopupNotification;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.forms.widgets.FormToolkit;

-

-/**

- * A Builder able to create {@link PapyrusPopup} instances

- *

- * @author tristan faure

- *

- */

-public class PopupBuilder implements IBuilder {

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#build(org.eclipse.papyrus.infra.widgets.toolbox.notification.PropertyWrapper,

-	 * org.eclipse.ui.forms.widgets.FormToolkit)

-	 */

-	public INotification build(PropertyWrapper wrapper, FormToolkit toolkit) {

-		PapyrusPopup popup = null;

-		String title = "Papyrus"; //$NON-NLS-1$

-		if (wrapper.getTitle() != null) {

-			title = wrapper.getTitle();

-		}

-		String message = null;

-		if (wrapper.getMessage() != null) {

-			message = wrapper.getMessage();

-		}

-		Shell activeShell = Display.getDefault().getActiveShell();

-		if (wrapper.getType() != null) {

-			popup = new IconAndMessagePapyrusPopup(activeShell, toolkit, message, wrapper.getType());

-		} else if (wrapper.getImage() != null) {

-			popup = new IconAndMessagePapyrusPopup(activeShell, toolkit, message);

-			((IconAndMessagePapyrusPopup) popup).setImage(wrapper.getImage());

-		} else {

-			popup = new MessagePapyrusPopup(activeShell, toolkit, message);

-		}

-		popup.setTitle(title);

-		popup.setUseHtml(wrapper.isHtml());

-		if (wrapper.getComposite() != null) {

-			popup.setCompositeCreator(wrapper.getComposite());

-			popup.setTitle(title);

-		}

-		if (wrapper.getActions() != null) {

-			popup.addRunnables(wrapper.getActions());

-		}

-		PopupNotification result = new PopupNotification(popup);

-		// assign the open result to the result of the run

-		popup.setINotification(result);

-		result.setResult(popup.open());

-		return result;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#accept(java.lang.String, java.lang.Object)

-	 */

-	public boolean accept(String parameterName, Object value) {

-		if (NotificationBuilder.ASYNCHRONOUS.equals(parameterName)) {

-			return value instanceof Boolean && !((Boolean) value);

-		}

-		if (NotificationBuilder.DELAY.equals(parameterName)) {

-			return false;

-		}

-		if (NotificationBuilder.TITLE.equals(parameterName)) {

-			return true;

-		}

-		if (NotificationBuilder.TYPE.equals(parameterName)) {

-			return true;

-		}

-		if (NotificationBuilder.IMAGE.equals(parameterName)) {

-			return true;

-		}

-		if (NotificationBuilder.MESSAGE.equals(parameterName)) {

-			return true;

-		}

-		if (NotificationBuilder.COMPOSITE.equals(parameterName)) {

-			return true;

-		}

-		if (NotificationBuilder.HTML.equals(parameterName)) {

-			return true;

-		}

-		if (NotificationBuilder.ACTION.equals(parameterName)) {

-			return true;

-		}

-		if (NotificationBuilder.TEMPORARY.equals(parameterName)) {

-			return value instanceof Boolean && !((Boolean) value);

-		}

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.builders;
+
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.PapyrusPopup;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.popups.IconAndMessagePapyrusPopup;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.popups.MessagePapyrusPopup;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.popups.PopupNotification;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+/**
+ * A Builder able to create {@link PapyrusPopup} instances
+ *
+ * @author tristan faure
+ *
+ */
+public class PopupBuilder implements IBuilder {
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#build(org.eclipse.papyrus.infra.widgets.toolbox.notification.PropertyWrapper,
+	 * org.eclipse.ui.forms.widgets.FormToolkit)
+	 */
+	public INotification build(PropertyWrapper wrapper, FormToolkit toolkit) {
+		PapyrusPopup popup = null;
+		String title = "Papyrus"; //$NON-NLS-1$
+		if (wrapper.getTitle() != null) {
+			title = wrapper.getTitle();
+		}
+		String message = null;
+		if (wrapper.getMessage() != null) {
+			message = wrapper.getMessage();
+		}
+		Shell activeShell = Display.getDefault().getActiveShell();
+		if (wrapper.getType() != null) {
+			popup = new IconAndMessagePapyrusPopup(activeShell, toolkit, message, wrapper.getType());
+		} else if (wrapper.getImage() != null) {
+			popup = new IconAndMessagePapyrusPopup(activeShell, toolkit, message);
+			((IconAndMessagePapyrusPopup) popup).setImage(wrapper.getImage());
+		} else {
+			popup = new MessagePapyrusPopup(activeShell, toolkit, message);
+		}
+		popup.setTitle(title);
+		popup.setUseHtml(wrapper.isHtml());
+		if (wrapper.getComposite() != null) {
+			popup.setCompositeCreator(wrapper.getComposite());
+			popup.setTitle(title);
+		}
+		if (wrapper.getActions() != null) {
+			popup.addRunnables(wrapper.getActions());
+		}
+		PopupNotification result = new PopupNotification(popup);
+		// assign the open result to the result of the run
+		popup.setINotification(result);
+		result.setResult(popup.open());
+		return result;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#accept(java.lang.String, java.lang.Object)
+	 */
+	public boolean accept(String parameterName, Object value) {
+		if (NotificationBuilder.ASYNCHRONOUS.equals(parameterName)) {
+			return value instanceof Boolean && !((Boolean) value);
+		}
+		if (NotificationBuilder.DELAY.equals(parameterName)) {
+			return false;
+		}
+		if (NotificationBuilder.TITLE.equals(parameterName)) {
+			return true;
+		}
+		if (NotificationBuilder.TYPE.equals(parameterName)) {
+			return true;
+		}
+		if (NotificationBuilder.IMAGE.equals(parameterName)) {
+			return true;
+		}
+		if (NotificationBuilder.MESSAGE.equals(parameterName)) {
+			return true;
+		}
+		if (NotificationBuilder.COMPOSITE.equals(parameterName)) {
+			return true;
+		}
+		if (NotificationBuilder.HTML.equals(parameterName)) {
+			return true;
+		}
+		if (NotificationBuilder.ACTION.equals(parameterName)) {
+			return true;
+		}
+		if (NotificationBuilder.TEMPORARY.equals(parameterName)) {
+			return value instanceof Boolean && !((Boolean) value);
+		}
+		return false;
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/PropertyWrapper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/PropertyWrapper.java
index 87f933b3d3d..48db799f622 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/PropertyWrapper.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/PropertyWrapper.java
@@ -1,189 +1,189 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification.builders;

-

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;

-import org.eclipse.swt.graphics.Image;

-

-

-/**

- * This class provides a more comfortable usage

- * to access to properties from NotificationBuilder map

- *

- * @author tristan faure

- *

- */

-public class PropertyWrapper {

-

-	private boolean asynchronous = false;

-

-	private String message = null;

-

-	private ICompositeCreator composite = null;

-

-	private Collection<NotificationRunnable> actions = null;

-

-	private Long delay = null;

-

-	private boolean temporary = false;

-

-	private String title = null;

-

-	private boolean html = false;

-

-	private Type type = null;

-

-	private Image image = null;

-

-	private Map<String, Object> others = new HashMap<String, Object>();

-

-	/**

-	 * The class analyses the map and set the fields of the objects according to the values of the map.

-	 *

-	 * @param properties

-	 *            the map from Notification Builder

-	 */

-	@SuppressWarnings("unchecked")

-	public PropertyWrapper(Map<String, Object> properties) {

-		for (String s : properties.keySet()) {

-			if (NotificationBuilder.ASYNCHRONOUS.equals(s)) {

-				asynchronous = (Boolean) properties.get(s);

-			} else if (NotificationBuilder.COMPOSITE.equals(s)) {

-				composite = (ICompositeCreator) properties.get(s);

-			} else if (NotificationBuilder.MESSAGE.equals(s)) {

-				message = (String) properties.get(s);

-			} else if (NotificationBuilder.ACTION.equals(s)) {

-				actions = (Collection<NotificationRunnable>) properties.get(s);

-			} else if (NotificationBuilder.DELAY.equals(s)) {

-				delay = (Long) properties.get(s);

-			} else if (NotificationBuilder.HTML.equals(s)) {

-				html = (Boolean) properties.get(s);

-			} else if (NotificationBuilder.TEMPORARY.equals(s)) {

-				temporary = (Boolean) properties.get(s);

-			} else if (NotificationBuilder.TITLE.equals(s)) {

-				title = (String) properties.get(s);

-			} else if (NotificationBuilder.TYPE.equals(s)) {

-				type = (Type) properties.get(s);

-			} else if (NotificationBuilder.IMAGE.equals(s)) {

-				image = (Image) properties.get(s);

-			} else {

-				others.put(s, properties.get(s));

-			}

-		}

-	}

-

-	/**

-	 * Checks if is asynchronous.

-	 *

-	 * @return true, if is asynchronous

-	 */

-	public boolean isAsynchronous() {

-		return asynchronous;

-	}

-

-	/**

-	 * Gets the message.

-	 *

-	 * @return the message

-	 */

-	public String getMessage() {

-		return message;

-	}

-

-	/**

-	 * Gets the composite.

-	 *

-	 * @return the composite

-	 */

-	public ICompositeCreator getComposite() {

-		return composite;

-	}

-

-	/**

-	 * Gets the actions.

-	 *

-	 * @return the actions

-	 */

-	public Collection<NotificationRunnable> getActions() {

-		return actions;

-	}

-

-	/**

-	 * Gets the delay.

-	 *

-	 * @return the delay

-	 */

-	public Long getDelay() {

-		return delay;

-	}

-

-	/**

-	 * Checks if is temporary.

-	 *

-	 * @return true, if is temporary

-	 */

-	public boolean isTemporary() {

-		return temporary;

-	}

-

-	/**

-	 * Gets the title.

-	 *

-	 * @return the title

-	 */

-	public String getTitle() {

-		return title;

-	}

-

-	/**

-	 * Checks if is html.

-	 *

-	 * @return true, if is html

-	 */

-	public boolean isHtml() {

-		return html;

-	}

-

-	/**

-	 * Gets the type.

-	 *

-	 * @return the type

-	 */

-	public Type getType() {

-		return type;

-	}

-

-	/**

-	 * Gets the image.

-	 *

-	 * @return the image

-	 */

-	public Image getImage() {

-		return image;

-	}

-

-	/**

-	 * Get the map containing parameters not predefined

-	 *

-	 * @return the map

-	 */

-	public Map<String, Object> getCustomParameters() {

-		return others;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.builders;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;
+import org.eclipse.swt.graphics.Image;
+
+
+/**
+ * This class provides a more comfortable usage
+ * to access to properties from NotificationBuilder map
+ *
+ * @author tristan faure
+ *
+ */
+public class PropertyWrapper {
+
+	private boolean asynchronous = false;
+
+	private String message = null;
+
+	private ICompositeCreator composite = null;
+
+	private Collection<NotificationRunnable> actions = null;
+
+	private Long delay = null;
+
+	private boolean temporary = false;
+
+	private String title = null;
+
+	private boolean html = false;
+
+	private Type type = null;
+
+	private Image image = null;
+
+	private Map<String, Object> others = new HashMap<String, Object>();
+
+	/**
+	 * The class analyses the map and set the fields of the objects according to the values of the map.
+	 *
+	 * @param properties
+	 *            the map from Notification Builder
+	 */
+	@SuppressWarnings("unchecked")
+	public PropertyWrapper(Map<String, Object> properties) {
+		for (String s : properties.keySet()) {
+			if (NotificationBuilder.ASYNCHRONOUS.equals(s)) {
+				asynchronous = (Boolean) properties.get(s);
+			} else if (NotificationBuilder.COMPOSITE.equals(s)) {
+				composite = (ICompositeCreator) properties.get(s);
+			} else if (NotificationBuilder.MESSAGE.equals(s)) {
+				message = (String) properties.get(s);
+			} else if (NotificationBuilder.ACTION.equals(s)) {
+				actions = (Collection<NotificationRunnable>) properties.get(s);
+			} else if (NotificationBuilder.DELAY.equals(s)) {
+				delay = (Long) properties.get(s);
+			} else if (NotificationBuilder.HTML.equals(s)) {
+				html = (Boolean) properties.get(s);
+			} else if (NotificationBuilder.TEMPORARY.equals(s)) {
+				temporary = (Boolean) properties.get(s);
+			} else if (NotificationBuilder.TITLE.equals(s)) {
+				title = (String) properties.get(s);
+			} else if (NotificationBuilder.TYPE.equals(s)) {
+				type = (Type) properties.get(s);
+			} else if (NotificationBuilder.IMAGE.equals(s)) {
+				image = (Image) properties.get(s);
+			} else {
+				others.put(s, properties.get(s));
+			}
+		}
+	}
+
+	/**
+	 * Checks if is asynchronous.
+	 *
+	 * @return true, if is asynchronous
+	 */
+	public boolean isAsynchronous() {
+		return asynchronous;
+	}
+
+	/**
+	 * Gets the message.
+	 *
+	 * @return the message
+	 */
+	public String getMessage() {
+		return message;
+	}
+
+	/**
+	 * Gets the composite.
+	 *
+	 * @return the composite
+	 */
+	public ICompositeCreator getComposite() {
+		return composite;
+	}
+
+	/**
+	 * Gets the actions.
+	 *
+	 * @return the actions
+	 */
+	public Collection<NotificationRunnable> getActions() {
+		return actions;
+	}
+
+	/**
+	 * Gets the delay.
+	 *
+	 * @return the delay
+	 */
+	public Long getDelay() {
+		return delay;
+	}
+
+	/**
+	 * Checks if is temporary.
+	 *
+	 * @return true, if is temporary
+	 */
+	public boolean isTemporary() {
+		return temporary;
+	}
+
+	/**
+	 * Gets the title.
+	 *
+	 * @return the title
+	 */
+	public String getTitle() {
+		return title;
+	}
+
+	/**
+	 * Checks if is html.
+	 *
+	 * @return true, if is html
+	 */
+	public boolean isHtml() {
+		return html;
+	}
+
+	/**
+	 * Gets the type.
+	 *
+	 * @return the type
+	 */
+	public Type getType() {
+		return type;
+	}
+
+	/**
+	 * Gets the image.
+	 *
+	 * @return the image
+	 */
+	public Image getImage() {
+		return image;
+	}
+
+	/**
+	 * Get the map containing parameters not predefined
+	 *
+	 * @return the map
+	 */
+	public Map<String, Object> getCustomParameters() {
+		return others;
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/ViewBuilder.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/ViewBuilder.java
index 55cf0fc5f7d..5ac8faacf14 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/ViewBuilder.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/builders/ViewBuilder.java
@@ -1,125 +1,125 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification.builders;

-

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.utils.PapyrusControlsFactory;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.view.AbstractInsideComposite;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.view.PapyrusNotificationView;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.view.ViewNotification;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.IViewPart;

-import org.eclipse.ui.IViewReference;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.forms.widgets.FormToolkit;

-

-

-/**

- * A Builder able to create {@link PapyrusNotificationView} instances

- *

- * @author tristan faure

- *

- */

-public class ViewBuilder implements IBuilder {

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#build(org.eclipse.papyrus.infra.widgets.toolbox.notification.PropertyWrapper,

-	 * org.eclipse.ui.forms.widgets.FormToolkit)

-	 */

-	public INotification build(PropertyWrapper wrapper, FormToolkit toolkit) {

-		try {

-			IViewPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(PapyrusNotificationView.ID);

-			if (part instanceof PapyrusNotificationView) {

-				PapyrusNotificationView view = (PapyrusNotificationView) part;

-				AbstractInsideComposite viewCompo = null;

-				if (wrapper.getComposite() != null) {

-					viewCompo = view.setComposite(wrapper.getComposite(), wrapper.getTitle(), wrapper.getActions(), wrapper.getType());

-				} else {

-					if (wrapper.getType() != null || wrapper.getImage() != null || wrapper.isHtml()) {

-						final Image image = wrapper.getImage();

-						final Type type = wrapper.getType();

-						final boolean isHtml = wrapper.isHtml();

-						final String message = wrapper.getMessage();

-						viewCompo = view.setComposite(new ICompositeCreator() {

-

-							public Composite createComposite(Composite parent, FormToolkit toolkit) {

-								Composite created = PapyrusControlsFactory.createCompositeWithType(Display.getDefault().getActiveShell(), toolkit, parent, type, image, message, isHtml);

-								return created;

-							}

-						}, wrapper.getTitle(), wrapper.getActions());

-					} else {

-						if (wrapper.getMessage() != null) {

-							viewCompo = view.setMessage(wrapper.getMessage(), wrapper.getTitle(), wrapper.getActions());

-						}

-					}

-				}

-				ViewNotification notification = new ViewNotification(viewCompo);

-				viewCompo.setINotification(notification);

-				return notification;

-			}

-		} catch (PartInitException e) {

-		}

-		return null;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#accept(java.lang.String, java.lang.Object)

-	 */

-	public boolean accept(String parameterName, Object value) {

-		boolean found = false;

-		for (IViewReference ref : PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getViewReferences()) {

-			if (PapyrusNotificationView.ID.equals(ref.getId())) {

-				found = true;

-			}

-		}

-		if (found) {

-			if (NotificationBuilder.ASYNCHRONOUS.equals(parameterName)) {

-				return value instanceof Boolean && (Boolean) value;

-			}

-			if (NotificationBuilder.TEMPORARY.equals(parameterName)) {

-				return value instanceof Boolean && !(Boolean) value;

-			}

-			if (NotificationBuilder.DELAY.equals(parameterName)) {

-				return false;

-			}

-			if (NotificationBuilder.MESSAGE.equals(parameterName)) {

-				return true;

-			}

-			if (NotificationBuilder.COMPOSITE.equals(parameterName)) {

-				return true;

-			}

-			if (NotificationBuilder.ACTION.equals(parameterName)) {

-				return true;

-			}

-			if (NotificationBuilder.TYPE.equals(parameterName)) {

-				return true;

-			}

-			if (NotificationBuilder.TITLE.equals(parameterName)) {

-				return true;

-			}

-			if (NotificationBuilder.HTML.equals(parameterName)) {

-				return true;

-			}

-		}

-		return false;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.builders;
+
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.utils.PapyrusControlsFactory;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.view.AbstractInsideComposite;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.view.PapyrusNotificationView;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.view.ViewNotification;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IViewReference;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+
+/**
+ * A Builder able to create {@link PapyrusNotificationView} instances
+ *
+ * @author tristan faure
+ *
+ */
+public class ViewBuilder implements IBuilder {
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#build(org.eclipse.papyrus.infra.widgets.toolbox.notification.PropertyWrapper,
+	 * org.eclipse.ui.forms.widgets.FormToolkit)
+	 */
+	public INotification build(PropertyWrapper wrapper, FormToolkit toolkit) {
+		try {
+			IViewPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(PapyrusNotificationView.ID);
+			if (part instanceof PapyrusNotificationView) {
+				PapyrusNotificationView view = (PapyrusNotificationView) part;
+				AbstractInsideComposite viewCompo = null;
+				if (wrapper.getComposite() != null) {
+					viewCompo = view.setComposite(wrapper.getComposite(), wrapper.getTitle(), wrapper.getActions(), wrapper.getType());
+				} else {
+					if (wrapper.getType() != null || wrapper.getImage() != null || wrapper.isHtml()) {
+						final Image image = wrapper.getImage();
+						final Type type = wrapper.getType();
+						final boolean isHtml = wrapper.isHtml();
+						final String message = wrapper.getMessage();
+						viewCompo = view.setComposite(new ICompositeCreator() {
+
+							public Composite createComposite(Composite parent, FormToolkit toolkit) {
+								Composite created = PapyrusControlsFactory.createCompositeWithType(Display.getDefault().getActiveShell(), toolkit, parent, type, image, message, isHtml);
+								return created;
+							}
+						}, wrapper.getTitle(), wrapper.getActions());
+					} else {
+						if (wrapper.getMessage() != null) {
+							viewCompo = view.setMessage(wrapper.getMessage(), wrapper.getTitle(), wrapper.getActions());
+						}
+					}
+				}
+				ViewNotification notification = new ViewNotification(viewCompo);
+				viewCompo.setINotification(notification);
+				return notification;
+			}
+		} catch (PartInitException e) {
+		}
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.IBuilder#accept(java.lang.String, java.lang.Object)
+	 */
+	public boolean accept(String parameterName, Object value) {
+		boolean found = false;
+		for (IViewReference ref : PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getViewReferences()) {
+			if (PapyrusNotificationView.ID.equals(ref.getId())) {
+				found = true;
+			}
+		}
+		if (found) {
+			if (NotificationBuilder.ASYNCHRONOUS.equals(parameterName)) {
+				return value instanceof Boolean && (Boolean) value;
+			}
+			if (NotificationBuilder.TEMPORARY.equals(parameterName)) {
+				return value instanceof Boolean && !(Boolean) value;
+			}
+			if (NotificationBuilder.DELAY.equals(parameterName)) {
+				return false;
+			}
+			if (NotificationBuilder.MESSAGE.equals(parameterName)) {
+				return true;
+			}
+			if (NotificationBuilder.COMPOSITE.equals(parameterName)) {
+				return true;
+			}
+			if (NotificationBuilder.ACTION.equals(parameterName)) {
+				return true;
+			}
+			if (NotificationBuilder.TYPE.equals(parameterName)) {
+				return true;
+			}
+			if (NotificationBuilder.TITLE.equals(parameterName)) {
+				return true;
+			}
+			if (NotificationBuilder.HTML.equals(parameterName)) {
+				return true;
+			}
+		}
+		return false;
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/AbstractNotificationPopup.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/AbstractNotificationPopup.java
index 37e917f3ce6..f77b94a991e 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/AbstractNotificationPopup.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/AbstractNotificationPopup.java
@@ -1,583 +1,583 @@
-/*******************************************************************************

- * Copyright (c) 2004, 2009 Tasktop Technologies 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:

- *     Benjamin Pasero - intial API and implementation

- *     Tasktop Technologies - initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs;

-

-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.JFaceResources;

-import org.eclipse.jface.resource.LocalResourceManager;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.infra.ui.util.PapyrusImageUtils;

-import org.eclipse.papyrus.infra.widgets.toolbox.SwtUtil;

-import org.eclipse.papyrus.infra.widgets.toolbox.SwtUtil.FadeJob;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.events.MouseAdapter;

-import org.eclipse.swt.events.MouseEvent;

-import org.eclipse.swt.events.MouseTrackAdapter;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.GC;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.graphics.Rectangle;

-import org.eclipse.swt.graphics.Region;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.swt.widgets.Monitor;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.forms.widgets.FormToolkit;

-

-/**

- * @author Benjamin Pasero

- * @author Mik Kersten

- * @author Steffen Pingel

- */

-public abstract class AbstractNotificationPopup extends Window {

-

-	private static final int TITLE_HEIGHT = 24;

-

-	private static final String LABEL_NOTIFICATION = "Notification";

-

-	private static final String LABEL_JOB_CLOSE = "CLOSE";

-

-	private static final int MAX_WIDTH = Display.getDefault().getPrimaryMonitor().getBounds().width;

-

-	private static final int MIN_HEIGHT = 100;

-

-	private static final long DEFAULT_DELAY_CLOSE = 5 * 1000;

-

-	private static final int PADDING_EDGE = 5;

-

-	private long delayClose = DEFAULT_DELAY_CLOSE;

-

-	protected LocalResourceManager resources;

-

-	private NotificationPopupColors color;

-

-	private final Display display;

-

-	private Shell shell;

-

-	private Region lastUsedRegion;

-

-	private Image lastUsedBgImage;

-

-	private final Job closeJob = new Job(LABEL_JOB_CLOSE) {

-

-		@Override

-		protected IStatus run(IProgressMonitor monitor) {

-			if (!display.isDisposed()) {

-				display.asyncExec(new Runnable() {

-

-					public void run() {

-						Shell shell = AbstractNotificationPopup.this.getShell();

-						if (shell == null || shell.isDisposed()) {

-							return;

-						}

-

-						if (isMouseOver(shell)) {

-							scheduleAutoClose();

-							return;

-						}

-

-						AbstractNotificationPopup.this.closeFade();

-					}

-

-				});

-			}

-			if (monitor.isCanceled()) {

-				return Status.CANCEL_STATUS;

-			}

-

-			return Status.OK_STATUS;

-		}

-	};

-

-	private final boolean respectDisplayBounds = true;

-

-	private final boolean respectMonitorBounds = true;

-

-	private FadeJob fadeJob;

-

-	private boolean fadingEnabled;

-

-	protected final FormToolkit toolkit;

-

-	public AbstractNotificationPopup(Display display, FormToolkit toolkit) {

-		this(display, SWT.NO_TRIM | SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL, toolkit);

-	}

-

-	public AbstractNotificationPopup(Display display, int style, FormToolkit toolkit) {

-		super(new Shell(display));

-		this.toolkit = toolkit;

-		setShellStyle(style);

-

-		this.display = display;

-		resources = new LocalResourceManager(JFaceResources.getResources());

-		initResources();

-

-		closeJob.setSystem(true);

-	}

-

-	public boolean isFadingEnabled() {

-		return fadingEnabled;

-	}

-

-	public void setFadingEnabled(boolean fadingEnabled) {

-		this.fadingEnabled = fadingEnabled;

-	}

-

-	/**

-	 * Override to return a customized name. Default is to return the name of

-	 * the product, specified by the -name (e.g. "Eclipse SDK") command line

-	 * parameter that's associated with the product ID (e.g.

-	 * "org.eclipse.sdk.ide"). Strips the trailing "SDK" for any name, since

-	 * this part of the label is considered visual noise.

-	 *

-	 * @return the name to be used in the title of the popup.

-	 */

-	protected String getPopupShellTitle() {

-		String productName = "Papyrus ";

-		return productName + LABEL_NOTIFICATION;

-	}

-

-	protected Image getPopupShellImage(int maximumHeight) {

-		return PapyrusImageUtils.getDefaultIcon();

-	}

-

-	/**

-	 * Override to populate with notifications.

-	 *

-	 * @param parent

-	 */

-	protected void createContentArea(Composite parent) {

-		// empty by default

-	}

-

-	/**

-	 * Override to customize the title bar

-	 */

-	protected void createTitleArea(Composite parent) {

-		((GridData) parent.getLayoutData()).heightHint = TITLE_HEIGHT;

-

-		Label titleImageLabel = new Label(parent, SWT.NONE);

-		titleImageLabel.setImage(getPopupShellImage(TITLE_HEIGHT));

-

-		Label titleTextLabel = new Label(parent, SWT.NONE);

-		titleTextLabel.setText(getPopupShellTitle());

-		titleTextLabel.setFont(CommonFonts.BOLD);

-		titleTextLabel.setForeground(getTitleForeground());

-		// titleTextLabel.setForeground(color.getTitleText());

-		titleTextLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));

-		titleTextLabel.setCursor(parent.getDisplay().getSystemCursor(SWT.CURSOR_HAND));

-

-		final Label button = new Label(parent, SWT.NONE);

-		// TODO

-		// button.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_CLOSE));

-		button.addMouseTrackListener(new MouseTrackAdapter() {

-

-			@Override

-			public void mouseEnter(MouseEvent e) {

-				// TODO

-				// button.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_CLOSE_HOVER));

-			}

-

-			@Override

-			public void mouseExit(MouseEvent e) {

-				// TODO

-				// button.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_CLOSE));

-			}

-		});

-		button.addMouseListener(new MouseAdapter() {

-

-			@Override

-			public void mouseUp(MouseEvent e) {

-				close();

-				setReturnCode(CANCEL);

-			}

-

-		});

-	}

-

-	protected Color getTitleForeground() {

-		return color.getTitleText();

-	}

-

-	private void initResources() {

-		color = new NotificationPopupColors(display, resources);

-	}

-

-	@Override

-	protected void configureShell(Shell newShell) {

-		super.configureShell(newShell);

-

-		shell = newShell;

-		newShell.setBackground(color.getBorder());

-	}

-

-	@Override

-	public void create() {

-		super.create();

-		addRegion(shell);

-	}

-

-	private void addRegion(Shell shell) {

-		Region region = new Region();

-		Point s = shell.getSize();

-

-		/* Add entire Shell */

-		region.add(0, 0, s.x, s.y);

-

-		/* Subtract Top-Left Corner */

-		region.subtract(0, 0, 5, 1);

-		region.subtract(0, 1, 3, 1);

-		region.subtract(0, 2, 2, 1);

-		region.subtract(0, 3, 1, 1);

-		region.subtract(0, 4, 1, 1);

-

-		/* Subtract Top-Right Corner */

-		region.subtract(s.x - 5, 0, 5, 1);

-		region.subtract(s.x - 3, 1, 3, 1);

-		region.subtract(s.x - 2, 2, 2, 1);

-		region.subtract(s.x - 1, 3, 1, 1);

-		region.subtract(s.x - 1, 4, 1, 1);

-

-		/* Subtract Bottom-Left Corner */

-		region.subtract(0, s.y, 5, 1);

-		region.subtract(0, s.y - 1, 3, 1);

-		region.subtract(0, s.y - 2, 2, 1);

-		region.subtract(0, s.y - 3, 1, 1);

-		region.subtract(0, s.y - 4, 1, 1);

-

-		/* Subtract Bottom-Right Corner */

-		region.subtract(s.x - 5, s.y - 0, 5, 1);

-		region.subtract(s.x - 3, s.y - 1, 3, 1);

-		region.subtract(s.x - 2, s.y - 2, 2, 1);

-		region.subtract(s.x - 1, s.y - 3, 1, 1);

-		region.subtract(s.x - 1, s.y - 4, 1, 1);

-

-		/* Dispose old first */

-		if (shell.getRegion() != null) {

-			shell.getRegion().dispose();

-		}

-

-		/* Apply Region */

-		shell.setRegion(region);

-

-		/* Remember to dispose later */

-		lastUsedRegion = region;

-	}

-

-	private boolean isMouseOver(Shell shell) {

-		if (display.isDisposed()) {

-			return false;

-		}

-		return shell.getBounds().contains(display.getCursorLocation());

-	}

-

-	@Override

-	public int open() {

-		if (shell == null || shell.isDisposed()) {

-			shell = null;

-			create();

-		}

-

-		constrainShellSize();

-		shell.setLocation(fixupDisplayBounds(shell.getSize(), shell.getLocation()));

-

-		if (isFadingEnabled()) {

-			shell.setAlpha(0);

-		}

-		shell.setVisible(true);

-		fadeJob = SwtUtil.fadeIn(shell, new SwtUtil.IFadeListener() {

-

-			public void faded(Shell shell, int alpha) {

-				if (shell.isDisposed()) {

-					return;

-				}

-

-				if (alpha == 255) {

-					scheduleAutoClose();

-				}

-			}

-		});

-		return Window.OK;

-	}

-

-	protected void scheduleAutoClose() {

-		if (delayClose > 0) {

-			closeJob.schedule(delayClose);

-		}

-	}

-

-	@Override

-	protected Control createContents(Composite parent) {

-		((GridLayout) parent.getLayout()).marginWidth = 1;

-		((GridLayout) parent.getLayout()).marginHeight = 1;

-

-		/* Outer Composite holding the controls */

-		final Composite outerCircle = new Composite(parent, SWT.NO_FOCUS);

-		outerCircle.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-		outerCircle.setBackgroundMode(SWT.INHERIT_FORCE);

-

-		outerCircle.addControlListener(new ControlAdapter() {

-

-			@Override

-			public void controlResized(ControlEvent e) {

-				Rectangle clArea = outerCircle.getClientArea();

-				lastUsedBgImage = new Image(outerCircle.getDisplay(), clArea.width, clArea.height);

-				GC gc = new GC(lastUsedBgImage);

-

-				/* Gradient */

-				drawGradient(gc, clArea);

-

-				/* Fix Region Shape */

-				fixRegion(gc, clArea);

-

-				gc.dispose();

-

-				Image oldBGImage = outerCircle.getBackgroundImage();

-				outerCircle.setBackgroundImage(lastUsedBgImage);

-

-				if (oldBGImage != null) {

-					oldBGImage.dispose();

-				}

-			}

-

-			private void drawGradient(GC gc, Rectangle clArea) {

-				gc.setForeground(color.getGradientBegin());

-				gc.setBackground(color.getGradientEnd());

-				gc.fillGradientRectangle(clArea.x, clArea.y, clArea.width, clArea.height, true);

-			}

-

-			private void fixRegion(GC gc, Rectangle clArea) {

-				gc.setForeground(color.getBorder());

-

-				/* Fill Top Left */

-				gc.drawPoint(2, 0);

-				gc.drawPoint(3, 0);

-				gc.drawPoint(1, 1);

-				gc.drawPoint(0, 2);

-				gc.drawPoint(0, 3);

-

-				/* Fill Top Right */

-				gc.drawPoint(clArea.width - 4, 0);

-				gc.drawPoint(clArea.width - 3, 0);

-				gc.drawPoint(clArea.width - 2, 1);

-				gc.drawPoint(clArea.width - 1, 2);

-				gc.drawPoint(clArea.width - 1, 3);

-

-				/* Fill Bottom Left */

-				gc.drawPoint(2, clArea.height - 0);

-				gc.drawPoint(3, clArea.height - 0);

-				gc.drawPoint(1, clArea.height - 1);

-				gc.drawPoint(0, clArea.height - 2);

-				gc.drawPoint(0, clArea.height - 3);

-

-				/* Fill Bottom Right */

-				gc.drawPoint(clArea.width - 4, clArea.height - 0);

-				gc.drawPoint(clArea.width - 3, clArea.height - 0);

-				gc.drawPoint(clArea.width - 2, clArea.height - 1);

-				gc.drawPoint(clArea.width - 1, clArea.height - 2);

-				gc.drawPoint(clArea.width - 1, clArea.height - 3);

-			}

-		});

-

-		GridLayout layout = new GridLayout(1, false);

-		layout.marginWidth = 0;

-		layout.marginHeight = 0;

-		layout.verticalSpacing = 0;

-

-		outerCircle.setLayout(layout);

-

-		/* Title area containing label and close button */

-		final Composite titleCircle = new Composite(outerCircle, SWT.NO_FOCUS);

-		titleCircle.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));

-		titleCircle.setBackgroundMode(SWT.INHERIT_FORCE);

-

-		layout = new GridLayout(4, false);

-		layout.marginWidth = 3;

-		layout.marginHeight = 0;

-		layout.verticalSpacing = 5;

-		layout.horizontalSpacing = 3;

-

-		titleCircle.setLayout(layout);

-

-		/* Create Title Area */

-		createTitleArea(titleCircle);

-

-		/* Outer composite to hold content controlls */

-		Composite outerContentCircle = new Composite(outerCircle, SWT.NONE);

-		outerContentCircle.setBackgroundMode(SWT.INHERIT_FORCE);

-

-		layout = new GridLayout(1, false);

-		layout.marginWidth = 0;

-		layout.marginHeight = 0;

-

-		outerContentCircle.setLayout(layout);

-		outerContentCircle.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-		outerContentCircle.setBackground(outerCircle.getBackground());

-

-		/* Middle composite to show a 1px black line around the content controls */

-		Composite middleContentCircle = new Composite(outerContentCircle, SWT.NO_FOCUS);

-		middleContentCircle.setBackgroundMode(SWT.INHERIT_FORCE);

-

-		layout = new GridLayout(1, false);

-		layout.marginWidth = 0;

-		layout.marginHeight = 0;

-		layout.marginTop = 1;

-

-		middleContentCircle.setLayout(layout);

-		middleContentCircle.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-		middleContentCircle.setBackground(color.getBorder());

-

-		/* Inner composite containing the content controls */

-		Composite innerContent = new Composite(middleContentCircle, SWT.NO_FOCUS);

-		innerContent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-		innerContent.setBackgroundMode(SWT.INHERIT_FORCE);

-

-		layout = new GridLayout(1, false);

-		layout.marginWidth = 0;

-		layout.marginHeight = 5;

-		layout.marginLeft = 5;

-		layout.marginRight = 5;

-		innerContent.setLayout(layout);

-

-		innerContent.setBackground(shell.getDisplay().getSystemColor(SWT.COLOR_WHITE));

-

-		/* Content Area */

-		createContentArea(innerContent);

-

-		setNullBackground(outerCircle);

-

-		return outerCircle;

-	}

-

-	private void setNullBackground(final Composite outerCircle) {

-		for (Control c : outerCircle.getChildren()) {

-			c.setBackground(null);

-			if (c instanceof Composite) {

-				setNullBackground((Composite) c);

-			}

-		}

-	}

-

-	@Override

-	protected void initializeBounds() {

-		Rectangle clArea = getPrimaryClientArea();

-		Point initialSize = shell.computeSize(SWT.DEFAULT, SWT.DEFAULT);

-		int height = Math.max(initialSize.y, MIN_HEIGHT);

-		int width = Math.min(initialSize.x, MAX_WIDTH);

-

-		Point size = new Point(width, height);

-		shell.setLocation(clArea.width + clArea.x - size.x - PADDING_EDGE, clArea.height + clArea.y - size.y - PADDING_EDGE);

-		shell.setSize(size);

-	}

-

-	private Rectangle getPrimaryClientArea() {

-		Monitor primaryMonitor = shell.getDisplay().getPrimaryMonitor();

-		return (primaryMonitor != null) ? primaryMonitor.getClientArea() : shell.getDisplay().getClientArea();

-	}

-

-	public void closeFade() {

-		if (fadeJob != null) {

-			fadeJob.cancelAndWait(false);

-		}

-		fadeJob = SwtUtil.fadeOut(getShell(), new SwtUtil.IFadeListener() {

-

-			public void faded(Shell shell, int alpha) {

-				if (!shell.isDisposed()) {

-					if (alpha == 0) {

-						shell.close();

-					} else if (isMouseOver(shell)) {

-						if (fadeJob != null) {

-							fadeJob.cancelAndWait(false);

-						}

-						fadeJob = SwtUtil.fastFadeIn(shell, new SwtUtil.IFadeListener() {

-

-							public void faded(Shell shell, int alpha) {

-								if (shell.isDisposed()) {

-									return;

-								}

-

-								if (alpha == 255) {

-									scheduleAutoClose();

-								}

-							}

-						});

-					}

-				}

-			}

-		});

-	}

-

-	@Override

-	public boolean close() {

-		resources.dispose();

-		if (lastUsedRegion != null) {

-			lastUsedRegion.dispose();

-		}

-		if (lastUsedBgImage != null && !lastUsedBgImage.isDisposed()) {

-			lastUsedBgImage.dispose();

-		}

-		return super.close();

-	}

-

-	public long getDelayClose() {

-		return delayClose;

-	}

-

-	public void setDelayClose(long delayClose) {

-		this.delayClose = delayClose;

-	}

-

-	private Point fixupDisplayBounds(Point tipSize, Point location) {

-		if (respectDisplayBounds) {

-			Rectangle bounds;

-			Point rightBounds = new Point(tipSize.x + location.x, tipSize.y + location.y);

-

-			if (respectMonitorBounds) {

-				bounds = shell.getDisplay().getPrimaryMonitor().getBounds();

-			} else {

-				bounds = getPrimaryClientArea();

-			}

-

-			if (!(bounds.contains(location) && bounds.contains(rightBounds))) {

-				if (rightBounds.x > bounds.x + bounds.width) {

-					location.x -= rightBounds.x - (bounds.x + bounds.width);

-				}

-

-				if (rightBounds.y > bounds.y + bounds.height) {

-					location.y -= rightBounds.y - (bounds.y + bounds.height);

-				}

-

-				if (location.x < bounds.x) {

-					location.x = bounds.x;

-				}

-

-				if (location.y < bounds.y) {

-					location.y = bounds.y;

-				}

-			}

-		}

-

-		return location;

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2004, 2009 Tasktop Technologies 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:
+ *     Benjamin Pasero - intial API and implementation
+ *     Tasktop Technologies - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs;
+
+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.JFaceResources;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.infra.ui.util.PapyrusImageUtils;
+import org.eclipse.papyrus.infra.widgets.toolbox.SwtUtil;
+import org.eclipse.papyrus.infra.widgets.toolbox.SwtUtil.FadeJob;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseTrackAdapter;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.graphics.Region;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Monitor;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+/**
+ * @author Benjamin Pasero
+ * @author Mik Kersten
+ * @author Steffen Pingel
+ */
+public abstract class AbstractNotificationPopup extends Window {
+
+	private static final int TITLE_HEIGHT = 24;
+
+	private static final String LABEL_NOTIFICATION = "Notification";
+
+	private static final String LABEL_JOB_CLOSE = "CLOSE";
+
+	private static final int MAX_WIDTH = Display.getDefault().getPrimaryMonitor().getBounds().width;
+
+	private static final int MIN_HEIGHT = 100;
+
+	private static final long DEFAULT_DELAY_CLOSE = 5 * 1000;
+
+	private static final int PADDING_EDGE = 5;
+
+	private long delayClose = DEFAULT_DELAY_CLOSE;
+
+	protected LocalResourceManager resources;
+
+	private NotificationPopupColors color;
+
+	private final Display display;
+
+	private Shell shell;
+
+	private Region lastUsedRegion;
+
+	private Image lastUsedBgImage;
+
+	private final Job closeJob = new Job(LABEL_JOB_CLOSE) {
+
+		@Override
+		protected IStatus run(IProgressMonitor monitor) {
+			if (!display.isDisposed()) {
+				display.asyncExec(new Runnable() {
+
+					public void run() {
+						Shell shell = AbstractNotificationPopup.this.getShell();
+						if (shell == null || shell.isDisposed()) {
+							return;
+						}
+
+						if (isMouseOver(shell)) {
+							scheduleAutoClose();
+							return;
+						}
+
+						AbstractNotificationPopup.this.closeFade();
+					}
+
+				});
+			}
+			if (monitor.isCanceled()) {
+				return Status.CANCEL_STATUS;
+			}
+
+			return Status.OK_STATUS;
+		}
+	};
+
+	private final boolean respectDisplayBounds = true;
+
+	private final boolean respectMonitorBounds = true;
+
+	private FadeJob fadeJob;
+
+	private boolean fadingEnabled;
+
+	protected final FormToolkit toolkit;
+
+	public AbstractNotificationPopup(Display display, FormToolkit toolkit) {
+		this(display, SWT.NO_TRIM | SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL, toolkit);
+	}
+
+	public AbstractNotificationPopup(Display display, int style, FormToolkit toolkit) {
+		super(new Shell(display));
+		this.toolkit = toolkit;
+		setShellStyle(style);
+
+		this.display = display;
+		resources = new LocalResourceManager(JFaceResources.getResources());
+		initResources();
+
+		closeJob.setSystem(true);
+	}
+
+	public boolean isFadingEnabled() {
+		return fadingEnabled;
+	}
+
+	public void setFadingEnabled(boolean fadingEnabled) {
+		this.fadingEnabled = fadingEnabled;
+	}
+
+	/**
+	 * Override to return a customized name. Default is to return the name of
+	 * the product, specified by the -name (e.g. "Eclipse SDK") command line
+	 * parameter that's associated with the product ID (e.g.
+	 * "org.eclipse.sdk.ide"). Strips the trailing "SDK" for any name, since
+	 * this part of the label is considered visual noise.
+	 *
+	 * @return the name to be used in the title of the popup.
+	 */
+	protected String getPopupShellTitle() {
+		String productName = "Papyrus ";
+		return productName + LABEL_NOTIFICATION;
+	}
+
+	protected Image getPopupShellImage(int maximumHeight) {
+		return PapyrusImageUtils.getDefaultIcon();
+	}
+
+	/**
+	 * Override to populate with notifications.
+	 *
+	 * @param parent
+	 */
+	protected void createContentArea(Composite parent) {
+		// empty by default
+	}
+
+	/**
+	 * Override to customize the title bar
+	 */
+	protected void createTitleArea(Composite parent) {
+		((GridData) parent.getLayoutData()).heightHint = TITLE_HEIGHT;
+
+		Label titleImageLabel = new Label(parent, SWT.NONE);
+		titleImageLabel.setImage(getPopupShellImage(TITLE_HEIGHT));
+
+		Label titleTextLabel = new Label(parent, SWT.NONE);
+		titleTextLabel.setText(getPopupShellTitle());
+		titleTextLabel.setFont(CommonFonts.BOLD);
+		titleTextLabel.setForeground(getTitleForeground());
+		// titleTextLabel.setForeground(color.getTitleText());
+		titleTextLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
+		titleTextLabel.setCursor(parent.getDisplay().getSystemCursor(SWT.CURSOR_HAND));
+
+		final Label button = new Label(parent, SWT.NONE);
+		// TODO
+		// button.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_CLOSE));
+		button.addMouseTrackListener(new MouseTrackAdapter() {
+
+			@Override
+			public void mouseEnter(MouseEvent e) {
+				// TODO
+				// button.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_CLOSE_HOVER));
+			}
+
+			@Override
+			public void mouseExit(MouseEvent e) {
+				// TODO
+				// button.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_CLOSE));
+			}
+		});
+		button.addMouseListener(new MouseAdapter() {
+
+			@Override
+			public void mouseUp(MouseEvent e) {
+				close();
+				setReturnCode(CANCEL);
+			}
+
+		});
+	}
+
+	protected Color getTitleForeground() {
+		return color.getTitleText();
+	}
+
+	private void initResources() {
+		color = new NotificationPopupColors(display, resources);
+	}
+
+	@Override
+	protected void configureShell(Shell newShell) {
+		super.configureShell(newShell);
+
+		shell = newShell;
+		newShell.setBackground(color.getBorder());
+	}
+
+	@Override
+	public void create() {
+		super.create();
+		addRegion(shell);
+	}
+
+	private void addRegion(Shell shell) {
+		Region region = new Region();
+		Point s = shell.getSize();
+
+		/* Add entire Shell */
+		region.add(0, 0, s.x, s.y);
+
+		/* Subtract Top-Left Corner */
+		region.subtract(0, 0, 5, 1);
+		region.subtract(0, 1, 3, 1);
+		region.subtract(0, 2, 2, 1);
+		region.subtract(0, 3, 1, 1);
+		region.subtract(0, 4, 1, 1);
+
+		/* Subtract Top-Right Corner */
+		region.subtract(s.x - 5, 0, 5, 1);
+		region.subtract(s.x - 3, 1, 3, 1);
+		region.subtract(s.x - 2, 2, 2, 1);
+		region.subtract(s.x - 1, 3, 1, 1);
+		region.subtract(s.x - 1, 4, 1, 1);
+
+		/* Subtract Bottom-Left Corner */
+		region.subtract(0, s.y, 5, 1);
+		region.subtract(0, s.y - 1, 3, 1);
+		region.subtract(0, s.y - 2, 2, 1);
+		region.subtract(0, s.y - 3, 1, 1);
+		region.subtract(0, s.y - 4, 1, 1);
+
+		/* Subtract Bottom-Right Corner */
+		region.subtract(s.x - 5, s.y - 0, 5, 1);
+		region.subtract(s.x - 3, s.y - 1, 3, 1);
+		region.subtract(s.x - 2, s.y - 2, 2, 1);
+		region.subtract(s.x - 1, s.y - 3, 1, 1);
+		region.subtract(s.x - 1, s.y - 4, 1, 1);
+
+		/* Dispose old first */
+		if (shell.getRegion() != null) {
+			shell.getRegion().dispose();
+		}
+
+		/* Apply Region */
+		shell.setRegion(region);
+
+		/* Remember to dispose later */
+		lastUsedRegion = region;
+	}
+
+	private boolean isMouseOver(Shell shell) {
+		if (display.isDisposed()) {
+			return false;
+		}
+		return shell.getBounds().contains(display.getCursorLocation());
+	}
+
+	@Override
+	public int open() {
+		if (shell == null || shell.isDisposed()) {
+			shell = null;
+			create();
+		}
+
+		constrainShellSize();
+		shell.setLocation(fixupDisplayBounds(shell.getSize(), shell.getLocation()));
+
+		if (isFadingEnabled()) {
+			shell.setAlpha(0);
+		}
+		shell.setVisible(true);
+		fadeJob = SwtUtil.fadeIn(shell, new SwtUtil.IFadeListener() {
+
+			public void faded(Shell shell, int alpha) {
+				if (shell.isDisposed()) {
+					return;
+				}
+
+				if (alpha == 255) {
+					scheduleAutoClose();
+				}
+			}
+		});
+		return Window.OK;
+	}
+
+	protected void scheduleAutoClose() {
+		if (delayClose > 0) {
+			closeJob.schedule(delayClose);
+		}
+	}
+
+	@Override
+	protected Control createContents(Composite parent) {
+		((GridLayout) parent.getLayout()).marginWidth = 1;
+		((GridLayout) parent.getLayout()).marginHeight = 1;
+
+		/* Outer Composite holding the controls */
+		final Composite outerCircle = new Composite(parent, SWT.NO_FOCUS);
+		outerCircle.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		outerCircle.setBackgroundMode(SWT.INHERIT_FORCE);
+
+		outerCircle.addControlListener(new ControlAdapter() {
+
+			@Override
+			public void controlResized(ControlEvent e) {
+				Rectangle clArea = outerCircle.getClientArea();
+				lastUsedBgImage = new Image(outerCircle.getDisplay(), clArea.width, clArea.height);
+				GC gc = new GC(lastUsedBgImage);
+
+				/* Gradient */
+				drawGradient(gc, clArea);
+
+				/* Fix Region Shape */
+				fixRegion(gc, clArea);
+
+				gc.dispose();
+
+				Image oldBGImage = outerCircle.getBackgroundImage();
+				outerCircle.setBackgroundImage(lastUsedBgImage);
+
+				if (oldBGImage != null) {
+					oldBGImage.dispose();
+				}
+			}
+
+			private void drawGradient(GC gc, Rectangle clArea) {
+				gc.setForeground(color.getGradientBegin());
+				gc.setBackground(color.getGradientEnd());
+				gc.fillGradientRectangle(clArea.x, clArea.y, clArea.width, clArea.height, true);
+			}
+
+			private void fixRegion(GC gc, Rectangle clArea) {
+				gc.setForeground(color.getBorder());
+
+				/* Fill Top Left */
+				gc.drawPoint(2, 0);
+				gc.drawPoint(3, 0);
+				gc.drawPoint(1, 1);
+				gc.drawPoint(0, 2);
+				gc.drawPoint(0, 3);
+
+				/* Fill Top Right */
+				gc.drawPoint(clArea.width - 4, 0);
+				gc.drawPoint(clArea.width - 3, 0);
+				gc.drawPoint(clArea.width - 2, 1);
+				gc.drawPoint(clArea.width - 1, 2);
+				gc.drawPoint(clArea.width - 1, 3);
+
+				/* Fill Bottom Left */
+				gc.drawPoint(2, clArea.height - 0);
+				gc.drawPoint(3, clArea.height - 0);
+				gc.drawPoint(1, clArea.height - 1);
+				gc.drawPoint(0, clArea.height - 2);
+				gc.drawPoint(0, clArea.height - 3);
+
+				/* Fill Bottom Right */
+				gc.drawPoint(clArea.width - 4, clArea.height - 0);
+				gc.drawPoint(clArea.width - 3, clArea.height - 0);
+				gc.drawPoint(clArea.width - 2, clArea.height - 1);
+				gc.drawPoint(clArea.width - 1, clArea.height - 2);
+				gc.drawPoint(clArea.width - 1, clArea.height - 3);
+			}
+		});
+
+		GridLayout layout = new GridLayout(1, false);
+		layout.marginWidth = 0;
+		layout.marginHeight = 0;
+		layout.verticalSpacing = 0;
+
+		outerCircle.setLayout(layout);
+
+		/* Title area containing label and close button */
+		final Composite titleCircle = new Composite(outerCircle, SWT.NO_FOCUS);
+		titleCircle.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+		titleCircle.setBackgroundMode(SWT.INHERIT_FORCE);
+
+		layout = new GridLayout(4, false);
+		layout.marginWidth = 3;
+		layout.marginHeight = 0;
+		layout.verticalSpacing = 5;
+		layout.horizontalSpacing = 3;
+
+		titleCircle.setLayout(layout);
+
+		/* Create Title Area */
+		createTitleArea(titleCircle);
+
+		/* Outer composite to hold content controlls */
+		Composite outerContentCircle = new Composite(outerCircle, SWT.NONE);
+		outerContentCircle.setBackgroundMode(SWT.INHERIT_FORCE);
+
+		layout = new GridLayout(1, false);
+		layout.marginWidth = 0;
+		layout.marginHeight = 0;
+
+		outerContentCircle.setLayout(layout);
+		outerContentCircle.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		outerContentCircle.setBackground(outerCircle.getBackground());
+
+		/* Middle composite to show a 1px black line around the content controls */
+		Composite middleContentCircle = new Composite(outerContentCircle, SWT.NO_FOCUS);
+		middleContentCircle.setBackgroundMode(SWT.INHERIT_FORCE);
+
+		layout = new GridLayout(1, false);
+		layout.marginWidth = 0;
+		layout.marginHeight = 0;
+		layout.marginTop = 1;
+
+		middleContentCircle.setLayout(layout);
+		middleContentCircle.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		middleContentCircle.setBackground(color.getBorder());
+
+		/* Inner composite containing the content controls */
+		Composite innerContent = new Composite(middleContentCircle, SWT.NO_FOCUS);
+		innerContent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		innerContent.setBackgroundMode(SWT.INHERIT_FORCE);
+
+		layout = new GridLayout(1, false);
+		layout.marginWidth = 0;
+		layout.marginHeight = 5;
+		layout.marginLeft = 5;
+		layout.marginRight = 5;
+		innerContent.setLayout(layout);
+
+		innerContent.setBackground(shell.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+
+		/* Content Area */
+		createContentArea(innerContent);
+
+		setNullBackground(outerCircle);
+
+		return outerCircle;
+	}
+
+	private void setNullBackground(final Composite outerCircle) {
+		for (Control c : outerCircle.getChildren()) {
+			c.setBackground(null);
+			if (c instanceof Composite) {
+				setNullBackground((Composite) c);
+			}
+		}
+	}
+
+	@Override
+	protected void initializeBounds() {
+		Rectangle clArea = getPrimaryClientArea();
+		Point initialSize = shell.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+		int height = Math.max(initialSize.y, MIN_HEIGHT);
+		int width = Math.min(initialSize.x, MAX_WIDTH);
+
+		Point size = new Point(width, height);
+		shell.setLocation(clArea.width + clArea.x - size.x - PADDING_EDGE, clArea.height + clArea.y - size.y - PADDING_EDGE);
+		shell.setSize(size);
+	}
+
+	private Rectangle getPrimaryClientArea() {
+		Monitor primaryMonitor = shell.getDisplay().getPrimaryMonitor();
+		return (primaryMonitor != null) ? primaryMonitor.getClientArea() : shell.getDisplay().getClientArea();
+	}
+
+	public void closeFade() {
+		if (fadeJob != null) {
+			fadeJob.cancelAndWait(false);
+		}
+		fadeJob = SwtUtil.fadeOut(getShell(), new SwtUtil.IFadeListener() {
+
+			public void faded(Shell shell, int alpha) {
+				if (!shell.isDisposed()) {
+					if (alpha == 0) {
+						shell.close();
+					} else if (isMouseOver(shell)) {
+						if (fadeJob != null) {
+							fadeJob.cancelAndWait(false);
+						}
+						fadeJob = SwtUtil.fastFadeIn(shell, new SwtUtil.IFadeListener() {
+
+							public void faded(Shell shell, int alpha) {
+								if (shell.isDisposed()) {
+									return;
+								}
+
+								if (alpha == 255) {
+									scheduleAutoClose();
+								}
+							}
+						});
+					}
+				}
+			}
+		});
+	}
+
+	@Override
+	public boolean close() {
+		resources.dispose();
+		if (lastUsedRegion != null) {
+			lastUsedRegion.dispose();
+		}
+		if (lastUsedBgImage != null && !lastUsedBgImage.isDisposed()) {
+			lastUsedBgImage.dispose();
+		}
+		return super.close();
+	}
+
+	public long getDelayClose() {
+		return delayClose;
+	}
+
+	public void setDelayClose(long delayClose) {
+		this.delayClose = delayClose;
+	}
+
+	private Point fixupDisplayBounds(Point tipSize, Point location) {
+		if (respectDisplayBounds) {
+			Rectangle bounds;
+			Point rightBounds = new Point(tipSize.x + location.x, tipSize.y + location.y);
+
+			if (respectMonitorBounds) {
+				bounds = shell.getDisplay().getPrimaryMonitor().getBounds();
+			} else {
+				bounds = getPrimaryClientArea();
+			}
+
+			if (!(bounds.contains(location) && bounds.contains(rightBounds))) {
+				if (rightBounds.x > bounds.x + bounds.width) {
+					location.x -= rightBounds.x - (bounds.x + bounds.width);
+				}
+
+				if (rightBounds.y > bounds.y + bounds.height) {
+					location.y -= rightBounds.y - (bounds.y + bounds.height);
+				}
+
+				if (location.x < bounds.x) {
+					location.x = bounds.x;
+				}
+
+				if (location.y < bounds.y) {
+					location.y = bounds.y;
+				}
+			}
+		}
+
+		return location;
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/AsyncNotification.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/AsyncNotification.java
index 1fd3230cc11..4771c484b14 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/AsyncNotification.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/AsyncNotification.java
@@ -1,51 +1,51 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs;

-

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;

-

-/**

- * The INotification corresponding to the async builder

- *

- * @author tfaure

- *

- */

-public class AsyncNotification implements INotification {

-

-	private final PapyrusAsyncNotificationPopup popup;

-

-	public AsyncNotification(PapyrusAsyncNotificationPopup popup) {

-		this.popup = popup;

-	}

-

-	/**

-	 * delete the current notification

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification#delete()

-	 */

-	public void delete() {

-		// delete immediately to avoid superposition with another

-		popup.close();

-	}

-

-	/**

-	 * whether the current notification is deleted

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification#isDeleted()

-	 *

-	 * @return true if notification is deleted

-	 */

-	public boolean isDeleted() {

-		return popup.getShell() == null || popup.getShell().isDisposed();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs;
+
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
+
+/**
+ * The INotification corresponding to the async builder
+ *
+ * @author tfaure
+ *
+ */
+public class AsyncNotification implements INotification {
+
+	private final PapyrusAsyncNotificationPopup popup;
+
+	public AsyncNotification(PapyrusAsyncNotificationPopup popup) {
+		this.popup = popup;
+	}
+
+	/**
+	 * delete the current notification
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification#delete()
+	 */
+	public void delete() {
+		// delete immediately to avoid superposition with another
+		popup.close();
+	}
+
+	/**
+	 * whether the current notification is deleted
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification#isDeleted()
+	 *
+	 * @return true if notification is deleted
+	 */
+	public boolean isDeleted() {
+		return popup.getShell() == null || popup.getShell().isDisposed();
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/CommonFonts.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/CommonFonts.java
index a7b30b66130..8e01569d957 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/CommonFonts.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/CommonFonts.java
@@ -1,106 +1,106 @@
-/*******************************************************************************

- * Copyright (c) 2004, 2009 Tasktop Technologies 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:

- *     Benjamin Pasero - intial API and implementation

- *     Tasktop Technologies - initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs;

-

-import java.lang.reflect.Field;

-

-import org.eclipse.jface.resource.FontRegistry;

-import org.eclipse.jface.resource.JFaceResources;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Font;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * @author Mik Kersten

- * @since 3.0

- */

-public class CommonFonts {

-

-	public static Font BOLD;

-

-	public static Font ITALIC;

-

-	public static Font BOLD_ITALIC;

-

-	public static Font STRIKETHROUGH = null;

-

-	public static boolean HAS_STRIKETHROUGH;

-

-	static {

-		if (Display.getCurrent() != null) {

-			init();

-		} else {

-			Display.getDefault().asyncExec(new Runnable() {

-

-				public void run() {

-					init();

-				}

-			});

-		}

-	}

-

-	private static void init() {

-		BOLD = JFaceResources.getFontRegistry().getBold(JFaceResources.DEFAULT_FONT);

-		ITALIC = JFaceResources.getFontRegistry().getItalic(JFaceResources.DEFAULT_FONT);

-		BOLD_ITALIC = new Font(Display.getCurrent(), getModifiedFontData(ITALIC.getFontData(), SWT.BOLD | SWT.ITALIC));

-

-		Font defaultFont = JFaceResources.getFontRegistry().get(JFaceResources.DEFAULT_FONT);

-		FontData[] defaultData = defaultFont.getFontData();

-		if (defaultData != null && defaultData.length == 1) {

-			FontData data = new FontData(defaultData[0].getName(), defaultData[0].getHeight(), defaultData[0].getStyle());

-

-			if ("win32".equals(SWT.getPlatform())) { //$NON-NLS-1$

-				// NOTE: Windows only, for: data.data.lfStrikeOut = 1;

-				try {

-					Field dataField = data.getClass().getDeclaredField("data"); //$NON-NLS-1$

-					Object dataObject = dataField.get(data);

-					Class<?> clazz = dataObject.getClass().getSuperclass();

-					Field strikeOutFiled = clazz.getDeclaredField("lfStrikeOut"); //$NON-NLS-1$

-					strikeOutFiled.set(dataObject, (byte) 1);

-					CommonFonts.STRIKETHROUGH = new Font(Display.getCurrent(), data);

-				} catch (Throwable t) {

-					// ignore

-				}

-			}

-		}

-		if (CommonFonts.STRIKETHROUGH == null) {

-			CommonFonts.HAS_STRIKETHROUGH = false;

-			CommonFonts.STRIKETHROUGH = defaultFont;

-		} else {

-			CommonFonts.HAS_STRIKETHROUGH = true;

-		}

-	}

-

-	/**

-	 * NOTE: disposal of JFaceResources fonts handled by registry.

-	 */

-	public static void dispose() {

-		if (CommonFonts.STRIKETHROUGH != null && !CommonFonts.STRIKETHROUGH.isDisposed()) {

-			CommonFonts.STRIKETHROUGH.dispose();

-			CommonFonts.BOLD_ITALIC.dispose();

-		}

-	}

-

-	/**

-	 * Copied from {@link FontRegistry}

-	 */

-	private static FontData[] getModifiedFontData(FontData[] baseData, int style) {

-		FontData[] styleData = new FontData[baseData.length];

-		for (int i = 0; i < styleData.length; i++) {

-			FontData base = baseData[i];

-			styleData[i] = new FontData(base.getName(), base.getHeight(), base.getStyle() | style);

-		}

-

-		return styleData;

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2004, 2009 Tasktop Technologies 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:
+ *     Benjamin Pasero - intial API and implementation
+ *     Tasktop Technologies - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs;
+
+import java.lang.reflect.Field;
+
+import org.eclipse.jface.resource.FontRegistry;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * @author Mik Kersten
+ * @since 3.0
+ */
+public class CommonFonts {
+
+	public static Font BOLD;
+
+	public static Font ITALIC;
+
+	public static Font BOLD_ITALIC;
+
+	public static Font STRIKETHROUGH = null;
+
+	public static boolean HAS_STRIKETHROUGH;
+
+	static {
+		if (Display.getCurrent() != null) {
+			init();
+		} else {
+			Display.getDefault().asyncExec(new Runnable() {
+
+				public void run() {
+					init();
+				}
+			});
+		}
+	}
+
+	private static void init() {
+		BOLD = JFaceResources.getFontRegistry().getBold(JFaceResources.DEFAULT_FONT);
+		ITALIC = JFaceResources.getFontRegistry().getItalic(JFaceResources.DEFAULT_FONT);
+		BOLD_ITALIC = new Font(Display.getCurrent(), getModifiedFontData(ITALIC.getFontData(), SWT.BOLD | SWT.ITALIC));
+
+		Font defaultFont = JFaceResources.getFontRegistry().get(JFaceResources.DEFAULT_FONT);
+		FontData[] defaultData = defaultFont.getFontData();
+		if (defaultData != null && defaultData.length == 1) {
+			FontData data = new FontData(defaultData[0].getName(), defaultData[0].getHeight(), defaultData[0].getStyle());
+
+			if ("win32".equals(SWT.getPlatform())) { //$NON-NLS-1$
+				// NOTE: Windows only, for: data.data.lfStrikeOut = 1;
+				try {
+					Field dataField = data.getClass().getDeclaredField("data"); //$NON-NLS-1$
+					Object dataObject = dataField.get(data);
+					Class<?> clazz = dataObject.getClass().getSuperclass();
+					Field strikeOutFiled = clazz.getDeclaredField("lfStrikeOut"); //$NON-NLS-1$
+					strikeOutFiled.set(dataObject, (byte) 1);
+					CommonFonts.STRIKETHROUGH = new Font(Display.getCurrent(), data);
+				} catch (Throwable t) {
+					// ignore
+				}
+			}
+		}
+		if (CommonFonts.STRIKETHROUGH == null) {
+			CommonFonts.HAS_STRIKETHROUGH = false;
+			CommonFonts.STRIKETHROUGH = defaultFont;
+		} else {
+			CommonFonts.HAS_STRIKETHROUGH = true;
+		}
+	}
+
+	/**
+	 * NOTE: disposal of JFaceResources fonts handled by registry.
+	 */
+	public static void dispose() {
+		if (CommonFonts.STRIKETHROUGH != null && !CommonFonts.STRIKETHROUGH.isDisposed()) {
+			CommonFonts.STRIKETHROUGH.dispose();
+			CommonFonts.BOLD_ITALIC.dispose();
+		}
+	}
+
+	/**
+	 * Copied from {@link FontRegistry}
+	 */
+	private static FontData[] getModifiedFontData(FontData[] baseData, int style) {
+		FontData[] styleData = new FontData[baseData.length];
+		for (int i = 0; i < styleData.length; i++) {
+			FontData base = baseData[i];
+			styleData[i] = new FontData(base.getName(), base.getHeight(), base.getStyle() | style);
+		}
+
+		return styleData;
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/ImagePapyrusAsyncNotificationPopup.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/ImagePapyrusAsyncNotificationPopup.java
index 98d0a551cd8..cfdb8d07b76 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/ImagePapyrusAsyncNotificationPopup.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/ImagePapyrusAsyncNotificationPopup.java
@@ -1,69 +1,69 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs;

-

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.utils.PapyrusControlsFactory;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.forms.widgets.FormToolkit;

-

-

-/**

- * An async notification with a message and an image

- *

- * @author tristan faure

- *

- */

-public class ImagePapyrusAsyncNotificationPopup extends PapyrusAsyncNotificationPopup {

-

-	protected final Type type;

-

-	protected Image image = null;

-

-	/**

-	 * Create an async popup with a specific type

-	 *

-	 * @param display

-	 *            , the display of the application

-	 * @param toolkit

-	 *            , the toolkit able to create the controls

-	 * @param type

-	 *            , the type of the window

-	 */

-	public ImagePapyrusAsyncNotificationPopup(Display display, FormToolkit toolkit, Type type) {

-		super(display, toolkit);

-		this.type = type;

-	}

-

-	/**

-	 * Set the image to display

-	 *

-	 * @param image

-	 */

-	public void setImage(Image image) {

-		this.image = image;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.PapyrusAsyncNotificationPopup#doCreateClient(org.eclipse.swt.widgets.Composite)

-	 *

-	 * @Override

-	 */

-	@Override

-	protected void doCreateClient(Composite parent) {

-		PapyrusControlsFactory.createCompositeWithType(getShell(), null, parent, type, image, text, false);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs;
+
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.utils.PapyrusControlsFactory;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+
+/**
+ * An async notification with a message and an image
+ *
+ * @author tristan faure
+ *
+ */
+public class ImagePapyrusAsyncNotificationPopup extends PapyrusAsyncNotificationPopup {
+
+	protected final Type type;
+
+	protected Image image = null;
+
+	/**
+	 * Create an async popup with a specific type
+	 *
+	 * @param display
+	 *            , the display of the application
+	 * @param toolkit
+	 *            , the toolkit able to create the controls
+	 * @param type
+	 *            , the type of the window
+	 */
+	public ImagePapyrusAsyncNotificationPopup(Display display, FormToolkit toolkit, Type type) {
+		super(display, toolkit);
+		this.type = type;
+	}
+
+	/**
+	 * Set the image to display
+	 *
+	 * @param image
+	 */
+	public void setImage(Image image) {
+		this.image = image;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.PapyrusAsyncNotificationPopup#doCreateClient(org.eclipse.swt.widgets.Composite)
+	 *
+	 * @Override
+	 */
+	@Override
+	protected void doCreateClient(Composite parent) {
+		PapyrusControlsFactory.createCompositeWithType(getShell(), null, parent, type, image, text, false);
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/NotificationPopupColors.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/NotificationPopupColors.java
index e675ce665f8..59c823be6c8 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/NotificationPopupColors.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/NotificationPopupColors.java
@@ -1,187 +1,187 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs;

-

-import org.eclipse.jface.resource.DeviceResourceException;

-import org.eclipse.jface.resource.ResourceManager;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.RGB;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * Helper Class to create the colors for the {@link AbstractNotificationPopup}.

- * <p>

- * Note: Copied from FormColors of UI Forms.

- * </p>

- *

- * @author Benjamin Pasero (initial contribution from RSSOwl, see bug 177974)

- * @author Mik Kersten

- */

-public class NotificationPopupColors {

-

-	private final Display display;

-

-	private Color titleText;

-

-	private Color gradientBegin;

-

-	private Color gradientEnd;

-

-	private Color border;

-

-	private final ResourceManager resourceManager;

-

-	public NotificationPopupColors(Display display, ResourceManager resourceManager) {

-		this.display = display;

-		this.resourceManager = resourceManager;

-

-		createColors();

-	}

-

-	private void createColors() {

-		createBorderColor();

-		createGradientColors();

-		// previously used SWT.COLOR_TITLE_INACTIVE_FOREGROUND, but too light on Windows XP

-		titleText = getColor(resourceManager, getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW));

-	}

-

-	public Color getGradientBegin() {

-		return gradientBegin;

-	}

-

-	public Color getGradientEnd() {

-		return gradientEnd;

-	}

-

-	public Color getBorder() {

-		return border;

-	}

-

-	public Color getTitleText() {

-		return titleText;

-	}

-

-	private void createBorderColor() {

-		RGB tbBorder = getSystemColor(SWT.COLOR_TITLE_BACKGROUND);

-		RGB bg = getImpliedBackground().getRGB();

-

-		// Group 1

-		// Rule: If at least 2 of the RGB values are equal to or between 180 and

-		// 255, then apply specified opacity for Group 1

-		// Examples: Vista, XP Silver, Wn High Con #2

-		// Keyline = TITLE_BACKGROUND @ 70% Opacity over LIST_BACKGROUND

-		if (testTwoPrimaryColors(tbBorder, 179, 256)) {

-			tbBorder = blend(tbBorder, bg, 70);

-		} else if (testTwoPrimaryColors(tbBorder, 120, 180)) {

-			tbBorder = blend(tbBorder, bg, 50);

-		} else {

-			tbBorder = blend(tbBorder, bg, 30);

-		}

-

-		border = getColor(resourceManager, tbBorder);

-	}

-

-	private void createGradientColors() {

-		RGB titleBg = getSystemColor(SWT.COLOR_TITLE_BACKGROUND);

-		Color bgColor = getImpliedBackground();

-		RGB bg = bgColor.getRGB();

-		RGB bottom, top;

-

-		// Group 1

-		// Rule: If at least 2 of the RGB values are equal to or between 180 and

-		// 255, then apply specified opacity for Group 1

-		// Examples: Vista, XP Silver, Wn High Con #2

-		// Gradient Bottom = TITLE_BACKGROUND @ 30% Opacity over LIST_BACKGROUND

-		// Gradient Top = TITLE BACKGROUND @ 0% Opacity over LIST_BACKGROUND

-		if (testTwoPrimaryColors(titleBg, 179, 256)) {

-			bottom = blend(titleBg, bg, 30);

-			top = bg;

-		}

-

-		// Group 2

-		// Rule: If at least 2 of the RGB values are equal to or between 121 and

-		// 179, then apply specified opacity for Group 2

-		// Examples: XP Olive, OSX Graphite, Linux GTK, Wn High Con Black

-		// Gradient Bottom = TITLE_BACKGROUND @ 20% Opacity over LIST_BACKGROUND

-		// Gradient Top = TITLE BACKGROUND @ 0% Opacity over LIST_BACKGROUND

-		else if (testTwoPrimaryColors(titleBg, 120, 180)) {

-			bottom = blend(titleBg, bg, 20);

-			top = bg;

-		}

-

-		// Group 3

-		// Rule: If at least 2 of the RGB values are equal to or between 0 and

-		// 120, then apply specified opacity for Group 3

-		// Examples: XP Default, Wn Classic Standard, Wn Marine, Wn Plum, OSX

-		// Aqua, Wn High Con White, Wn High Con #1

-		// Gradient Bottom = TITLE_BACKGROUND @ 10% Opacity over LIST_BACKGROUND

-		// Gradient Top = TITLE BACKGROUND @ 0% Opacity over LIST_BACKGROUND

-		else {

-			bottom = blend(titleBg, bg, 10);

-			top = bg;

-		}

-

-		gradientBegin = getColor(resourceManager, top);

-		gradientEnd = getColor(resourceManager, bottom);

-	}

-

-	private RGB blend(RGB c1, RGB c2, int ratio) {

-		int r = blend(c1.red, c2.red, ratio);

-		int g = blend(c1.green, c2.green, ratio);

-		int b = blend(c1.blue, c2.blue, ratio);

-		return new RGB(r, g, b);

-	}

-

-	private int blend(int v1, int v2, int ratio) {

-		int b = (ratio * v1 + (100 - ratio) * v2) / 100;

-		return Math.min(255, b);

-	}

-

-	private boolean testTwoPrimaryColors(RGB rgb, int from, int to) {

-		int total = 0;

-		if (testPrimaryColor(rgb.red, from, to)) {

-			total++;

-		}

-		if (testPrimaryColor(rgb.green, from, to)) {

-			total++;

-		}

-		if (testPrimaryColor(rgb.blue, from, to)) {

-			total++;

-		}

-		return total >= 2;

-	}

-

-	private boolean testPrimaryColor(int value, int from, int to) {

-		return value > from && value < to;

-	}

-

-	private RGB getSystemColor(int code) {

-		return getDisplay().getSystemColor(code).getRGB();

-	}

-

-	private Color getImpliedBackground() {

-		return display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);

-	}

-

-	private Display getDisplay() {

-		return display;

-	}

-

-	private Color getColor(ResourceManager manager, RGB rgb) {

-		try {

-			return manager.createColor(rgb);

-		} catch (DeviceResourceException e) {

-			return manager.getDevice().getSystemColor(SWT.COLOR_BLACK);

-		}

-	}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs;
+
+import org.eclipse.jface.resource.DeviceResourceException;
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * Helper Class to create the colors for the {@link AbstractNotificationPopup}.
+ * <p>
+ * Note: Copied from FormColors of UI Forms.
+ * </p>
+ *
+ * @author Benjamin Pasero (initial contribution from RSSOwl, see bug 177974)
+ * @author Mik Kersten
+ */
+public class NotificationPopupColors {
+
+	private final Display display;
+
+	private Color titleText;
+
+	private Color gradientBegin;
+
+	private Color gradientEnd;
+
+	private Color border;
+
+	private final ResourceManager resourceManager;
+
+	public NotificationPopupColors(Display display, ResourceManager resourceManager) {
+		this.display = display;
+		this.resourceManager = resourceManager;
+
+		createColors();
+	}
+
+	private void createColors() {
+		createBorderColor();
+		createGradientColors();
+		// previously used SWT.COLOR_TITLE_INACTIVE_FOREGROUND, but too light on Windows XP
+		titleText = getColor(resourceManager, getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW));
+	}
+
+	public Color getGradientBegin() {
+		return gradientBegin;
+	}
+
+	public Color getGradientEnd() {
+		return gradientEnd;
+	}
+
+	public Color getBorder() {
+		return border;
+	}
+
+	public Color getTitleText() {
+		return titleText;
+	}
+
+	private void createBorderColor() {
+		RGB tbBorder = getSystemColor(SWT.COLOR_TITLE_BACKGROUND);
+		RGB bg = getImpliedBackground().getRGB();
+
+		// Group 1
+		// Rule: If at least 2 of the RGB values are equal to or between 180 and
+		// 255, then apply specified opacity for Group 1
+		// Examples: Vista, XP Silver, Wn High Con #2
+		// Keyline = TITLE_BACKGROUND @ 70% Opacity over LIST_BACKGROUND
+		if (testTwoPrimaryColors(tbBorder, 179, 256)) {
+			tbBorder = blend(tbBorder, bg, 70);
+		} else if (testTwoPrimaryColors(tbBorder, 120, 180)) {
+			tbBorder = blend(tbBorder, bg, 50);
+		} else {
+			tbBorder = blend(tbBorder, bg, 30);
+		}
+
+		border = getColor(resourceManager, tbBorder);
+	}
+
+	private void createGradientColors() {
+		RGB titleBg = getSystemColor(SWT.COLOR_TITLE_BACKGROUND);
+		Color bgColor = getImpliedBackground();
+		RGB bg = bgColor.getRGB();
+		RGB bottom, top;
+
+		// Group 1
+		// Rule: If at least 2 of the RGB values are equal to or between 180 and
+		// 255, then apply specified opacity for Group 1
+		// Examples: Vista, XP Silver, Wn High Con #2
+		// Gradient Bottom = TITLE_BACKGROUND @ 30% Opacity over LIST_BACKGROUND
+		// Gradient Top = TITLE BACKGROUND @ 0% Opacity over LIST_BACKGROUND
+		if (testTwoPrimaryColors(titleBg, 179, 256)) {
+			bottom = blend(titleBg, bg, 30);
+			top = bg;
+		}
+
+		// Group 2
+		// Rule: If at least 2 of the RGB values are equal to or between 121 and
+		// 179, then apply specified opacity for Group 2
+		// Examples: XP Olive, OSX Graphite, Linux GTK, Wn High Con Black
+		// Gradient Bottom = TITLE_BACKGROUND @ 20% Opacity over LIST_BACKGROUND
+		// Gradient Top = TITLE BACKGROUND @ 0% Opacity over LIST_BACKGROUND
+		else if (testTwoPrimaryColors(titleBg, 120, 180)) {
+			bottom = blend(titleBg, bg, 20);
+			top = bg;
+		}
+
+		// Group 3
+		// Rule: If at least 2 of the RGB values are equal to or between 0 and
+		// 120, then apply specified opacity for Group 3
+		// Examples: XP Default, Wn Classic Standard, Wn Marine, Wn Plum, OSX
+		// Aqua, Wn High Con White, Wn High Con #1
+		// Gradient Bottom = TITLE_BACKGROUND @ 10% Opacity over LIST_BACKGROUND
+		// Gradient Top = TITLE BACKGROUND @ 0% Opacity over LIST_BACKGROUND
+		else {
+			bottom = blend(titleBg, bg, 10);
+			top = bg;
+		}
+
+		gradientBegin = getColor(resourceManager, top);
+		gradientEnd = getColor(resourceManager, bottom);
+	}
+
+	private RGB blend(RGB c1, RGB c2, int ratio) {
+		int r = blend(c1.red, c2.red, ratio);
+		int g = blend(c1.green, c2.green, ratio);
+		int b = blend(c1.blue, c2.blue, ratio);
+		return new RGB(r, g, b);
+	}
+
+	private int blend(int v1, int v2, int ratio) {
+		int b = (ratio * v1 + (100 - ratio) * v2) / 100;
+		return Math.min(255, b);
+	}
+
+	private boolean testTwoPrimaryColors(RGB rgb, int from, int to) {
+		int total = 0;
+		if (testPrimaryColor(rgb.red, from, to)) {
+			total++;
+		}
+		if (testPrimaryColor(rgb.green, from, to)) {
+			total++;
+		}
+		if (testPrimaryColor(rgb.blue, from, to)) {
+			total++;
+		}
+		return total >= 2;
+	}
+
+	private boolean testPrimaryColor(int value, int from, int to) {
+		return value > from && value < to;
+	}
+
+	private RGB getSystemColor(int code) {
+		return getDisplay().getSystemColor(code).getRGB();
+	}
+
+	private Color getImpliedBackground() {
+		return display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
+	}
+
+	private Display getDisplay() {
+		return display;
+	}
+
+	private Color getColor(ResourceManager manager, RGB rgb) {
+		try {
+			return manager.createColor(rgb);
+		} catch (DeviceResourceException e) {
+			return manager.getDevice().getSystemColor(SWT.COLOR_BLACK);
+		}
+	}
 }
\ No newline at end of file
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/PapyrusAsyncNotificationPopup.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/PapyrusAsyncNotificationPopup.java
index 2127812e143..5bf614e7f61 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/PapyrusAsyncNotificationPopup.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/PapyrusAsyncNotificationPopup.java
@@ -1,139 +1,139 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs;

-

-import java.util.Collection;

-import java.util.LinkedList;

-

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.IContext;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.forms.events.HyperlinkAdapter;

-import org.eclipse.ui.forms.events.HyperlinkEvent;

-import org.eclipse.ui.forms.widgets.FormToolkit;

-import org.eclipse.ui.forms.widgets.Hyperlink;

-

-/**

- * This popup creates an async notification

- *

- * @author tristan faure

- *

- */

-public class PapyrusAsyncNotificationPopup extends AbstractNotificationPopup {

-

-	protected String text;

-

-	protected String title;

-

-	protected IContext context = new IContext.Context();

-

-	protected Collection<NotificationRunnable> runnables = new LinkedList<NotificationRunnable>();

-

-	public PapyrusAsyncNotificationPopup(Display display, FormToolkit toolkit) {

-		super(display, toolkit);

-	}

-

-	@Override

-	protected void createContentArea(Composite parent) {

-		super.createContentArea(parent);

-		doCreateClient(parent);

-		doCreateActionSection(parent);

-	}

-

-	protected void doCreateActionSection(Composite parent) {

-		Composite compo = toolkit.createComposite(parent);

-		compo.setLayoutData(new GridData(GridData.END, GridData.END, true, false, 1, 1));

-		compo.setLayout(new FillLayout(SWT.HORIZONTAL));

-		createRunnables(compo);

-	}

-

-	protected void createRunnables(Composite compo) {

-		if (!runnables.isEmpty()) {

-			boolean first = true;

-			for (final NotificationRunnable r : runnables) {

-				if (!first) {

-					toolkit.createLabel(compo, " ");

-				}

-				Hyperlink h = toolkit.createHyperlink(compo, r.getLabel() == null ? "run" : r.getLabel(), SWT.NONE);

-				h.addHyperlinkListener(new HyperlinkAdapter() {

-

-					@Override

-					public void linkActivated(HyperlinkEvent e) {

-						Display.getDefault().asyncExec(new Runnable() {

-

-							public void run() {

-								PapyrusAsyncNotificationPopup.this.run(r);

-							}

-						});

-					}

-				});

-				first = false;

-			}

-		}

-	}

-

-	protected void setCompositeCreated(Composite c) {

-		context.put(IContext.COMPOSITE_CREATED, c);

-	}

-

-	/**

-	 * Sets the used notification for recovering when needed (e.g. for removal)

-	 *

-	 * @param notification

-	 *            the used notification

-	 */

-	public void setINotification(INotification notification) {

-		context.put(IContext.NOTIFICATION_OBJECT, notification);

-	}

-

-	protected void run(NotificationRunnable r) {

-		if (r != null) {

-			r.run(context);

-		}

-	}

-

-	protected void doCreateClient(Composite parent) {

-		Label label = new Label(parent, SWT.None);

-		label.setText(text);

-	}

-

-	public void setText(String text) {

-		this.text = text;

-	}

-

-	public void setTitle(String title) {

-		this.title = title;

-	}

-

-	public void addRunnable(NotificationRunnable runnable) {

-		runnables.add(runnable);

-	}

-

-	public void addAllRunnable(Collection<NotificationRunnable> runnable) {

-		runnables.addAll(runnable);

-	}

-

-	@Override

-	protected String getPopupShellTitle() {

-		if (title == null) {

-			return super.getPopupShellTitle();

-		}

-		return title;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs;
+
+import java.util.Collection;
+import java.util.LinkedList;
+
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.IContext;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.forms.events.HyperlinkAdapter;
+import org.eclipse.ui.forms.events.HyperlinkEvent;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.Hyperlink;
+
+/**
+ * This popup creates an async notification
+ *
+ * @author tristan faure
+ *
+ */
+public class PapyrusAsyncNotificationPopup extends AbstractNotificationPopup {
+
+	protected String text;
+
+	protected String title;
+
+	protected IContext context = new IContext.Context();
+
+	protected Collection<NotificationRunnable> runnables = new LinkedList<NotificationRunnable>();
+
+	public PapyrusAsyncNotificationPopup(Display display, FormToolkit toolkit) {
+		super(display, toolkit);
+	}
+
+	@Override
+	protected void createContentArea(Composite parent) {
+		super.createContentArea(parent);
+		doCreateClient(parent);
+		doCreateActionSection(parent);
+	}
+
+	protected void doCreateActionSection(Composite parent) {
+		Composite compo = toolkit.createComposite(parent);
+		compo.setLayoutData(new GridData(GridData.END, GridData.END, true, false, 1, 1));
+		compo.setLayout(new FillLayout(SWT.HORIZONTAL));
+		createRunnables(compo);
+	}
+
+	protected void createRunnables(Composite compo) {
+		if (!runnables.isEmpty()) {
+			boolean first = true;
+			for (final NotificationRunnable r : runnables) {
+				if (!first) {
+					toolkit.createLabel(compo, " ");
+				}
+				Hyperlink h = toolkit.createHyperlink(compo, r.getLabel() == null ? "run" : r.getLabel(), SWT.NONE);
+				h.addHyperlinkListener(new HyperlinkAdapter() {
+
+					@Override
+					public void linkActivated(HyperlinkEvent e) {
+						Display.getDefault().asyncExec(new Runnable() {
+
+							public void run() {
+								PapyrusAsyncNotificationPopup.this.run(r);
+							}
+						});
+					}
+				});
+				first = false;
+			}
+		}
+	}
+
+	protected void setCompositeCreated(Composite c) {
+		context.put(IContext.COMPOSITE_CREATED, c);
+	}
+
+	/**
+	 * Sets the used notification for recovering when needed (e.g. for removal)
+	 *
+	 * @param notification
+	 *            the used notification
+	 */
+	public void setINotification(INotification notification) {
+		context.put(IContext.NOTIFICATION_OBJECT, notification);
+	}
+
+	protected void run(NotificationRunnable r) {
+		if (r != null) {
+			r.run(context);
+		}
+	}
+
+	protected void doCreateClient(Composite parent) {
+		Label label = new Label(parent, SWT.None);
+		label.setText(text);
+	}
+
+	public void setText(String text) {
+		this.text = text;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public void addRunnable(NotificationRunnable runnable) {
+		runnables.add(runnable);
+	}
+
+	public void addAllRunnable(Collection<NotificationRunnable> runnable) {
+		runnables.addAll(runnable);
+	}
+
+	@Override
+	protected String getPopupShellTitle() {
+		if (title == null) {
+			return super.getPopupShellTitle();
+		}
+		return title;
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/PapyrusPopup.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/PapyrusPopup.java
index 93aa5e399b0..530dec1e4e1 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/PapyrusPopup.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/dialogs/PapyrusPopup.java
@@ -1,222 +1,222 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs;

-

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.LinkedList;

-import java.util.Map;

-

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.dialogs.IDialogConstants;

-import org.eclipse.papyrus.infra.ui.util.PapyrusImageUtils;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.PapyrusToolkit;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.IContext;

-import org.eclipse.swt.graphics.Rectangle;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.forms.widgets.FormToolkit;

-import org.eclipse.ui.forms.widgets.ScrolledForm;

-import org.eclipse.ui.forms.widgets.Section;

-

-/**

- * A papyrus Popup

- *

- * @author tristan faure

- *

- */

-public abstract class PapyrusPopup extends Dialog {

-

-	protected FormToolkit toolkit;

-

-	protected boolean useHtml = false;

-

-	protected IContext context = new IContext.Context();

-

-	protected Collection<NotificationRunnable> runnables = new LinkedList<NotificationRunnable>();

-

-	protected Map<Integer, NotificationRunnable> mapForIds = new HashMap<Integer, NotificationRunnable>();

-

-	/**

-	 * Used to custom the composite inside the popup

-	 */

-	protected ICompositeCreator creator = null;

-

-	private String title;

-

-	public PapyrusPopup(Shell parentShell, FormToolkit toolkit) {

-		super(parentShell);

-		this.toolkit = toolkit;

-	}

-

-

-	@Override

-	protected Control createDialogArea(Composite parent) {

-		getShell().setText(title == null ? "" : title);

-		getShell().setImage(PapyrusImageUtils.getDefaultIcon());

-		Composite c = (Composite) super.createDialogArea(parent);

-		c.setLayout(new FillLayout());

-		createForm(c);

-		return c;

-	}

-

-

-	/**

-	 * Creates a form and a section

-	 * override this method to avoid form creation

-	 *

-	 * @param c

-	 *            , the composite container

-	 */

-	protected void createForm(Composite c) {

-		ScrolledForm form = toolkit.createScrolledForm(c);

-		// form.getBody().setLayoutData(new GridData(GridData.FILL_BOTH));

-		form.getBody().setLayout(new GridLayout());

-		toolkit.decorateFormHeading(form.getForm());

-		createSection(c, form);

-		c.setLayoutData(new GridData(GridData.FILL_BOTH));

-	}

-

-	/**

-	 * Sets the used notification for recovering when needed (e.g. for removal)

-	 *

-	 * @param notification

-	 *            the used notification

-	 */

-	public void setINotification(INotification notification) {

-		context.put(IContext.NOTIFICATION_OBJECT, notification);

-	}

-

-	/**

-	 * Creates a section

-	 * override this method to avoid section creation

-	 *

-	 * @param c

-	 *            , the composite container of the form

-	 * @param form

-	 *            , the form container

-	 */

-	protected void createSection(Composite c, ScrolledForm form) {

-		Section section = toolkit.createSection(form.getBody(), PapyrusToolkit.DEFAULT_STYLE);

-		section.setText("Papyrus");

-		if (creator != null && c instanceof Composite) {

-			Composite createComposite = creator.createComposite(section, toolkit);

-			section.setClient(createComposite);

-			context.put(IContext.COMPOSITE_CREATED, createComposite);

-			getShell().setFocus();

-		} else {

-			section.setClient(doCreateContents(section));

-			getShell().setFocus();

-		}

-		section.setLayoutData(new GridData(GridData.FILL_BOTH));

-	}

-

-	/**

-	 * @param runnable

-	 */

-	public void addRunnable(NotificationRunnable runnable) {

-		runnables.add(runnable);

-	}

-

-	@Override

-	protected void createButtonsForButtonBar(Composite parent) {

-		if (runnables != null && !runnables.isEmpty()) {

-			int START_AFTER_CANCEL = 2;

-			for (final NotificationRunnable r : runnables) {

-				createButton(parent, START_AFTER_CANCEL, r.getLabel(), START_AFTER_CANCEL == 2);

-				mapForIds.put(START_AFTER_CANCEL, r);

-				START_AFTER_CANCEL++;

-			}

-		} else {

-			createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);

-		}

-	}

-

-

-

-	@Override

-	protected void buttonPressed(int buttonId) {

-		if (buttonId != IDialogConstants.OK_ID && buttonId != IDialogConstants.CANCEL_ID) {

-			NotificationRunnable run = mapForIds.get(buttonId);

-			if (run == null) {

-				super.buttonPressed(buttonId);

-			} else {

-				run.run(context);

-				// retrieve the return code according to the context if it is set

-				Object contextCode = context.get(IContext.ACTION_ID);

-				if (contextCode != null && contextCode instanceof Integer) {

-					setReturnCode((Integer) contextCode);

-				}

-			}

-		} else {

-			super.buttonPressed(buttonId);

-		}

-		close();

-	}

-

-	/**

-	 * @param runnable

-	 */

-	public void addRunnables(Collection<NotificationRunnable> runnable) {

-		runnables.addAll(runnable);

-	}

-

-	protected abstract Control doCreateContents(Composite composite);

-

-	public void setCompositeCreator(ICompositeCreator creator) {

-		this.creator = creator;

-	}

-

-	public void setTitle(String title) {

-		this.title = title;

-	}

-

-	/**

-	 * Gets the bounds.

-	 *

-	 * @return the bounds

-	 */

-	public static Rectangle getBounds() {

-		Display display = Display.getDefault();

-		Rectangle bounds = display.getPrimaryMonitor().getBounds();

-		Rectangle result = new Rectangle(bounds.x + bounds.width / 4, bounds.y + bounds.height / 4, bounds.width / 2, bounds.height / 2);

-		return result;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.jface.window.Window#getConstrainedShellBounds(org.eclipse.swt.graphics.Rectangle)

-	 */

-	@Override

-	protected Rectangle getConstrainedShellBounds(Rectangle preferredSize) {

-		// return getBounds();

-		return super.getConstrainedShellBounds(preferredSize);

-	}

-

-	public void setUseHtml(boolean useHtml) {

-		this.useHtml = useHtml;

-	}

-

-	public boolean isUseHtml() {

-		return useHtml;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.papyrus.infra.ui.util.PapyrusImageUtils;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.PapyrusToolkit;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.IContext;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.ScrolledForm;
+import org.eclipse.ui.forms.widgets.Section;
+
+/**
+ * A papyrus Popup
+ *
+ * @author tristan faure
+ *
+ */
+public abstract class PapyrusPopup extends Dialog {
+
+	protected FormToolkit toolkit;
+
+	protected boolean useHtml = false;
+
+	protected IContext context = new IContext.Context();
+
+	protected Collection<NotificationRunnable> runnables = new LinkedList<NotificationRunnable>();
+
+	protected Map<Integer, NotificationRunnable> mapForIds = new HashMap<Integer, NotificationRunnable>();
+
+	/**
+	 * Used to custom the composite inside the popup
+	 */
+	protected ICompositeCreator creator = null;
+
+	private String title;
+
+	public PapyrusPopup(Shell parentShell, FormToolkit toolkit) {
+		super(parentShell);
+		this.toolkit = toolkit;
+	}
+
+
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		getShell().setText(title == null ? "" : title);
+		getShell().setImage(PapyrusImageUtils.getDefaultIcon());
+		Composite c = (Composite) super.createDialogArea(parent);
+		c.setLayout(new FillLayout());
+		createForm(c);
+		return c;
+	}
+
+
+	/**
+	 * Creates a form and a section
+	 * override this method to avoid form creation
+	 *
+	 * @param c
+	 *            , the composite container
+	 */
+	protected void createForm(Composite c) {
+		ScrolledForm form = toolkit.createScrolledForm(c);
+		// form.getBody().setLayoutData(new GridData(GridData.FILL_BOTH));
+		form.getBody().setLayout(new GridLayout());
+		toolkit.decorateFormHeading(form.getForm());
+		createSection(c, form);
+		c.setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
+	/**
+	 * Sets the used notification for recovering when needed (e.g. for removal)
+	 *
+	 * @param notification
+	 *            the used notification
+	 */
+	public void setINotification(INotification notification) {
+		context.put(IContext.NOTIFICATION_OBJECT, notification);
+	}
+
+	/**
+	 * Creates a section
+	 * override this method to avoid section creation
+	 *
+	 * @param c
+	 *            , the composite container of the form
+	 * @param form
+	 *            , the form container
+	 */
+	protected void createSection(Composite c, ScrolledForm form) {
+		Section section = toolkit.createSection(form.getBody(), PapyrusToolkit.DEFAULT_STYLE);
+		section.setText("Papyrus");
+		if (creator != null && c instanceof Composite) {
+			Composite createComposite = creator.createComposite(section, toolkit);
+			section.setClient(createComposite);
+			context.put(IContext.COMPOSITE_CREATED, createComposite);
+			getShell().setFocus();
+		} else {
+			section.setClient(doCreateContents(section));
+			getShell().setFocus();
+		}
+		section.setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
+	/**
+	 * @param runnable
+	 */
+	public void addRunnable(NotificationRunnable runnable) {
+		runnables.add(runnable);
+	}
+
+	@Override
+	protected void createButtonsForButtonBar(Composite parent) {
+		if (runnables != null && !runnables.isEmpty()) {
+			int START_AFTER_CANCEL = 2;
+			for (final NotificationRunnable r : runnables) {
+				createButton(parent, START_AFTER_CANCEL, r.getLabel(), START_AFTER_CANCEL == 2);
+				mapForIds.put(START_AFTER_CANCEL, r);
+				START_AFTER_CANCEL++;
+			}
+		} else {
+			createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
+		}
+	}
+
+
+
+	@Override
+	protected void buttonPressed(int buttonId) {
+		if (buttonId != IDialogConstants.OK_ID && buttonId != IDialogConstants.CANCEL_ID) {
+			NotificationRunnable run = mapForIds.get(buttonId);
+			if (run == null) {
+				super.buttonPressed(buttonId);
+			} else {
+				run.run(context);
+				// retrieve the return code according to the context if it is set
+				Object contextCode = context.get(IContext.ACTION_ID);
+				if (contextCode != null && contextCode instanceof Integer) {
+					setReturnCode((Integer) contextCode);
+				}
+			}
+		} else {
+			super.buttonPressed(buttonId);
+		}
+		close();
+	}
+
+	/**
+	 * @param runnable
+	 */
+	public void addRunnables(Collection<NotificationRunnable> runnable) {
+		runnables.addAll(runnable);
+	}
+
+	protected abstract Control doCreateContents(Composite composite);
+
+	public void setCompositeCreator(ICompositeCreator creator) {
+		this.creator = creator;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	/**
+	 * Gets the bounds.
+	 *
+	 * @return the bounds
+	 */
+	public static Rectangle getBounds() {
+		Display display = Display.getDefault();
+		Rectangle bounds = display.getPrimaryMonitor().getBounds();
+		Rectangle result = new Rectangle(bounds.x + bounds.width / 4, bounds.y + bounds.height / 4, bounds.width / 2, bounds.height / 2);
+		return result;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.jface.window.Window#getConstrainedShellBounds(org.eclipse.swt.graphics.Rectangle)
+	 */
+	@Override
+	protected Rectangle getConstrainedShellBounds(Rectangle preferredSize) {
+		// return getBounds();
+		return super.getConstrainedShellBounds(preferredSize);
+	}
+
+	public void setUseHtml(boolean useHtml) {
+		this.useHtml = useHtml;
+	}
+
+	public boolean isUseHtml() {
+		return useHtml;
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/exception/NotificationException.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/exception/NotificationException.java
index b963b8e2ad1..32847630c20 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/exception/NotificationException.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/exception/NotificationException.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification.exception;

-

-

-/**

- * An exception for the notification

- *

- * @author tfaure

- *

- */

-public class NotificationException extends RuntimeException {

-

-	/** serialization UID */

-	private static final long serialVersionUID = 3538113727604912133L;

-

-	private final String message;

-

-	public NotificationException(String message) {

-		this.message = message;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public String getMessage() {

-		return message;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.exception;
+
+
+/**
+ * An exception for the notification
+ *
+ * @author tfaure
+ *
+ */
+public class NotificationException extends RuntimeException {
+
+	/** serialization UID */
+	private static final long serialVersionUID = 3538113727604912133L;
+
+	private final String message;
+
+	public NotificationException(String message) {
+		this.message = message;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getMessage() {
+		return message;
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/popups/IconAndMessagePapyrusPopup.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/popups/IconAndMessagePapyrusPopup.java
index d9db3d74a04..4656cf2b07b 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/popups/IconAndMessagePapyrusPopup.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/popups/IconAndMessagePapyrusPopup.java
@@ -1,67 +1,67 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification.popups;

-

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.PapyrusToolkit;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.utils.PapyrusControlsFactory;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.forms.widgets.FormToolkit;

-import org.eclipse.ui.forms.widgets.ScrolledForm;

-import org.eclipse.ui.forms.widgets.Section;

-

-

-/**

- * A notification with icon and message

- *

- * @author tristan faure

- *

- */

-public class IconAndMessagePapyrusPopup extends MessagePapyrusPopup {

-

-	private Type type = null;

-

-	private Image image;

-

-	public IconAndMessagePapyrusPopup(Shell parentShell, FormToolkit toolkit, String message, Type type) {

-		super(parentShell, toolkit, message);

-		this.type = type;

-	}

-

-	public IconAndMessagePapyrusPopup(Shell activeShell, FormToolkit toolkit, String message) {

-		super(activeShell, toolkit, message);

-	}

-

-

-

-	@Override

-	protected void createSection(Composite c, ScrolledForm form) {

-		Section section = toolkit.createSection(form.getBody(), PapyrusToolkit.DEFAULT_STYLE);

-		section.setText("Papyrus");

-		section.setClient(doCreateContents(section));

-		getShell().setFocus();

-		section.setLayoutData(new GridData(GridData.FILL_BOTH));

-	}

-

-	@Override

-	protected Composite createText(Composite composite) {

-		Composite top = PapyrusControlsFactory.createCompositeWithType(getShell(), toolkit, composite, type, image, message, useHtml, creator, context);

-		return top;

-	}

-

-	public void setImage(Image image) {

-		this.image = image;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.popups;
+
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.PapyrusToolkit;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.utils.PapyrusControlsFactory;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.ScrolledForm;
+import org.eclipse.ui.forms.widgets.Section;
+
+
+/**
+ * A notification with icon and message
+ *
+ * @author tristan faure
+ *
+ */
+public class IconAndMessagePapyrusPopup extends MessagePapyrusPopup {
+
+	private Type type = null;
+
+	private Image image;
+
+	public IconAndMessagePapyrusPopup(Shell parentShell, FormToolkit toolkit, String message, Type type) {
+		super(parentShell, toolkit, message);
+		this.type = type;
+	}
+
+	public IconAndMessagePapyrusPopup(Shell activeShell, FormToolkit toolkit, String message) {
+		super(activeShell, toolkit, message);
+	}
+
+
+
+	@Override
+	protected void createSection(Composite c, ScrolledForm form) {
+		Section section = toolkit.createSection(form.getBody(), PapyrusToolkit.DEFAULT_STYLE);
+		section.setText("Papyrus");
+		section.setClient(doCreateContents(section));
+		getShell().setFocus();
+		section.setLayoutData(new GridData(GridData.FILL_BOTH));
+	}
+
+	@Override
+	protected Composite createText(Composite composite) {
+		Composite top = PapyrusControlsFactory.createCompositeWithType(getShell(), toolkit, composite, type, image, message, useHtml, creator, context);
+		return top;
+	}
+
+	public void setImage(Image image) {
+		this.image = image;
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/popups/MessagePapyrusPopup.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/popups/MessagePapyrusPopup.java
index 95b1428819d..eb70e24e692 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/popups/MessagePapyrusPopup.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/popups/MessagePapyrusPopup.java
@@ -1,74 +1,74 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification.popups;

-

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.PapyrusPopup;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Layout;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.forms.widgets.FormText;

-import org.eclipse.ui.forms.widgets.FormToolkit;

-

-

-/**

- * A notification with a message

- *

- * @author tristan faure

- *

- */

-public class MessagePapyrusPopup extends PapyrusPopup {

-

-	protected final String message;

-

-

-	/**

-	 * Create a Papyrus message popup

-	 *

-	 * @param parentShell

-	 *            , the shell

-	 * @param toolkit

-	 *            , the toolkit to create elements

-	 * @param message

-	 *            , the message to display

-	 */

-	public MessagePapyrusPopup(Shell parentShell, FormToolkit toolkit, String message) {

-		super(parentShell, toolkit);

-		this.message = message;

-

-	}

-

-	@Override

-	protected Control doCreateContents(Composite composite) {

-		composite.setLayout(getCompositeLayout());

-		Composite label = createText(composite);

-		return label;

-	}

-

-	protected Layout getCompositeLayout() {

-		return new FillLayout();

-	}

-

-	protected Composite createText(Composite composite) {

-		FormText label = toolkit.createFormText(composite, false);

-		label.setText(message, useHtml, true);

-		return label;

-	}

-

-	@Override

-	protected void createButtonsForButtonBar(Composite parent) {

-		super.createButtonsForButtonBar(parent);

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.popups;
+
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.PapyrusPopup;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Layout;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.forms.widgets.FormText;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+
+/**
+ * A notification with a message
+ *
+ * @author tristan faure
+ *
+ */
+public class MessagePapyrusPopup extends PapyrusPopup {
+
+	protected final String message;
+
+
+	/**
+	 * Create a Papyrus message popup
+	 *
+	 * @param parentShell
+	 *            , the shell
+	 * @param toolkit
+	 *            , the toolkit to create elements
+	 * @param message
+	 *            , the message to display
+	 */
+	public MessagePapyrusPopup(Shell parentShell, FormToolkit toolkit, String message) {
+		super(parentShell, toolkit);
+		this.message = message;
+
+	}
+
+	@Override
+	protected Control doCreateContents(Composite composite) {
+		composite.setLayout(getCompositeLayout());
+		Composite label = createText(composite);
+		return label;
+	}
+
+	protected Layout getCompositeLayout() {
+		return new FillLayout();
+	}
+
+	protected Composite createText(Composite composite) {
+		FormText label = toolkit.createFormText(composite, false);
+		label.setText(message, useHtml, true);
+		return label;
+	}
+
+	@Override
+	protected void createButtonsForButtonBar(Composite parent) {
+		super.createButtonsForButtonBar(parent);
+	}
+
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/popups/PopupNotification.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/popups/PopupNotification.java
index ddf02285549..2ff2ae074c5 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/popups/PopupNotification.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/popups/PopupNotification.java
@@ -1,63 +1,63 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification.popups;

-

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.PapyrusPopup;

-import org.eclipse.swt.SWT;

-

-/**

- * The INotification corresponding to the popup builder

- *

- * @author tfaure

- *

- */

-public class PopupNotification implements INotification {

-

-	private final PapyrusPopup popup;

-

-	private int popupResult = SWT.NONE;

-

-	public PopupNotification(PapyrusPopup popup) {

-		this.popup = popup;

-	}

-

-	public void delete() {

-		// no effect

-	}

-

-	/**

-	 * Whether the popup has been closed

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification#isDeleted()

-	 *

-	 * @return true

-	 */

-	public boolean isDeleted() {

-		// the object is created once the popup is closed

-		return true;

-	}

-

-	public void setResult(int popupResult) {

-		this.popupResult = popupResult;

-	}

-

-	/**

-	 * Returns the result of the popup

-	 *

-	 * @return

-	 */

-	public int getResult() {

-		return popupResult;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.popups;
+
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.dialogs.PapyrusPopup;
+import org.eclipse.swt.SWT;
+
+/**
+ * The INotification corresponding to the popup builder
+ *
+ * @author tfaure
+ *
+ */
+public class PopupNotification implements INotification {
+
+	private final PapyrusPopup popup;
+
+	private int popupResult = SWT.NONE;
+
+	public PopupNotification(PapyrusPopup popup) {
+		this.popup = popup;
+	}
+
+	public void delete() {
+		// no effect
+	}
+
+	/**
+	 * Whether the popup has been closed
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification#isDeleted()
+	 *
+	 * @return true
+	 */
+	public boolean isDeleted() {
+		// the object is created once the popup is closed
+		return true;
+	}
+
+	public void setResult(int popupResult) {
+		this.popupResult = popupResult;
+	}
+
+	/**
+	 * Returns the result of the popup
+	 *
+	 * @return
+	 */
+	public int getResult() {
+		return popupResult;
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/utils/PapyrusControlsFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/utils/PapyrusControlsFactory.java
index af745fda8fe..f955bf80ae8 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/utils/PapyrusControlsFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/utils/PapyrusControlsFactory.java
@@ -1,128 +1,128 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification.utils;

-

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.PapyrusToolkit;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.IContext;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Image;

-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 org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.forms.widgets.FormText;

-import org.eclipse.ui.forms.widgets.FormToolkit;

-

-

-public class PapyrusControlsFactory {

-

-	/**

-	 * Create a composite according to the type

-	 *

-	 * @param shell

-	 *            , the shell of the element

-	 * @param toolkit

-	 *            , the toolkit used

-	 * @param parent

-	 *            , the parent containing the composite created

-	 * @param type

-	 *            , the type to create

-	 * @param image

-	 *            , the image to associate

-	 * @param message

-	 *            , the message to display

-	 * @param useHTML

-	 *            , if the composite use html

-	 * @return the composite created

-	 */

-	public static Composite createCompositeWithType(Shell shell, FormToolkit toolkit, Composite parent, Type type, Image image, String message, boolean useHTML) {

-		return createCompositeWithType(shell, toolkit, parent, type, image, message, useHTML, null, null);

-	}

-

-	/**

-	 * Create a composite according to the type

-	 *

-	 * @param shell

-	 *            , the shell of the element

-	 * @param toolkit

-	 *            , the toolkit used

-	 * @param parent

-	 *            , the parent containing the composite created

-	 * @param type

-	 *            , the type to create

-	 * @param image

-	 *            , the image to associate

-	 * @param message

-	 *            , the message to display

-	 * @param useHTML

-	 *            , if the composite use html

-	 * @param creator

-	 *            , the composite creator it can be null

-	 * @param context

-	 *            , the context to add the composite created by the creator

-	 * @return the composite created

-	 */

-	public static Composite createCompositeWithType(Shell shell, FormToolkit toolkit, Composite parent, Type type, Image image, String message, boolean useHTML, ICompositeCreator creator, IContext context) {

-		Composite top = null;

-		if (toolkit == null) {

-			top = new Composite(parent, SWT.None);

-		} else {

-			top = toolkit.createComposite(parent, SWT.NONE);

-		}

-		top.setLayout(new GridLayout(2, false));

-		Image anImage = image;

-		switch (type) {

-		case ERROR:

-			anImage = NotificationBuilder.getSWTImage(SWT.ICON_ERROR, shell);

-			break;

-		case INFO:

-			anImage = NotificationBuilder.getSWTImage(SWT.ICON_INFORMATION, shell);

-			break;

-		case WARNING:

-			anImage = NotificationBuilder.getSWTImage(SWT.ICON_WARNING, shell);

-			break;

-		case QUESTION:

-			anImage = NotificationBuilder.getSWTImage(SWT.ICON_QUESTION, shell);

-			break;

-		default:

-		}

-		Label labelImage = new Label(top, SWT.None);

-		if (anImage != null) {

-			labelImage.setImage(anImage);

-		}

-		if (creator == null) {

-			if (toolkit != null) {

-				FormText label = toolkit.createFormText(top, false);

-				label.setText(message, useHTML, true);

-				label.setLayoutData(new GridData(GridData.FILL_BOTH));

-			} else {

-				Label label = new Label(top, SWT.None);

-				label.setText(message);

-				label.setLayoutData(new GridData(GridData.FILL_BOTH));

-			}

-		} else {

-			if (toolkit == null) {

-				toolkit = PapyrusToolkit.INSTANCE;

-			}

-			Composite compo = creator.createComposite(top, toolkit);

-			if (context != null) {

-				context.put(IContext.COMPOSITE_CREATED, compo);

-			}

-		}

-		return top;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.utils;
+
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.PapyrusToolkit;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.IContext;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+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 org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.forms.widgets.FormText;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+
+public class PapyrusControlsFactory {
+
+	/**
+	 * Create a composite according to the type
+	 *
+	 * @param shell
+	 *            , the shell of the element
+	 * @param toolkit
+	 *            , the toolkit used
+	 * @param parent
+	 *            , the parent containing the composite created
+	 * @param type
+	 *            , the type to create
+	 * @param image
+	 *            , the image to associate
+	 * @param message
+	 *            , the message to display
+	 * @param useHTML
+	 *            , if the composite use html
+	 * @return the composite created
+	 */
+	public static Composite createCompositeWithType(Shell shell, FormToolkit toolkit, Composite parent, Type type, Image image, String message, boolean useHTML) {
+		return createCompositeWithType(shell, toolkit, parent, type, image, message, useHTML, null, null);
+	}
+
+	/**
+	 * Create a composite according to the type
+	 *
+	 * @param shell
+	 *            , the shell of the element
+	 * @param toolkit
+	 *            , the toolkit used
+	 * @param parent
+	 *            , the parent containing the composite created
+	 * @param type
+	 *            , the type to create
+	 * @param image
+	 *            , the image to associate
+	 * @param message
+	 *            , the message to display
+	 * @param useHTML
+	 *            , if the composite use html
+	 * @param creator
+	 *            , the composite creator it can be null
+	 * @param context
+	 *            , the context to add the composite created by the creator
+	 * @return the composite created
+	 */
+	public static Composite createCompositeWithType(Shell shell, FormToolkit toolkit, Composite parent, Type type, Image image, String message, boolean useHTML, ICompositeCreator creator, IContext context) {
+		Composite top = null;
+		if (toolkit == null) {
+			top = new Composite(parent, SWT.None);
+		} else {
+			top = toolkit.createComposite(parent, SWT.NONE);
+		}
+		top.setLayout(new GridLayout(2, false));
+		Image anImage = image;
+		switch (type) {
+		case ERROR:
+			anImage = NotificationBuilder.getSWTImage(SWT.ICON_ERROR, shell);
+			break;
+		case INFO:
+			anImage = NotificationBuilder.getSWTImage(SWT.ICON_INFORMATION, shell);
+			break;
+		case WARNING:
+			anImage = NotificationBuilder.getSWTImage(SWT.ICON_WARNING, shell);
+			break;
+		case QUESTION:
+			anImage = NotificationBuilder.getSWTImage(SWT.ICON_QUESTION, shell);
+			break;
+		default:
+		}
+		Label labelImage = new Label(top, SWT.None);
+		if (anImage != null) {
+			labelImage.setImage(anImage);
+		}
+		if (creator == null) {
+			if (toolkit != null) {
+				FormText label = toolkit.createFormText(top, false);
+				label.setText(message, useHTML, true);
+				label.setLayoutData(new GridData(GridData.FILL_BOTH));
+			} else {
+				Label label = new Label(top, SWT.None);
+				label.setText(message);
+				label.setLayoutData(new GridData(GridData.FILL_BOTH));
+			}
+		} else {
+			if (toolkit == null) {
+				toolkit = PapyrusToolkit.INSTANCE;
+			}
+			Composite compo = creator.createComposite(top, toolkit);
+			if (context != null) {
+				context.put(IContext.COMPOSITE_CREATED, compo);
+			}
+		}
+		return top;
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/AbstractInsideComposite.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/AbstractInsideComposite.java
index 69342497087..4c3cd01ac30 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/AbstractInsideComposite.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/AbstractInsideComposite.java
@@ -1,174 +1,174 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification.view;

-

-import java.text.SimpleDateFormat;

-import java.util.Collection;

-import java.util.Date;

-

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICallBack;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.IContext;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.layout.FillLayout;

-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.Control;

-import org.eclipse.ui.forms.widgets.ExpandableComposite;

-import org.eclipse.ui.forms.widgets.FormToolkit;

-import org.eclipse.ui.forms.widgets.ScrolledForm;

-import org.eclipse.ui.forms.widgets.Section;

-

-/**

- * A composite contained in PapyrusNotificationView

- *

- * @author tfaure

- */

-public abstract class AbstractInsideComposite extends Composite {

-

-	private final FormToolkit toolkit;

-

-	private Section section;

-

-	private Control previous;

-

-	private Control after;

-

-	private final ICallBack callback;

-

-	protected IContext context = new IContext.Context();

-

-	private Collection<NotificationRunnable> runnables;

-

-	AbstractInsideComposite(ICallBack callback, ScrolledForm parent, FormToolkit toolkit, Collection<NotificationRunnable> collection) {

-		super(parent.getBody(), SWT.NONE);

-		this.callback = callback;

-		this.toolkit = toolkit;

-		this.runnables = collection;

-		createContents();

-	}

-

-	/**

-	 * Sets the used notification for recovering when needed (e.g. for removal)

-	 *

-	 * @param notification

-	 *            the used notification

-	 */

-	public void setINotification(INotification notification) {

-		context.put(IContext.NOTIFICATION_OBJECT, notification);

-	}

-

-	private void createContents() {

-		section = toolkit.createSection(this, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);

-		section.setText(getSectionName() + " - " + new SimpleDateFormat("HH'h'mm'm'ss's'").format(new Date()));

-		section.setLayout(new FillLayout());

-		Composite compo = toolkit.createComposite(section);

-		compo.setLayout(new GridLayout(1, false));

-		Control control = doCreateContents(toolkit, compo);

-		control.setLayoutData(new GridData(GridData.FILL_BOTH));

-		createHyperLinkSection(compo);

-		section.setClient(compo);

-	}

-

-	protected void createHyperLinkSection(Composite compo) {

-		Composite compoHL = toolkit.createComposite(compo);

-		compoHL.setLayout(new FillLayout());

-		if (runnables != null && !runnables.isEmpty()) {

-			for (final NotificationRunnable r : runnables) {

-				Button b = toolkit.createButton(compoHL, r.getLabel() == null ? "run" : r.getLabel(), SWT.NONE);

-				b.addSelectionListener(new SelectionListener() {

-

-					public void widgetSelected(SelectionEvent e) {

-						run(r);

-					}

-

-					public void widgetDefaultSelected(SelectionEvent e) {

-						run(r);

-					}

-				});

-			}

-		} else {

-			Button b = toolkit.createButton(compoHL, "close", SWT.NONE);

-			b.addSelectionListener(new SelectionListener() {

-

-				public void widgetSelected(SelectionEvent e) {

-					close();

-				}

-

-				public void widgetDefaultSelected(SelectionEvent e) {

-					close();

-				}

-			});

-		}

-		compoHL.setLayoutData(new GridData(GridData.END, GridData.END, false, true, 1, 1));

-	}

-

-	protected void setCompositeCreated(Composite c) {

-		context.put(IContext.COMPOSITE_CREATED, c);

-	}

-

-	/**

-	 * Close the current Composite

-	 */

-	public void close() {

-		callback.callBack(this);

-	}

-

-	public void run(NotificationRunnable r) {

-		if (r != null) {

-			r.run(context);

-			close();

-		}

-	}

-

-	public void runDefault() {

-		if (runnables != null && !runnables.isEmpty()) {

-			runnables.iterator().next().run(context);

-		}

-		close();

-	}

-

-	public void expand() {

-		section.setExpanded(true);

-	}

-

-	public void collapse() {

-		section.setExpanded(false);

-	}

-

-	protected abstract Control doCreateContents(FormToolkit toolkit, Composite composite);

-

-	protected abstract String getSectionName();

-

-	public void setAfter(Control after) {

-		this.after = after;

-	}

-

-	public Control getAfter() {

-		return after;

-	}

-

-	public void setPrevious(Control previous) {

-		this.previous = previous;

-	}

-

-	public Control getPrevious() {

-		return previous;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.view;
+
+import java.text.SimpleDateFormat;
+import java.util.Collection;
+import java.util.Date;
+
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICallBack;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.IContext;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.FillLayout;
+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.Control;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.ScrolledForm;
+import org.eclipse.ui.forms.widgets.Section;
+
+/**
+ * A composite contained in PapyrusNotificationView
+ *
+ * @author tfaure
+ */
+public abstract class AbstractInsideComposite extends Composite {
+
+	private final FormToolkit toolkit;
+
+	private Section section;
+
+	private Control previous;
+
+	private Control after;
+
+	private final ICallBack callback;
+
+	protected IContext context = new IContext.Context();
+
+	private Collection<NotificationRunnable> runnables;
+
+	AbstractInsideComposite(ICallBack callback, ScrolledForm parent, FormToolkit toolkit, Collection<NotificationRunnable> collection) {
+		super(parent.getBody(), SWT.NONE);
+		this.callback = callback;
+		this.toolkit = toolkit;
+		this.runnables = collection;
+		createContents();
+	}
+
+	/**
+	 * Sets the used notification for recovering when needed (e.g. for removal)
+	 *
+	 * @param notification
+	 *            the used notification
+	 */
+	public void setINotification(INotification notification) {
+		context.put(IContext.NOTIFICATION_OBJECT, notification);
+	}
+
+	private void createContents() {
+		section = toolkit.createSection(this, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
+		section.setText(getSectionName() + " - " + new SimpleDateFormat("HH'h'mm'm'ss's'").format(new Date()));
+		section.setLayout(new FillLayout());
+		Composite compo = toolkit.createComposite(section);
+		compo.setLayout(new GridLayout(1, false));
+		Control control = doCreateContents(toolkit, compo);
+		control.setLayoutData(new GridData(GridData.FILL_BOTH));
+		createHyperLinkSection(compo);
+		section.setClient(compo);
+	}
+
+	protected void createHyperLinkSection(Composite compo) {
+		Composite compoHL = toolkit.createComposite(compo);
+		compoHL.setLayout(new FillLayout());
+		if (runnables != null && !runnables.isEmpty()) {
+			for (final NotificationRunnable r : runnables) {
+				Button b = toolkit.createButton(compoHL, r.getLabel() == null ? "run" : r.getLabel(), SWT.NONE);
+				b.addSelectionListener(new SelectionListener() {
+
+					public void widgetSelected(SelectionEvent e) {
+						run(r);
+					}
+
+					public void widgetDefaultSelected(SelectionEvent e) {
+						run(r);
+					}
+				});
+			}
+		} else {
+			Button b = toolkit.createButton(compoHL, "close", SWT.NONE);
+			b.addSelectionListener(new SelectionListener() {
+
+				public void widgetSelected(SelectionEvent e) {
+					close();
+				}
+
+				public void widgetDefaultSelected(SelectionEvent e) {
+					close();
+				}
+			});
+		}
+		compoHL.setLayoutData(new GridData(GridData.END, GridData.END, false, true, 1, 1));
+	}
+
+	protected void setCompositeCreated(Composite c) {
+		context.put(IContext.COMPOSITE_CREATED, c);
+	}
+
+	/**
+	 * Close the current Composite
+	 */
+	public void close() {
+		callback.callBack(this);
+	}
+
+	public void run(NotificationRunnable r) {
+		if (r != null) {
+			r.run(context);
+			close();
+		}
+	}
+
+	public void runDefault() {
+		if (runnables != null && !runnables.isEmpty()) {
+			runnables.iterator().next().run(context);
+		}
+		close();
+	}
+
+	public void expand() {
+		section.setExpanded(true);
+	}
+
+	public void collapse() {
+		section.setExpanded(false);
+	}
+
+	protected abstract Control doCreateContents(FormToolkit toolkit, Composite composite);
+
+	protected abstract String getSectionName();
+
+	public void setAfter(Control after) {
+		this.after = after;
+	}
+
+	public Control getAfter() {
+		return after;
+	}
+
+	public void setPrevious(Control previous) {
+		this.previous = previous;
+	}
+
+	public Control getPrevious() {
+		return previous;
+	}
+
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/MessageComposite.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/MessageComposite.java
index 8724e27b720..a5783f3460a 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/MessageComposite.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/MessageComposite.java
@@ -1,50 +1,50 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification.view;

-

-import java.util.Collection;

-

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICallBack;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.ui.forms.widgets.FormText;

-import org.eclipse.ui.forms.widgets.FormToolkit;

-import org.eclipse.ui.forms.widgets.ScrolledForm;

-

-public class MessageComposite extends AbstractInsideComposite {

-

-	protected FormText text;

-

-

-	public MessageComposite(ICallBack callBack, ScrolledForm parent, FormToolkit toolkit, Collection<NotificationRunnable> collection) {

-		super(callBack, parent, toolkit, collection);

-		setLayout(new FillLayout(SWT.HORIZONTAL));

-	}

-

-	@Override

-	protected Control doCreateContents(FormToolkit toolkit, Composite composite) {

-		text = toolkit.createFormText(composite, false);

-		return text;

-	}

-

-	public void setText(String text) {

-		this.text.setText(text, false, false);

-	}

-

-	@Override

-	protected String getSectionName() {

-		return "Message";

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.view;
+
+import java.util.Collection;
+
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICallBack;
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.forms.widgets.FormText;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.ScrolledForm;
+
+public class MessageComposite extends AbstractInsideComposite {
+
+	protected FormText text;
+
+
+	public MessageComposite(ICallBack callBack, ScrolledForm parent, FormToolkit toolkit, Collection<NotificationRunnable> collection) {
+		super(callBack, parent, toolkit, collection);
+		setLayout(new FillLayout(SWT.HORIZONTAL));
+	}
+
+	@Override
+	protected Control doCreateContents(FormToolkit toolkit, Composite composite) {
+		text = toolkit.createFormText(composite, false);
+		return text;
+	}
+
+	public void setText(String text) {
+		this.text.setText(text, false, false);
+	}
+
+	@Override
+	protected String getSectionName() {
+		return "Message";
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/PapyrusNotificationView.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/PapyrusNotificationView.java
index a6d5a7d99fb..a6d5a7d99fb 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/PapyrusNotificationView.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/PapyrusNotificationView.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/ViewNotification.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/ViewNotification.java
index d3ccf55cae7..dac34dae29b 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/ViewNotification.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/notification/view/ViewNotification.java
@@ -1,44 +1,44 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.notification.view;

-

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;

-

-/**

- * The INotification corresponding to the view builder

- *

- * @author tfaure

- *

- */

-public class ViewNotification implements INotification {

-

-	private final AbstractInsideComposite viewCompo;

-

-	public ViewNotification(AbstractInsideComposite viewCompo) {

-		this.viewCompo = viewCompo;

-	}

-

-	public void delete() {

-		viewCompo.close();

-	}

-

-	/**

-	 *

-	 * whether the current notification is deleted

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification#isDeleted()

-	 * @return true if notification is deleted

-	 */

-	public boolean isDeleted() {

-		return viewCompo.isDisposed();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.notification.view;
+
+import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;
+
+/**
+ * The INotification corresponding to the view builder
+ *
+ * @author tfaure
+ *
+ */
+public class ViewNotification implements INotification {
+
+	private final AbstractInsideComposite viewCompo;
+
+	public ViewNotification(AbstractInsideComposite viewCompo) {
+		this.viewCompo = viewCompo;
+	}
+
+	public void delete() {
+		viewCompo.close();
+	}
+
+	/**
+	 *
+	 * whether the current notification is deleted
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification#isDeleted()
+	 * @return true if notification is deleted
+	 */
+	public boolean isDeleted() {
+		return viewCompo.isDisposed();
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/utils/DialogUtils.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/utils/DialogUtils.java
index 0449f67cf07..0449f67cf07 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/utils/DialogUtils.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/utils/DialogUtils.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/utils/ISharedImages.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/utils/ISharedImages.java
index 8cd11f885ab..c4a7dd95320 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/utils/ISharedImages.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/utils/ISharedImages.java
@@ -1,25 +1,25 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.utils;

-

-

-/**

- * Constants to use in {@link ToolbooxImageUtils}

- *

- * @author tfaure

- *

- */

-public interface ISharedImages {

-

-	int IMG_RUN = 0;

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.utils;
+
+
+/**
+ * Constants to use in {@link ToolbooxImageUtils}
+ *
+ * @author tfaure
+ *
+ */
+public interface ISharedImages {
+
+	int IMG_RUN = 0;
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/utils/ToolbooxImageUtils.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/utils/ToolbooxImageUtils.java
index 448e2de78dd..5eede25823c 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/utils/ToolbooxImageUtils.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/infra/widgets/toolbox/utils/ToolbooxImageUtils.java
@@ -1,78 +1,78 @@
-/*****************************************************************************

- * Copyright (c) 2010 ATOS ORIGIN.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.toolbox.utils;

-

-import java.io.IOException;

-import java.net.URL;

-

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.resource.JFaceResources;

-import org.eclipse.papyrus.infra.widgets.toolbox.Activator;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.graphics.ImageData;

-import org.eclipse.swt.widgets.Display;

-

-

-/**

- * A class retrieving the icons used in papyrus toolbox

- *

- * @author tfaure

- *

- */

-public class ToolbooxImageUtils {

-

-	/**

-	 * Returns an image according to {@link ISharedImages}

-	 *

-	 * @param id

-	 *            , the constant

-	 * @return

-	 */

-	public static Image getImage(int id) {

-		StringBuffer path = new StringBuffer("/icons/");

-		switch (id) {

-		case ISharedImages.IMG_RUN:

-			path = path.append("run.gif");

-			break;

-		default:

-			break;

-		}

-		String key = Activator.PLUGIN_ID + path;

-		Image result = JFaceResources.getImageRegistry().get(key);

-		if (result == null) {

-			URL url = Activator.getDefault().getBundle().getEntry(path.toString());

-			try {

-				result = new Image(Display.getDefault(), url.openStream());

-				JFaceResources.getImageRegistry().put(key, result);

-			} catch (IOException e) {

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * Returns an image descriptor according to {@link ISharedImages}

-	 *

-	 * @param id

-	 *            , the constant

-	 * @return

-	 */

-	public static ImageDescriptor getImageDescriptor(final int id) {

-		return new ImageDescriptor() {

-

-			@Override

-			public ImageData getImageData() {

-				return getImage(id).getImageData();

-			}

-		};

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.toolbox.utils;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.papyrus.infra.widgets.toolbox.Activator;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.widgets.Display;
+
+
+/**
+ * A class retrieving the icons used in papyrus toolbox
+ *
+ * @author tfaure
+ *
+ */
+public class ToolbooxImageUtils {
+
+	/**
+	 * Returns an image according to {@link ISharedImages}
+	 *
+	 * @param id
+	 *            , the constant
+	 * @return
+	 */
+	public static Image getImage(int id) {
+		StringBuffer path = new StringBuffer("/icons/");
+		switch (id) {
+		case ISharedImages.IMG_RUN:
+			path = path.append("run.gif");
+			break;
+		default:
+			break;
+		}
+		String key = Activator.PLUGIN_ID + path;
+		Image result = JFaceResources.getImageRegistry().get(key);
+		if (result == null) {
+			URL url = Activator.getDefault().getBundle().getEntry(path.toString());
+			try {
+				result = new Image(Display.getDefault(), url.openStream());
+				JFaceResources.getImageRegistry().put(key, result);
+			} catch (IOException e) {
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Returns an image descriptor according to {@link ISharedImages}
+	 *
+	 * @param id
+	 *            , the constant
+	 * @return
+	 */
+	public static ImageDescriptor getImageDescriptor(final int id) {
+		return new ImageDescriptor() {
+
+			@Override
+			public ImageData getImageData() {
+				return getImage(id).getImageData();
+			}
+		};
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/.checkstyle b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.checkstyle
index 75246d341f9..75246d341f9 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/.checkstyle
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.checkstyle
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.classpath b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.classpath
new file mode 100644
index 00000000000..eca7bdba8f0
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.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.8"/>
+	<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/widget/org.eclipse.papyrus.infra.widgets/.project b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.project
index 3de31c82458..6c2049aab43 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/.project
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.widgets</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>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.widgets</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/widget/org.eclipse.papyrus.infra.widgets/.settings/org.eclipse.core.resources.prefs b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.settings/org.eclipse.core.resources.prefs
index aa6fa4fa30c..58763b1afa7 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +1,2 @@
-eclipse.preferences.version=1

-encoding//src/org/eclipse/papyrus/editors/messages/messages.properties=ISO-8859-1

+eclipse.preferences.version=1
+encoding//src/org/eclipse/papyrus/editors/messages/messages.properties=ISO-8859-1
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.settings/org.eclipse.jdt.core.prefs
new file mode 100755
index 00000000000..b3aa6d60f94
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
index a92502791bf..fd449867eca 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
@@ -1,36 +1,36 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.core.databinding.property;bundle-version="1.3.0",

- org.eclipse.core.databinding,

- org.eclipse.jface.databinding,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",

- org.eclipse.core.resources;bundle-version="3.7.100",

- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",

- com.ibm.icu;bundle-version="4.4.2",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.jface.text;bundle-version="3.10.0",

- org.eclipse.emf.edit;bundle-version="2.12.0"

-Export-Package: org.eclipse.papyrus.infra.widgets,

- org.eclipse.papyrus.infra.widgets.creation,

- org.eclipse.papyrus.infra.widgets.databinding,

- org.eclipse.papyrus.infra.widgets.editors,

- org.eclipse.papyrus.infra.widgets.messages,

- org.eclipse.papyrus.infra.widgets.providers,

- org.eclipse.papyrus.infra.widgets.selectors,

- org.eclipse.papyrus.infra.widgets.strategy,

- org.eclipse.papyrus.infra.widgets.util,

- org.eclipse.papyrus.infra.widgets.validator,

- org.eclipse.papyrus.infra.widgets.widgets,

- org.eclipse.papyrus.infra.widgets.wizard.pages

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.widgets.Activator

-Bundle-Description: %pluginDescription

-Bundle-SymbolicName: org.eclipse.papyrus.infra.widgets;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.databinding.property;bundle-version="1.3.0",
+ org.eclipse.core.databinding,
+ org.eclipse.jface.databinding,
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
+ org.eclipse.core.resources;bundle-version="3.7.100",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
+ com.ibm.icu;bundle-version="4.4.2",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.jface.text;bundle-version="3.10.0",
+ org.eclipse.emf.edit;bundle-version="2.12.0"
+Export-Package: org.eclipse.papyrus.infra.widgets,
+ org.eclipse.papyrus.infra.widgets.creation,
+ org.eclipse.papyrus.infra.widgets.databinding,
+ org.eclipse.papyrus.infra.widgets.editors,
+ org.eclipse.papyrus.infra.widgets.messages,
+ org.eclipse.papyrus.infra.widgets.providers,
+ org.eclipse.papyrus.infra.widgets.selectors,
+ org.eclipse.papyrus.infra.widgets.strategy,
+ org.eclipse.papyrus.infra.widgets.util,
+ org.eclipse.papyrus.infra.widgets.validator,
+ org.eclipse.papyrus.infra.widgets.widgets,
+ org.eclipse.papyrus.infra.widgets.wizard.pages
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.widgets.Activator
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.infra.widgets;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/about.html b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/about.html
new file mode 100644
index 00000000000..d35d5aed64c
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/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/widget/org.eclipse.papyrus.infra.widgets/build.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/build.properties
index 8080cf00176..8080cf00176 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/build.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/build.properties
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/AddReg.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/AddReg.gif
index 8493df40dfe..8493df40dfe 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/AddReg.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/AddReg.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/Add_12x12.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/Add_12x12.gif
index 189b46e5a5b..189b46e5a5b 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/Add_12x12.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/Add_12x12.gif
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/Add_16x16.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/Add_16x16.gif
new file mode 100644
index 00000000000..252d7ebcb8c
--- /dev/null
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/Add_16x16.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/ArrowDown_16x16.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/ArrowDown_16x16.gif
index 072b1844572..072b1844572 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/ArrowDown_16x16.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/ArrowDown_16x16.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/ArrowUp_16x16.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/ArrowUp_16x16.gif
index 07164754e5c..07164754e5c 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/ArrowUp_16x16.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/ArrowUp_16x16.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/Delete_12x12.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/Delete_12x12.gif
index bd924a5e0fa..bd924a5e0fa 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/Delete_12x12.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/Delete_12x12.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/Delete_16x16.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/Delete_16x16.gif
index b6922ac11cf..b6922ac11cf 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/Delete_16x16.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/Delete_16x16.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/Down_12x12.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/Down_12x12.gif
index c0672e72a2b..c0672e72a2b 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/Down_12x12.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/Down_12x12.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/Edit_12x12.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/Edit_12x12.gif
index 0b0bcd15539..0b0bcd15539 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/Edit_12x12.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/Edit_12x12.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/Edit_16x16.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/Edit_16x16.gif
index 17d8b2e7aa0..17d8b2e7aa0 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/Edit_16x16.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/Edit_16x16.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/PapyrusLogo16x16.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/PapyrusLogo16x16.gif
index 8a31f458379..8a31f458379 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/PapyrusLogo16x16.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/PapyrusLogo16x16.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/Switch_12x12.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/Switch_12x12.gif
index 9a6070c38ef..9a6070c38ef 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/Switch_12x12.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/Switch_12x12.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/Up_12x12.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/Up_12x12.gif
index 9620d683cbd..9620d683cbd 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/Up_12x12.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/Up_12x12.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/arrow_double.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/arrow_double.gif
index c02db2c9df4..c02db2c9df4 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/arrow_double.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/arrow_double.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/arrow_left.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/arrow_left.gif
index 4fb41501036..4fb41501036 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/arrow_left.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/arrow_left.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/arrow_left_double.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/arrow_left_double.gif
index 336b55cf08e..336b55cf08e 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/arrow_left_double.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/arrow_left_double.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/arrow_right.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/arrow_right.gif
index 19567890aa8..19567890aa8 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/arrow_right.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/arrow_right.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/browse-filesystem_12x12.png b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/browse-filesystem_12x12.png
index bdd513d2405..bdd513d2405 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/browse-filesystem_12x12.png
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/browse-filesystem_12x12.png
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/browse-workspace_12x12.png b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/browse-workspace_12x12.png
index a9461a35269..a9461a35269 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/browse-workspace_12x12.png
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/browse-workspace_12x12.png
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/browse_12x12.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/browse_12x12.gif
index b53ced50f96..b53ced50f96 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/browse_12x12.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/browse_12x12.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/icons/error.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/error.gif
index 9b048d60532..9b048d60532 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/icons/error.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/error.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/hyperlink_16x16.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/hyperlink_16x16.gif
index 1e09d979520..1e09d979520 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/hyperlink_16x16.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/hyperlink_16x16.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/papyrus.png b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/papyrus.png
index 0f74e27b483..0f74e27b483 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/papyrus.png
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/papyrus.png
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/refresh.gif b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/refresh.gif
index e3831471a65..e3831471a65 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/refresh.gif
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/icons/refresh.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/plugin.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/plugin.properties
index a566c99ea30..a566c99ea30 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/plugin.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/plugin.properties
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/plugin.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/plugin.xml
index 7fe85136bec..257978e8e4c 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/plugin.xml
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/plugin.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">

-      <labelProvider

-            priority="10"

-            provider="org.eclipse.papyrus.infra.widgets.providers.WorkbenchFilteredLabelProvider">

-      </labelProvider>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">
+      <labelProvider
+            priority="10"
+            provider="org.eclipse.papyrus.infra.widgets.providers.WorkbenchFilteredLabelProvider">
+      </labelProvider>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/pom.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/pom.xml
index b7388863882..3ee11efad95 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/pom.xml
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-ui</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.widgets</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/Activator.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/Activator.java
index fe1993a263b..fe1993a263b 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/Activator.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/Activator.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/BooleanEditionFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/BooleanEditionFactory.java
index 2fe93796e39..1ac8e433d49 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/BooleanEditionFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/BooleanEditionFactory.java
@@ -1,85 +1,85 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2014 CEA LIST and others.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 402525

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.creation;

-

-import org.eclipse.jface.dialogs.IInputValidator;

-import org.eclipse.papyrus.infra.widgets.validator.BooleanInputValidator;

-import org.eclipse.swt.widgets.Control;

-

-/**

- * The factory for the boolean

- *

- * @author Vincent Lorenzo

- *

- */

-public class BooleanEditionFactory extends StringEditionFactory {

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public BooleanEditionFactory() {

-		this(new BooleanInputValidator());

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param validator

-	 *            The InputValidator used to check the entered String

-	 */

-	public BooleanEditionFactory(IInputValidator validator) {

-		super(validator);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param title

-	 *            The title of the dialog opened by this factory when editing a Boolean

-	 * @param label

-	 *            The Label used to describe the kind of value being edited

-	 * @param validator

-	 *            The validator used to check the Booleans being edited

-	 */

-	public BooleanEditionFactory(String title, String label, IInputValidator validator) {

-		super(title, label, validator);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param title

-	 *            The title of the dialog opened by this factory when editing a Boolean

-	 * @param label

-	 *            The Label used to describe the kind of value being edited

-	 */

-	public BooleanEditionFactory(String title, String label) {

-		super(title, label, new BooleanInputValidator());

-	}

-

-	@Override

-	public Object createObject(Control widget, Object context) {

-		String txt = super.createObject(widget, context).toString();

-		if (txt != null) {

-			return Boolean.parseBoolean(txt);

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 402525
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.creation;
+
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.papyrus.infra.widgets.validator.BooleanInputValidator;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * The factory for the boolean
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class BooleanEditionFactory extends StringEditionFactory {
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public BooleanEditionFactory() {
+		this(new BooleanInputValidator());
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param validator
+	 *            The InputValidator used to check the entered String
+	 */
+	public BooleanEditionFactory(IInputValidator validator) {
+		super(validator);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param title
+	 *            The title of the dialog opened by this factory when editing a Boolean
+	 * @param label
+	 *            The Label used to describe the kind of value being edited
+	 * @param validator
+	 *            The validator used to check the Booleans being edited
+	 */
+	public BooleanEditionFactory(String title, String label, IInputValidator validator) {
+		super(title, label, validator);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param title
+	 *            The title of the dialog opened by this factory when editing a Boolean
+	 * @param label
+	 *            The Label used to describe the kind of value being edited
+	 */
+	public BooleanEditionFactory(String title, String label) {
+		super(title, label, new BooleanInputValidator());
+	}
+
+	@Override
+	public Object createObject(Control widget, Object context) {
+		String txt = super.createObject(widget, context).toString();
+		if (txt != null) {
+			return Boolean.parseBoolean(txt);
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/IAtomicOperationExecutor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/IAtomicOperationExecutor.java
index 304150f7449..304150f7449 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/IAtomicOperationExecutor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/IAtomicOperationExecutor.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/IntegerEditionFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/IntegerEditionFactory.java
index be1d051b1fa..ea94a8e7cf9 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/IntegerEditionFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/IntegerEditionFactory.java
@@ -1,80 +1,80 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 402525

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.creation;

-

-import org.eclipse.jface.dialogs.IInputValidator;

-import org.eclipse.papyrus.infra.widgets.validator.IntegerInputValidator;

-import org.eclipse.swt.widgets.Control;

-

-

-public class IntegerEditionFactory extends StringEditionFactory {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public IntegerEditionFactory() {

-		this(new IntegerInputValidator());

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param validator

-	 *            The InputValidator used to check the entered Integer

-	 */

-	public IntegerEditionFactory(IInputValidator validator) {

-		super(validator);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param title

-	 *            The title of the dialog opened by this factory when editing an Integer

-	 * @param label

-	 *            The Label used to describe the kind of value being edited

-	 * @param validator

-	 *            The validator used to check the Integers being edited

-	 */

-

-	public IntegerEditionFactory(String title, String label, IInputValidator validator) {

-		super(title, label, validator);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param title

-	 *            The title of the dialog opened by this factory when editing a Integer

-	 * @param label

-	 *            The Label used to describe the kind of value being edited

-	 */

-	public IntegerEditionFactory(String title, String label) {

-		this(title, label, new IntegerInputValidator());

-	}

-

-	@Override

-	public Object createObject(Control widget, Object context) {

-		String txt = super.createObject(widget, context).toString();

-		if (txt != null) {

-			return Integer.parseInt(txt);

-		}

-		return null;

-	}

+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 402525
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.creation;
+
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.papyrus.infra.widgets.validator.IntegerInputValidator;
+import org.eclipse.swt.widgets.Control;
+
+
+public class IntegerEditionFactory extends StringEditionFactory {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public IntegerEditionFactory() {
+		this(new IntegerInputValidator());
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param validator
+	 *            The InputValidator used to check the entered Integer
+	 */
+	public IntegerEditionFactory(IInputValidator validator) {
+		super(validator);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param title
+	 *            The title of the dialog opened by this factory when editing an Integer
+	 * @param label
+	 *            The Label used to describe the kind of value being edited
+	 * @param validator
+	 *            The validator used to check the Integers being edited
+	 */
+
+	public IntegerEditionFactory(String title, String label, IInputValidator validator) {
+		super(title, label, validator);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param title
+	 *            The title of the dialog opened by this factory when editing a Integer
+	 * @param label
+	 *            The Label used to describe the kind of value being edited
+	 */
+	public IntegerEditionFactory(String title, String label) {
+		this(title, label, new IntegerInputValidator());
+	}
+
+	@Override
+	public Object createObject(Control widget, Object context) {
+		String txt = super.createObject(widget, context).toString();
+		if (txt != null) {
+			return Integer.parseInt(txt);
+		}
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/RealEditionFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/RealEditionFactory.java
index 76727a31449..a1360c0a079 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/RealEditionFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/RealEditionFactory.java
@@ -1,77 +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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.creation;

-

-import org.eclipse.jface.dialogs.IInputValidator;

-import org.eclipse.papyrus.infra.widgets.validator.RealInputValidator;

-

-/**

- * The factory for real

- *

- * @author Vincent Lorenzo

- *

- */

-public class RealEditionFactory extends StringEditionFactory {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public RealEditionFactory() {

-		this(new RealInputValidator());

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param title

-	 *            The title of the dialog opened by this factory when editing a real

-	 * @param label

-	 *            The Label used to describe the kind of value being edited

-	 */

-	public RealEditionFactory(String title, String label) {

-		this(title, label, new RealInputValidator());

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param validator

-	 *            The InputValidator used to check the entered Real

-	 */

-	public RealEditionFactory(IInputValidator validator) {

-		super(validator);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param title

-	 *            The title of the dialog opened by this factory when editing a Real

-	 * @param label

-	 *            The Label used to describe the kind of value being edited

-	 * @param validator

-	 *            The validator used to check the Reals being edited

-	 */

-	public RealEditionFactory(String title, String label, IInputValidator validator) {

-		super(title, label, validator);

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.widgets.creation;
+
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.papyrus.infra.widgets.validator.RealInputValidator;
+
+/**
+ * The factory for real
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RealEditionFactory extends StringEditionFactory {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public RealEditionFactory() {
+		this(new RealInputValidator());
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param title
+	 *            The title of the dialog opened by this factory when editing a real
+	 * @param label
+	 *            The Label used to describe the kind of value being edited
+	 */
+	public RealEditionFactory(String title, String label) {
+		this(title, label, new RealInputValidator());
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param validator
+	 *            The InputValidator used to check the entered Real
+	 */
+	public RealEditionFactory(IInputValidator validator) {
+		super(validator);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param title
+	 *            The title of the dialog opened by this factory when editing a Real
+	 * @param label
+	 *            The Label used to describe the kind of value being edited
+	 * @param validator
+	 *            The validator used to check the Reals being edited
+	 */
+	public RealEditionFactory(String title, String label, IInputValidator validator) {
+		super(title, label, validator);
+	}
+
+
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/ReferenceValueFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/ReferenceValueFactory.java
index f00a2d6253e..b58b0af45f9 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/ReferenceValueFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/ReferenceValueFactory.java
@@ -1,96 +1,96 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 402525

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.creation;

-

-import java.util.Collection;

-

-import org.eclipse.swt.widgets.Control;

-

-/**

- * A Factory for instantiating new Objects (Typically, from an Editor, although it could be

- * used elsewhere)

- * The caller of this Factory is responsible for storing the objects. However, in some cases,

- * the objects must be created in a specific parent, which is different than the Source object

- * Typically, it may happen that we need to reference an object that hasn't been yet created. If this

- * reference is the container of the object, it isn't a problem, but sometime it is not it's container.

- * In this case, it's the responsibility of the Factory to create the object in its container. The

- * caller will then refer it from wherever it needs it.

- *

- * @author Camille Letavernier

- */

-public interface ReferenceValueFactory {

-

-	/**

-	 * Indicates if this factory can create new instances

-	 *

-	 * @return

-	 *         True if the factory can create a new object

-	 */

-	public boolean canCreateObject();

-

-	/**

-	 * Creates a new Object

-	 * The widget Control can be used to display a dialog if additional

-	 * information is needed to create the object (e.g. the users needs

-	 * to input a name)

-	 * This method is used to create objects that <b>won't necessarily</b> be attached

-	 * to a parent (For example, the user can start creating an object, then cancel the operation :

-	 * the Java Object will therefore be created, but won't be attached to anything, and then will

-	 * be garbage collected). That's why this method should *not* attach the object to the given source.

-	 *

-	 * @param widget

-	 *            The widget calling this factory. It can be used for example to retrieve

-	 *            the Display for opening a Dialog

-	 * @param context

-	 *            The object being edited, in which context the new object is to be created and which will as a result have a reference to the new object.

-	 *            If there is no context object (creation of a free-floating object) or it cannot be determined, this may be {@code null}

-	 * @return

-	 *         The newly created object, or null if no object has been created

-	 */

-	public Object createObject(Control widget, Object context);

-

-	/**

-	 * The objects have been validated (For example, the user pressed "Ok")

-	 * This method should attach the objects where they belong.

-	 * Note however that the newly created objects will automatically be attached

-	 * to their source. If the source is their container, then this method should probably

-	 * not do anything. However, if the source is a simple reference, this method should

-	 * attach these objects to their container.

-	 *

-	 * @param objectsToValidate

-	 *            The newly created objects that need to be validated

-	 * @return

-	 *         The validated objects

-	 */

-	public Collection<Object> validateObjects(Collection<Object> objectsToValidate);

-

-	/**

-	 * Indicates if this factory can edit an object

-	 *

-	 * @return

-	 *         True if the Factory can edit an object

-	 */

-	public boolean canEdit();

-

-	/**

-	 * Starts the edition of the given object

-	 *

-	 * @param widget

-	 *            The widget calling the factory. May be used for example to retrieve the shell for opening a Dialog.

-	 * @param object

-	 *            The object to edit

-	 * @return the edited object, or null if the object has been edited "in place"

-	 */

-	public Object edit(Control widget, Object object);

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 402525
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.creation;
+
+import java.util.Collection;
+
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * A Factory for instantiating new Objects (Typically, from an Editor, although it could be
+ * used elsewhere)
+ * The caller of this Factory is responsible for storing the objects. However, in some cases,
+ * the objects must be created in a specific parent, which is different than the Source object
+ * Typically, it may happen that we need to reference an object that hasn't been yet created. If this
+ * reference is the container of the object, it isn't a problem, but sometime it is not it's container.
+ * In this case, it's the responsibility of the Factory to create the object in its container. The
+ * caller will then refer it from wherever it needs it.
+ *
+ * @author Camille Letavernier
+ */
+public interface ReferenceValueFactory {
+
+	/**
+	 * Indicates if this factory can create new instances
+	 *
+	 * @return
+	 *         True if the factory can create a new object
+	 */
+	public boolean canCreateObject();
+
+	/**
+	 * Creates a new Object
+	 * The widget Control can be used to display a dialog if additional
+	 * information is needed to create the object (e.g. the users needs
+	 * to input a name)
+	 * This method is used to create objects that <b>won't necessarily</b> be attached
+	 * to a parent (For example, the user can start creating an object, then cancel the operation :
+	 * the Java Object will therefore be created, but won't be attached to anything, and then will
+	 * be garbage collected). That's why this method should *not* attach the object to the given source.
+	 *
+	 * @param widget
+	 *            The widget calling this factory. It can be used for example to retrieve
+	 *            the Display for opening a Dialog
+	 * @param context
+	 *            The object being edited, in which context the new object is to be created and which will as a result have a reference to the new object.
+	 *            If there is no context object (creation of a free-floating object) or it cannot be determined, this may be {@code null}
+	 * @return
+	 *         The newly created object, or null if no object has been created
+	 */
+	public Object createObject(Control widget, Object context);
+
+	/**
+	 * The objects have been validated (For example, the user pressed "Ok")
+	 * This method should attach the objects where they belong.
+	 * Note however that the newly created objects will automatically be attached
+	 * to their source. If the source is their container, then this method should probably
+	 * not do anything. However, if the source is a simple reference, this method should
+	 * attach these objects to their container.
+	 *
+	 * @param objectsToValidate
+	 *            The newly created objects that need to be validated
+	 * @return
+	 *         The validated objects
+	 */
+	public Collection<Object> validateObjects(Collection<Object> objectsToValidate);
+
+	/**
+	 * Indicates if this factory can edit an object
+	 *
+	 * @return
+	 *         True if the Factory can edit an object
+	 */
+	public boolean canEdit();
+
+	/**
+	 * Starts the edition of the given object
+	 *
+	 * @param widget
+	 *            The widget calling the factory. May be used for example to retrieve the shell for opening a Dialog.
+	 * @param object
+	 *            The object to edit
+	 * @return the edited object, or null if the object has been edited "in place"
+	 */
+	public Object edit(Control widget, Object object);
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/StringEditionFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/StringEditionFactory.java
index b7f2ae8aaad..0b845e24275 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/StringEditionFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/StringEditionFactory.java
@@ -1,162 +1,162 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 402525

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.creation;

-

-import java.util.Collection;

-

-import org.eclipse.jface.dialogs.IInputValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.infra.widgets.editors.InputDialog;

-import org.eclipse.papyrus.infra.widgets.messages.Messages;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.swt.widgets.Control;

-

-/**

- * A ValueFactory for editing Strings

- *

- * @author Camille Letavernier

- *

- */

-public class StringEditionFactory implements ReferenceValueFactory {

-

-	private String title = Messages.StringEditionFactory_EnterANewValue;

-

-	private String label = Messages.StringEditionFactory_EnterANewValue;

-

-	private IInputValidator validator;

-

-	private IStaticContentProvider contentProvider;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public StringEditionFactory() {

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param title

-	 *            The title of the dialog opened by this factory when editing a String

-	 * @param label

-	 *            The Label used to describe the kind of value being edited

-	 */

-	public StringEditionFactory(String title, String label) {

-		this.title = title;

-		this.label = label;

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param validator

-	 *            The InputValidator used to check the entered String

-	 */

-	public StringEditionFactory(IInputValidator validator) {

-		this.validator = validator;

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param title

-	 *            The title of the dialog opened by this factory when editing a String

-	 * @param label

-	 *            The Label used to describe the kind of value being edited

-	 * @param validator

-	 *            The validator used to check the Strings being edited

-	 */

-	public StringEditionFactory(String title, String label, IInputValidator validator) {

-		this.title = title;

-		this.label = label;

-		this.validator = validator;

-	}

-

-	@Override

-	public boolean canCreateObject() {

-		return true;

-	}

-

-	@Override

-	public Object createObject(Control widget, Object context) {

-		InputDialog dialog = new InputDialog(widget.getShell(), title, label, "", validator); //$NON-NLS-1$

-		if (contentProvider != null) {

-			dialog.setContentProvider(contentProvider);

-		}

-

-		int result = dialog.open();

-		if (result == Window.OK) {

-			String newValue = dialog.getText();

-			return newValue;

-		}

-

-		return null;

-	}

-

-	@Override

-	public Collection<Object> validateObjects(Collection<Object> objectsToValidate) {

-		return objectsToValidate;

-	}

-

-	@Override

-	public boolean canEdit() {

-		return true;

-	}

-

-	@Override

-	public Object edit(Control widget, Object object) {

-		if (!(object instanceof String)) {

-			return object;

-		}

-

-		InputDialog dialog = new InputDialog(widget.getShell(), title, label, (String) object, validator);

-		if (contentProvider != null) {

-			dialog.setContentProvider(contentProvider);

-		}

-

-		int result = dialog.open();

-		if (result == Window.OK) {

-			String newValue = dialog.getText();

-			return newValue;

-		}

-

-		return object;

-	}

-

-	/**

-	 * Sets the Validator for this factory

-	 *

-	 * @param validator

-	 *            The InputValidator to be used to check the input String

-	 */

-	public void setValidator(IInputValidator validator) {

-		this.validator = validator;

-	}

-

-	/**

-	 * Sets the content provider for this edition factory. The ContentProvider is used

-	 * to suggest values to the user.

-	 *

-	 * @param provider

-	 *            The provider which will make suggestions to the user

-	 */

-	public void setContentProvider(IStaticContentProvider provider) {

-		this.contentProvider = provider;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 402525
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.creation;
+
+import java.util.Collection;
+
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.infra.widgets.editors.InputDialog;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * A ValueFactory for editing Strings
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class StringEditionFactory implements ReferenceValueFactory {
+
+	private String title = Messages.StringEditionFactory_EnterANewValue;
+
+	private String label = Messages.StringEditionFactory_EnterANewValue;
+
+	private IInputValidator validator;
+
+	private IStaticContentProvider contentProvider;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public StringEditionFactory() {
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param title
+	 *            The title of the dialog opened by this factory when editing a String
+	 * @param label
+	 *            The Label used to describe the kind of value being edited
+	 */
+	public StringEditionFactory(String title, String label) {
+		this.title = title;
+		this.label = label;
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param validator
+	 *            The InputValidator used to check the entered String
+	 */
+	public StringEditionFactory(IInputValidator validator) {
+		this.validator = validator;
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param title
+	 *            The title of the dialog opened by this factory when editing a String
+	 * @param label
+	 *            The Label used to describe the kind of value being edited
+	 * @param validator
+	 *            The validator used to check the Strings being edited
+	 */
+	public StringEditionFactory(String title, String label, IInputValidator validator) {
+		this.title = title;
+		this.label = label;
+		this.validator = validator;
+	}
+
+	@Override
+	public boolean canCreateObject() {
+		return true;
+	}
+
+	@Override
+	public Object createObject(Control widget, Object context) {
+		InputDialog dialog = new InputDialog(widget.getShell(), title, label, "", validator); //$NON-NLS-1$
+		if (contentProvider != null) {
+			dialog.setContentProvider(contentProvider);
+		}
+
+		int result = dialog.open();
+		if (result == Window.OK) {
+			String newValue = dialog.getText();
+			return newValue;
+		}
+
+		return null;
+	}
+
+	@Override
+	public Collection<Object> validateObjects(Collection<Object> objectsToValidate) {
+		return objectsToValidate;
+	}
+
+	@Override
+	public boolean canEdit() {
+		return true;
+	}
+
+	@Override
+	public Object edit(Control widget, Object object) {
+		if (!(object instanceof String)) {
+			return object;
+		}
+
+		InputDialog dialog = new InputDialog(widget.getShell(), title, label, (String) object, validator);
+		if (contentProvider != null) {
+			dialog.setContentProvider(contentProvider);
+		}
+
+		int result = dialog.open();
+		if (result == Window.OK) {
+			String newValue = dialog.getText();
+			return newValue;
+		}
+
+		return object;
+	}
+
+	/**
+	 * Sets the Validator for this factory
+	 *
+	 * @param validator
+	 *            The InputValidator to be used to check the input String
+	 */
+	public void setValidator(IInputValidator validator) {
+		this.validator = validator;
+	}
+
+	/**
+	 * Sets the content provider for this edition factory. The ContentProvider is used
+	 * to suggest values to the user.
+	 *
+	 * @param provider
+	 *            The provider which will make suggestions to the user
+	 */
+	public void setContentProvider(IStaticContentProvider provider) {
+		this.contentProvider = provider;
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/UnlimitedNaturalEditionFactory.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/UnlimitedNaturalEditionFactory.java
index bec56d5466a..d9265e67e75 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/UnlimitedNaturalEditionFactory.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/creation/UnlimitedNaturalEditionFactory.java
@@ -1,88 +1,88 @@
-/*****************************************************************************

- * Copyright (c) 2013, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 402525

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.creation;

-

-import org.eclipse.jface.dialogs.IInputValidator;

-import org.eclipse.papyrus.infra.widgets.validator.UnlimitedNaturalInputValidator;

-import org.eclipse.papyrus.infra.widgets.validator.UnlimitedNaturalValidator;

-import org.eclipse.swt.widgets.Control;

-

-/**

- *

- * The factory for UnlimitedNatural

- *

- */

-public class UnlimitedNaturalEditionFactory extends StringEditionFactory {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public UnlimitedNaturalEditionFactory() {

-		this(new UnlimitedNaturalInputValidator());

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param title

-	 *            The title of the dialog opened by this factory when editing an UnlimitedNatural

-	 * @param label

-	 *            The Label used to describe the kind of value being edited

-	 */

-	public UnlimitedNaturalEditionFactory(String title, String label) {

-		super(title, label, new UnlimitedNaturalInputValidator());

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param validator

-	 *            The InputValidator used to check the entered UnlimitedNatural

-	 */

-	public UnlimitedNaturalEditionFactory(IInputValidator validator) {

-		super(validator);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param title

-	 *            The title of the dialog opened by this factory when editing a UnlimitedNatural

-	 * @param label

-	 *            The Label used to describe the kind of value being edited

-	 * @param validator

-	 *            The validator used to check the UnlimitedNaturals being edited

-	 */

-	public UnlimitedNaturalEditionFactory(String title, String label, IInputValidator validator) {

-		super(title, label, validator);

-	}

-

-	@Override

-	public Object createObject(Control widget, Object context) {

-		String txt = super.createObject(widget, context).toString();

-		if (UnlimitedNaturalValidator.INFINITE_STAR.equals(txt)) {

-			txt = UnlimitedNaturalValidator.INFINITE_MINUS_ONE;

-		}

-		if (txt != null) {

-			return Integer.parseInt(txt);

-		}

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 402525
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.creation;
+
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.papyrus.infra.widgets.validator.UnlimitedNaturalInputValidator;
+import org.eclipse.papyrus.infra.widgets.validator.UnlimitedNaturalValidator;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ *
+ * The factory for UnlimitedNatural
+ *
+ */
+public class UnlimitedNaturalEditionFactory extends StringEditionFactory {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public UnlimitedNaturalEditionFactory() {
+		this(new UnlimitedNaturalInputValidator());
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param title
+	 *            The title of the dialog opened by this factory when editing an UnlimitedNatural
+	 * @param label
+	 *            The Label used to describe the kind of value being edited
+	 */
+	public UnlimitedNaturalEditionFactory(String title, String label) {
+		super(title, label, new UnlimitedNaturalInputValidator());
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param validator
+	 *            The InputValidator used to check the entered UnlimitedNatural
+	 */
+	public UnlimitedNaturalEditionFactory(IInputValidator validator) {
+		super(validator);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param title
+	 *            The title of the dialog opened by this factory when editing a UnlimitedNatural
+	 * @param label
+	 *            The Label used to describe the kind of value being edited
+	 * @param validator
+	 *            The validator used to check the UnlimitedNaturals being edited
+	 */
+	public UnlimitedNaturalEditionFactory(String title, String label, IInputValidator validator) {
+		super(title, label, validator);
+	}
+
+	@Override
+	public Object createObject(Control widget, Object context) {
+		String txt = super.createObject(widget, context).toString();
+		if (UnlimitedNaturalValidator.INFINITE_STAR.equals(txt)) {
+			txt = UnlimitedNaturalValidator.INFINITE_MINUS_ONE;
+		}
+		if (txt != null) {
+			return Integer.parseInt(txt);
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/CLabelObservableValue.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/CLabelObservableValue.java
index 96d0c646d40..c653eedd906 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/CLabelObservableValue.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/CLabelObservableValue.java
@@ -1,121 +1,121 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.databinding;

-

-import org.eclipse.core.databinding.observable.value.AbstractObservableValue;

-import org.eclipse.core.databinding.observable.value.IObservableValue;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.papyrus.infra.tools.databinding.AggregatedObservable;

-import org.eclipse.papyrus.infra.widgets.messages.Messages;

-import org.eclipse.swt.custom.CLabel;

-

-/**

- * An IObservableValue to edit a CLabel (Text + Image), based on a LabelProvider

- * It supports AggregatedObservable

- *

- * @author Camille Letavernier

- */

-public class CLabelObservableValue extends AbstractObservableValue {

-

-	/**

-	 * The observed CLabel

-	 */

-	protected CLabel label;

-

-	/**

-	 * The current value

-	 */

-	protected Object currentValue;

-

-	/**

-	 * The LabelProvider used to define the CLabel's text and image,

-	 * based on the current value

-	 */

-	protected ILabelProvider labelProvider;

-

-	/**

-	 * If the CLabel may represent more than one value,

-	 * use an AggregatedObservable

-	 *

-	 * May be null

-	 */

-	protected AggregatedObservable aggregated;

-

-	/**

-	 * Constructor

-	 *

-	 * @param label

-	 *            The observed CLabel

-	 * @param modelObservable

-	 *            The Model IObservable

-	 */

-	public CLabelObservableValue(CLabel label, IObservableValue modelObservable) {

-		this(label, modelObservable, null);

-	}

-

-	/**

-	 * Constructor

-	 *

-	 * @param label

-	 *            The observed CLabel

-	 * @param modelObservable

-	 *            The Model IObservable

-	 * @param labelProvider

-	 *            The LabelProvider used to define the CLabel's text/image from the current value

-	 */

-	public CLabelObservableValue(CLabel label, IObservableValue modelObservable, ILabelProvider labelProvider) {

-		this.label = label;

-		setLabelProvider(labelProvider);

-		if (modelObservable instanceof AggregatedObservable) {

-			this.aggregated = (AggregatedObservable) modelObservable;

-		}

-	}

-

-	/**

-	 * @param labelProvider

-	 *            The LabelProvider used to define the CLabel's text and image,

-	 *            based on the current value

-	 */

-	public void setLabelProvider(ILabelProvider labelProvider) {

-		if (labelProvider != null) {

-			this.labelProvider = labelProvider;

-		} else {

-			this.labelProvider = new LabelProvider();

-		}

-	}

-

-	@Override

-	public Object getValueType() {

-		return Object.class;

-	}

-

-	@Override

-	protected Object doGetValue() {

-		return currentValue;

-	}

-

-	@Override

-	protected void doSetValue(Object value) {

-		this.currentValue = value;

-		if (aggregated != null && aggregated.hasDifferentValues()) {

-			label.setText(Messages.ReferenceDialogObservable_Unchanged);

-			label.setImage(null);

-		} else if (currentValue == null) {

-			label.setText(Messages.ReferenceDialog_Unset);

-			label.setImage(null);

-		} else {

-			label.setText(labelProvider.getText(value));

-			label.setImage(labelProvider.getImage(value));

-		}

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.databinding;
+
+import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.papyrus.infra.tools.databinding.AggregatedObservable;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+import org.eclipse.swt.custom.CLabel;
+
+/**
+ * An IObservableValue to edit a CLabel (Text + Image), based on a LabelProvider
+ * It supports AggregatedObservable
+ *
+ * @author Camille Letavernier
+ */
+public class CLabelObservableValue extends AbstractObservableValue {
+
+	/**
+	 * The observed CLabel
+	 */
+	protected CLabel label;
+
+	/**
+	 * The current value
+	 */
+	protected Object currentValue;
+
+	/**
+	 * The LabelProvider used to define the CLabel's text and image,
+	 * based on the current value
+	 */
+	protected ILabelProvider labelProvider;
+
+	/**
+	 * If the CLabel may represent more than one value,
+	 * use an AggregatedObservable
+	 *
+	 * May be null
+	 */
+	protected AggregatedObservable aggregated;
+
+	/**
+	 * Constructor
+	 *
+	 * @param label
+	 *            The observed CLabel
+	 * @param modelObservable
+	 *            The Model IObservable
+	 */
+	public CLabelObservableValue(CLabel label, IObservableValue modelObservable) {
+		this(label, modelObservable, null);
+	}
+
+	/**
+	 * Constructor
+	 *
+	 * @param label
+	 *            The observed CLabel
+	 * @param modelObservable
+	 *            The Model IObservable
+	 * @param labelProvider
+	 *            The LabelProvider used to define the CLabel's text/image from the current value
+	 */
+	public CLabelObservableValue(CLabel label, IObservableValue modelObservable, ILabelProvider labelProvider) {
+		this.label = label;
+		setLabelProvider(labelProvider);
+		if (modelObservable instanceof AggregatedObservable) {
+			this.aggregated = (AggregatedObservable) modelObservable;
+		}
+	}
+
+	/**
+	 * @param labelProvider
+	 *            The LabelProvider used to define the CLabel's text and image,
+	 *            based on the current value
+	 */
+	public void setLabelProvider(ILabelProvider labelProvider) {
+		if (labelProvider != null) {
+			this.labelProvider = labelProvider;
+		} else {
+			this.labelProvider = new LabelProvider();
+		}
+	}
+
+	@Override
+	public Object getValueType() {
+		return Object.class;
+	}
+
+	@Override
+	protected Object doGetValue() {
+		return currentValue;
+	}
+
+	@Override
+	protected void doSetValue(Object value) {
+		this.currentValue = value;
+		if (aggregated != null && aggregated.hasDifferentValues()) {
+			label.setText(Messages.ReferenceDialogObservable_Unchanged);
+			label.setImage(null);
+		} else if (currentValue == null) {
+			label.setText(Messages.ReferenceDialog_Unset);
+			label.setImage(null);
+		} else {
+			label.setText(labelProvider.getText(value));
+			label.setImage(labelProvider.getImage(value));
+		}
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/ComboObservableValue.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/ComboObservableValue.java
index ca62486e1d3..4b6821538bd 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/ComboObservableValue.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/ComboObservableValue.java
@@ -1,135 +1,135 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.databinding;

-

-import org.eclipse.core.databinding.observable.value.AbstractObservableValue;

-import org.eclipse.core.databinding.observable.value.IObservableValue;

-import org.eclipse.core.databinding.observable.value.ValueDiff;

-import org.eclipse.jface.viewers.ComboViewer;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.infra.tools.databinding.AggregatedObservable;

-import org.eclipse.papyrus.infra.widgets.providers.ComboLabelProvider;

-import org.eclipse.papyrus.infra.widgets.providers.UnchangedObject;

-import org.eclipse.papyrus.infra.widgets.providers.UnsetObject;

-

-/**

- * An ObservableValue for a ComboViewer, with support for AggregatedObservable

- *

- * @author Camille Letavernier

- */

-public class ComboObservableValue extends AbstractObservableValue implements ISelectionChangedListener {

-

-	/**

-	 * The Observed ComboViewer

-	 */

-	protected ComboViewer viewer;

-

-	/**

-	 * The current value

-	 */

-	protected Object currentValue;

-

-	/**

-	 * If the Combo may represent more than one value,

-	 * use an AggregatedObservable

-	 *

-	 * May be null

-	 */

-	protected AggregatedObservable modelProperty;

-

-	/**

-	 *

-	 * @param viewer

-	 *            The observed ComboViewer

-	 * @param modelProperty

-	 *            The Model IObservable

-	 */

-	public ComboObservableValue(ComboViewer viewer, IObservableValue modelProperty) {

-		this.viewer = viewer;

-		viewer.setLabelProvider(new ComboLabelProvider(viewer.getLabelProvider()));

-		if (modelProperty instanceof AggregatedObservable) {

-			this.modelProperty = (AggregatedObservable) modelProperty;

-		}

-		viewer.addSelectionChangedListener(this);

-	}

-

-	@Override

-	public Object getValueType() {

-		return Object.class;

-	}

-

-	@Override

-	protected Object doGetValue() {

-		ISelection selection = viewer.getSelection();

-		if (!selection.isEmpty() && selection instanceof IStructuredSelection) {

-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;

-			Object firstElement = structuredSelection.getFirstElement();

-			if (firstElement == UnsetObject.instance) {

-				return null;

-			}

-			if (firstElement == UnchangedObject.instance) {

-				return null;

-			}

-			return firstElement;

-		}

-

-		return null;

-	}

-

-	@Override

-	protected void doSetValue(Object value) {

-		currentValue = value;

-

-		if (modelProperty != null && modelProperty.hasDifferentValues()) {

-			viewer.setSelection(new StructuredSelection(UnchangedObject.instance));

-		} else if (value == null) {

-			viewer.setSelection(new StructuredSelection(UnsetObject.instance));

-		} else {

-			viewer.setSelection(new StructuredSelection(value));

-		}

-	}

-

-	@Override

-	public synchronized void dispose() {

-		viewer.removeSelectionChangedListener(this);

-		super.dispose();

-	}

-

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		if (((IStructuredSelection) event.getSelection()).getFirstElement() != UnchangedObject.instance) {

-

-			final Object oldValue = currentValue;

-			final Object newValue = doGetValue();

-			currentValue = newValue;

-

-			fireValueChange(new ValueDiff() {

-

-				@Override

-				public Object getOldValue() {

-					return oldValue;

-				}

-

-				@Override

-				public Object getNewValue() {

-					return newValue;

-				}

-

-			});

-		}

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.databinding;
+
+import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.ValueDiff;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.infra.tools.databinding.AggregatedObservable;
+import org.eclipse.papyrus.infra.widgets.providers.ComboLabelProvider;
+import org.eclipse.papyrus.infra.widgets.providers.UnchangedObject;
+import org.eclipse.papyrus.infra.widgets.providers.UnsetObject;
+
+/**
+ * An ObservableValue for a ComboViewer, with support for AggregatedObservable
+ *
+ * @author Camille Letavernier
+ */
+public class ComboObservableValue extends AbstractObservableValue implements ISelectionChangedListener {
+
+	/**
+	 * The Observed ComboViewer
+	 */
+	protected ComboViewer viewer;
+
+	/**
+	 * The current value
+	 */
+	protected Object currentValue;
+
+	/**
+	 * If the Combo may represent more than one value,
+	 * use an AggregatedObservable
+	 *
+	 * May be null
+	 */
+	protected AggregatedObservable modelProperty;
+
+	/**
+	 *
+	 * @param viewer
+	 *            The observed ComboViewer
+	 * @param modelProperty
+	 *            The Model IObservable
+	 */
+	public ComboObservableValue(ComboViewer viewer, IObservableValue modelProperty) {
+		this.viewer = viewer;
+		viewer.setLabelProvider(new ComboLabelProvider(viewer.getLabelProvider()));
+		if (modelProperty instanceof AggregatedObservable) {
+			this.modelProperty = (AggregatedObservable) modelProperty;
+		}
+		viewer.addSelectionChangedListener(this);
+	}
+
+	@Override
+	public Object getValueType() {
+		return Object.class;
+	}
+
+	@Override
+	protected Object doGetValue() {
+		ISelection selection = viewer.getSelection();
+		if (!selection.isEmpty() && selection instanceof IStructuredSelection) {
+			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
+			Object firstElement = structuredSelection.getFirstElement();
+			if (firstElement == UnsetObject.instance) {
+				return null;
+			}
+			if (firstElement == UnchangedObject.instance) {
+				return null;
+			}
+			return firstElement;
+		}
+
+		return null;
+	}
+
+	@Override
+	protected void doSetValue(Object value) {
+		currentValue = value;
+
+		if (modelProperty != null && modelProperty.hasDifferentValues()) {
+			viewer.setSelection(new StructuredSelection(UnchangedObject.instance));
+		} else if (value == null) {
+			viewer.setSelection(new StructuredSelection(UnsetObject.instance));
+		} else {
+			viewer.setSelection(new StructuredSelection(value));
+		}
+	}
+
+	@Override
+	public synchronized void dispose() {
+		viewer.removeSelectionChangedListener(this);
+		super.dispose();
+	}
+
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		if (((IStructuredSelection) event.getSelection()).getFirstElement() != UnchangedObject.instance) {
+
+			final Object oldValue = currentValue;
+			final Object newValue = doGetValue();
+			currentValue = newValue;
+
+			fireValueChange(new ValueDiff() {
+
+				@Override
+				public Object getOldValue() {
+					return oldValue;
+				}
+
+				@Override
+				public Object getNewValue() {
+					return newValue;
+				}
+
+			});
+		}
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/CompletionStyledTextMultiReferenceDialogObservableValue.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/CompletionStyledTextMultiReferenceDialogObservableValue.java
index 33e481ba136..33e481ba136 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/CompletionStyledTextMultiReferenceDialogObservableValue.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/CompletionStyledTextMultiReferenceDialogObservableValue.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/CompletionStyledTextObservableValue.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/CompletionStyledTextObservableValue.java
index 7a6eb78f706..7a6eb78f706 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/CompletionStyledTextObservableValue.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/CompletionStyledTextObservableValue.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/CompletionStyledTextReferenceDialogObservableValue.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/CompletionStyledTextReferenceDialogObservableValue.java
index ef22a7ba233..ef22a7ba233 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/CompletionStyledTextReferenceDialogObservableValue.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/CompletionStyledTextReferenceDialogObservableValue.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/GrayedCheckboxObservableValue.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/GrayedCheckboxObservableValue.java
index d73930c0730..2e40f91e770 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/GrayedCheckboxObservableValue.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/GrayedCheckboxObservableValue.java
@@ -1,114 +1,114 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.databinding;

-

-import org.eclipse.core.databinding.observable.value.AbstractObservableValue;

-import org.eclipse.core.databinding.observable.value.ValueDiff;

-import org.eclipse.papyrus.infra.tools.databinding.AggregatedObservable;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.widgets.Button;

-

-/**

- * An ObservableValue for {@link Button}s with the {@link SWT.CHECK} style

- * Allows the checkbox to take four states ; one for each possible combination

- * of {@link Button#getSelection()} and {@link Button#getGrayed()}

- *

- * @author Camille Letavernier

- */

-public class GrayedCheckboxObservableValue extends AbstractObservableValue implements SelectionListener {

-

-	private Button checkbox;

-

-	private Boolean currentValue;

-

-	private AggregatedObservable aggregated;

-

-	/**

-	 * Constructor

-	 *

-	 * @param checkbox

-	 *            The observed checkbox

-	 * @param aggregated

-	 *            The Observable aggregating the various observable booleans

-	 */

-	public GrayedCheckboxObservableValue(Button checkbox, AggregatedObservable aggregated) {

-		this.checkbox = checkbox;

-		this.checkbox.addSelectionListener(this);

-		this.aggregated = aggregated;

-	}

-

-	@Override

-	public Object getValueType() {

-		return Object.class; // Can be either Boolean or BooleanWithDefaultState

-	}

-

-	@Override

-	protected Boolean doGetValue() {

-		return checkbox.getSelection();

-	}

-

-	@Override

-	protected void doSetValue(Object value) {

-		if (aggregated.hasDifferentValues()) {

-			checkbox.setSelection(true);

-			checkbox.setGrayed(true);

-			return;

-		} else {

-			checkbox.setGrayed(false);

-		}

-

-		if (value instanceof Boolean) {

-			Boolean booleanValue = (Boolean) value;

-			checkbox.setSelection(booleanValue);

-

-			this.currentValue = booleanValue;

-		} else if (value == null) {

-			checkbox.setSelection(false);

-		}

-	}

-

-	@Override

-	public synchronized void dispose() {

-		checkbox.removeSelectionListener(this);

-		super.dispose();

-	}

-

-	@Override

-	public void widgetSelected(SelectionEvent e) {

-		final Boolean oldValue = currentValue;

-		final Boolean newValue = checkbox.getSelection();

-

-		currentValue = newValue;

-		checkbox.setGrayed(false);

-

-		fireValueChange(new ValueDiff() {

-

-			@Override

-			public Object getOldValue() {

-				return oldValue;

-			}

-

-			@Override

-			public Object getNewValue() {

-				return newValue;

-			}

-		});

-	}

-

-	@Override

-	public void widgetDefaultSelected(SelectionEvent e) {

-		// Nothing

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.databinding;
+
+import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
+import org.eclipse.core.databinding.observable.value.ValueDiff;
+import org.eclipse.papyrus.infra.tools.databinding.AggregatedObservable;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Button;
+
+/**
+ * An ObservableValue for {@link Button}s with the {@link SWT.CHECK} style
+ * Allows the checkbox to take four states ; one for each possible combination
+ * of {@link Button#getSelection()} and {@link Button#getGrayed()}
+ *
+ * @author Camille Letavernier
+ */
+public class GrayedCheckboxObservableValue extends AbstractObservableValue implements SelectionListener {
+
+	private Button checkbox;
+
+	private Boolean currentValue;
+
+	private AggregatedObservable aggregated;
+
+	/**
+	 * Constructor
+	 *
+	 * @param checkbox
+	 *            The observed checkbox
+	 * @param aggregated
+	 *            The Observable aggregating the various observable booleans
+	 */
+	public GrayedCheckboxObservableValue(Button checkbox, AggregatedObservable aggregated) {
+		this.checkbox = checkbox;
+		this.checkbox.addSelectionListener(this);
+		this.aggregated = aggregated;
+	}
+
+	@Override
+	public Object getValueType() {
+		return Object.class; // Can be either Boolean or BooleanWithDefaultState
+	}
+
+	@Override
+	protected Boolean doGetValue() {
+		return checkbox.getSelection();
+	}
+
+	@Override
+	protected void doSetValue(Object value) {
+		if (aggregated.hasDifferentValues()) {
+			checkbox.setSelection(true);
+			checkbox.setGrayed(true);
+			return;
+		} else {
+			checkbox.setGrayed(false);
+		}
+
+		if (value instanceof Boolean) {
+			Boolean booleanValue = (Boolean) value;
+			checkbox.setSelection(booleanValue);
+
+			this.currentValue = booleanValue;
+		} else if (value == null) {
+			checkbox.setSelection(false);
+		}
+	}
+
+	@Override
+	public synchronized void dispose() {
+		checkbox.removeSelectionListener(this);
+		super.dispose();
+	}
+
+	@Override
+	public void widgetSelected(SelectionEvent e) {
+		final Boolean oldValue = currentValue;
+		final Boolean newValue = checkbox.getSelection();
+
+		currentValue = newValue;
+		checkbox.setGrayed(false);
+
+		fireValueChange(new ValueDiff() {
+
+			@Override
+			public Object getOldValue() {
+				return oldValue;
+			}
+
+			@Override
+			public Object getNewValue() {
+				return newValue;
+			}
+		});
+	}
+
+	@Override
+	public void widgetDefaultSelected(SelectionEvent e) {
+		// Nothing
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/ReferenceDialogObservableValue.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/ReferenceDialogObservableValue.java
index 7f06b71aa00..21c70b3f2d3 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/ReferenceDialogObservableValue.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/ReferenceDialogObservableValue.java
@@ -1,63 +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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.databinding;

-

-import org.eclipse.core.databinding.observable.value.IObservableValue;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.papyrus.infra.widgets.editors.ReferenceDialog;

-import org.eclipse.swt.custom.CLabel;

-

-

-/**

- * An ObservableValue for ReferenceDialog widget (Which displays

- * the current value with a CLabel)

- *

- * @author Camille Letavernier

- */

-public class ReferenceDialogObservableValue extends CLabelObservableValue {

-

-	private ReferenceDialog referenceDialog;

-

-	/**

-	 * @param dialog

-	 *            The observed ReferenceDialog

-	 * @param label

-	 *            The observed CLabel (Should correspond to dialog#currentValueLabel)

-	 * @param modelObservable

-	 *            The Model IObservable

-	 */

-	public ReferenceDialogObservableValue(ReferenceDialog dialog, CLabel label, IObservableValue modelObservable) {

-		this(dialog, label, modelObservable, null);

-	}

-

-	/**

-	 * @param dialog

-	 *            The observed ReferenceDialog

-	 * @param label

-	 *            The observed CLabel (Should correspond to dialog#currentValueLabel)

-	 * @param modelObservable

-	 *            The Model IObservable

-	 * @param labelProvider

-	 *            The LabelProvider used to define the CLabel's text/image from the current value

-	 */

-	public ReferenceDialogObservableValue(ReferenceDialog dialog, CLabel label, IObservableValue modelObservable, ILabelProvider labelProvider) {

-		super(label, modelObservable, labelProvider);

-		this.referenceDialog = dialog;

-	}

-

-	@Override

-	protected void doSetValue(Object value) {

-		super.doSetValue(value);

-		referenceDialog.update();

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.databinding;
+
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.widgets.editors.ReferenceDialog;
+import org.eclipse.swt.custom.CLabel;
+
+
+/**
+ * An ObservableValue for ReferenceDialog widget (Which displays
+ * the current value with a CLabel)
+ *
+ * @author Camille Letavernier
+ */
+public class ReferenceDialogObservableValue extends CLabelObservableValue {
+
+	private ReferenceDialog referenceDialog;
+
+	/**
+	 * @param dialog
+	 *            The observed ReferenceDialog
+	 * @param label
+	 *            The observed CLabel (Should correspond to dialog#currentValueLabel)
+	 * @param modelObservable
+	 *            The Model IObservable
+	 */
+	public ReferenceDialogObservableValue(ReferenceDialog dialog, CLabel label, IObservableValue modelObservable) {
+		this(dialog, label, modelObservable, null);
+	}
+
+	/**
+	 * @param dialog
+	 *            The observed ReferenceDialog
+	 * @param label
+	 *            The observed CLabel (Should correspond to dialog#currentValueLabel)
+	 * @param modelObservable
+	 *            The Model IObservable
+	 * @param labelProvider
+	 *            The LabelProvider used to define the CLabel's text/image from the current value
+	 */
+	public ReferenceDialogObservableValue(ReferenceDialog dialog, CLabel label, IObservableValue modelObservable, ILabelProvider labelProvider) {
+		super(label, modelObservable, labelProvider);
+		this.referenceDialog = dialog;
+	}
+
+	@Override
+	protected void doSetValue(Object value) {
+		super.doSetValue(value);
+		referenceDialog.update();
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/StyledTextObservableValue.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/StyledTextObservableValue.java
index 19ab83c7351..19ab83c7351 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/StyledTextObservableValue.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/StyledTextObservableValue.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/StyledTextReferenceDialogObservableValue.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/StyledTextReferenceDialogObservableValue.java
index eb77f7e30d1..eb77f7e30d1 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/StyledTextReferenceDialogObservableValue.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/StyledTextReferenceDialogObservableValue.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/TextObservableValue.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/TextObservableValue.java
index bd25a4a8bb8..823931e278b 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/TextObservableValue.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/databinding/TextObservableValue.java
@@ -1,118 +1,118 @@
-package org.eclipse.papyrus.infra.widgets.databinding;

-

-import org.eclipse.core.databinding.observable.value.AbstractObservableValue;

-import org.eclipse.core.databinding.observable.value.IObservableValue;

-import org.eclipse.core.databinding.observable.value.ValueDiff;

-import org.eclipse.papyrus.infra.tools.databinding.AggregatedObservable;

-import org.eclipse.papyrus.infra.widgets.providers.UnchangedObject;

-import org.eclipse.swt.widgets.Event;

-import org.eclipse.swt.widgets.Listener;

-import org.eclipse.swt.widgets.Text;

-

-

-/**

- * An ObservableValue for Text field, with support for AggregatedObservable

- *

- * @author Camille Letavernier

- */

-public class TextObservableValue extends AbstractObservableValue implements Listener {

-

-	private Text text;

-

-	private int eventType;

-

-	private Object currentValue;

-

-	/**

-	 * If the Text field may represent more than one value,

-	 * use an AggregatedObservable

-	 *

-	 * May be null

-	 */

-	protected AggregatedObservable modelProperty;

-

-	/**

-	 * Constructor

-	 *

-	 * @param text

-	 *            The Text field to observe

-	 * @param modelProperty

-	 *            The model IObservableValue

-	 * @param eventType

-	 *            The eventType to listen to. When the event is fired by the Text

-	 *            widget, this IObservableValue will fire a ChangeEvent

-	 */

-	public TextObservableValue(Text text, IObservableValue modelProperty, int eventType) {

-		this.text = text;

-		this.eventType = eventType;

-		if (modelProperty instanceof AggregatedObservable) {

-			this.modelProperty = (AggregatedObservable) modelProperty;

-		}

-		this.text.addListener(eventType, this);

-	}

-

-	@Override

-	public Object getValueType() {

-		return String.class;

-	}

-

-	@Override

-	protected Object doGetValue() {

-		if (this.text == null || this.text.isDisposed()) {

-			return null;

-		}

-

-		if (UnchangedObject.instance.toString().equals(text.getText())) {

-			return null;

-		} else {

-			return text.getText();

-		}

-	}

-

-	@Override

-	protected void doSetValue(Object value) {

-		if (modelProperty != null && modelProperty.hasDifferentValues()) {

-			this.text.setText(UnchangedObject.instance.toString());

-			this.currentValue = UnchangedObject.instance;

-		} else {

-			if (value instanceof String) {

-				this.text.setText((String) value);

-				this.currentValue = value;

-			} else if (value == null) {

-				this.text.setText(""); //$NON-NLS-1$

-				this.currentValue = null;

-			}

-		}

-	}

-

-	@Override

-	public void handleEvent(Event event) {

-		if (this.text == null || this.text.isDisposed()) {

-			return;

-		}

-

-		final Object oldValue = currentValue;

-		final Object newValue = getValue();

-		if (newValue == null) {

-			return;

-		}

-		currentValue = newValue;

-

-		if ((eventType & event.type) != 0) {

-			fireValueChange(new ValueDiff() {

-

-				@Override

-				public Object getOldValue() {

-					return oldValue;

-				}

-

-				@Override

-				public Object getNewValue() {

-					return newValue;

-				}

-

-			});

-		}

-	}

-

-}

+package org.eclipse.papyrus.infra.widgets.databinding;
+
+import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.ValueDiff;
+import org.eclipse.papyrus.infra.tools.databinding.AggregatedObservable;
+import org.eclipse.papyrus.infra.widgets.providers.UnchangedObject;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Text;
+
+
+/**
+ * An ObservableValue for Text field, with support for AggregatedObservable
+ *
+ * @author Camille Letavernier
+ */
+public class TextObservableValue extends AbstractObservableValue implements Listener {
+
+	private Text text;
+
+	private int eventType;
+
+	private Object currentValue;
+
+	/**
+	 * If the Text field may represent more than one value,
+	 * use an AggregatedObservable
+	 *
+	 * May be null
+	 */
+	protected AggregatedObservable modelProperty;
+
+	/**
+	 * Constructor
+	 *
+	 * @param text
+	 *            The Text field to observe
+	 * @param modelProperty
+	 *            The model IObservableValue
+	 * @param eventType
+	 *            The eventType to listen to. When the event is fired by the Text
+	 *            widget, this IObservableValue will fire a ChangeEvent
+	 */
+	public TextObservableValue(Text text, IObservableValue modelProperty, int eventType) {
+		this.text = text;
+		this.eventType = eventType;
+		if (modelProperty instanceof AggregatedObservable) {
+			this.modelProperty = (AggregatedObservable) modelProperty;
+		}
+		this.text.addListener(eventType, this);
+	}
+
+	@Override
+	public Object getValueType() {
+		return String.class;
+	}
+
+	@Override
+	protected Object doGetValue() {
+		if (this.text == null || this.text.isDisposed()) {
+			return null;
+		}
+
+		if (UnchangedObject.instance.toString().equals(text.getText())) {
+			return null;
+		} else {
+			return text.getText();
+		}
+	}
+
+	@Override
+	protected void doSetValue(Object value) {
+		if (modelProperty != null && modelProperty.hasDifferentValues()) {
+			this.text.setText(UnchangedObject.instance.toString());
+			this.currentValue = UnchangedObject.instance;
+		} else {
+			if (value instanceof String) {
+				this.text.setText((String) value);
+				this.currentValue = value;
+			} else if (value == null) {
+				this.text.setText(""); //$NON-NLS-1$
+				this.currentValue = null;
+			}
+		}
+	}
+
+	@Override
+	public void handleEvent(Event event) {
+		if (this.text == null || this.text.isDisposed()) {
+			return;
+		}
+
+		final Object oldValue = currentValue;
+		final Object newValue = getValue();
+		if (newValue == null) {
+			return;
+		}
+		currentValue = newValue;
+
+		if ((eventType & event.type) != 0) {
+			fireValueChange(new ValueDiff() {
+
+				@Override
+				public Object getOldValue() {
+					return oldValue;
+				}
+
+				@Override
+				public Object getNewValue() {
+					return newValue;
+				}
+
+			});
+		}
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractEditor.java
index dace9b4bfd1..badc5aa8d51 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractEditor.java
@@ -1,509 +1,509 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation

- *  Christian W. Damus (CEA) - bug 402525

- *  Christian W. Damus (CEA) - bug 435420

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import java.util.LinkedHashSet;

-import java.util.Set;

-

-import org.eclipse.core.databinding.Binding;

-import org.eclipse.core.databinding.DataBindingContext;

-import org.eclipse.core.databinding.conversion.IConverter;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.papyrus.infra.widgets.creation.IAtomicOperationExecutor;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CCombo;

-import org.eclipse.swt.events.DisposeEvent;

-import org.eclipse.swt.events.DisposeListener;

-import org.eclipse.swt.events.FocusAdapter;

-import org.eclipse.swt.events.FocusEvent;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.swt.widgets.Text;

-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;

-

-/**

- * An Abstract class to represent Editors.

- * An editor is a Composite, containing a label and one

- * or more controls. The label may be null.

- * The controls are specified by the implementations

- * of this abstract class.

- *

- * @author Camille Letavernier

- */

-// FIXME: The composite widget hides access to the encapsulated widget(s).

-// Thus, it is not possible to add custom listeners on the editors

-// We should forward the listeners to the encapsulated (this.addListener(int, Listener) -> getMainWidget().addListener(int, Listener))

-// Problem: some widgets have more than one "main widget" (e.g. EnumRadio).

-public abstract class AbstractEditor extends Composite implements DisposeListener {

-

-	/**

-	 * The label for this editor. May be null.

-	 */

-	protected Label label;

-

-	/**

-	 * The label value for this editor

-	 */

-	protected String labelText;

-

-	/**

-	 * The set of elements listening on changes from this editor

-	 */

-	protected Set<ICommitListener> commitListeners = new LinkedHashSet<ICommitListener>();

-

-	/**

-	 * The binding between the model object and the widget

-	 */

-	protected Binding binding;

-

-	/**

-	 * The toolTipText associated to this editor

-	 */

-	protected String toolTipText;

-

-	protected DataBindingContext dbc;

-

-	/**

-	 * The factory for creating all the editors with a common style

-	 */

-	public static final TabbedPropertySheetWidgetFactory factory = new TabbedPropertySheetWidgetFactory();

-

-	static {

-		factory.setBackground(null);

-		factory.setBorderStyle(SWT.BORDER); // This seems to be used only by the FormToolKit factory, we still need to force it for the CLabel or CCombo widgets

-	}

-

-	/**

-	 *

-	 * Constructor. Constructs an editor without a label

-	 *

-	 * @param parent

-	 *            The composite in which this editor should be created

-	 */

-	protected AbstractEditor(Composite parent) {

-		this(parent, SWT.NONE, null);

-	}

-

-	/**

-	 *

-	 * Constructor. Constructs an editor without a label

-	 *

-	 * @param parent

-	 *            The composite in which this editor should be created

-	 * @param style

-	 *            The style of this editor's main composite

-	 */

-	protected AbstractEditor(Composite parent, int style) {

-		this(parent, style, null);

-	}

-

-	/**

-	 *

-	 * Constructor. Constructs an editor with a label

-	 *

-	 * @param parent

-	 *            The composite in which this editor should be created

-	 * @param label

-	 *            The label that will be displayed for this editor, or null

-	 *            if no label should be displayed

-	 */

-	protected AbstractEditor(Composite parent, String label) {

-		this(parent, SWT.NONE, label);

-	}

-

-	/**

-	 *

-	 * Constructor. Constructs an editor with a label

-	 *

-	 * @param parent

-	 *            The composite in which this editor should be created

-	 * @param style

-	 *            The style of this editor's main composite

-	 * @param label

-	 *            The label that will be displayed for this editor, or null

-	 *            if no label should be displayed

-	 */

-	protected AbstractEditor(Composite parent, int style, String label) {

-		super(parent, style);

-		GridLayout layout = new GridLayout(1, false);

-		setLayout(layout);

-		if (label != null) {

-			createLabel(label);

-		}

-		parent.addDisposeListener(this);

-	}

-

-	/**

-	 * Creates the label widget with the given text

-	 *

-	 * @param text

-	 *            The text to be displayed on the label

-	 */

-	protected void createLabel(String text) {

-		label = factory.createLabel(this, text);

-		label.setLayoutData(getLabelLayoutData());

-		if (toolTipText != null) {

-			label.setToolTipText(toolTipText);

-		}

-		((GridLayout) getLayout()).numColumns++;

-	}

-

-	/**

-	 * @return The default layoutData for the label

-	 */

-	protected GridData getLabelLayoutData() {

-		GridData data = new GridData();

-		data.widthHint = 120;

-		data.verticalAlignment = SWT.CENTER;

-		return data;

-	}

-

-	/**

-	 * This method should be called by subclasses to get the default layoutData

-	 * for a control in this editor.

-	 *

-	 * @return The default layoutData for the main control

-	 */

-	protected GridData getDefaultLayoutData() {

-		GridData data = new GridData(SWT.FILL, SWT.BEGINNING, true, false);

-		return data;

-	}

-

-	/**

-	 * Changes the text label for this editor. This method is available

-	 * only when the editor has been constructed with a label.

-	 *

-	 * @param label

-	 *            The new text for this editor's label

-	 */

-	public void setLabel(String label) {

-		this.labelText = label;

-

-		if (this.label != null) {

-			this.label.setText(label);

-		} else {

-			createLabel(label);

-			this.label.moveAbove(getChildren()[0]);

-		}

-	}

-

-	/**

-	 * Show or delete the Label Widget.

-	 *

-	 * @param displayLabel

-	 */

-	public void setDisplayLabel(boolean displayLabel) {

-		if (displayLabel) {

-			setLabel(labelText);

-		} else {

-			if (this.label != null) {

-				this.label.dispose();

-				((GridLayout) getLayout()).numColumns--;

-			}

-		}

-	}

-

-	/**

-	 * Adds a commit listener to this editor. A Commit event is

-	 * fired when a modification occurs on this editor.

-	 *

-	 * @param listener

-	 *            The commit listener to add to this editor

-	 */

-	public void addCommitListener(ICommitListener listener) {

-		commitListeners.add(listener);

-	}

-

-	/**

-	 * Removes a commit listener from this editor.

-	 *

-	 * @param listener

-	 *            The commit listener to remove from this editor

-	 */

-	public void removeCommitListener(ICommitListener listener) {

-		commitListeners.remove(listener);

-	}

-

-	/**

-	 * Informs the commit listeners that a modification occured

-	 */

-	protected void commit() {

-		for (ICommitListener listener : commitListeners) {

-			listener.commit(this);

-

-		}

-

-

-	}

-

-	/**

-	 * Gets the BindingContext associated to the editors

-	 *

-	 * @return

-	 */

-	protected DataBindingContext getBindingContext() {

-		if (dbc == null) {

-			dbc = new DataBindingContext();

-		}

-		return dbc;

-	}

-

-

-	/**

-	 * Sets the converters to convert data from Model to Target (Widget),

-	 * and from Widget to Model

-	 *

-	 * @param targetToModel

-	 * @param modelToTarget

-	 */

-	abstract public void setConverters(IConverter targetToModel, IConverter modelToTarget);

-

-

-	/**

-	 * Binds the Widget Observable to the Model observable property,

-	 * using the specified converters when available

-	 */

-	abstract protected void doBinding();

-

-	/**

-	 * @return the type of objects that this widget can edit

-	 */

-	public abstract Object getEditableType();

-

-	/**

-	 * Marks this editor as being read-only. The value of a read-only

-	 * editor cannot be changed by the editor itself.

-	 *

-	 * @param readOnly

-	 */

-	public abstract void setReadOnly(boolean readOnly);

-

-	/**

-	 * Tests whether this editor is read-only or not

-	 *

-	 * @return

-	 * 		True if the editor is read-only

-	 */

-	public abstract boolean isReadOnly();

-

-	/**

-	 * Indicates that this editor should notify its commit listeners

-	 * when the given control looses the Focus

-	 *

-	 * @param control

-	 *            The control on which a FocusListener should be added,

-	 *            to notify the CommitListeners

-	 */

-	protected void setCommitOnFocusLost(Control control) {

-		control.addFocusListener(new FocusAdapter() {

-

-			@Override

-			public void focusLost(FocusEvent e) {

-				commit();

-			}

-

-		});

-	}

-

-	/**

-	 * Forces the refresh of the widget's value

-	 */

-	public void refreshValue() {

-		if (binding != null) {

-			binding.updateModelToTarget();

-		}

-

-	}

-

-	public void refreshModel() {

-		if (binding != null) {

-			binding.updateTargetToModel();

-		}

-

-	}

-

-	/**

-	 * Sets the given toolTip to the label

-	 *

-	 * @param text

-	 *            The new label's tooltip

-	 */

-	protected void setLabelToolTipText(String text) {

-		toolTipText = text;

-		if (label != null && !label.isDisposed()) {

-			label.setToolTipText(text);

-		}

-	}

-

-	/**

-	 * Excludes or includes the given control from the layout

-	 *

-	 * @param control

-	 *            The control to exclude or include

-	 * @param exclude

-	 *            If true, the control will be excluded ; otherwise, it will be included

-	 */

-	protected void setExclusion(Control control, boolean exclude) {

-		if (control.getLayoutData() == null) {

-			GridData data = new GridData();

-			control.setLayoutData(data);

-		}

-

-		GridData data = (GridData) control.getLayoutData();

-

-		if (data.exclude != exclude) {

-			data.exclude = exclude;

-			GridLayout layout = (GridLayout) control.getParent().getLayout();

-			if (exclude) {

-				layout.numColumns--;

-			} else {

-				layout.numColumns++;

-			}

-		}

-	}

-

-

-	@Override

-	public void widgetDisposed(DisposeEvent e) {

-		dispose();

-	}

-

-	public void changeColorField() {

-

-	}

-

-

-	/**

-	 * Obtains the most appropriate operation executor for the object being edited.

-	 *

-	 * @param context

-	 *            the object being edited

-	 * @return the executor to use to run operations (never {@code null})

-	 */

-	public IAtomicOperationExecutor getOperationExecutor(Object context) {

-		IAtomicOperationExecutor result;

-		if (context instanceof IAdaptable) {

-			result = ((IAdaptable) context).getAdapter(IAtomicOperationExecutor.class);

-		} else if (context != null) {

-			result = Platform.getAdapterManager().getAdapter(context, IAtomicOperationExecutor.class);

-		} else {

-			// We can't adapt null, of course, so we will have to settle for the default executor

-			result = null;

-		}

-

-		if (result == null) {

-			result = IAtomicOperationExecutor.DEFAULT;

-		}

-

-		return result;

-	}

-

-	/**

-	 * A hook to call when a control is accepting a focus that is sensitive to glitches in focus management

-	 * on the current SWT platform.

-	 *

-	 * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=435420">bug 435420</a>

-	 */

-	protected final void acceptingFocus() {

-		// On SWT/Cocoa, veto attempts to give focus to any other control for the current event-loop iteration

-		FocusVeto.vetoFocus(this);

-	}

-

-	/**

-	 * Queries the model element that I edit.

-	 *

-	 * @return the contextual model element

-	 */

-	protected abstract Object getContextElement();

-

-	//

-	// Nested types

-	//

-

-	/**

-	 * A utility that implements a bug in the SWT implementation on Cocoa, in which responder-chain management

-	 * while a {@link CCombo} is trying to accept focus in a Property Sheet that currently does not have focus

-	 * results in the text contents of some unrelated {@link Text} widget being presented in the {@code CCombo}'s

-	 * text field.

-	 *

-	 * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=435420">bug 435420</a>

-	 */

-	static class FocusVeto {

-

-		// Only engage this work-around on the Cocoa implementation of SWT because it actually results in

-		// editable CCombos not getting keyboard focus when initially clicked if the Property Sheet is not

-		// yet active

-		private static final boolean IS_SWT_COCOA = Platform.WS_COCOA.equals(Platform.getWS());

-

-		private final Control focusControl;

-

-		private FocusVeto(Control focusControl) {

-			this.focusControl = focusControl;

-			final Shell shell = focusControl.getShell();

-

-			focusControl.getDisplay().asyncExec(new Runnable() {

-

-				@Override

-				public void run() {

-

-					removeFocusVeto(shell, FocusVeto.this);

-

-					if (!FocusVeto.this.focusControl.isDisposed() && !FocusVeto.this.focusControl.isFocusControl()) {

-						FocusVeto.this.focusControl.setFocus();

-					}

-				}

-			});

-		}

-

-		Control getFocusControl() {

-			return focusControl;

-		}

-

-		static Control getFocusVetoControl(Control context) {

-			FocusVeto veto = IS_SWT_COCOA ? getFocusVeto(context.getShell()) : null;

-			return (veto == null) ? null : veto.getFocusControl();

-		}

-

-		static void vetoFocus(Control focusControl) {

-			if (IS_SWT_COCOA) {

-				Shell shell = focusControl.getShell();

-				FocusVeto current = getFocusVeto(shell);

-				if (current == null) {

-					setFocusVeto(shell, new FocusVeto(focusControl));

-				}

-			}

-		}

-

-		static FocusVeto getFocusVeto(Shell shell) {

-			return (FocusVeto) shell.getData(FocusVeto.class.getName());

-		}

-

-		static void setFocusVeto(Shell shell, FocusVeto focusVeto) {

-			shell.setData(FocusVeto.class.getName(), focusVeto);

-		}

-

-		static void removeFocusVeto(Shell shell, FocusVeto focusVeto) {

-			if (getFocusVeto(shell) == focusVeto) {

-				shell.setData(FocusVeto.class.getName(), null);

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *  Christian W. Damus (CEA) - bug 402525
+ *  Christian W. Damus (CEA) - bug 435420
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.eclipse.core.databinding.Binding;
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.papyrus.infra.widgets.creation.IAtomicOperationExecutor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CCombo;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.FocusAdapter;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
+
+/**
+ * An Abstract class to represent Editors.
+ * An editor is a Composite, containing a label and one
+ * or more controls. The label may be null.
+ * The controls are specified by the implementations
+ * of this abstract class.
+ *
+ * @author Camille Letavernier
+ */
+// FIXME: The composite widget hides access to the encapsulated widget(s).
+// Thus, it is not possible to add custom listeners on the editors
+// We should forward the listeners to the encapsulated (this.addListener(int, Listener) -> getMainWidget().addListener(int, Listener))
+// Problem: some widgets have more than one "main widget" (e.g. EnumRadio).
+public abstract class AbstractEditor extends Composite implements DisposeListener {
+
+	/**
+	 * The label for this editor. May be null.
+	 */
+	protected Label label;
+
+	/**
+	 * The label value for this editor
+	 */
+	protected String labelText;
+
+	/**
+	 * The set of elements listening on changes from this editor
+	 */
+	protected Set<ICommitListener> commitListeners = new LinkedHashSet<ICommitListener>();
+
+	/**
+	 * The binding between the model object and the widget
+	 */
+	protected Binding binding;
+
+	/**
+	 * The toolTipText associated to this editor
+	 */
+	protected String toolTipText;
+
+	protected DataBindingContext dbc;
+
+	/**
+	 * The factory for creating all the editors with a common style
+	 */
+	public static final TabbedPropertySheetWidgetFactory factory = new TabbedPropertySheetWidgetFactory();
+
+	static {
+		factory.setBackground(null);
+		factory.setBorderStyle(SWT.BORDER); // This seems to be used only by the FormToolKit factory, we still need to force it for the CLabel or CCombo widgets
+	}
+
+	/**
+	 *
+	 * Constructor. Constructs an editor without a label
+	 *
+	 * @param parent
+	 *            The composite in which this editor should be created
+	 */
+	protected AbstractEditor(Composite parent) {
+		this(parent, SWT.NONE, null);
+	}
+
+	/**
+	 *
+	 * Constructor. Constructs an editor without a label
+	 *
+	 * @param parent
+	 *            The composite in which this editor should be created
+	 * @param style
+	 *            The style of this editor's main composite
+	 */
+	protected AbstractEditor(Composite parent, int style) {
+		this(parent, style, null);
+	}
+
+	/**
+	 *
+	 * Constructor. Constructs an editor with a label
+	 *
+	 * @param parent
+	 *            The composite in which this editor should be created
+	 * @param label
+	 *            The label that will be displayed for this editor, or null
+	 *            if no label should be displayed
+	 */
+	protected AbstractEditor(Composite parent, String label) {
+		this(parent, SWT.NONE, label);
+	}
+
+	/**
+	 *
+	 * Constructor. Constructs an editor with a label
+	 *
+	 * @param parent
+	 *            The composite in which this editor should be created
+	 * @param style
+	 *            The style of this editor's main composite
+	 * @param label
+	 *            The label that will be displayed for this editor, or null
+	 *            if no label should be displayed
+	 */
+	protected AbstractEditor(Composite parent, int style, String label) {
+		super(parent, style);
+		GridLayout layout = new GridLayout(1, false);
+		setLayout(layout);
+		if (label != null) {
+			createLabel(label);
+		}
+		parent.addDisposeListener(this);
+	}
+
+	/**
+	 * Creates the label widget with the given text
+	 *
+	 * @param text
+	 *            The text to be displayed on the label
+	 */
+	protected void createLabel(String text) {
+		label = factory.createLabel(this, text);
+		label.setLayoutData(getLabelLayoutData());
+		if (toolTipText != null) {
+			label.setToolTipText(toolTipText);
+		}
+		((GridLayout) getLayout()).numColumns++;
+	}
+
+	/**
+	 * @return The default layoutData for the label
+	 */
+	protected GridData getLabelLayoutData() {
+		GridData data = new GridData();
+		data.widthHint = 120;
+		data.verticalAlignment = SWT.CENTER;
+		return data;
+	}
+
+	/**
+	 * This method should be called by subclasses to get the default layoutData
+	 * for a control in this editor.
+	 *
+	 * @return The default layoutData for the main control
+	 */
+	protected GridData getDefaultLayoutData() {
+		GridData data = new GridData(SWT.FILL, SWT.BEGINNING, true, false);
+		return data;
+	}
+
+	/**
+	 * Changes the text label for this editor. This method is available
+	 * only when the editor has been constructed with a label.
+	 *
+	 * @param label
+	 *            The new text for this editor's label
+	 */
+	public void setLabel(String label) {
+		this.labelText = label;
+
+		if (this.label != null) {
+			this.label.setText(label);
+		} else {
+			createLabel(label);
+			this.label.moveAbove(getChildren()[0]);
+		}
+	}
+
+	/**
+	 * Show or delete the Label Widget.
+	 *
+	 * @param displayLabel
+	 */
+	public void setDisplayLabel(boolean displayLabel) {
+		if (displayLabel) {
+			setLabel(labelText);
+		} else {
+			if (this.label != null) {
+				this.label.dispose();
+				((GridLayout) getLayout()).numColumns--;
+			}
+		}
+	}
+
+	/**
+	 * Adds a commit listener to this editor. A Commit event is
+	 * fired when a modification occurs on this editor.
+	 *
+	 * @param listener
+	 *            The commit listener to add to this editor
+	 */
+	public void addCommitListener(ICommitListener listener) {
+		commitListeners.add(listener);
+	}
+
+	/**
+	 * Removes a commit listener from this editor.
+	 *
+	 * @param listener
+	 *            The commit listener to remove from this editor
+	 */
+	public void removeCommitListener(ICommitListener listener) {
+		commitListeners.remove(listener);
+	}
+
+	/**
+	 * Informs the commit listeners that a modification occured
+	 */
+	protected void commit() {
+		for (ICommitListener listener : commitListeners) {
+			listener.commit(this);
+
+		}
+
+
+	}
+
+	/**
+	 * Gets the BindingContext associated to the editors
+	 *
+	 * @return
+	 */
+	protected DataBindingContext getBindingContext() {
+		if (dbc == null) {
+			dbc = new DataBindingContext();
+		}
+		return dbc;
+	}
+
+
+	/**
+	 * Sets the converters to convert data from Model to Target (Widget),
+	 * and from Widget to Model
+	 *
+	 * @param targetToModel
+	 * @param modelToTarget
+	 */
+	abstract public void setConverters(IConverter targetToModel, IConverter modelToTarget);
+
+
+	/**
+	 * Binds the Widget Observable to the Model observable property,
+	 * using the specified converters when available
+	 */
+	abstract protected void doBinding();
+
+	/**
+	 * @return the type of objects that this widget can edit
+	 */
+	public abstract Object getEditableType();
+
+	/**
+	 * Marks this editor as being read-only. The value of a read-only
+	 * editor cannot be changed by the editor itself.
+	 *
+	 * @param readOnly
+	 */
+	public abstract void setReadOnly(boolean readOnly);
+
+	/**
+	 * Tests whether this editor is read-only or not
+	 *
+	 * @return
+	 * 		True if the editor is read-only
+	 */
+	public abstract boolean isReadOnly();
+
+	/**
+	 * Indicates that this editor should notify its commit listeners
+	 * when the given control looses the Focus
+	 *
+	 * @param control
+	 *            The control on which a FocusListener should be added,
+	 *            to notify the CommitListeners
+	 */
+	protected void setCommitOnFocusLost(Control control) {
+		control.addFocusListener(new FocusAdapter() {
+
+			@Override
+			public void focusLost(FocusEvent e) {
+				commit();
+			}
+
+		});
+	}
+
+	/**
+	 * Forces the refresh of the widget's value
+	 */
+	public void refreshValue() {
+		if (binding != null) {
+			binding.updateModelToTarget();
+		}
+
+	}
+
+	public void refreshModel() {
+		if (binding != null) {
+			binding.updateTargetToModel();
+		}
+
+	}
+
+	/**
+	 * Sets the given toolTip to the label
+	 *
+	 * @param text
+	 *            The new label's tooltip
+	 */
+	protected void setLabelToolTipText(String text) {
+		toolTipText = text;
+		if (label != null && !label.isDisposed()) {
+			label.setToolTipText(text);
+		}
+	}
+
+	/**
+	 * Excludes or includes the given control from the layout
+	 *
+	 * @param control
+	 *            The control to exclude or include
+	 * @param exclude
+	 *            If true, the control will be excluded ; otherwise, it will be included
+	 */
+	protected void setExclusion(Control control, boolean exclude) {
+		if (control.getLayoutData() == null) {
+			GridData data = new GridData();
+			control.setLayoutData(data);
+		}
+
+		GridData data = (GridData) control.getLayoutData();
+
+		if (data.exclude != exclude) {
+			data.exclude = exclude;
+			GridLayout layout = (GridLayout) control.getParent().getLayout();
+			if (exclude) {
+				layout.numColumns--;
+			} else {
+				layout.numColumns++;
+			}
+		}
+	}
+
+
+	@Override
+	public void widgetDisposed(DisposeEvent e) {
+		dispose();
+	}
+
+	public void changeColorField() {
+
+	}
+
+
+	/**
+	 * Obtains the most appropriate operation executor for the object being edited.
+	 *
+	 * @param context
+	 *            the object being edited
+	 * @return the executor to use to run operations (never {@code null})
+	 */
+	public IAtomicOperationExecutor getOperationExecutor(Object context) {
+		IAtomicOperationExecutor result;
+		if (context instanceof IAdaptable) {
+			result = ((IAdaptable) context).getAdapter(IAtomicOperationExecutor.class);
+		} else if (context != null) {
+			result = Platform.getAdapterManager().getAdapter(context, IAtomicOperationExecutor.class);
+		} else {
+			// We can't adapt null, of course, so we will have to settle for the default executor
+			result = null;
+		}
+
+		if (result == null) {
+			result = IAtomicOperationExecutor.DEFAULT;
+		}
+
+		return result;
+	}
+
+	/**
+	 * A hook to call when a control is accepting a focus that is sensitive to glitches in focus management
+	 * on the current SWT platform.
+	 *
+	 * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=435420">bug 435420</a>
+	 */
+	protected final void acceptingFocus() {
+		// On SWT/Cocoa, veto attempts to give focus to any other control for the current event-loop iteration
+		FocusVeto.vetoFocus(this);
+	}
+
+	/**
+	 * Queries the model element that I edit.
+	 *
+	 * @return the contextual model element
+	 */
+	protected abstract Object getContextElement();
+
+	//
+	// Nested types
+	//
+
+	/**
+	 * A utility that implements a bug in the SWT implementation on Cocoa, in which responder-chain management
+	 * while a {@link CCombo} is trying to accept focus in a Property Sheet that currently does not have focus
+	 * results in the text contents of some unrelated {@link Text} widget being presented in the {@code CCombo}'s
+	 * text field.
+	 *
+	 * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=435420">bug 435420</a>
+	 */
+	static class FocusVeto {
+
+		// Only engage this work-around on the Cocoa implementation of SWT because it actually results in
+		// editable CCombos not getting keyboard focus when initially clicked if the Property Sheet is not
+		// yet active
+		private static final boolean IS_SWT_COCOA = Platform.WS_COCOA.equals(Platform.getWS());
+
+		private final Control focusControl;
+
+		private FocusVeto(Control focusControl) {
+			this.focusControl = focusControl;
+			final Shell shell = focusControl.getShell();
+
+			focusControl.getDisplay().asyncExec(new Runnable() {
+
+				@Override
+				public void run() {
+
+					removeFocusVeto(shell, FocusVeto.this);
+
+					if (!FocusVeto.this.focusControl.isDisposed() && !FocusVeto.this.focusControl.isFocusControl()) {
+						FocusVeto.this.focusControl.setFocus();
+					}
+				}
+			});
+		}
+
+		Control getFocusControl() {
+			return focusControl;
+		}
+
+		static Control getFocusVetoControl(Control context) {
+			FocusVeto veto = IS_SWT_COCOA ? getFocusVeto(context.getShell()) : null;
+			return (veto == null) ? null : veto.getFocusControl();
+		}
+
+		static void vetoFocus(Control focusControl) {
+			if (IS_SWT_COCOA) {
+				Shell shell = focusControl.getShell();
+				FocusVeto current = getFocusVeto(shell);
+				if (current == null) {
+					setFocusVeto(shell, new FocusVeto(focusControl));
+				}
+			}
+		}
+
+		static FocusVeto getFocusVeto(Shell shell) {
+			return (FocusVeto) shell.getData(FocusVeto.class.getName());
+		}
+
+		static void setFocusVeto(Shell shell, FocusVeto focusVeto) {
+			shell.setData(FocusVeto.class.getName(), focusVeto);
+		}
+
+		static void removeFocusVeto(Shell shell, FocusVeto focusVeto) {
+			if (getFocusVeto(shell) == focusVeto) {
+				shell.setData(FocusVeto.class.getName(), null);
+			}
+		}
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractListEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractListEditor.java
index 5abed80f85b..652cfc03880 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractListEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractListEditor.java
@@ -1,155 +1,155 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 402525

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.core.databinding.UpdateListStrategy;

-import org.eclipse.core.databinding.conversion.IConverter;

-import org.eclipse.core.databinding.observable.IObserving;

-import org.eclipse.core.databinding.observable.list.IObservableList;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * An abstract class to represent List Editors.

- * List editors are based on the Eclipse Databinding Framework

- * They take {@link IObservableList}s as Input

- *

- * @author Camille Letavernier

- *

- */

-public abstract class AbstractListEditor extends AbstractEditor {

-

-	/**

-	 * The IObservableList associated to the model property

-	 */

-	protected IObservableList modelProperty;

-

-	/**

-	 * The UpdateStrategy for binding data from widget to model

-	 */

-	protected UpdateListStrategy targetToModelStrategy;

-

-	/**

-	 * The UpdateStrategy for binding data from model to widget

-	 */

-	protected UpdateListStrategy modelToTargetStrategy;

-

-	/**

-	 * The IObservableList associated to the widget

-	 */

-	protected IObservableList widgetObservable;

-

-	protected AbstractListEditor(Composite parent) {

-		super(parent);

-	}

-

-	protected AbstractListEditor(Composite parent, int style, String label) {

-		super(parent, style, label);

-	}

-

-	protected AbstractListEditor(Composite parent, int style) {

-		super(parent, style);

-	}

-

-	protected AbstractListEditor(Composite parent, String label) {

-		super(parent, label);

-	}

-

-	/**

-	 * Sets this editor's IObservableList associated to the widget property

-	 *

-	 * @param widgetObservable

-	 * @param targetToModel

-	 *            the IConverter to convert data from Widget to Model

-	 * @param modelToTarget

-	 *            the IConverter to convert data from Model to Widget

-	 */

-	protected void setWidgetObservable(IObservableList widgetObservable, IConverter targetToModel, IConverter modelToTarget) {

-		this.widgetObservable = widgetObservable;

-		setConverters(targetToModel, modelToTarget);

-	}

-

-	/**

-	 * Sets this editor's IObservableList associated to the widget property

-	 *

-	 * @param widgetObservable

-	 */

-	protected void setWidgetObservable(IObservableList widgetObservable) {

-		this.widgetObservable = widgetObservable;

-	}

-

-	/**

-	 * Sets this editor's IObservableList associated to the model property,

-	 * and binds it to the Editor's Widget

-	 *

-	 * @param modelProperty

-	 */

-	public void setModelObservable(IObservableList modelProperty) {

-		this.modelProperty = modelProperty;

-		doBinding();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void setConverters(IConverter targetToModel, IConverter modelToTarget) {

-		if (targetToModelStrategy == null) {

-			targetToModelStrategy = new UpdateListStrategy();

-		}

-		if (modelToTargetStrategy == null) {

-			modelToTargetStrategy = new UpdateListStrategy();

-		}

-

-		targetToModelStrategy.setConverter(targetToModel);

-		modelToTargetStrategy.setConverter(modelToTarget);

-	}

-

-	/**

-	 * Sets the UpdateStrategies for databinding between the widget and the model

-	 *

-	 * @param targetToModelStrategy

-	 *            The widget to model Update strategy

-	 * @param modelToTargetStrategy

-	 *            The model to widget Update strategy

-	 */

-	public void setUpdateStrategies(UpdateListStrategy targetToModelStrategy, UpdateListStrategy modelToTargetStrategy) {

-		this.targetToModelStrategy = targetToModelStrategy;

-		this.modelToTargetStrategy = modelToTargetStrategy;

-	}

-

-	/**

-	 * Binds the Widget Observable to the Model observable property,

-	 * using the specified converters or Update strategies when available

-	 *

-	 * When overriding this method, you should also override {@link #refreshValue()}

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.AbstractEditor#doBinding()

-	 */

-	@Override

-	protected void doBinding() {

-

-		if (modelProperty == null || widgetObservable == null) {

-			return;

-		}

-

-		binding = getBindingContext().bindList(widgetObservable, modelProperty, targetToModelStrategy, modelToTargetStrategy);

-	}

-

-	@Override

-	protected Object getContextElement() {

-		// Our observables for features of EMF objects are expected to implement IObserving because

-		// the observe the value of the object's feature

-		return (modelProperty instanceof IObserving) ? ((IObserving) modelProperty).getObserved() : null;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 402525
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import org.eclipse.core.databinding.UpdateListStrategy;
+import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.core.databinding.observable.IObserving;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * An abstract class to represent List Editors.
+ * List editors are based on the Eclipse Databinding Framework
+ * They take {@link IObservableList}s as Input
+ *
+ * @author Camille Letavernier
+ *
+ */
+public abstract class AbstractListEditor extends AbstractEditor {
+
+	/**
+	 * The IObservableList associated to the model property
+	 */
+	protected IObservableList modelProperty;
+
+	/**
+	 * The UpdateStrategy for binding data from widget to model
+	 */
+	protected UpdateListStrategy targetToModelStrategy;
+
+	/**
+	 * The UpdateStrategy for binding data from model to widget
+	 */
+	protected UpdateListStrategy modelToTargetStrategy;
+
+	/**
+	 * The IObservableList associated to the widget
+	 */
+	protected IObservableList widgetObservable;
+
+	protected AbstractListEditor(Composite parent) {
+		super(parent);
+	}
+
+	protected AbstractListEditor(Composite parent, int style, String label) {
+		super(parent, style, label);
+	}
+
+	protected AbstractListEditor(Composite parent, int style) {
+		super(parent, style);
+	}
+
+	protected AbstractListEditor(Composite parent, String label) {
+		super(parent, label);
+	}
+
+	/**
+	 * Sets this editor's IObservableList associated to the widget property
+	 *
+	 * @param widgetObservable
+	 * @param targetToModel
+	 *            the IConverter to convert data from Widget to Model
+	 * @param modelToTarget
+	 *            the IConverter to convert data from Model to Widget
+	 */
+	protected void setWidgetObservable(IObservableList widgetObservable, IConverter targetToModel, IConverter modelToTarget) {
+		this.widgetObservable = widgetObservable;
+		setConverters(targetToModel, modelToTarget);
+	}
+
+	/**
+	 * Sets this editor's IObservableList associated to the widget property
+	 *
+	 * @param widgetObservable
+	 */
+	protected void setWidgetObservable(IObservableList widgetObservable) {
+		this.widgetObservable = widgetObservable;
+	}
+
+	/**
+	 * Sets this editor's IObservableList associated to the model property,
+	 * and binds it to the Editor's Widget
+	 *
+	 * @param modelProperty
+	 */
+	public void setModelObservable(IObservableList modelProperty) {
+		this.modelProperty = modelProperty;
+		doBinding();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setConverters(IConverter targetToModel, IConverter modelToTarget) {
+		if (targetToModelStrategy == null) {
+			targetToModelStrategy = new UpdateListStrategy();
+		}
+		if (modelToTargetStrategy == null) {
+			modelToTargetStrategy = new UpdateListStrategy();
+		}
+
+		targetToModelStrategy.setConverter(targetToModel);
+		modelToTargetStrategy.setConverter(modelToTarget);
+	}
+
+	/**
+	 * Sets the UpdateStrategies for databinding between the widget and the model
+	 *
+	 * @param targetToModelStrategy
+	 *            The widget to model Update strategy
+	 * @param modelToTargetStrategy
+	 *            The model to widget Update strategy
+	 */
+	public void setUpdateStrategies(UpdateListStrategy targetToModelStrategy, UpdateListStrategy modelToTargetStrategy) {
+		this.targetToModelStrategy = targetToModelStrategy;
+		this.modelToTargetStrategy = modelToTargetStrategy;
+	}
+
+	/**
+	 * Binds the Widget Observable to the Model observable property,
+	 * using the specified converters or Update strategies when available
+	 *
+	 * When overriding this method, you should also override {@link #refreshValue()}
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.AbstractEditor#doBinding()
+	 */
+	@Override
+	protected void doBinding() {
+
+		if (modelProperty == null || widgetObservable == null) {
+			return;
+		}
+
+		binding = getBindingContext().bindList(widgetObservable, modelProperty, targetToModelStrategy, modelToTargetStrategy);
+	}
+
+	@Override
+	protected Object getContextElement() {
+		// Our observables for features of EMF objects are expected to implement IObserving because
+		// the observe the value of the object's feature
+		return (modelProperty instanceof IObserving) ? ((IObserving) modelProperty).getObserved() : null;
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractReferenceDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractReferenceDialog.java
index 70ef6df522c..70ef6df522c 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractReferenceDialog.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractReferenceDialog.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractValueEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractValueEditor.java
index 2cbb8b44e2f..2cbb8b44e2f 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractValueEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/AbstractValueEditor.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanCheckbox.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanCheckbox.java
index 57835979ea3..31298ad2376 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanCheckbox.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanCheckbox.java
@@ -1,144 +1,144 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.core.databinding.observable.value.IObservableValue;

-import org.eclipse.jface.databinding.swt.WidgetProperties;

-import org.eclipse.jface.fieldassist.FieldDecorationRegistry;

-import org.eclipse.papyrus.infra.tools.databinding.AggregatedObservable;

-import org.eclipse.papyrus.infra.widgets.databinding.GrayedCheckboxObservableValue;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * A Property Editor representing a Boolean value

- * as a Checkbox.

- *

- * @author Camille Letavernier

- */

-public class BooleanCheckbox extends AbstractValueEditor {

-

-	private final Button checkbox;

-

-	private AggregatedObservable aggregated;

-

-

-	/**

-	 *

-	 * Constructor. Creates a new Property Editor for a Boolean

-	 * value, represented as a Checkbox.

-	 *

-	 * @param parent

-	 *            This editor's parent composite

-	 * @param style

-	 *            The style applied to this editor's checkbox

-	 */

-	public BooleanCheckbox(Composite parent, int style) {

-		this(parent, style, null);

-	}

-

-	/**

-	 *

-	 * Constructor. Creates a new Property Editor for a Boolean

-	 * value, represented as a Checkbox, with the given label

-	 *

-	 * @param parent

-	 *            This editor's parent composite

-	 * @param style

-	 *            The style applied to this editor's checkbox

-	 * @param label

-	 *            The label for this editor

-	 */

-	public BooleanCheckbox(Composite parent, int style, String label) {

-		super(parent);

-		checkbox = factory.createButton(this, label, SWT.CHECK | style);

-

-		IObservableValue widgetObservable = WidgetProperties.selection().observe(checkbox);

-		setWidgetObservable(widgetObservable, true);

-		GridData gridData = getDefaultLayoutData();

-		checkbox.setLayoutData(gridData);

-		gridData.horizontalIndent = FieldDecorationRegistry.getDefault().getMaximumDecorationWidth();

-

-

-	}

-

-	@Override

-	public void setModelObservable(IObservableValue modelProperty) {

-		IObservableValue newWidgetObservable;

-

-		if (this.widgetObservable != null) {

-			this.widgetObservable.dispose();

-		}

-

-		if (modelProperty instanceof AggregatedObservable) {

-			this.aggregated = (AggregatedObservable) modelProperty;

-			newWidgetObservable = new GrayedCheckboxObservableValue(checkbox, aggregated);

-		} else {

-			newWidgetObservable = WidgetProperties.selection().observe(checkbox);

-		}

-		setWidgetObservable(newWidgetObservable, true);

-		super.setModelObservable(modelProperty);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object getEditableType() {

-		return Boolean.class;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Boolean getValue() {

-		return checkbox.getSelection();

-	}

-

-	@Override

-	public void setReadOnly(boolean readOnly) {

-		checkbox.setEnabled(!readOnly);

-	}

-

-	@Override

-	public boolean isReadOnly() {

-		return !checkbox.isEnabled();

-	}

-

-	@Override

-	public void setToolTipText(String text) {

-		checkbox.setToolTipText(text);

-		super.setLabelToolTipText(text);

-	}

-

-	@Override

-	public void setLabel(String label) {

-		checkbox.setText(label);

-	}

-

-	/**

-	 * Sets this widget's value

-	 *

-	 * @param selected

-	 *            Whether the checkbox should be selected or not

-	 */

-	public void setValue(Boolean selected) {

-		if (modelProperty != null) {

-			modelProperty.setValue(selected);

-		}

-		widgetObservable.setValue(selected);

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
+import org.eclipse.papyrus.infra.tools.databinding.AggregatedObservable;
+import org.eclipse.papyrus.infra.widgets.databinding.GrayedCheckboxObservableValue;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A Property Editor representing a Boolean value
+ * as a Checkbox.
+ *
+ * @author Camille Letavernier
+ */
+public class BooleanCheckbox extends AbstractValueEditor {
+
+	private final Button checkbox;
+
+	private AggregatedObservable aggregated;
+
+
+	/**
+	 *
+	 * Constructor. Creates a new Property Editor for a Boolean
+	 * value, represented as a Checkbox.
+	 *
+	 * @param parent
+	 *            This editor's parent composite
+	 * @param style
+	 *            The style applied to this editor's checkbox
+	 */
+	public BooleanCheckbox(Composite parent, int style) {
+		this(parent, style, null);
+	}
+
+	/**
+	 *
+	 * Constructor. Creates a new Property Editor for a Boolean
+	 * value, represented as a Checkbox, with the given label
+	 *
+	 * @param parent
+	 *            This editor's parent composite
+	 * @param style
+	 *            The style applied to this editor's checkbox
+	 * @param label
+	 *            The label for this editor
+	 */
+	public BooleanCheckbox(Composite parent, int style, String label) {
+		super(parent);
+		checkbox = factory.createButton(this, label, SWT.CHECK | style);
+
+		IObservableValue widgetObservable = WidgetProperties.selection().observe(checkbox);
+		setWidgetObservable(widgetObservable, true);
+		GridData gridData = getDefaultLayoutData();
+		checkbox.setLayoutData(gridData);
+		gridData.horizontalIndent = FieldDecorationRegistry.getDefault().getMaximumDecorationWidth();
+
+
+	}
+
+	@Override
+	public void setModelObservable(IObservableValue modelProperty) {
+		IObservableValue newWidgetObservable;
+
+		if (this.widgetObservable != null) {
+			this.widgetObservable.dispose();
+		}
+
+		if (modelProperty instanceof AggregatedObservable) {
+			this.aggregated = (AggregatedObservable) modelProperty;
+			newWidgetObservable = new GrayedCheckboxObservableValue(checkbox, aggregated);
+		} else {
+			newWidgetObservable = WidgetProperties.selection().observe(checkbox);
+		}
+		setWidgetObservable(newWidgetObservable, true);
+		super.setModelObservable(modelProperty);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object getEditableType() {
+		return Boolean.class;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getValue() {
+		return checkbox.getSelection();
+	}
+
+	@Override
+	public void setReadOnly(boolean readOnly) {
+		checkbox.setEnabled(!readOnly);
+	}
+
+	@Override
+	public boolean isReadOnly() {
+		return !checkbox.isEnabled();
+	}
+
+	@Override
+	public void setToolTipText(String text) {
+		checkbox.setToolTipText(text);
+		super.setLabelToolTipText(text);
+	}
+
+	@Override
+	public void setLabel(String label) {
+		checkbox.setText(label);
+	}
+
+	/**
+	 * Sets this widget's value
+	 *
+	 * @param selected
+	 *            Whether the checkbox should be selected or not
+	 */
+	public void setValue(Boolean selected) {
+		if (modelProperty != null) {
+			modelProperty.setValue(selected);
+		}
+		widgetObservable.setValue(selected);
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanCombo.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanCombo.java
index 4cc16cdb29a..4672085f927 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanCombo.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanCombo.java
@@ -1,144 +1,144 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.jface.databinding.viewers.ViewerProperties;

-import org.eclipse.jface.viewers.ComboViewer;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.infra.widgets.providers.AbstractStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CCombo;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * An editor representing a boolean value as a combo box, with

- * two options (true / false)

- *

- * @author Camille Letavernier

- *

- */

-public class BooleanCombo extends AbstractValueEditor {

-

-	private ComboViewer viewer;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The Composite widget in which this editor will be displayed

-	 */

-	public BooleanCombo(Composite parent) {

-		this(parent, SWT.NONE, null);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The Composite widget in which this editor will be displayed

-	 * @param style

-	 *            The style of this editor's CCombo

-	 * @param label

-	 *            This editor's label

-	 */

-	public BooleanCombo(Composite parent, int style, String label) {

-		super(parent, style, label);

-		CCombo combo = factory.createCCombo(this, style | SWT.BORDER);

-		combo.setBackground(new Color(combo.getDisplay(), 255, 255, 255));

-		combo.setLayoutData(getDefaultLayoutData());

-		combo.setEditable(false);

-		viewer = createComboViewer(combo);

-

-		viewer.setContentProvider(new EncapsulatedContentProvider(new AbstractStaticContentProvider() {

-

-			@Override

-			public Object[] getElements() {

-				return new Boolean[] { Boolean.TRUE, Boolean.FALSE };

-			}

-		}));

-

-		viewer.setInput(""); //$NON-NLS-1$

-

-		setWidgetObservable(ViewerProperties.singleSelection().observe(viewer));

-

-		setCommitOnFocusLost(combo);

-

-	}

-

-	/**

-	 * Creates the combo viewer

-	 *

-	 * @param combo

-	 *            The parent combo

-	 * @return the combo viewer.

-	 */

-	protected ComboViewer createComboViewer(CCombo combo) {

-		return new ComboViewer(combo);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The Composite widget in which this editor will be displayed

-	 * @param style

-	 *            The style of this editor's CCombo

-	 */

-	public BooleanCombo(Composite parent, int style) {

-		this(parent, style, null);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The Composite widget in which this editor will be displayed

-	 * @param label

-	 *            This editor's label

-	 */

-	public BooleanCombo(Composite parent, String label) {

-		this(parent, SWT.NONE, label);

-	}

-

-	@Override

-	public Object getValue() {

-		return ((StructuredSelection) viewer.getSelection()).getFirstElement();

-	}

-

-	@Override

-	public Object getEditableType() {

-		return Boolean.class;

-	}

-

-	@Override

-	public void setReadOnly(boolean readOnly) {

-		viewer.getCCombo().setEnabled(!readOnly);

-	}

-

-	@Override

-	public boolean isReadOnly() {

-		return !viewer.getCCombo().isEnabled();

-	}

-

-	@Override

-	public void setToolTipText(String text) {

-		viewer.getCCombo().setToolTipText(text);

-		super.setLabelToolTipText(text);

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.infra.widgets.providers.AbstractStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CCombo;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * An editor representing a boolean value as a combo box, with
+ * two options (true / false)
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class BooleanCombo extends AbstractValueEditor {
+
+	private ComboViewer viewer;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The Composite widget in which this editor will be displayed
+	 */
+	public BooleanCombo(Composite parent) {
+		this(parent, SWT.NONE, null);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The Composite widget in which this editor will be displayed
+	 * @param style
+	 *            The style of this editor's CCombo
+	 * @param label
+	 *            This editor's label
+	 */
+	public BooleanCombo(Composite parent, int style, String label) {
+		super(parent, style, label);
+		CCombo combo = factory.createCCombo(this, style | SWT.BORDER);
+		combo.setBackground(new Color(combo.getDisplay(), 255, 255, 255));
+		combo.setLayoutData(getDefaultLayoutData());
+		combo.setEditable(false);
+		viewer = createComboViewer(combo);
+
+		viewer.setContentProvider(new EncapsulatedContentProvider(new AbstractStaticContentProvider() {
+
+			@Override
+			public Object[] getElements() {
+				return new Boolean[] { Boolean.TRUE, Boolean.FALSE };
+			}
+		}));
+
+		viewer.setInput(""); //$NON-NLS-1$
+
+		setWidgetObservable(ViewerProperties.singleSelection().observe(viewer));
+
+		setCommitOnFocusLost(combo);
+
+	}
+
+	/**
+	 * Creates the combo viewer
+	 *
+	 * @param combo
+	 *            The parent combo
+	 * @return the combo viewer.
+	 */
+	protected ComboViewer createComboViewer(CCombo combo) {
+		return new ComboViewer(combo);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The Composite widget in which this editor will be displayed
+	 * @param style
+	 *            The style of this editor's CCombo
+	 */
+	public BooleanCombo(Composite parent, int style) {
+		this(parent, style, null);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The Composite widget in which this editor will be displayed
+	 * @param label
+	 *            This editor's label
+	 */
+	public BooleanCombo(Composite parent, String label) {
+		this(parent, SWT.NONE, label);
+	}
+
+	@Override
+	public Object getValue() {
+		return ((StructuredSelection) viewer.getSelection()).getFirstElement();
+	}
+
+	@Override
+	public Object getEditableType() {
+		return Boolean.class;
+	}
+
+	@Override
+	public void setReadOnly(boolean readOnly) {
+		viewer.getCCombo().setEnabled(!readOnly);
+	}
+
+	@Override
+	public boolean isReadOnly() {
+		return !viewer.getCCombo().isEnabled();
+	}
+
+	@Override
+	public void setToolTipText(String text) {
+		viewer.getCCombo().setToolTipText(text);
+		super.setLabelToolTipText(text);
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanRadio.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanRadio.java
index fdbfee994e7..9b9ba41f4f9 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanRadio.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanRadio.java
@@ -1,144 +1,144 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.core.databinding.observable.value.IObservableValue;

-import org.eclipse.core.databinding.observable.value.SelectObservableValue;

-import org.eclipse.jface.databinding.swt.WidgetProperties;

-import org.eclipse.jface.fieldassist.ControlDecoration;

-import org.eclipse.jface.fieldassist.FieldDecorationRegistry;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * A Property Editor representing a Boolean value

- * as a Radio, with two options (true/false).

- *

- * @author Camille Letavernier

- *

- */

-public class BooleanRadio extends AbstractValueEditor {

-

-	/**

-	 * The "true" radio button

-	 */

-	protected Button trueRadio;

-

-	/**

-	 * The "false" radio button

-	 */

-	protected Button falseRadio;

-

-	private ControlDecoration controlDecoration;

-

-

-	/**

-	 *

-	 * Constructor. Creates a new Property Editor for a Boolean

-	 * value, represented by two radio buttons.

-	 *

-	 * @param parent

-	 *            This editor's parent composite

-	 * @param style

-	 *            The style applied to this editor's radio buttons

-	 */

-	public BooleanRadio(Composite parent, int style) {

-		this(parent, style, null);

-	}

-

-	/**

-	 *

-	 * Constructor. Creates a new Property Editor for a Boolean

-	 * value, represented by two radio buttons.

-	 *

-	 * @param parent

-	 *            This editor's parent composite

-	 * @param style

-	 *            The style applied to this editor's radio buttons

-	 * @param label

-	 *            The label for this editor

-	 */

-	public BooleanRadio(Composite parent, int style, String label) {

-		super(parent, label);

-

-		((GridLayout) getLayout()).numColumns = 3;

-

-		trueRadio = factory.createButton(this, "true", style | SWT.RADIO); //$NON-NLS-1$

-		trueRadio.setBackground(this.getBackground()); // For Radio buttons, we need to force the color

-

-		falseRadio = factory.createButton(this, "false", style | SWT.RADIO); //$NON-NLS-1$

-		falseRadio.setBackground(this.getBackground()); // For Radio buttons, we need to force the color

-

-		setWidgetObservable(getObservable(), true);

-		controlDecoration = new ControlDecoration(trueRadio, SWT.TOP | SWT.LEFT);

-		GridData gridData = new GridData();

-		trueRadio.setLayoutData(gridData);

-		falseRadio.setLayoutData(gridData);

-		gridData.horizontalIndent = FieldDecorationRegistry.getDefault().getMaximumDecorationWidth();

-	}

-

-	/**

-	 * Defines a single observable value, encapsulating the ones

-	 * from each radio button (true / false)

-	 *

-	 * @return The encapsulating observable value

-	 */

-	private IObservableValue getObservable() {

-		IObservableValue trueObservable = WidgetProperties.selection().observe(trueRadio);

-		IObservableValue falseObservable = WidgetProperties.selection().observe(falseRadio);

-

-		SelectObservableValue observable = new SelectObservableValue();

-		observable.addOption(true, trueObservable);

-		observable.addOption(false, falseObservable);

-

-		return observable;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object getEditableType() {

-		return Boolean.class;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Boolean getValue() {

-		return trueRadio.getSelection();

-	}

-

-	@Override

-	public void setReadOnly(boolean readOnly) {

-		trueRadio.setEnabled(!readOnly);

-		falseRadio.setEnabled(!readOnly);

-	}

-

-	@Override

-	public boolean isReadOnly() {

-		return !trueRadio.isEnabled() || !falseRadio.isEnabled();

-	}

-

-	@Override

-	public void setToolTipText(String text) {

-		trueRadio.setToolTipText(text);

-		falseRadio.setToolTipText(text);

-		super.setLabelToolTipText(text);

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.SelectObservableValue;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.fieldassist.ControlDecoration;
+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A Property Editor representing a Boolean value
+ * as a Radio, with two options (true/false).
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class BooleanRadio extends AbstractValueEditor {
+
+	/**
+	 * The "true" radio button
+	 */
+	protected Button trueRadio;
+
+	/**
+	 * The "false" radio button
+	 */
+	protected Button falseRadio;
+
+	private ControlDecoration controlDecoration;
+
+
+	/**
+	 *
+	 * Constructor. Creates a new Property Editor for a Boolean
+	 * value, represented by two radio buttons.
+	 *
+	 * @param parent
+	 *            This editor's parent composite
+	 * @param style
+	 *            The style applied to this editor's radio buttons
+	 */
+	public BooleanRadio(Composite parent, int style) {
+		this(parent, style, null);
+	}
+
+	/**
+	 *
+	 * Constructor. Creates a new Property Editor for a Boolean
+	 * value, represented by two radio buttons.
+	 *
+	 * @param parent
+	 *            This editor's parent composite
+	 * @param style
+	 *            The style applied to this editor's radio buttons
+	 * @param label
+	 *            The label for this editor
+	 */
+	public BooleanRadio(Composite parent, int style, String label) {
+		super(parent, label);
+
+		((GridLayout) getLayout()).numColumns = 3;
+
+		trueRadio = factory.createButton(this, "true", style | SWT.RADIO); //$NON-NLS-1$
+		trueRadio.setBackground(this.getBackground()); // For Radio buttons, we need to force the color
+
+		falseRadio = factory.createButton(this, "false", style | SWT.RADIO); //$NON-NLS-1$
+		falseRadio.setBackground(this.getBackground()); // For Radio buttons, we need to force the color
+
+		setWidgetObservable(getObservable(), true);
+		controlDecoration = new ControlDecoration(trueRadio, SWT.TOP | SWT.LEFT);
+		GridData gridData = new GridData();
+		trueRadio.setLayoutData(gridData);
+		falseRadio.setLayoutData(gridData);
+		gridData.horizontalIndent = FieldDecorationRegistry.getDefault().getMaximumDecorationWidth();
+	}
+
+	/**
+	 * Defines a single observable value, encapsulating the ones
+	 * from each radio button (true / false)
+	 *
+	 * @return The encapsulating observable value
+	 */
+	private IObservableValue getObservable() {
+		IObservableValue trueObservable = WidgetProperties.selection().observe(trueRadio);
+		IObservableValue falseObservable = WidgetProperties.selection().observe(falseRadio);
+
+		SelectObservableValue observable = new SelectObservableValue();
+		observable.addOption(true, trueObservable);
+		observable.addOption(false, falseObservable);
+
+		return observable;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object getEditableType() {
+		return Boolean.class;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean getValue() {
+		return trueRadio.getSelection();
+	}
+
+	@Override
+	public void setReadOnly(boolean readOnly) {
+		trueRadio.setEnabled(!readOnly);
+		falseRadio.setEnabled(!readOnly);
+	}
+
+	@Override
+	public boolean isReadOnly() {
+		return !trueRadio.isEnabled() || !falseRadio.isEnabled();
+	}
+
+	@Override
+	public void setToolTipText(String text) {
+		trueRadio.setToolTipText(text);
+		falseRadio.setToolTipText(text);
+		super.setLabelToolTipText(text);
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanToggle.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanToggle.java
index 8b59975475c..64207141577 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanToggle.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanToggle.java
@@ -1,179 +1,179 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.jface.databinding.swt.WidgetProperties;

-import org.eclipse.jface.fieldassist.ControlDecoration;

-import org.eclipse.jface.fieldassist.FieldDecoration;

-import org.eclipse.jface.fieldassist.FieldDecorationRegistry;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * A widget to represent boolean values as a Toggle Button.

- * The Button may have either an Icon or a Text

- *

- * @author Camille Letavernier

- *

- */

-public class BooleanToggle extends AbstractValueEditor {

-

-	private Button toggleButton;

-	private ControlDecoration controlDecoration;

-

-	private BooleanToggle(Composite parent, int style, String label, Image image, String text) {

-		super(parent, SWT.NONE, label);

-

-		toggleButton = factory.createButton(this, null, style | SWT.TOGGLE);

-		setWidgetObservable(WidgetProperties.selection().observe(toggleButton));

-		setCommitOnFocusLost(toggleButton);

-		GridData gridData = new GridData();

-		toggleButton.setLayoutData(gridData);

-

-		toggleButton.addSelectionListener(new SelectionListener() {

-

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				commit();

-			}

-

-			@Override

-			public void widgetDefaultSelected(SelectionEvent e) {

-				// Nothing

-			}

-		});

-

-		setText(text);

-		setImage(image);

-		gridData.horizontalIndent = FieldDecorationRegistry.getDefault().getMaximumDecorationWidth();

-

-		controlDecoration = new ControlDecoration(toggleButton, SWT.TOP | SWT.LEFT);

-	}

-

-	public BooleanToggle(Composite parent, int style, String label, String text) {

-		this(parent, style, label, null, text);

-	}

-

-	public BooleanToggle(Composite parent, int style, String label, Image image) {

-		this(parent, style, label, image, null);

-	}

-

-	public BooleanToggle(Composite parent) {

-		this(parent, SWT.NONE, null, null, null);

-	}

-

-	public BooleanToggle(Composite parent, int style) {

-		this(parent, style, null, null, null);

-	}

-

-	/**

-	 * Sets this button's text

-	 *

-	 * @param text

-	 *            The text to set to this button

-	 */

-	public void setText(String text) {

-		if (text != null) {

-			toggleButton.setText(text);

-		}

-	}

-

-	/**

-	 * Sets this button's image

-	 *

-	 * @param image

-	 *            The image to set to this button

-	 */

-	public void setImage(Image image) {

-		if (image != null) {

-			toggleButton.setImage(image);

-		}

-	}

-

-	@Override

-	public Boolean getValue() {

-		return toggleButton.getSelection();

-	}

-

-	@Override

-	public Object getEditableType() {

-		return Boolean.class;

-	}

-

-	@Override

-	public void setReadOnly(boolean readOnly) {

-		toggleButton.setEnabled(!readOnly);

-	}

-

-	@Override

-	public boolean isReadOnly() {

-		return !toggleButton.isEnabled();

-	}

-

-	@Override

-	public void setToolTipText(String text) {

-		toggleButton.setToolTipText(text);

-		setLabelToolTipText(text);

-	}

-

-	/**

-	 * Indicates whether this button should be selected or not

-	 *

-	 * @param isActive

-	 *            If true, the button will be selected

-	 */

-	public void setValue(boolean isActive) {

-		toggleButton.setSelection(isActive);

-	}

-

-	@Override

-	public void updateStatus(IStatus status) {

-		// nothing

-		switch (status.getSeverity()) {

-		case IStatus.OK:

-			controlDecoration.hide();

-			break;

-		case IStatus.WARNING:

-			FieldDecoration warning = FieldDecorationRegistry.getDefault()

-					.getFieldDecoration(FieldDecorationRegistry.DEC_WARNING);

-			controlDecoration.setImage(warning.getImage());

-			controlDecoration.showHoverText(status.getMessage());

-			controlDecoration.setDescriptionText(status.getMessage());

-			controlDecoration.show();

-			break;

-		case IStatus.ERROR:

-			FieldDecoration error = FieldDecorationRegistry.getDefault()

-					.getFieldDecoration(FieldDecorationRegistry.DEC_ERROR);

-			controlDecoration.setImage(error.getImage());

-			controlDecoration.showHoverText(status.getMessage());

-			controlDecoration.setDescriptionText(status.getMessage());

-			controlDecoration.show();

-			break;

-		default:

-			controlDecoration.hide();

-			break;

-		}

-	}

-

-	@Override

-	public void changeColorField() {

-

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.fieldassist.ControlDecoration;
+import org.eclipse.jface.fieldassist.FieldDecoration;
+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A widget to represent boolean values as a Toggle Button.
+ * The Button may have either an Icon or a Text
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class BooleanToggle extends AbstractValueEditor {
+
+	private Button toggleButton;
+	private ControlDecoration controlDecoration;
+
+	private BooleanToggle(Composite parent, int style, String label, Image image, String text) {
+		super(parent, SWT.NONE, label);
+
+		toggleButton = factory.createButton(this, null, style | SWT.TOGGLE);
+		setWidgetObservable(WidgetProperties.selection().observe(toggleButton));
+		setCommitOnFocusLost(toggleButton);
+		GridData gridData = new GridData();
+		toggleButton.setLayoutData(gridData);
+
+		toggleButton.addSelectionListener(new SelectionListener() {
+
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				commit();
+			}
+
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// Nothing
+			}
+		});
+
+		setText(text);
+		setImage(image);
+		gridData.horizontalIndent = FieldDecorationRegistry.getDefault().getMaximumDecorationWidth();
+
+		controlDecoration = new ControlDecoration(toggleButton, SWT.TOP | SWT.LEFT);
+	}
+
+	public BooleanToggle(Composite parent, int style, String label, String text) {
+		this(parent, style, label, null, text);
+	}
+
+	public BooleanToggle(Composite parent, int style, String label, Image image) {
+		this(parent, style, label, image, null);
+	}
+
+	public BooleanToggle(Composite parent) {
+		this(parent, SWT.NONE, null, null, null);
+	}
+
+	public BooleanToggle(Composite parent, int style) {
+		this(parent, style, null, null, null);
+	}
+
+	/**
+	 * Sets this button's text
+	 *
+	 * @param text
+	 *            The text to set to this button
+	 */
+	public void setText(String text) {
+		if (text != null) {
+			toggleButton.setText(text);
+		}
+	}
+
+	/**
+	 * Sets this button's image
+	 *
+	 * @param image
+	 *            The image to set to this button
+	 */
+	public void setImage(Image image) {
+		if (image != null) {
+			toggleButton.setImage(image);
+		}
+	}
+
+	@Override
+	public Boolean getValue() {
+		return toggleButton.getSelection();
+	}
+
+	@Override
+	public Object getEditableType() {
+		return Boolean.class;
+	}
+
+	@Override
+	public void setReadOnly(boolean readOnly) {
+		toggleButton.setEnabled(!readOnly);
+	}
+
+	@Override
+	public boolean isReadOnly() {
+		return !toggleButton.isEnabled();
+	}
+
+	@Override
+	public void setToolTipText(String text) {
+		toggleButton.setToolTipText(text);
+		setLabelToolTipText(text);
+	}
+
+	/**
+	 * Indicates whether this button should be selected or not
+	 *
+	 * @param isActive
+	 *            If true, the button will be selected
+	 */
+	public void setValue(boolean isActive) {
+		toggleButton.setSelection(isActive);
+	}
+
+	@Override
+	public void updateStatus(IStatus status) {
+		// nothing
+		switch (status.getSeverity()) {
+		case IStatus.OK:
+			controlDecoration.hide();
+			break;
+		case IStatus.WARNING:
+			FieldDecoration warning = FieldDecorationRegistry.getDefault()
+					.getFieldDecoration(FieldDecorationRegistry.DEC_WARNING);
+			controlDecoration.setImage(warning.getImage());
+			controlDecoration.showHoverText(status.getMessage());
+			controlDecoration.setDescriptionText(status.getMessage());
+			controlDecoration.show();
+			break;
+		case IStatus.ERROR:
+			FieldDecoration error = FieldDecorationRegistry.getDefault()
+					.getFieldDecoration(FieldDecorationRegistry.DEC_ERROR);
+			controlDecoration.setImage(error.getImage());
+			controlDecoration.showHoverText(status.getMessage());
+			controlDecoration.setDescriptionText(status.getMessage());
+			controlDecoration.show();
+			break;
+		default:
+			controlDecoration.hide();
+			break;
+		}
+	}
+
+	@Override
+	public void changeColorField() {
+
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BrowseFileEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BrowseFileEditor.java
index 854a6e094a8..854a6e094a8 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BrowseFileEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BrowseFileEditor.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleIntegerEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleIntegerEditor.java
index e76c3e7b616..c281c5697be 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleIntegerEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleIntegerEditor.java
@@ -1,73 +1,73 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.papyrus.infra.widgets.selectors.IntegerSelector;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * A compact editor for multivalued Integer attributes

- *

- * @author Camille Letavernier

- *

- */

-public class CompactMultipleIntegerEditor extends CompactMultipleValueEditor {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The Composite widget in which this editor will be displayed

-	 * @param style

-	 *            The value label's style

-	 */

-	public CompactMultipleIntegerEditor(Composite parent, int style) {

-		this(parent, style, true, false, DEFAULT_VALUE_SEPARATOR, null);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The Composite widget in which this editor will be displayed

-	 * @param style

-	 *            The value label's style

-	 * @param ordered

-	 *            True if the values should be ordered

-	 * @param unique

-	 *            True if the values should be unique

-	 */

-	public CompactMultipleIntegerEditor(Composite parent, int style, boolean ordered, boolean unique) {

-		this(parent, style, ordered, unique, DEFAULT_VALUE_SEPARATOR, null);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The Composite widget in which this editor will be displayed

-	 * @param style

-	 *            The value label's style

-	 * @param ordered

-	 *            True if the values should be ordered

-	 * @param unique

-	 *            True if the values should be unique

-	 * @param separator

-	 *            The String used to separate the different values in the value label

-	 * @param label

-	 *            The editor's label

-	 */

-	public CompactMultipleIntegerEditor(Composite parent, int style, boolean ordered, boolean unique, String separator, String label) {

-		super(parent, style, new IntegerSelector(), ordered, unique, separator, label);

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import org.eclipse.papyrus.infra.widgets.selectors.IntegerSelector;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A compact editor for multivalued Integer attributes
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class CompactMultipleIntegerEditor extends CompactMultipleValueEditor {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The Composite widget in which this editor will be displayed
+	 * @param style
+	 *            The value label's style
+	 */
+	public CompactMultipleIntegerEditor(Composite parent, int style) {
+		this(parent, style, true, false, DEFAULT_VALUE_SEPARATOR, null);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The Composite widget in which this editor will be displayed
+	 * @param style
+	 *            The value label's style
+	 * @param ordered
+	 *            True if the values should be ordered
+	 * @param unique
+	 *            True if the values should be unique
+	 */
+	public CompactMultipleIntegerEditor(Composite parent, int style, boolean ordered, boolean unique) {
+		this(parent, style, ordered, unique, DEFAULT_VALUE_SEPARATOR, null);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The Composite widget in which this editor will be displayed
+	 * @param style
+	 *            The value label's style
+	 * @param ordered
+	 *            True if the values should be ordered
+	 * @param unique
+	 *            True if the values should be unique
+	 * @param separator
+	 *            The String used to separate the different values in the value label
+	 * @param label
+	 *            The editor's label
+	 */
+	public CompactMultipleIntegerEditor(Composite parent, int style, boolean ordered, boolean unique, String separator, String label) {
+		super(parent, style, new IntegerSelector(), ordered, unique, separator, label);
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleReferenceEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleReferenceEditor.java
index 544ffcccd7b..25591a493b8 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleReferenceEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleReferenceEditor.java
@@ -1,86 +1,86 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * A Property Editor representing a MultipleReference

- * as a label with the selected values. If the list

- * of values is too long, it gets truncated.

- * The values can be edited via a selection dialog.

- * This widget is useful when there is not much vertical space available,

- * and a MultipleReferenceEditor can not be used.

- *

- * @author Camille Letavernier

- *

- */

-public class CompactMultipleReferenceEditor extends CompactMultipleValueEditor {

-

-	/**

-	 * The selector for the available values

-	 */

-	protected ReferenceSelector selector;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The widget in which this editor is created

-	 * @param style

-	 *            The style for this editor's control

-	 */

-	public CompactMultipleReferenceEditor(Composite parent, int style) {

-		this(parent, style, true, false);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The widget in which this editor is created

-	 * @param style

-	 *            The style for this editor's control

-	 * @param ordered

-	 *            True if the multivalued property is ordered

-	 * @param unique

-	 *            True if the multivalued property needs unique values

-	 */

-	public CompactMultipleReferenceEditor(Composite parent, int style, boolean ordered, boolean unique) {

-		super(parent, style, new ReferenceSelector(unique), ordered, unique);

-		this.selector = (ReferenceSelector) super.selector;

-	}

-

-	/**

-	 * Sets the Content and Label providers for this widget.

-	 *

-	 * The label provider is used in each place where the values can

-	 * be displayed

-	 * The content provider is used to display the items that can be selected

-	 *

-	 * @param contentProvider

-	 *            The content provider for this widget

-	 * @param labelProvider

-	 *            The label provider for this widget

-	 */

-	public void setProviders(IStaticContentProvider contentProvider, ILabelProvider labelProvider) {

-		selector.setContentProvider(contentProvider);

-		selector.setLabelProvider(labelProvider);

-		super.setLabelProvider(labelProvider);

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A Property Editor representing a MultipleReference
+ * as a label with the selected values. If the list
+ * of values is too long, it gets truncated.
+ * The values can be edited via a selection dialog.
+ * This widget is useful when there is not much vertical space available,
+ * and a MultipleReferenceEditor can not be used.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class CompactMultipleReferenceEditor extends CompactMultipleValueEditor {
+
+	/**
+	 * The selector for the available values
+	 */
+	protected ReferenceSelector selector;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The widget in which this editor is created
+	 * @param style
+	 *            The style for this editor's control
+	 */
+	public CompactMultipleReferenceEditor(Composite parent, int style) {
+		this(parent, style, true, false);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The widget in which this editor is created
+	 * @param style
+	 *            The style for this editor's control
+	 * @param ordered
+	 *            True if the multivalued property is ordered
+	 * @param unique
+	 *            True if the multivalued property needs unique values
+	 */
+	public CompactMultipleReferenceEditor(Composite parent, int style, boolean ordered, boolean unique) {
+		super(parent, style, new ReferenceSelector(unique), ordered, unique);
+		this.selector = (ReferenceSelector) super.selector;
+	}
+
+	/**
+	 * Sets the Content and Label providers for this widget.
+	 *
+	 * The label provider is used in each place where the values can
+	 * be displayed
+	 * The content provider is used to display the items that can be selected
+	 *
+	 * @param contentProvider
+	 *            The content provider for this widget
+	 * @param labelProvider
+	 *            The label provider for this widget
+	 */
+	public void setProviders(IStaticContentProvider contentProvider, ILabelProvider labelProvider) {
+		selector.setContentProvider(contentProvider);
+		selector.setLabelProvider(labelProvider);
+		super.setLabelProvider(labelProvider);
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleStringEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleStringEditor.java
index d57e550a4de..e9c958f2c6d 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleStringEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleStringEditor.java
@@ -1,73 +1,73 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.papyrus.infra.widgets.selectors.StringSelector;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * A compact editor for multivalued String attributes

- *

- * @author Camille Letavernier

- *

- */

-public class CompactMultipleStringEditor extends CompactMultipleValueEditor {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The Composite widget in which this editor will be displayed

-	 * @param style

-	 *            The value label's style

-	 */

-	public CompactMultipleStringEditor(Composite parent, int style) {

-		this(parent, style, true, false, DEFAULT_VALUE_SEPARATOR, null);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The Composite widget in which this editor will be displayed

-	 * @param style

-	 *            The value label's style

-	 * @param ordered

-	 *            True if the values should be ordered

-	 * @param unique

-	 *            True if the values should be unique

-	 */

-	public CompactMultipleStringEditor(Composite parent, int style, boolean ordered, boolean unique) {

-		this(parent, style, ordered, unique, DEFAULT_VALUE_SEPARATOR, null);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The Composite widget in which this editor will be displayed

-	 * @param style

-	 *            The value label's style

-	 * @param ordered

-	 *            True if the values should be ordered

-	 * @param unique

-	 *            True if the values should be unique

-	 * @param separator

-	 *            The String used to separate the different values in the value label

-	 * @param label

-	 *            The editor's label

-	 */

-	public CompactMultipleStringEditor(Composite parent, int style, boolean ordered, boolean unique, String separator, String label) {

-		super(parent, style, new StringSelector(), ordered, unique, separator, label);

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import org.eclipse.papyrus.infra.widgets.selectors.StringSelector;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A compact editor for multivalued String attributes
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class CompactMultipleStringEditor extends CompactMultipleValueEditor {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The Composite widget in which this editor will be displayed
+	 * @param style
+	 *            The value label's style
+	 */
+	public CompactMultipleStringEditor(Composite parent, int style) {
+		this(parent, style, true, false, DEFAULT_VALUE_SEPARATOR, null);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The Composite widget in which this editor will be displayed
+	 * @param style
+	 *            The value label's style
+	 * @param ordered
+	 *            True if the values should be ordered
+	 * @param unique
+	 *            True if the values should be unique
+	 */
+	public CompactMultipleStringEditor(Composite parent, int style, boolean ordered, boolean unique) {
+		this(parent, style, ordered, unique, DEFAULT_VALUE_SEPARATOR, null);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The Composite widget in which this editor will be displayed
+	 * @param style
+	 *            The value label's style
+	 * @param ordered
+	 *            True if the values should be ordered
+	 * @param unique
+	 *            True if the values should be unique
+	 * @param separator
+	 *            The String used to separate the different values in the value label
+	 * @param label
+	 *            The editor's label
+	 */
+	public CompactMultipleStringEditor(Composite parent, int style, boolean ordered, boolean unique, String separator, String label) {
+		super(parent, style, new StringSelector(), ordered, unique, separator, label);
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleValueEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleValueEditor.java
index f2a4c6afcea..c17a3329f04 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleValueEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompactMultipleValueEditor.java
@@ -1,288 +1,288 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 402525

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import java.util.Collection;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.databinding.observable.ChangeEvent;

-import org.eclipse.core.databinding.observable.IChangeListener;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.jface.window.Window;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.DisposeListener;

-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.Composite;

-import org.eclipse.swt.widgets.Label;

-

-/**

- * A Property Editor representing a multivalued property as a label with the

- * selected values. If the list of values is too long, it is truncated. The

- * values can be edited via a selection dialog. This widget is useful when there

- * is not much vertical space available, and a MultipleValueEditor can not be

- * used.

- */

-public class CompactMultipleValueEditor extends AbstractListEditor implements IChangeListener, DisposeListener, SelectionListener {

-

-	/**

-	 * The default value separator in the value label

-	 */

-	protected static final String DEFAULT_VALUE_SEPARATOR = ", "; //$NON-NLS-1$

-

-	/**

-	 * The label for displayed the selected values

-	 */

-	protected Label valueLabel;

-

-	/**

-	 * The button to open a dialog for editing the values

-	 */

-	protected Button edit;

-

-	/**

-	 * The label provider for this editor. Also used by the dialog.

-	 */

-	protected ILabelProvider labelProvider;

-

-	/**

-	 * The string used for separating values in the value label

-	 */

-	protected String separator;

-

-	/**

-	 * The Dialog displayed when adding new elements

-	 */

-	protected MultipleValueSelectorDialog dialog;

-

-	/**

-	 * The element selector for the dialog

-	 */

-	protected IElementSelector selector;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The widget in which this editor is created

-	 * @param style

-	 *            The style for this editor's control

-	 * @param selector

-	 *            The IElementSelector for this editor's selection dialog

-	 */

-	public CompactMultipleValueEditor(Composite parent, int style, IElementSelector selector) {

-		this(parent, style, selector, false, false, DEFAULT_VALUE_SEPARATOR, null);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The widget in which this editor is created

-	 * @param style

-	 *            The style for this editor's control

-	 * @param selector

-	 *            The element selector to be used in the selection dialog

-	 * @param ordered

-	 *            True if the multivalued property is ordered

-	 * @param unique

-	 *            True if the multivalued property needs unique values

-	 */

-	public CompactMultipleValueEditor(Composite parent, int style, IElementSelector selector, boolean ordered, boolean unique) {

-		this(parent, style, selector, ordered, unique, DEFAULT_VALUE_SEPARATOR, null);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The widget in which this editor is created

-	 * @param style

-	 *            The style for this editor's control

-	 * @param selector

-	 *            The element selector to be used in the selection dialog

-	 * @param ordered

-	 *            True if the multivalued property is ordered

-	 * @param unique

-	 *            True if the multivalued property needs unique values

-	 * @param separator

-	 *            The string used to separate values in the display label

-	 * @param label

-	 *            The label for this editor

-	 */

-	public CompactMultipleValueEditor(Composite parent, int style, IElementSelector selector, boolean ordered, boolean unique, String separator, String label) {

-		super(parent, label);

-

-		((GridLayout) getLayout()).numColumns = 3;

-

-		valueLabel = factory.createLabel(this, null, style);

-		valueLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));

-

-		edit = new Button(this, SWT.PUSH);

-		edit.setText("..."); //$NON-NLS-1$

-		edit.addSelectionListener(this);

-		edit.setLayoutData(new GridData(SWT.END, SWT.CENTER, false, false));

-

-		this.selector = selector;

-		dialog = new MultipleValueSelectorDialog(parent.getShell(), selector, unique);

-

-		labelProvider = new LabelProvider();

-		this.separator = separator;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object getEditableType() {

-		return Collection.class;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void doBinding() {

-		// We don't do a real Databinding in this case

-		modelProperty.addChangeListener(this);

-		handleChange(null);

-	}

-

-	/**

-	 * Sets the label provider for this editor

-	 *

-	 * @param provider

-	 *            The label provider for this editor

-	 */

-	public void setLabelProvider(ILabelProvider provider) {

-		dialog.setLabelProvider(provider);

-		this.labelProvider = provider;

-	}

-

-	/**

-	 * Refreshes the Label when a change occurs on the ObservableList

-	 *

-	 * @see org.eclipse.core.databinding.observable.IChangeListener#handleChange(org.eclipse.core.databinding.observable.ChangeEvent)

-	 *

-	 * @param event

-	 */

-	@Override

-	public void handleChange(ChangeEvent event) {

-		if (modelProperty != null) {

-

-			List<String> labels = new LinkedList<String>();

-			for (Object element : modelProperty) {

-				labels.add(labelProvider.getText(element));

-			}

-

-			valueLabel.setText(createValueLabel(labels));

-		}

-	}

-

-	/**

-	 * Creates the text for the value label of this editor

-	 *

-	 * @param labels

-	 *            The labels for each selected element

-	 * @return The concatenated label

-	 */

-	protected String createValueLabel(List<String> labels) {

-		if (labels.size() == 0) {

-			return ""; //$NON-NLS-1$

-		}

-

-		String result = labels.get(0);

-		for (int i = 1; i < labels.size(); i++) {

-			result += separator + labels.get(i);

-		}

-		return result;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void dispose() {

-		if (modelProperty != null) {

-			modelProperty.removeChangeListener(this);

-		}

-		super.dispose();

-	}

-

-	/**

-	 * {@inheritDoc} Handles the event when the edit button is pressed

-	 */

-	@Override

-	public void widgetSelected(SelectionEvent e) {

-		dialog.setContextElement(getContextElement());

-		dialog.setInitialSelections(modelProperty.toArray());

-		int returnCode = dialog.open();

-		if (returnCode == Window.CANCEL) {

-			return;

-		}

-

-		modelProperty.clear();

-

-		Object[] result = dialog.getResult();

-		if (result == null) {

-			return;

-		}

-

-		java.util.List<Object> resultElements = new LinkedList<Object>();

-		for (Object r : result) {

-			resultElements.add(r);

-		}

-

-		modelProperty.addAll(resultElements);

-	}

-

-	/**

-	 * {@inheritDoc} Ignored

-	 */

-	@Override

-	public void widgetDefaultSelected(SelectionEvent e) {

-		// Nothing

-	}

-

-	@Override

-	public void setReadOnly(boolean readOnly) {

-		valueLabel.setEnabled(!readOnly);

-		edit.setEnabled(!readOnly);

-	}

-

-	@Override

-	public boolean isReadOnly() {

-		return !valueLabel.isEnabled() || !edit.isEnabled();

-	}

-

-	@Override

-	public void setToolTipText(String text) {

-		valueLabel.setToolTipText(text);

-		super.setLabelToolTipText(text);

-	}

-

-	@Override

-	public void refreshValue() {

-		handleChange(null);

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 402525
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.databinding.observable.ChangeEvent;
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeListener;
+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.Composite;
+import org.eclipse.swt.widgets.Label;
+
+/**
+ * A Property Editor representing a multivalued property as a label with the
+ * selected values. If the list of values is too long, it is truncated. The
+ * values can be edited via a selection dialog. This widget is useful when there
+ * is not much vertical space available, and a MultipleValueEditor can not be
+ * used.
+ */
+public class CompactMultipleValueEditor extends AbstractListEditor implements IChangeListener, DisposeListener, SelectionListener {
+
+	/**
+	 * The default value separator in the value label
+	 */
+	protected static final String DEFAULT_VALUE_SEPARATOR = ", "; //$NON-NLS-1$
+
+	/**
+	 * The label for displayed the selected values
+	 */
+	protected Label valueLabel;
+
+	/**
+	 * The button to open a dialog for editing the values
+	 */
+	protected Button edit;
+
+	/**
+	 * The label provider for this editor. Also used by the dialog.
+	 */
+	protected ILabelProvider labelProvider;
+
+	/**
+	 * The string used for separating values in the value label
+	 */
+	protected String separator;
+
+	/**
+	 * The Dialog displayed when adding new elements
+	 */
+	protected MultipleValueSelectorDialog dialog;
+
+	/**
+	 * The element selector for the dialog
+	 */
+	protected IElementSelector selector;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The widget in which this editor is created
+	 * @param style
+	 *            The style for this editor's control
+	 * @param selector
+	 *            The IElementSelector for this editor's selection dialog
+	 */
+	public CompactMultipleValueEditor(Composite parent, int style, IElementSelector selector) {
+		this(parent, style, selector, false, false, DEFAULT_VALUE_SEPARATOR, null);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The widget in which this editor is created
+	 * @param style
+	 *            The style for this editor's control
+	 * @param selector
+	 *            The element selector to be used in the selection dialog
+	 * @param ordered
+	 *            True if the multivalued property is ordered
+	 * @param unique
+	 *            True if the multivalued property needs unique values
+	 */
+	public CompactMultipleValueEditor(Composite parent, int style, IElementSelector selector, boolean ordered, boolean unique) {
+		this(parent, style, selector, ordered, unique, DEFAULT_VALUE_SEPARATOR, null);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The widget in which this editor is created
+	 * @param style
+	 *            The style for this editor's control
+	 * @param selector
+	 *            The element selector to be used in the selection dialog
+	 * @param ordered
+	 *            True if the multivalued property is ordered
+	 * @param unique
+	 *            True if the multivalued property needs unique values
+	 * @param separator
+	 *            The string used to separate values in the display label
+	 * @param label
+	 *            The label for this editor
+	 */
+	public CompactMultipleValueEditor(Composite parent, int style, IElementSelector selector, boolean ordered, boolean unique, String separator, String label) {
+		super(parent, label);
+
+		((GridLayout) getLayout()).numColumns = 3;
+
+		valueLabel = factory.createLabel(this, null, style);
+		valueLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+
+		edit = new Button(this, SWT.PUSH);
+		edit.setText("..."); //$NON-NLS-1$
+		edit.addSelectionListener(this);
+		edit.setLayoutData(new GridData(SWT.END, SWT.CENTER, false, false));
+
+		this.selector = selector;
+		dialog = new MultipleValueSelectorDialog(parent.getShell(), selector, unique);
+
+		labelProvider = new LabelProvider();
+		this.separator = separator;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object getEditableType() {
+		return Collection.class;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void doBinding() {
+		// We don't do a real Databinding in this case
+		modelProperty.addChangeListener(this);
+		handleChange(null);
+	}
+
+	/**
+	 * Sets the label provider for this editor
+	 *
+	 * @param provider
+	 *            The label provider for this editor
+	 */
+	public void setLabelProvider(ILabelProvider provider) {
+		dialog.setLabelProvider(provider);
+		this.labelProvider = provider;
+	}
+
+	/**
+	 * Refreshes the Label when a change occurs on the ObservableList
+	 *
+	 * @see org.eclipse.core.databinding.observable.IChangeListener#handleChange(org.eclipse.core.databinding.observable.ChangeEvent)
+	 *
+	 * @param event
+	 */
+	@Override
+	public void handleChange(ChangeEvent event) {
+		if (modelProperty != null) {
+
+			List<String> labels = new LinkedList<String>();
+			for (Object element : modelProperty) {
+				labels.add(labelProvider.getText(element));
+			}
+
+			valueLabel.setText(createValueLabel(labels));
+		}
+	}
+
+	/**
+	 * Creates the text for the value label of this editor
+	 *
+	 * @param labels
+	 *            The labels for each selected element
+	 * @return The concatenated label
+	 */
+	protected String createValueLabel(List<String> labels) {
+		if (labels.size() == 0) {
+			return ""; //$NON-NLS-1$
+		}
+
+		String result = labels.get(0);
+		for (int i = 1; i < labels.size(); i++) {
+			result += separator + labels.get(i);
+		}
+		return result;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void dispose() {
+		if (modelProperty != null) {
+			modelProperty.removeChangeListener(this);
+		}
+		super.dispose();
+	}
+
+	/**
+	 * {@inheritDoc} Handles the event when the edit button is pressed
+	 */
+	@Override
+	public void widgetSelected(SelectionEvent e) {
+		dialog.setContextElement(getContextElement());
+		dialog.setInitialSelections(modelProperty.toArray());
+		int returnCode = dialog.open();
+		if (returnCode == Window.CANCEL) {
+			return;
+		}
+
+		modelProperty.clear();
+
+		Object[] result = dialog.getResult();
+		if (result == null) {
+			return;
+		}
+
+		java.util.List<Object> resultElements = new LinkedList<Object>();
+		for (Object r : result) {
+			resultElements.add(r);
+		}
+
+		modelProperty.addAll(resultElements);
+	}
+
+	/**
+	 * {@inheritDoc} Ignored
+	 */
+	@Override
+	public void widgetDefaultSelected(SelectionEvent e) {
+		// Nothing
+	}
+
+	@Override
+	public void setReadOnly(boolean readOnly) {
+		valueLabel.setEnabled(!readOnly);
+		edit.setEnabled(!readOnly);
+	}
+
+	@Override
+	public boolean isReadOnly() {
+		return !valueLabel.isEnabled() || !edit.isEnabled();
+	}
+
+	@Override
+	public void setToolTipText(String text) {
+		valueLabel.setToolTipText(text);
+		super.setLabelToolTipText(text);
+	}
+
+	@Override
+	public void refreshValue() {
+		handleChange(null);
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompletionStyledTextMultipleReferenceEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompletionStyledTextMultipleReferenceEditor.java
index 7103ed3b46e..7103ed3b46e 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompletionStyledTextMultipleReferenceEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompletionStyledTextMultipleReferenceEditor.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompletionStyledTextReferenceDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompletionStyledTextReferenceDialog.java
index 8c7847d3b0a..8c7847d3b0a 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompletionStyledTextReferenceDialog.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompletionStyledTextReferenceDialog.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompletionStyledTextStringEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompletionStyledTextStringEditor.java
index 367b67aa907..367b67aa907 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompletionStyledTextStringEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/CompletionStyledTextStringEditor.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/DoubleEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/DoubleEditor.java
index 637ef06a01d..d76d447681b 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/DoubleEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/DoubleEditor.java
@@ -1,120 +1,120 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-

-import org.eclipse.core.databinding.conversion.IConverter;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.papyrus.infra.widgets.validator.RealValidator;

-import org.eclipse.swt.widgets.Composite;

-

-

-/**

- * An editor representing a float value as a text box

- *

- * @author Camille Letavernier

- */

-public class DoubleEditor extends StringEditor {

-

-	private IConverter targetToModelConverter;

-

-	/**

-	 *

-	 * Constructs an Editor for a Double value. The widget is a Text field.

-	 *

-	 * @param parent

-	 *            The Composite in which the editor is created

-	 * @param style

-	 *            The Text's style

-	 */

-	public DoubleEditor(Composite parent, int style) {

-		super(parent, style);

-

-		targetValidator = new RealValidator();

-		targetToModelConverter = new IConverter() {

-

-			@Override

-			public Object getFromType() {

-				return String.class;

-			}

-

-			@Override

-			public Object getToType() {

-				return Double.class;

-			}

-

-			@Override

-			public Double convert(Object fromObject) {

-				if (fromObject instanceof String) {

-					String newString = ((String) fromObject)

-							.replaceAll(" ", ""); //$NON-NLS-1$ //$NON-NLS-2$

-					try {

-						return Double.parseDouble(newString);

-					} catch (NumberFormatException ex) {

-						Activator.log.error(ex);

-						return null;

-					}

-				}

-				return null;

-			}

-

-		};

-

-		IConverter doubleToString = new IConverter() {

-

-			@Override

-			public Object getFromType() {

-				return Double.class;

-			}

-

-			@Override

-			public Object getToType() {

-				return String.class;

-			}

-

-			@Override

-			public Object convert(Object fromObject) {

-				if (fromObject instanceof Double) {

-					return Double.toString((Double) fromObject);

-				}

-				return ""; //$NON-NLS-1$

-			}

-		};

-		setValidateOnDelay(true);

-		setConverters(targetToModelConverter, doubleToString);

-		setTargetAfterGetValidator(targetValidator);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object getEditableType() {

-		return Double.class;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Double getValue() {

-		try {

-			return (Double) targetToModelConverter.convert(super.getValue());

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-			return null;

-		}

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+
+import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.validator.RealValidator;
+import org.eclipse.swt.widgets.Composite;
+
+
+/**
+ * An editor representing a float value as a text box
+ *
+ * @author Camille Letavernier
+ */
+public class DoubleEditor extends StringEditor {
+
+	private IConverter targetToModelConverter;
+
+	/**
+	 *
+	 * Constructs an Editor for a Double value. The widget is a Text field.
+	 *
+	 * @param parent
+	 *            The Composite in which the editor is created
+	 * @param style
+	 *            The Text's style
+	 */
+	public DoubleEditor(Composite parent, int style) {
+		super(parent, style);
+
+		targetValidator = new RealValidator();
+		targetToModelConverter = new IConverter() {
+
+			@Override
+			public Object getFromType() {
+				return String.class;
+			}
+
+			@Override
+			public Object getToType() {
+				return Double.class;
+			}
+
+			@Override
+			public Double convert(Object fromObject) {
+				if (fromObject instanceof String) {
+					String newString = ((String) fromObject)
+							.replaceAll(" ", ""); //$NON-NLS-1$ //$NON-NLS-2$
+					try {
+						return Double.parseDouble(newString);
+					} catch (NumberFormatException ex) {
+						Activator.log.error(ex);
+						return null;
+					}
+				}
+				return null;
+			}
+
+		};
+
+		IConverter doubleToString = new IConverter() {
+
+			@Override
+			public Object getFromType() {
+				return Double.class;
+			}
+
+			@Override
+			public Object getToType() {
+				return String.class;
+			}
+
+			@Override
+			public Object convert(Object fromObject) {
+				if (fromObject instanceof Double) {
+					return Double.toString((Double) fromObject);
+				}
+				return ""; //$NON-NLS-1$
+			}
+		};
+		setValidateOnDelay(true);
+		setConverters(targetToModelConverter, doubleToString);
+		setTargetAfterGetValidator(targetValidator);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object getEditableType() {
+		return Double.class;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Double getValue() {
+		try {
+			return (Double) targetToModelConverter.convert(super.getValue());
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+			return null;
+		}
+	}
+
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/EditorParentComposite.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/EditorParentComposite.java
index 515a0c110a6..515a0c110a6 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/EditorParentComposite.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/EditorParentComposite.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/EnumCombo.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/EnumCombo.java
index 853e49cf97a..4b22a020676 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/EnumCombo.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/EnumCombo.java
@@ -1,53 +1,53 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * An editor representing an Enumeration as a Combo

- * This Editor needs a ContentProvider describing the Enumerated values,

- * and an optional label provider

- *

- * @author Camille Letavernier

- */

-public class EnumCombo extends ReferenceCombo {

-

-	/**

-	 *

-	 * Constructs an editor for an Enumeration. The widget is a CCombo.

-	 *

-	 * @param parent

-	 *            The composite is which this editor is created

-	 * @param style

-	 *            The CCombo's style

-	 */

-	public EnumCombo(Composite parent, int style) {

-		super(parent, style);

-	}

-

-	/**

-	 *

-	 * Constructs an editor for an Enumeration. The widget is a CCombo.

-	 *

-	 * @param parent

-	 *            The composite is which this editor is created

-	 * @param style

-	 *            The CCombo's style

-	 * @param label

-	 *            The editor's label

-	 */

-	public EnumCombo(Composite parent, int style, String label) {

-		super(parent, style, label);

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * An editor representing an Enumeration as a Combo
+ * This Editor needs a ContentProvider describing the Enumerated values,
+ * and an optional label provider
+ *
+ * @author Camille Letavernier
+ */
+public class EnumCombo extends ReferenceCombo {
+
+	/**
+	 *
+	 * Constructs an editor for an Enumeration. The widget is a CCombo.
+	 *
+	 * @param parent
+	 *            The composite is which this editor is created
+	 * @param style
+	 *            The CCombo's style
+	 */
+	public EnumCombo(Composite parent, int style) {
+		super(parent, style);
+	}
+
+	/**
+	 *
+	 * Constructs an editor for an Enumeration. The widget is a CCombo.
+	 *
+	 * @param parent
+	 *            The composite is which this editor is created
+	 * @param style
+	 *            The CCombo's style
+	 * @param label
+	 *            The editor's label
+	 */
+	public EnumCombo(Composite parent, int style, String label) {
+		super(parent, style, label);
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/EnumRadio.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/EnumRadio.java
index ccf0f8cf59c..5543eaa68d3 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/EnumRadio.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/EnumRadio.java
@@ -1,261 +1,261 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.databinding.observable.value.IObservableValue;

-import org.eclipse.core.databinding.observable.value.SelectObservableValue;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.jface.databinding.swt.WidgetProperties;

-import org.eclipse.jface.fieldassist.ControlDecoration;

-import org.eclipse.jface.fieldassist.FieldDecoration;

-import org.eclipse.jface.fieldassist.FieldDecorationRegistry;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.papyrus.infra.widgets.messages.Messages;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.MapLabelProvider;

-import org.eclipse.papyrus.infra.widgets.providers.StaticContentProvider;

-import org.eclipse.swt.SWT;

-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.Control;

-

-/**

- * An editor representing an Enumeration as a list of Radio Buttons

- * If there are many possible values, it is probably more judicious to use an

- * EnumCombo.

- * This Editor needs a ContentProvider describing the Enumerated values,

- * and an optional label provider.

- *

- * @author Camille Letavernier

- *

- * @see EnumCombo

- */

-public class EnumRadio extends AbstractValueEditor {

-

-	protected IStaticContentProvider contentProvider;

-

-	protected Composite buttonsArea;

-

-	protected ILabelProvider labelProvider = new LabelProvider();

-

-	protected final Map<Button, Object> values = new HashMap<Button, Object>();

-

-	protected int numColumns = -1;

-

-	private ControlDecoration controlDecoration;

-

-	public EnumRadio(Composite parent, int style) {

-		this(parent, SWT.NONE, null);

-	}

-

-	public EnumRadio(Composite parent, int style, String label) {

-		super(parent, style, label);

-		buttonsArea = factory.createComposite(this);

-		GridData gridData = getDefaultLayoutData();

-		buttonsArea.setLayoutData(gridData);

-		GridLayout layout = new GridLayout(1, true);

-		layout.marginWidth = 0;

-		layout.marginHeight = 0;

-		buttonsArea.setLayout(layout);

-		factory.createCLabel(buttonsArea, Messages.EnumRadio_NoValue);

-		controlDecoration = new ControlDecoration(buttonsArea, SWT.TOP | SWT.LEFT);

-		gridData.horizontalIndent = FieldDecorationRegistry.getDefault().getMaximumDecorationWidth();

-

-	}

-

-

-	/**

-	 * Sets the content provider for this editor. The Content provider should

-	 * specify the values that can be set for this property

-	 *

-	 * @param contentProvider

-	 *            The Content provider returning the available values for this editor

-	 * @param labelProvider

-	 *            The label provider returning a label for each value of the

-	 *            content provider. If null, a default label provider will be used

-	 */

-	public void setProviders(IStaticContentProvider contentProvider, ILabelProvider labelProvider) {

-		this.contentProvider = contentProvider;

-		if (labelProvider != null) {

-			this.labelProvider = labelProvider;

-		}

-

-		disposeButtons();

-		if (widgetObservable != null) {

-			widgetObservable.dispose();

-		}

-

-		SelectObservableValue observable = new SelectObservableValue();

-		for (Object value : contentProvider.getElements()) {

-			Button button = factory.createButton(buttonsArea, labelProvider.getText(value), SWT.RADIO);

-			button.setBackground(buttonsArea.getBackground()); // For Radio buttons, we need to force the color

-			button.setData(value);

-			button.setToolTipText(toolTipText);

-			IObservableValue buttonObservable = WidgetProperties.selection().observe(button);

-			observable.addOption(value, buttonObservable);

-

-			values.put(button, value);

-		}

-

-		setWidgetObservable(observable, true);

-		updateLayout();

-

-		doBinding();

-	}

-

-	protected void disposeButtons() {

-		for (Control control : buttonsArea.getChildren()) {

-			control.dispose();

-		}

-		if (binding != null) {

-			binding.dispose();

-		}

-		values.clear();

-	}

-

-	/**

-	 * Sets the max number of elements per line for this editor

-	 *

-	 * @param numColumns

-	 *            The max number of elements per line. May be -1 if there should

-	 *            be a single line of elements

-	 */

-	public void setNumColumns(int numColumns) {

-		this.numColumns = numColumns;

-		updateLayout();

-	}

-

-	private void updateLayout() {

-		GridLayout gridLayout = (GridLayout) buttonsArea.getLayout();

-		gridLayout.numColumns = numColumns > 0 ? numColumns : values.size();

-		gridLayout.makeColumnsEqualWidth = numColumns > 0;

-

-		updateLabelLayout();

-	}

-

-	private void updateLabelLayout() {

-		if (label == null || label.isDisposed()) {

-			return;

-		}

-

-		if (numColumns == -1) {

-			((GridData) label.getLayoutData()).verticalAlignment = SWT.CENTER;

-		} else {

-			((GridData) label.getLayoutData()).verticalAlignment = SWT.BEGINNING;

-		}

-	}

-

-	@Override

-	protected void createLabel(String label) {

-		super.createLabel(label);

-		updateLabelLayout();

-	}

-

-	@Override

-	public Object getValue() {

-		for (Button button : values.keySet()) {

-			if (button.getSelection()) {

-				return values.get(button);

-			}

-		}

-		return null;

-	}

-

-	@Override

-	public Object getEditableType() {

-		return Object.class;

-	}

-

-	@Override

-	public void setReadOnly(boolean readOnly) {

-		for (Button button : values.keySet()) {

-			button.setEnabled(!readOnly);

-		}

-		buttonsArea.setEnabled(!readOnly);

-	}

-

-	@Override

-	public boolean isReadOnly() {

-		return !buttonsArea.isEnabled();

-	}

-

-	@Override

-	public void setToolTipText(String text) {

-		for (Button button : values.keySet()) {

-			button.setToolTipText(text);

-		}

-		super.setLabelToolTipText(text);

-	}

-

-	public void setValue(Object value) {

-		if (modelProperty != null) {

-			modelProperty.setValue(value);

-		}

-		if (widgetObservable != null) {

-			widgetObservable.setValue(value);

-		} else {

-			for (Button button : values.keySet()) {

-				if (values.get(button) == value) {

-					button.setSelection(true);

-					return;

-				}

-			}

-		}

-	}

-

-	/**

-	 * Use a Map instead of content providers to define the selectable elements

-	 * The keys are the semantic objects (contentProvider), and the values are

-	 * the labels (labelProvider)

-	 *

-	 * @param objectsAndLabels

-	 */

-	public void setEnumValues(Map<Object, String> objectsAndLabels) {

-		StaticContentProvider provider = new StaticContentProvider(objectsAndLabels.keySet().toArray());

-		LabelProvider labelProvider = new MapLabelProvider(objectsAndLabels);

-		setProviders(provider, labelProvider);

-	}

-

-	@Override

-	public void updateStatus(IStatus status) {

-		switch (status.getSeverity()) {

-		case IStatus.OK:

-			controlDecoration.hide();

-			break;

-		case IStatus.WARNING:

-			FieldDecoration warning = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_WARNING);

-			controlDecoration.setImage(warning.getImage());

-			controlDecoration.showHoverText(status.getMessage());

-			controlDecoration.setDescriptionText(status.getMessage());

-			controlDecoration.show();

-			break;

-		case IStatus.ERROR:

-			FieldDecoration error = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_ERROR);

-			controlDecoration.setImage(error.getImage());

-			controlDecoration.showHoverText(status.getMessage());

-			controlDecoration.setDescriptionText(status.getMessage());

-			controlDecoration.show();

-			break;

-		default:

-			controlDecoration.hide();

-			break;

-		}

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.SelectObservableValue;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.fieldassist.ControlDecoration;
+import org.eclipse.jface.fieldassist.FieldDecoration;
+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.MapLabelProvider;
+import org.eclipse.papyrus.infra.widgets.providers.StaticContentProvider;
+import org.eclipse.swt.SWT;
+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.Control;
+
+/**
+ * An editor representing an Enumeration as a list of Radio Buttons
+ * If there are many possible values, it is probably more judicious to use an
+ * EnumCombo.
+ * This Editor needs a ContentProvider describing the Enumerated values,
+ * and an optional label provider.
+ *
+ * @author Camille Letavernier
+ *
+ * @see EnumCombo
+ */
+public class EnumRadio extends AbstractValueEditor {
+
+	protected IStaticContentProvider contentProvider;
+
+	protected Composite buttonsArea;
+
+	protected ILabelProvider labelProvider = new LabelProvider();
+
+	protected final Map<Button, Object> values = new HashMap<Button, Object>();
+
+	protected int numColumns = -1;
+
+	private ControlDecoration controlDecoration;
+
+	public EnumRadio(Composite parent, int style) {
+		this(parent, SWT.NONE, null);
+	}
+
+	public EnumRadio(Composite parent, int style, String label) {
+		super(parent, style, label);
+		buttonsArea = factory.createComposite(this);
+		GridData gridData = getDefaultLayoutData();
+		buttonsArea.setLayoutData(gridData);
+		GridLayout layout = new GridLayout(1, true);
+		layout.marginWidth = 0;
+		layout.marginHeight = 0;
+		buttonsArea.setLayout(layout);
+		factory.createCLabel(buttonsArea, Messages.EnumRadio_NoValue);
+		controlDecoration = new ControlDecoration(buttonsArea, SWT.TOP | SWT.LEFT);
+		gridData.horizontalIndent = FieldDecorationRegistry.getDefault().getMaximumDecorationWidth();
+
+	}
+
+
+	/**
+	 * Sets the content provider for this editor. The Content provider should
+	 * specify the values that can be set for this property
+	 *
+	 * @param contentProvider
+	 *            The Content provider returning the available values for this editor
+	 * @param labelProvider
+	 *            The label provider returning a label for each value of the
+	 *            content provider. If null, a default label provider will be used
+	 */
+	public void setProviders(IStaticContentProvider contentProvider, ILabelProvider labelProvider) {
+		this.contentProvider = contentProvider;
+		if (labelProvider != null) {
+			this.labelProvider = labelProvider;
+		}
+
+		disposeButtons();
+		if (widgetObservable != null) {
+			widgetObservable.dispose();
+		}
+
+		SelectObservableValue observable = new SelectObservableValue();
+		for (Object value : contentProvider.getElements()) {
+			Button button = factory.createButton(buttonsArea, labelProvider.getText(value), SWT.RADIO);
+			button.setBackground(buttonsArea.getBackground()); // For Radio buttons, we need to force the color
+			button.setData(value);
+			button.setToolTipText(toolTipText);
+			IObservableValue buttonObservable = WidgetProperties.selection().observe(button);
+			observable.addOption(value, buttonObservable);
+
+			values.put(button, value);
+		}
+
+		setWidgetObservable(observable, true);
+		updateLayout();
+
+		doBinding();
+	}
+
+	protected void disposeButtons() {
+		for (Control control : buttonsArea.getChildren()) {
+			control.dispose();
+		}
+		if (binding != null) {
+			binding.dispose();
+		}
+		values.clear();
+	}
+
+	/**
+	 * Sets the max number of elements per line for this editor
+	 *
+	 * @param numColumns
+	 *            The max number of elements per line. May be -1 if there should
+	 *            be a single line of elements
+	 */
+	public void setNumColumns(int numColumns) {
+		this.numColumns = numColumns;
+		updateLayout();
+	}
+
+	private void updateLayout() {
+		GridLayout gridLayout = (GridLayout) buttonsArea.getLayout();
+		gridLayout.numColumns = numColumns > 0 ? numColumns : values.size();
+		gridLayout.makeColumnsEqualWidth = numColumns > 0;
+
+		updateLabelLayout();
+	}
+
+	private void updateLabelLayout() {
+		if (label == null || label.isDisposed()) {
+			return;
+		}
+
+		if (numColumns == -1) {
+			((GridData) label.getLayoutData()).verticalAlignment = SWT.CENTER;
+		} else {
+			((GridData) label.getLayoutData()).verticalAlignment = SWT.BEGINNING;
+		}
+	}
+
+	@Override
+	protected void createLabel(String label) {
+		super.createLabel(label);
+		updateLabelLayout();
+	}
+
+	@Override
+	public Object getValue() {
+		for (Button button : values.keySet()) {
+			if (button.getSelection()) {
+				return values.get(button);
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public Object getEditableType() {
+		return Object.class;
+	}
+
+	@Override
+	public void setReadOnly(boolean readOnly) {
+		for (Button button : values.keySet()) {
+			button.setEnabled(!readOnly);
+		}
+		buttonsArea.setEnabled(!readOnly);
+	}
+
+	@Override
+	public boolean isReadOnly() {
+		return !buttonsArea.isEnabled();
+	}
+
+	@Override
+	public void setToolTipText(String text) {
+		for (Button button : values.keySet()) {
+			button.setToolTipText(text);
+		}
+		super.setLabelToolTipText(text);
+	}
+
+	public void setValue(Object value) {
+		if (modelProperty != null) {
+			modelProperty.setValue(value);
+		}
+		if (widgetObservable != null) {
+			widgetObservable.setValue(value);
+		} else {
+			for (Button button : values.keySet()) {
+				if (values.get(button) == value) {
+					button.setSelection(true);
+					return;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Use a Map instead of content providers to define the selectable elements
+	 * The keys are the semantic objects (contentProvider), and the values are
+	 * the labels (labelProvider)
+	 *
+	 * @param objectsAndLabels
+	 */
+	public void setEnumValues(Map<Object, String> objectsAndLabels) {
+		StaticContentProvider provider = new StaticContentProvider(objectsAndLabels.keySet().toArray());
+		LabelProvider labelProvider = new MapLabelProvider(objectsAndLabels);
+		setProviders(provider, labelProvider);
+	}
+
+	@Override
+	public void updateStatus(IStatus status) {
+		switch (status.getSeverity()) {
+		case IStatus.OK:
+			controlDecoration.hide();
+			break;
+		case IStatus.WARNING:
+			FieldDecoration warning = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_WARNING);
+			controlDecoration.setImage(warning.getImage());
+			controlDecoration.showHoverText(status.getMessage());
+			controlDecoration.setDescriptionText(status.getMessage());
+			controlDecoration.show();
+			break;
+		case IStatus.ERROR:
+			FieldDecoration error = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_ERROR);
+			controlDecoration.setImage(error.getImage());
+			controlDecoration.showHoverText(status.getMessage());
+			controlDecoration.setDescriptionText(status.getMessage());
+			controlDecoration.show();
+			break;
+		default:
+			controlDecoration.hide();
+			break;
+		}
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/FloatEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/FloatEditor.java
index a69beeb4b74..cef28a4785e 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/FloatEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/FloatEditor.java
@@ -1,69 +1,69 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import java.util.Locale;

-

-import org.eclipse.core.databinding.conversion.IConverter;

-import org.eclipse.core.databinding.conversion.NumberToStringConverter;

-import org.eclipse.core.databinding.conversion.StringToNumberConverter;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.swt.widgets.Composite;

-

-import com.ibm.icu.text.NumberFormat;

-

-/**

- * An editor representing a float value as a text box

- *

- * @author Camille Letavernier

- */

-public class FloatEditor extends StringEditor {

-

-	private IConverter targetToModelConverter;

-

-	/**

-	 *

-	 * Constructs an Editor for a Float value. The widget is a Text field.

-	 *

-	 * @param parent

-	 *            The Composite in which the editor is created

-	 * @param style

-	 *            The Text's style

-	 */

-	public FloatEditor(Composite parent, int style) {

-		super(parent, style);

-

-		targetToModelConverter = StringToNumberConverter.toFloat(NumberFormat.getInstance(Locale.ENGLISH), true);

-		setConverters(targetToModelConverter, NumberToStringConverter.fromFloat(NumberFormat.getInstance(Locale.ENGLISH), true));

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object getEditableType() {

-		return Float.class;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Float getValue() {

-		try {

-			return (Float) targetToModelConverter.convert(super.getValue());

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-			return null;

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import java.util.Locale;
+
+import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.core.databinding.conversion.NumberToStringConverter;
+import org.eclipse.core.databinding.conversion.StringToNumberConverter;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.swt.widgets.Composite;
+
+import com.ibm.icu.text.NumberFormat;
+
+/**
+ * An editor representing a float value as a text box
+ *
+ * @author Camille Letavernier
+ */
+public class FloatEditor extends StringEditor {
+
+	private IConverter targetToModelConverter;
+
+	/**
+	 *
+	 * Constructs an Editor for a Float value. The widget is a Text field.
+	 *
+	 * @param parent
+	 *            The Composite in which the editor is created
+	 * @param style
+	 *            The Text's style
+	 */
+	public FloatEditor(Composite parent, int style) {
+		super(parent, style);
+
+		targetToModelConverter = StringToNumberConverter.toFloat(NumberFormat.getInstance(Locale.ENGLISH), true);
+		setConverters(targetToModelConverter, NumberToStringConverter.fromFloat(NumberFormat.getInstance(Locale.ENGLISH), true));
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object getEditableType() {
+		return Float.class;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Float getValue() {
+		try {
+			return (Float) targetToModelConverter.convert(super.getValue());
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+			return null;
+		}
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ICommitListener.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ICommitListener.java
index 0ff5bd09ca2..8ac36a3d56f 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ICommitListener.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ICommitListener.java
@@ -1,35 +1,35 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.core.databinding.observable.IObservable;

-

-

-/**

- * An interface for listening "Commit" events on Editors

- * This is used to implement transactions when using some editors (Especially {@link MultipleValueEditor}s)

- * When using a CommitListener, the {@link IObservable} should not directly execute

- * commands when its methods are called, but instead wait for a commit event.

- *

- * @author Camille Letavernier

- */

-public interface ICommitListener {

-

-	/**

-	 * Indicates that the implementer should apply the list of operations

-	 * received since the last commit

-	 *

-	 * @param editor

-	 *            The editor that sent the commit event

-	 */

-	public void commit(AbstractEditor editor);

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import org.eclipse.core.databinding.observable.IObservable;
+
+
+/**
+ * An interface for listening "Commit" events on Editors
+ * This is used to implement transactions when using some editors (Especially {@link MultipleValueEditor}s)
+ * When using a CommitListener, the {@link IObservable} should not directly execute
+ * commands when its methods are called, but instead wait for a commit event.
+ *
+ * @author Camille Letavernier
+ */
+public interface ICommitListener {
+
+	/**
+	 * Indicates that the implementer should apply the list of operations
+	 * received since the last commit
+	 *
+	 * @param editor
+	 *            The editor that sent the commit event
+	 */
+	public void commit(AbstractEditor editor);
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IElementSelectionListener.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IElementSelectionListener.java
index 9a96ce8e709..d4acffd0630 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IElementSelectionListener.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IElementSelectionListener.java
@@ -1,18 +1,18 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-

-public interface IElementSelectionListener {

-

-	public void addElements(Object[] elements);

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+
+public interface IElementSelectionListener {
+
+	public void addElements(Object[] elements);
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IElementSelector.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IElementSelector.java
index 67c2f3c3d71..7af7f758a53 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IElementSelector.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IElementSelector.java
@@ -1,84 +1,84 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * An interface for defining widgets that can return

- * some values.

- *

- * @author Camille Letavernier

- *

- */

-public interface IElementSelector {

-

-	/**

-	 *

-	 * @return The currently selected elements

-	 */

-	public Object[] getSelectedElements();

-

-	/**

-	 * Sets the elements that have already been chosen.

-	 *

-	 * @param elements

-	 */

-	public void setSelectedElements(Object[] elements);

-

-	/**

-	 *

-	 * @return all displayed elements. If the widget uses a filter,

-	 *         only the filtered elements should be returned

-	 */

-	public Object[] getAllElements();

-

-	/**

-	 * Creates the widgets to display this selector

-	 *

-	 * @param parent

-	 */

-	public void createControls(Composite parent);

-

-	/**

-	 * Handles the "newObjectCreated" event

-	 *

-	 * @param newObject

-	 *            The object that has been created

-	 */

-	public void newObjectCreated(Object newObject);

-

-	/**

-	 * Clears this selector. Removes all temporary elements that

-	 * may have been created.

-	 */

-	public void clearTemporaryElements();

-

-	/**

-	 * Adds a new listener to this selector.

-	 * The selector can inform the listener that new elements have

-	 * been selected

-	 *

-	 * @param listener

-	 */

-	public void addElementSelectionListener(IElementSelectionListener listener);

-

-	/**

-	 * Removes the element selection listener

-	 *

-	 * @param listener

-	 *

-	 * @see {@link #addElementSelectionListener(IElementSelectionListener)}

-	 */

-	public void removeElementSelectionListener(IElementSelectionListener listener);

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * An interface for defining widgets that can return
+ * some values.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public interface IElementSelector {
+
+	/**
+	 *
+	 * @return The currently selected elements
+	 */
+	public Object[] getSelectedElements();
+
+	/**
+	 * Sets the elements that have already been chosen.
+	 *
+	 * @param elements
+	 */
+	public void setSelectedElements(Object[] elements);
+
+	/**
+	 *
+	 * @return all displayed elements. If the widget uses a filter,
+	 *         only the filtered elements should be returned
+	 */
+	public Object[] getAllElements();
+
+	/**
+	 * Creates the widgets to display this selector
+	 *
+	 * @param parent
+	 */
+	public void createControls(Composite parent);
+
+	/**
+	 * Handles the "newObjectCreated" event
+	 *
+	 * @param newObject
+	 *            The object that has been created
+	 */
+	public void newObjectCreated(Object newObject);
+
+	/**
+	 * Clears this selector. Removes all temporary elements that
+	 * may have been created.
+	 */
+	public void clearTemporaryElements();
+
+	/**
+	 * Adds a new listener to this selector.
+	 * The selector can inform the listener that new elements have
+	 * been selected
+	 *
+	 * @param listener
+	 */
+	public void addElementSelectionListener(IElementSelectionListener listener);
+
+	/**
+	 * Removes the element selection listener
+	 *
+	 * @param listener
+	 *
+	 * @see {@link #addElementSelectionListener(IElementSelectionListener)}
+	 */
+	public void removeElementSelectionListener(IElementSelectionListener listener);
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IReferenceValueEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IReferenceValueEditor.java
index a546674dfea..a546674dfea 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IReferenceValueEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IReferenceValueEditor.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ITreeSelectorDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ITreeSelectorDialog.java
index 14ebdc4dfe6..1a15448fd5f 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ITreeSelectorDialog.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ITreeSelectorDialog.java
@@ -1,89 +1,89 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import java.util.List;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider;

-

-

-

-public interface ITreeSelectorDialog {

-

-	/**

-	 * Sets the label provider for this dialog

-	 *

-	 * @param provider

-	 */

-	public void setLabelProvider(ILabelProvider provider);

-

-	/**

-	 * Sets the ContentProvider for this dialog

-	 * The ContentProvider may be a {@link IHierarchicContentProvider}

-	 *

-	 * @param provider

-	 *            The content provider for this dialog. May be a {@link IHierarchicContentProvider}

-	 */

-	public void setContentProvider(ITreeContentProvider provider);

-

-	/**

-	 * Sets the description for this Dialog. The description is displayed on

-	 * top of the dialog

-	 *

-	 * @param description

-	 *            The description for this dialog

-	 */

-	public void setDescription(String description);

-

-	/**

-	 * Sets the input object for this dialog's TreeViewer

-	 *

-	 * @param input

-	 */

-	public void setInput(Object input);

-

-	/**

-	 * Sets the initial selected value for this dialog

-	 *

-	 * @param singletonList

-	 */

-	public void setInitialElementSelections(List selectedElements);

-

-

-	/**

-	 * Opens the dialog's window, and returns its return code

-	 *

-	 * @return the return code

-	 *

-	 * @see #create()

-	 */

-	public int open();

-

-	/**

-	 * Returns the list of selections made by the user, or <code>null</code> if the selection was canceled.

-	 *

-	 * @return the array of selected elements, or <code>null</code> if Cancel

-	 *         was pressed

-	 */

-	public Object[] getResult();

-

-	/**

-	 * Sets the title for this dialog.

-	 *

-	 * @param title

-	 *            the title

-	 */

-	public void setTitle(String label);

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import java.util.List;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider;
+
+
+
+public interface ITreeSelectorDialog {
+
+	/**
+	 * Sets the label provider for this dialog
+	 *
+	 * @param provider
+	 */
+	public void setLabelProvider(ILabelProvider provider);
+
+	/**
+	 * Sets the ContentProvider for this dialog
+	 * The ContentProvider may be a {@link IHierarchicContentProvider}
+	 *
+	 * @param provider
+	 *            The content provider for this dialog. May be a {@link IHierarchicContentProvider}
+	 */
+	public void setContentProvider(ITreeContentProvider provider);
+
+	/**
+	 * Sets the description for this Dialog. The description is displayed on
+	 * top of the dialog
+	 *
+	 * @param description
+	 *            The description for this dialog
+	 */
+	public void setDescription(String description);
+
+	/**
+	 * Sets the input object for this dialog's TreeViewer
+	 *
+	 * @param input
+	 */
+	public void setInput(Object input);
+
+	/**
+	 * Sets the initial selected value for this dialog
+	 *
+	 * @param singletonList
+	 */
+	public void setInitialElementSelections(List selectedElements);
+
+
+	/**
+	 * Opens the dialog's window, and returns its return code
+	 *
+	 * @return the return code
+	 *
+	 * @see #create()
+	 */
+	public int open();
+
+	/**
+	 * Returns the list of selections made by the user, or <code>null</code> if the selection was canceled.
+	 *
+	 * @return the array of selected elements, or <code>null</code> if Cancel
+	 *         was pressed
+	 */
+	public Object[] getResult();
+
+	/**
+	 * Sets the title for this dialog.
+	 *
+	 * @param title
+	 *            the title
+	 */
+	public void setTitle(String label);
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/InputDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/InputDialog.java
index 5573892c5c5..3dd10d27407 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/InputDialog.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/InputDialog.java
@@ -1,220 +1,220 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-

-import java.util.Collections;

-

-import org.eclipse.jface.dialogs.IInputValidator;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.KeyEvent;

-import org.eclipse.swt.events.KeyListener;

-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 org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.dialogs.SelectionDialog;

-

-/**

- * A Dialog used to input a String. The dialog uses a IInputValidator

- * to check the string, and can display an error message.

- *

- * @author Camille Letavernier

- */

-public class InputDialog extends SelectionDialog {

-

-	/**

-	 * The initial value for the string

-	 */

-	protected String initialValue;

-

-	/**

-	 * The string validator

-	 */

-	protected IInputValidator validator;

-

-	/**

-	 * The label used to display the error message

-	 */

-	protected Label errorLabel;

-

-	/**

-	 * The label used to display the error icon

-	 */

-	protected Label errorImage;

-

-	/**

-	 * The text widget used to input a new string

-	 */

-	protected AbstractValueEditor editor;

-

-	/**

-	 * The dialog's title

-	 */

-	protected String title;

-

-	/**

-	 * The label describing the kind of text to input

-	 */

-	protected String labelText;

-

-	/**

-	 * The content provider used to suggest predefined values to the user

-	 */

-	protected IStaticContentProvider contentProvider;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 *            The shell in which the dialog will be opened

-	 * @param title

-	 *            The dialog's title

-	 * @param initialValue

-	 *            The dialog's initial value

-	 * @param validator

-	 *            The validator used to check the input string

-	 */

-	public InputDialog(Shell parentShell, String title, String label, String initialValue, IInputValidator validator) {

-		super(parentShell);

-		this.initialValue = initialValue;

-		this.validator = validator;

-		this.title = title;

-		this.labelText = label;

-	}

-

-	@Override

-	protected Composite getDialogArea() {

-		return (Composite) super.getDialogArea();

-	}

-

-	@Override

-	public void create() {

-		super.create();

-

-		((GridLayout) getDialogArea().getLayout()).numColumns = 2;

-

-		errorImage = new Label(getDialogArea(), SWT.NONE);

-		errorImage.setImage(Activator.getDefault().getImage("/icons/error.gif")); //$NON-NLS-1$

-

-		errorLabel = new Label(getDialogArea(), SWT.NONE);

-		errorLabel.setVisible(false);

-

-		Label label = new Label(getDialogArea(), SWT.None);

-		if (labelText != null) {

-			label.setText(labelText);

-		}

-		label.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1));

-

-		if (contentProvider != null) {

-			editor = new StringCombo(getDialogArea(), SWT.BORDER);

-			((StringCombo) editor).setValue(initialValue);

-			((StringCombo) editor).setContentProvider(contentProvider);

-		} else {

-			editor = new StringEditor(getDialogArea(), SWT.BORDER) {

-

-				// FIXME: The StringEditor (Or one of its superclasses) should be responsible for forwarding this call

-				@Override

-				public void addKeyListener(KeyListener keyListener) {

-					super.text.addKeyListener(keyListener);

-				}

-			};

-

-			((StringEditor) editor).setValue(initialValue);

-		}

-		// input = new Text(getDialogArea(), SWT.BORDER);

-		// input.setText(initialValue);

-		editor.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1));

-

-		editor.addKeyListener(new KeyListener() {

-

-			@Override

-			public void keyPressed(KeyEvent e) {

-				// Nothing

-			}

-

-			@Override

-			public void keyReleased(KeyEvent e) {

-				validate();

-			}

-

-		});

-

-		getShell().setImage(Activator.getDefault().getImage("/icons/papyrus.png")); //$NON-NLS-1$

-

-		if (title != null) {

-			getShell().setText(title);

-		}

-

-		validate();

-		getShell().pack();

-	}

-

-	/**

-	 * Validates the current string. If the string isn't valid,

-	 * and error message will be displayed.

-	 */

-	protected void validate() {

-		if (validator == null) {

-			errorLabel.setVisible(false);

-			errorImage.setVisible(false);

-			getOkButton().setEnabled(true);

-			return;

-		}

-

-		String errorMessage = validator.isValid((String) editor.getValue());

-		if (errorMessage == null) {

-			errorLabel.setVisible(false);

-			errorImage.setVisible(false);

-			getOkButton().setEnabled(true);

-		} else {

-			errorLabel.setText(errorMessage);

-			errorLabel.setVisible(true);

-			errorImage.setVisible(true);

-			getOkButton().setEnabled(false);

-		}

-

-		getDialogArea().layout(true);

-	}

-

-	@Override

-	protected void okPressed() {

-		setResult(Collections.singletonList((String) editor.getValue()));

-		super.okPressed();

-	}

-

-	/**

-	 * @return the input text from this dialog, or null

-	 *         if the dialog has been canceled

-	 */

-	public String getText() {

-		Object[] result = getResult();

-		if (result == null || result.length == 0) {

-			return null;

-		}

-		return (String) result[0];

-	}

-

-	/**

-	 * Sets a content provider to suggest predefined values to the user

-	 *

-	 * @param contentProvider

-	 */

-	public void setContentProvider(IStaticContentProvider contentProvider) {

-		this.contentProvider = contentProvider;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+
+import java.util.Collections;
+
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
+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 org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.dialogs.SelectionDialog;
+
+/**
+ * A Dialog used to input a String. The dialog uses a IInputValidator
+ * to check the string, and can display an error message.
+ *
+ * @author Camille Letavernier
+ */
+public class InputDialog extends SelectionDialog {
+
+	/**
+	 * The initial value for the string
+	 */
+	protected String initialValue;
+
+	/**
+	 * The string validator
+	 */
+	protected IInputValidator validator;
+
+	/**
+	 * The label used to display the error message
+	 */
+	protected Label errorLabel;
+
+	/**
+	 * The label used to display the error icon
+	 */
+	protected Label errorImage;
+
+	/**
+	 * The text widget used to input a new string
+	 */
+	protected AbstractValueEditor editor;
+
+	/**
+	 * The dialog's title
+	 */
+	protected String title;
+
+	/**
+	 * The label describing the kind of text to input
+	 */
+	protected String labelText;
+
+	/**
+	 * The content provider used to suggest predefined values to the user
+	 */
+	protected IStaticContentProvider contentProvider;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 *            The shell in which the dialog will be opened
+	 * @param title
+	 *            The dialog's title
+	 * @param initialValue
+	 *            The dialog's initial value
+	 * @param validator
+	 *            The validator used to check the input string
+	 */
+	public InputDialog(Shell parentShell, String title, String label, String initialValue, IInputValidator validator) {
+		super(parentShell);
+		this.initialValue = initialValue;
+		this.validator = validator;
+		this.title = title;
+		this.labelText = label;
+	}
+
+	@Override
+	protected Composite getDialogArea() {
+		return (Composite) super.getDialogArea();
+	}
+
+	@Override
+	public void create() {
+		super.create();
+
+		((GridLayout) getDialogArea().getLayout()).numColumns = 2;
+
+		errorImage = new Label(getDialogArea(), SWT.NONE);
+		errorImage.setImage(Activator.getDefault().getImage("/icons/error.gif")); //$NON-NLS-1$
+
+		errorLabel = new Label(getDialogArea(), SWT.NONE);
+		errorLabel.setVisible(false);
+
+		Label label = new Label(getDialogArea(), SWT.None);
+		if (labelText != null) {
+			label.setText(labelText);
+		}
+		label.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1));
+
+		if (contentProvider != null) {
+			editor = new StringCombo(getDialogArea(), SWT.BORDER);
+			((StringCombo) editor).setValue(initialValue);
+			((StringCombo) editor).setContentProvider(contentProvider);
+		} else {
+			editor = new StringEditor(getDialogArea(), SWT.BORDER) {
+
+				// FIXME: The StringEditor (Or one of its superclasses) should be responsible for forwarding this call
+				@Override
+				public void addKeyListener(KeyListener keyListener) {
+					super.text.addKeyListener(keyListener);
+				}
+			};
+
+			((StringEditor) editor).setValue(initialValue);
+		}
+		// input = new Text(getDialogArea(), SWT.BORDER);
+		// input.setText(initialValue);
+		editor.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1));
+
+		editor.addKeyListener(new KeyListener() {
+
+			@Override
+			public void keyPressed(KeyEvent e) {
+				// Nothing
+			}
+
+			@Override
+			public void keyReleased(KeyEvent e) {
+				validate();
+			}
+
+		});
+
+		getShell().setImage(Activator.getDefault().getImage("/icons/papyrus.png")); //$NON-NLS-1$
+
+		if (title != null) {
+			getShell().setText(title);
+		}
+
+		validate();
+		getShell().pack();
+	}
+
+	/**
+	 * Validates the current string. If the string isn't valid,
+	 * and error message will be displayed.
+	 */
+	protected void validate() {
+		if (validator == null) {
+			errorLabel.setVisible(false);
+			errorImage.setVisible(false);
+			getOkButton().setEnabled(true);
+			return;
+		}
+
+		String errorMessage = validator.isValid((String) editor.getValue());
+		if (errorMessage == null) {
+			errorLabel.setVisible(false);
+			errorImage.setVisible(false);
+			getOkButton().setEnabled(true);
+		} else {
+			errorLabel.setText(errorMessage);
+			errorLabel.setVisible(true);
+			errorImage.setVisible(true);
+			getOkButton().setEnabled(false);
+		}
+
+		getDialogArea().layout(true);
+	}
+
+	@Override
+	protected void okPressed() {
+		setResult(Collections.singletonList((String) editor.getValue()));
+		super.okPressed();
+	}
+
+	/**
+	 * @return the input text from this dialog, or null
+	 *         if the dialog has been canceled
+	 */
+	public String getText() {
+		Object[] result = getResult();
+		if (result == null || result.length == 0) {
+			return null;
+		}
+		return (String) result[0];
+	}
+
+	/**
+	 * Sets a content provider to suggest predefined values to the user
+	 *
+	 * @param contentProvider
+	 */
+	public void setContentProvider(IStaticContentProvider contentProvider) {
+		this.contentProvider = contentProvider;
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/InputDialogWithLocation.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/InputDialogWithLocation.java
index a092c8519f1..72de46c05a4 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/InputDialogWithLocation.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/InputDialogWithLocation.java
@@ -1,72 +1,72 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.widgets.editors;

-

-import org.eclipse.jface.dialogs.IInputValidator;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.widgets.Shell;

-

-/**

- * The developper can define the location of this input dialog

- *

- * @author vl222926

- *

- */

-public class InputDialogWithLocation extends InputDialog {

-

-	/**

-	 * the location wanted to display the dialog

-	 */

-	private Point location;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @see InputDialog#InputDialog(Shell, String, String, String, IInputValidator)

-	 * @param parentShell

-	 * @param title

-	 * @param label

-	 * @param initialValue

-	 * @param validator

-	 * @param dialogLocation

-	 *            the location to use for the dialog

-	 */

-	public InputDialogWithLocation(Shell parentShell, String title, String label, String initialValue, IInputValidator validator, final Point dialogLocation) {

-		super(parentShell, title, label, initialValue, validator);

-		this.location = dialogLocation;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.editors.InputDialog#create()

-	 *

-	 */

-	@Override

-	public void create() {

-		super.create();

-		// adapted code from AbstractStyleEditorDialog in nattable plugin

-		if (location != null) {

-			if (location.x < getParentShell().getDisplay().getBounds().x) {

-				location.x = getParentShell().getDisplay().getBounds().x;

-			} else if (location.x + getShell().getBounds().width > getParentShell().getDisplay().getBounds().x + getParentShell().getDisplay().getBounds().width) {

-				location.x = getParentShell().getDisplay().getBounds().x + getParentShell().getDisplay().getBounds().width - getShell().getBounds().width;

-			}

-			if (location.y + getShell().getBounds().height > getParentShell().getDisplay().getBounds().y + getParentShell().getDisplay().getBounds().height) {

-				location.y = getParentShell().getDisplay().getBounds().y + getParentShell().getDisplay().getBounds().height - getShell().getBounds().height;

-			}

-		}

-		getShell().setLocation(location);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.widgets.editors;
+
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * The developper can define the location of this input dialog
+ *
+ * @author vl222926
+ *
+ */
+public class InputDialogWithLocation extends InputDialog {
+
+	/**
+	 * the location wanted to display the dialog
+	 */
+	private Point location;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @see InputDialog#InputDialog(Shell, String, String, String, IInputValidator)
+	 * @param parentShell
+	 * @param title
+	 * @param label
+	 * @param initialValue
+	 * @param validator
+	 * @param dialogLocation
+	 *            the location to use for the dialog
+	 */
+	public InputDialogWithLocation(Shell parentShell, String title, String label, String initialValue, IInputValidator validator, final Point dialogLocation) {
+		super(parentShell, title, label, initialValue, validator);
+		this.location = dialogLocation;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.editors.InputDialog#create()
+	 *
+	 */
+	@Override
+	public void create() {
+		super.create();
+		// adapted code from AbstractStyleEditorDialog in nattable plugin
+		if (location != null) {
+			if (location.x < getParentShell().getDisplay().getBounds().x) {
+				location.x = getParentShell().getDisplay().getBounds().x;
+			} else if (location.x + getShell().getBounds().width > getParentShell().getDisplay().getBounds().x + getParentShell().getDisplay().getBounds().width) {
+				location.x = getParentShell().getDisplay().getBounds().x + getParentShell().getDisplay().getBounds().width - getShell().getBounds().width;
+			}
+			if (location.y + getShell().getBounds().height > getParentShell().getDisplay().getBounds().y + getParentShell().getDisplay().getBounds().height) {
+				location.y = getParentShell().getDisplay().getBounds().y + getParentShell().getDisplay().getBounds().height - getShell().getBounds().height;
+			}
+		}
+		getShell().setLocation(location);
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerEditor.java
index 6e117d3d6d0..ea6c89d4478 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerEditor.java
@@ -1,146 +1,146 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.core.databinding.conversion.IConverter;

-import org.eclipse.core.databinding.conversion.StringToNumberConverter;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.papyrus.infra.widgets.validator.IntegerValidator;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * A Property Editor representing an Integer value as a text box.

- *

- * @author Camille Letavernier

- *

- */

-public class IntegerEditor extends StringEditor {

-

-	/**

-	 * The IConverter for converting data from the widget to the model

-	 */

-	private IConverter targetToModelConverter;

-

-

-	/**

-	 * Constructs an editor for Integer values. The widget is a Text field.

-	 *

-	 * @param parent

-	 *            The Composite in which this editor is created

-	 * @param style

-	 *            The Text's style

-	 */

-	public IntegerEditor(Composite parent, int style) {

-		this(parent, style, null);

-	}

-

-	/**

-	 * Constructs an editor for Integer values. The widget is a Text field.

-	 *

-	 * @param parent

-	 *            The Composite in which this editor is created

-	 * @param style

-	 *            The Text's style

-	 * @param label

-	 *            The editor's label

-	 */

-	public IntegerEditor(Composite parent, int style, String label) {

-		super(parent, style, label);

-

-		targetValidator = new IntegerValidator();

-

-		targetToModelConverter = new IConverter() {

-

-			@Override

-			public Object getToType() {

-				return Integer.class;

-			}

-

-			@Override

-			public Object getFromType() {

-				return String.class;

-			}

-

-			@Override

-			public Integer convert(Object fromObject) {

-				if (fromObject instanceof String) {

-					String newString = ((String) fromObject).replaceAll(" ", ""); //$NON-NLS-1$ //$NON-NLS-2$

-					try {

-						Integer i = (Integer) StringToNumberConverter.toInteger(false).convert(newString);

-						return i;

-					} catch (Exception ex) {

-

-					}

-

-				}

-

-				return null;

-			}

-		};

-

-		IConverter integerToString = new IConverter() {

-

-			@Override

-			public Object getToType() {

-				return String.class;

-			}

-

-			@Override

-			public Object getFromType() {

-				return Integer.class;

-			}

-

-			@Override

-			public Object convert(Object fromObject) {

-

-				if (fromObject instanceof Integer) {

-					return Integer.toString((Integer) fromObject);

-				}

-				errorBinding = true;

-				return ""; //$NON-NLS-1$

-			}

-

-		};

-		setValidateOnDelay(true);

-		setConverters(targetToModelConverter, integerToString);

-		setTargetAfterGetValidator(targetValidator);

-

-	}

-

-

-

-

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object getEditableType() {

-		return Integer.class;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Integer getValue() {

-		try {

-

-			return (Integer) targetToModelConverter.convert(super.getValue());

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-			return null;

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.core.databinding.conversion.StringToNumberConverter;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.validator.IntegerValidator;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A Property Editor representing an Integer value as a text box.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class IntegerEditor extends StringEditor {
+
+	/**
+	 * The IConverter for converting data from the widget to the model
+	 */
+	private IConverter targetToModelConverter;
+
+
+	/**
+	 * Constructs an editor for Integer values. The widget is a Text field.
+	 *
+	 * @param parent
+	 *            The Composite in which this editor is created
+	 * @param style
+	 *            The Text's style
+	 */
+	public IntegerEditor(Composite parent, int style) {
+		this(parent, style, null);
+	}
+
+	/**
+	 * Constructs an editor for Integer values. The widget is a Text field.
+	 *
+	 * @param parent
+	 *            The Composite in which this editor is created
+	 * @param style
+	 *            The Text's style
+	 * @param label
+	 *            The editor's label
+	 */
+	public IntegerEditor(Composite parent, int style, String label) {
+		super(parent, style, label);
+
+		targetValidator = new IntegerValidator();
+
+		targetToModelConverter = new IConverter() {
+
+			@Override
+			public Object getToType() {
+				return Integer.class;
+			}
+
+			@Override
+			public Object getFromType() {
+				return String.class;
+			}
+
+			@Override
+			public Integer convert(Object fromObject) {
+				if (fromObject instanceof String) {
+					String newString = ((String) fromObject).replaceAll(" ", ""); //$NON-NLS-1$ //$NON-NLS-2$
+					try {
+						Integer i = (Integer) StringToNumberConverter.toInteger(false).convert(newString);
+						return i;
+					} catch (Exception ex) {
+
+					}
+
+				}
+
+				return null;
+			}
+		};
+
+		IConverter integerToString = new IConverter() {
+
+			@Override
+			public Object getToType() {
+				return String.class;
+			}
+
+			@Override
+			public Object getFromType() {
+				return Integer.class;
+			}
+
+			@Override
+			public Object convert(Object fromObject) {
+
+				if (fromObject instanceof Integer) {
+					return Integer.toString((Integer) fromObject);
+				}
+				errorBinding = true;
+				return ""; //$NON-NLS-1$
+			}
+
+		};
+		setValidateOnDelay(true);
+		setConverters(targetToModelConverter, integerToString);
+		setTargetAfterGetValidator(targetValidator);
+
+	}
+
+
+
+
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object getEditableType() {
+		return Integer.class;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Integer getValue() {
+		try {
+
+			return (Integer) targetToModelConverter.convert(super.getValue());
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+			return null;
+		}
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerMask.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerMask.java
index 49c09df5a94..de609cd4b74 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerMask.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerMask.java
@@ -1,216 +1,216 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import java.util.HashMap;

-import java.util.Map;

-import java.util.Map.Entry;

-

-import org.eclipse.core.databinding.observable.ChangeEvent;

-import org.eclipse.core.databinding.observable.IChangeListener;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.papyrus.infra.widgets.messages.Messages;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.DisposeListener;

-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.Composite;

-

-public class IntegerMask extends AbstractValueEditor implements SelectionListener, IChangeListener, DisposeListener {

-

-	private Button[] checkboxes;

-

-	private int currentValue;

-

-	private final Composite checkboxContainer;

-

-	private boolean refreshCheckboxes = true;

-

-	public IntegerMask(final Composite parent, final int style) {

-		super(parent, style);

-		checkboxContainer = new Composite(this, style);

-		checkboxContainer.setLayoutData(getDefaultLayoutData());

-		checkboxContainer.setLayout(new GridLayout(2, true));

-		checkboxContainer.addDisposeListener(this);

-	}

-

-	@Override

-	protected GridData getLabelLayoutData() {

-		GridData data = super.getLabelLayoutData();

-		data.verticalAlignment = SWT.BEGINNING;

-		return data;

-	}

-

-	@Override

-	public Object getValue() {

-		int totalValue = 0;

-		for (Button button : checkboxes) {

-			int value = (Integer) button.getData("IntValue"); //$NON-NLS-1$

-			if (button.getSelection()) {

-				totalValue |= value;

-			}

-		}

-		return totalValue;

-	}

-

-	@Override

-	public void dispose() {

-		if (modelProperty != null) {

-			modelProperty.removeChangeListener(this);

-		}

-		super.dispose();

-	}

-

-	@Override

-	public Object getEditableType() {

-		return Integer.class;

-	}

-

-	@Override

-	public void setReadOnly(final boolean readOnly) {

-		// TODO Auto-generated method stub

-

-	}

-

-	@Override

-	public boolean isReadOnly() {

-		// TODO Auto-generated method stub

-		return false;

-	}

-

-	public void setMasks(final String[] values) {

-		Map<Integer, String> masks = new HashMap<Integer, String>();

-		int intValue = 1;

-		for (String value : values) {

-			masks.put(intValue, value);

-			intValue <<= 1;

-		}

-		setMasks(masks);

-	}

-

-	public void setMasks(final Map<Integer, String> values) {

-		if (values.size() > 32) {

-			StringLabel label = new StringLabel(checkboxContainer, SWT.NONE);

-			label.getValueLabel().setImage(Activator.getDefault().getImage("/icons/error.gif")); //$NON-NLS-1$

-			label.getValueLabel().setText(Messages.IntegerMask_ErrorTooManyValues);

-			checkboxes = new Button[0];

-		} else {

-			if (checkboxes != null) {

-				disposeCheckboxes();

-			}

-

-			checkboxes = new Button[values.size()];

-

-			int i = 0;

-			for (Entry<Integer, String> mask : values.entrySet()) {

-				int intValue = mask.getKey();

-				String value = mask.getValue();

-				checkboxes[i] = new Button(checkboxContainer, SWT.CHECK);

-				checkboxes[i].setText(value);

-				checkboxes[i].setData("IntValue", intValue); //$NON-NLS-1$

-				checkboxes[i].addSelectionListener(this);

-				i++;

-			}

-		}

-	}

-

-	protected void disposeCheckboxes() {

-		for (Button button : checkboxes) {

-			button.removeSelectionListener(this);

-			button.dispose();

-		}

-	}

-

-	public void setNumColumns(final int numColumns) {

-		((GridLayout) checkboxContainer.getLayout()).numColumns = numColumns;

-		checkboxContainer.layout();

-		layout();

-	}

-

-	@Override

-	public void doBinding() {

-		// We don't do a real databinding here

-		modelProperty.addChangeListener(this);

-

-		refreshCheckboxes();

-	}

-

-	protected void refreshCheckboxes() {

-		if (!refreshCheckboxes) {

-			return;

-		}

-

-		int totalValue = getCurrentValue();

-		for (Button button : checkboxes) {

-			int value = (Integer) button.getData("IntValue"); //$NON-NLS-1$

-			button.setSelection((totalValue & value) != 0);

-		}

-	}

-

-	@Override

-	public void setToolTipText(final String text) {

-		super.setLabelToolTipText(text);

-	}

-

-	@Override

-	public void widgetSelected(final SelectionEvent e) {

-		Button button = (Button) e.widget;

-		int value = (Integer) button.getData("IntValue"); //$NON-NLS-1$

-		int totalValue = getCurrentValue();

-		if (button.getSelection()) {

-			totalValue |= value;

-		} else {

-			totalValue &= ~value;

-		}

-		setCurrentValue(totalValue);

-	}

-

-	protected void setCurrentValue(final int value) {

-		if (modelProperty != null) {

-			refreshCheckboxes = false;

-			modelProperty.setValue(value);

-			refreshCheckboxes = true;

-		}

-		currentValue = value;

-

-		commit();

-	}

-

-	protected Integer getCurrentValue() {

-		if (modelProperty != null) {

-			Object value = modelProperty.getValue();

-			return value == null ? 0 : (Integer) value;

-		} else {

-			return currentValue;

-		}

-	}

-

-	@Override

-	public void widgetDefaultSelected(final SelectionEvent e) {

-		// Nothing

-	}

-

-	public int getNumColumns() {

-		return ((GridLayout) checkboxContainer.getLayout()).numColumns;

-	}

-

-	@Override

-	public void handleChange(final ChangeEvent event) {

-		refreshCheckboxes();

-	}

-

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.eclipse.core.databinding.observable.ChangeEvent;
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeListener;
+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.Composite;
+
+public class IntegerMask extends AbstractValueEditor implements SelectionListener, IChangeListener, DisposeListener {
+
+	private Button[] checkboxes;
+
+	private int currentValue;
+
+	private final Composite checkboxContainer;
+
+	private boolean refreshCheckboxes = true;
+
+	public IntegerMask(final Composite parent, final int style) {
+		super(parent, style);
+		checkboxContainer = new Composite(this, style);
+		checkboxContainer.setLayoutData(getDefaultLayoutData());
+		checkboxContainer.setLayout(new GridLayout(2, true));
+		checkboxContainer.addDisposeListener(this);
+	}
+
+	@Override
+	protected GridData getLabelLayoutData() {
+		GridData data = super.getLabelLayoutData();
+		data.verticalAlignment = SWT.BEGINNING;
+		return data;
+	}
+
+	@Override
+	public Object getValue() {
+		int totalValue = 0;
+		for (Button button : checkboxes) {
+			int value = (Integer) button.getData("IntValue"); //$NON-NLS-1$
+			if (button.getSelection()) {
+				totalValue |= value;
+			}
+		}
+		return totalValue;
+	}
+
+	@Override
+	public void dispose() {
+		if (modelProperty != null) {
+			modelProperty.removeChangeListener(this);
+		}
+		super.dispose();
+	}
+
+	@Override
+	public Object getEditableType() {
+		return Integer.class;
+	}
+
+	@Override
+	public void setReadOnly(final boolean readOnly) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public boolean isReadOnly() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public void setMasks(final String[] values) {
+		Map<Integer, String> masks = new HashMap<Integer, String>();
+		int intValue = 1;
+		for (String value : values) {
+			masks.put(intValue, value);
+			intValue <<= 1;
+		}
+		setMasks(masks);
+	}
+
+	public void setMasks(final Map<Integer, String> values) {
+		if (values.size() > 32) {
+			StringLabel label = new StringLabel(checkboxContainer, SWT.NONE);
+			label.getValueLabel().setImage(Activator.getDefault().getImage("/icons/error.gif")); //$NON-NLS-1$
+			label.getValueLabel().setText(Messages.IntegerMask_ErrorTooManyValues);
+			checkboxes = new Button[0];
+		} else {
+			if (checkboxes != null) {
+				disposeCheckboxes();
+			}
+
+			checkboxes = new Button[values.size()];
+
+			int i = 0;
+			for (Entry<Integer, String> mask : values.entrySet()) {
+				int intValue = mask.getKey();
+				String value = mask.getValue();
+				checkboxes[i] = new Button(checkboxContainer, SWT.CHECK);
+				checkboxes[i].setText(value);
+				checkboxes[i].setData("IntValue", intValue); //$NON-NLS-1$
+				checkboxes[i].addSelectionListener(this);
+				i++;
+			}
+		}
+	}
+
+	protected void disposeCheckboxes() {
+		for (Button button : checkboxes) {
+			button.removeSelectionListener(this);
+			button.dispose();
+		}
+	}
+
+	public void setNumColumns(final int numColumns) {
+		((GridLayout) checkboxContainer.getLayout()).numColumns = numColumns;
+		checkboxContainer.layout();
+		layout();
+	}
+
+	@Override
+	public void doBinding() {
+		// We don't do a real databinding here
+		modelProperty.addChangeListener(this);
+
+		refreshCheckboxes();
+	}
+
+	protected void refreshCheckboxes() {
+		if (!refreshCheckboxes) {
+			return;
+		}
+
+		int totalValue = getCurrentValue();
+		for (Button button : checkboxes) {
+			int value = (Integer) button.getData("IntValue"); //$NON-NLS-1$
+			button.setSelection((totalValue & value) != 0);
+		}
+	}
+
+	@Override
+	public void setToolTipText(final String text) {
+		super.setLabelToolTipText(text);
+	}
+
+	@Override
+	public void widgetSelected(final SelectionEvent e) {
+		Button button = (Button) e.widget;
+		int value = (Integer) button.getData("IntValue"); //$NON-NLS-1$
+		int totalValue = getCurrentValue();
+		if (button.getSelection()) {
+			totalValue |= value;
+		} else {
+			totalValue &= ~value;
+		}
+		setCurrentValue(totalValue);
+	}
+
+	protected void setCurrentValue(final int value) {
+		if (modelProperty != null) {
+			refreshCheckboxes = false;
+			modelProperty.setValue(value);
+			refreshCheckboxes = true;
+		}
+		currentValue = value;
+
+		commit();
+	}
+
+	protected Integer getCurrentValue() {
+		if (modelProperty != null) {
+			Object value = modelProperty.getValue();
+			return value == null ? 0 : (Integer) value;
+		} else {
+			return currentValue;
+		}
+	}
+
+	@Override
+	public void widgetDefaultSelected(final SelectionEvent e) {
+		// Nothing
+	}
+
+	public int getNumColumns() {
+		return ((GridLayout) checkboxContainer.getLayout()).numColumns;
+	}
+
+	@Override
+	public void handleChange(final ChangeEvent event) {
+		refreshCheckboxes();
+	}
+
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerSpinner.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerSpinner.java
index 838bea13819..defe38a6ce7 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerSpinner.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerSpinner.java
@@ -1,325 +1,325 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import java.util.Timer;

-import java.util.TimerTask;

-

-import org.eclipse.core.databinding.conversion.IConverter;

-import org.eclipse.core.databinding.conversion.StringToNumberConverter;

-import org.eclipse.core.databinding.observable.value.AbstractObservableValue;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.jface.fieldassist.ControlDecoration;

-import org.eclipse.jface.fieldassist.FieldDecoration;

-import org.eclipse.jface.fieldassist.FieldDecorationRegistry;

-import org.eclipse.swt.SWT;

-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.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Event;

-import org.eclipse.swt.widgets.Spinner;

-

-/**

- * A widget for editing Integer values with a SWT Spinner

- *

- * @author Camille Letavernier

- *

- * @see Spinner

- */

-public class IntegerSpinner extends AbstractValueEditor implements KeyListener, ModifyListener {

-

-	/**

-	 * The SWT Spinner

-	 */

-	protected Spinner spinner;

-

-	/**

-	 * The String to Integer converter

-	 */

-	protected IConverter targetToModelConverter;

-

-

-	private Timer timer;

-

-	private TimerTask changeColorTask;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The Composite in which the editor will be created

-	 * @param style

-	 *            The SWT style to apply

-	 */

-	public IntegerSpinner(Composite parent, int style) {

-		super(parent, style);

-		spinner = createSpinner();

-

-		setWidgetObservable(new AbstractObservableValue() {

-

-			@Override

-			public Object getValueType() {

-				return Integer.class;

-			}

-

-			@Override

-			protected Integer doGetValue() {

-				return (Integer) targetToModelConverter.convert(spinner.getText());

-			}

-

-			@Override

-			protected void doSetValue(Object value) {

-				spinner.setSelection((Integer) value);

-			}

-

-		});

-

-		spinner.addKeyListener(this);

-		spinner.addModifyListener(this);

-		setCommitOnFocusLost(spinner);

-

-		GridData gridData = getDefaultLayoutData();

-		spinner.setLayoutData(gridData);

-		gridData.horizontalIndent = FieldDecorationRegistry.getDefault().getMaximumDecorationWidth();

-		targetToModelConverter = StringToNumberConverter.toInteger(false);

-		controlDecoration = new ControlDecoration(spinner, SWT.LEFT | SWT.LEFT);

-	}

-

-	/**

-	 * Creates the Spinner

-	 *

-	 * @return the Spinner

-	 */

-	protected Spinner createSpinner() {

-		return new Spinner(this, factory.getBorderStyle());

-	}

-

-	@Override

-	public void doBinding() {

-

-		spinner.addFocusListener(new FocusListener() {

-

-			@Override

-			public void focusGained(FocusEvent e) {

-				// Nothing

-			}

-

-			@Override

-			public void focusLost(FocusEvent e) {

-				binding.updateTargetToModel();

-			}

-

-		});

-

-		super.doBinding();

-	}

-

-	@Override

-	public Object getValue() {

-		String value = spinner.getText();

-		return targetToModelConverter.convert(value);

-	}

-

-	@Override

-	public Object getEditableType() {

-		return Integer.class;

-	}

-

-	@Override

-	public void setReadOnly(boolean readOnly) {

-		spinner.setEnabled(!readOnly);

-	}

-

-	@Override

-	public boolean isReadOnly() {

-		return !spinner.isEnabled();

-	}

-

-	@Override

-	public void setToolTipText(String text) {

-		spinner.setToolTipText(text);

-		super.setLabelToolTipText(text);

-	}

-

-	/**

-	 * Sets the minimum value for the spinner

-	 *

-	 * @param minimum

-	 * @see Spinner#setMinimum(int)

-	 */

-	public void setMinimum(int minimum) {

-		spinner.setMinimum(minimum);

-	}

-

-	/**

-	 * Sets the maximum value for the spinner

-	 *

-	 * @param maximum

-	 * @see Spinner#setMaximum(int)

-	 */

-	public void setMaximum(int maximum) {

-		spinner.setMaximum(maximum);

-	}

-

-	/**

-	 * Sets the increment value for the spinner

-	 *

-	 * @param increment

-	 * @see Spinner#setIncrement(int)

-	 */

-	public void setIncrement(int increment) {

-		spinner.setIncrement(increment);

-	}

-

-	@Override

-	public void keyPressed(KeyEvent e) {

-

-	}

-

-	@Override

-	public void keyReleased(KeyEvent e) {

-		if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) {

-			notifyChange();

-		}

-

-	}

-

-	protected void notifyChange() {

-		spinner.notifyListeners(SWT.FocusOut, new Event());

-		commit();

-	}

-

-	@Override

-	public void updateStatus(IStatus status) {

-		switch (status.getSeverity()) {

-		case IStatus.OK:

-			controlDecoration.hide();

-			break;

-		case IStatus.WARNING:

-			FieldDecoration warning = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_WARNING);

-			controlDecoration.setImage(warning.getImage());

-			controlDecoration.showHoverText(status.getMessage());

-			controlDecoration.setDescriptionText(status.getMessage());

-			controlDecoration.show();

-			break;

-		case IStatus.ERROR:

-			FieldDecoration error = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_ERROR);

-			controlDecoration.setImage(error.getImage());

-			controlDecoration.showHoverText(status.getMessage());

-			controlDecoration.setDescriptionText(status.getMessage());

-			controlDecoration.show();

-			break;

-		default:

-			controlDecoration.hide();

-			break;

-		}

-	}

-

-	private void cancelCurrentTask() {

-		if (changeColorTask != null) {

-			changeColorTask.cancel();

-		}

-	}

-

-	@Override

-	public void changeColorField() {

-		if (timer == null) {

-			timer = new Timer(true);

-		}

-

-		cancelCurrentTask();

-		changeColorTask = new TimerTask() {

-

-			@Override

-			public void run() {

-				IntegerSpinner.this.getDisplay().asyncExec(new Runnable() {

-

-					@Override

-					public void run() {

-						if (!spinner.isDisposed()) {

-							spinner.setBackground(DEFAULT);

-							spinner.update();

-						}

-					}

-

-

-				});

-			}

-		};

-		if (errorBinding) {

-			spinner.setBackground(ERROR);

-			spinner.update();

-		} else {

-			IStatus status = (IStatus) binding.getValidationStatus().getValue();

-			switch (status.getSeverity()) {

-			case IStatus.OK:

-			case IStatus.WARNING:

-				timer.schedule(changeColorTask, 600);

-				spinner.setBackground(VALID);

-				spinner.update();

-				break;

-			case IStatus.ERROR:

-				spinner.setBackground(ERROR);

-				spinner.update();

-				break;

-			}

-		}

-	}

-

-	@Override

-	public void dispose() {

-		if (changeColorTask != null) {

-			changeColorTask.cancel();

-			changeColorTask = null;

-		}

-		if (timer != null) {

-			timer.cancel();

-			timer = null;

-		}

-		super.dispose();

-	}

-

-	/**

-	 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)

-	 *

-	 * @param e

-	 */

-

-	@Override

-	public void modifyText(ModifyEvent e) {

-		if (modelProperty == null) {

-			return;

-		}

-

-		if (modelProperty.getValue() != null) {

-			if (!isReadOnly() && !modelProperty.getValue().toString().equals(spinner.getText())) {

-				spinner.setBackground(EDIT);

-			} else {

-				spinner.setBackground(DEFAULT);

-			}

-		} else {

-			if (spinner.getText().equals("")) {

-				spinner.setBackground(DEFAULT);

-			} else {

-				spinner.setBackground(EDIT);

-			}

-		}

-	}

-

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.core.databinding.conversion.StringToNumberConverter;
+import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.fieldassist.ControlDecoration;
+import org.eclipse.jface.fieldassist.FieldDecoration;
+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
+import org.eclipse.swt.SWT;
+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.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Spinner;
+
+/**
+ * A widget for editing Integer values with a SWT Spinner
+ *
+ * @author Camille Letavernier
+ *
+ * @see Spinner
+ */
+public class IntegerSpinner extends AbstractValueEditor implements KeyListener, ModifyListener {
+
+	/**
+	 * The SWT Spinner
+	 */
+	protected Spinner spinner;
+
+	/**
+	 * The String to Integer converter
+	 */
+	protected IConverter targetToModelConverter;
+
+
+	private Timer timer;
+
+	private TimerTask changeColorTask;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The Composite in which the editor will be created
+	 * @param style
+	 *            The SWT style to apply
+	 */
+	public IntegerSpinner(Composite parent, int style) {
+		super(parent, style);
+		spinner = createSpinner();
+
+		setWidgetObservable(new AbstractObservableValue() {
+
+			@Override
+			public Object getValueType() {
+				return Integer.class;
+			}
+
+			@Override
+			protected Integer doGetValue() {
+				return (Integer) targetToModelConverter.convert(spinner.getText());
+			}
+
+			@Override
+			protected void doSetValue(Object value) {
+				spinner.setSelection((Integer) value);
+			}
+
+		});
+
+		spinner.addKeyListener(this);
+		spinner.addModifyListener(this);
+		setCommitOnFocusLost(spinner);
+
+		GridData gridData = getDefaultLayoutData();
+		spinner.setLayoutData(gridData);
+		gridData.horizontalIndent = FieldDecorationRegistry.getDefault().getMaximumDecorationWidth();
+		targetToModelConverter = StringToNumberConverter.toInteger(false);
+		controlDecoration = new ControlDecoration(spinner, SWT.LEFT | SWT.LEFT);
+	}
+
+	/**
+	 * Creates the Spinner
+	 *
+	 * @return the Spinner
+	 */
+	protected Spinner createSpinner() {
+		return new Spinner(this, factory.getBorderStyle());
+	}
+
+	@Override
+	public void doBinding() {
+
+		spinner.addFocusListener(new FocusListener() {
+
+			@Override
+			public void focusGained(FocusEvent e) {
+				// Nothing
+			}
+
+			@Override
+			public void focusLost(FocusEvent e) {
+				binding.updateTargetToModel();
+			}
+
+		});
+
+		super.doBinding();
+	}
+
+	@Override
+	public Object getValue() {
+		String value = spinner.getText();
+		return targetToModelConverter.convert(value);
+	}
+
+	@Override
+	public Object getEditableType() {
+		return Integer.class;
+	}
+
+	@Override
+	public void setReadOnly(boolean readOnly) {
+		spinner.setEnabled(!readOnly);
+	}
+
+	@Override
+	public boolean isReadOnly() {
+		return !spinner.isEnabled();
+	}
+
+	@Override
+	public void setToolTipText(String text) {
+		spinner.setToolTipText(text);
+		super.setLabelToolTipText(text);
+	}
+
+	/**
+	 * Sets the minimum value for the spinner
+	 *
+	 * @param minimum
+	 * @see Spinner#setMinimum(int)
+	 */
+	public void setMinimum(int minimum) {
+		spinner.setMinimum(minimum);
+	}
+
+	/**
+	 * Sets the maximum value for the spinner
+	 *
+	 * @param maximum
+	 * @see Spinner#setMaximum(int)
+	 */
+	public void setMaximum(int maximum) {
+		spinner.setMaximum(maximum);
+	}
+
+	/**
+	 * Sets the increment value for the spinner
+	 *
+	 * @param increment
+	 * @see Spinner#setIncrement(int)
+	 */
+	public void setIncrement(int increment) {
+		spinner.setIncrement(increment);
+	}
+
+	@Override
+	public void keyPressed(KeyEvent e) {
+
+	}
+
+	@Override
+	public void keyReleased(KeyEvent e) {
+		if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) {
+			notifyChange();
+		}
+
+	}
+
+	protected void notifyChange() {
+		spinner.notifyListeners(SWT.FocusOut, new Event());
+		commit();
+	}
+
+	@Override
+	public void updateStatus(IStatus status) {
+		switch (status.getSeverity()) {
+		case IStatus.OK:
+			controlDecoration.hide();
+			break;
+		case IStatus.WARNING:
+			FieldDecoration warning = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_WARNING);
+			controlDecoration.setImage(warning.getImage());
+			controlDecoration.showHoverText(status.getMessage());
+			controlDecoration.setDescriptionText(status.getMessage());
+			controlDecoration.show();
+			break;
+		case IStatus.ERROR:
+			FieldDecoration error = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_ERROR);
+			controlDecoration.setImage(error.getImage());
+			controlDecoration.showHoverText(status.getMessage());
+			controlDecoration.setDescriptionText(status.getMessage());
+			controlDecoration.show();
+			break;
+		default:
+			controlDecoration.hide();
+			break;
+		}
+	}
+
+	private void cancelCurrentTask() {
+		if (changeColorTask != null) {
+			changeColorTask.cancel();
+		}
+	}
+
+	@Override
+	public void changeColorField() {
+		if (timer == null) {
+			timer = new Timer(true);
+		}
+
+		cancelCurrentTask();
+		changeColorTask = new TimerTask() {
+
+			@Override
+			public void run() {
+				IntegerSpinner.this.getDisplay().asyncExec(new Runnable() {
+
+					@Override
+					public void run() {
+						if (!spinner.isDisposed()) {
+							spinner.setBackground(DEFAULT);
+							spinner.update();
+						}
+					}
+
+
+				});
+			}
+		};
+		if (errorBinding) {
+			spinner.setBackground(ERROR);
+			spinner.update();
+		} else {
+			IStatus status = (IStatus) binding.getValidationStatus().getValue();
+			switch (status.getSeverity()) {
+			case IStatus.OK:
+			case IStatus.WARNING:
+				timer.schedule(changeColorTask, 600);
+				spinner.setBackground(VALID);
+				spinner.update();
+				break;
+			case IStatus.ERROR:
+				spinner.setBackground(ERROR);
+				spinner.update();
+				break;
+			}
+		}
+	}
+
+	@Override
+	public void dispose() {
+		if (changeColorTask != null) {
+			changeColorTask.cancel();
+			changeColorTask = null;
+		}
+		if (timer != null) {
+			timer.cancel();
+			timer = null;
+		}
+		super.dispose();
+	}
+
+	/**
+	 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
+	 *
+	 * @param e
+	 */
+
+	@Override
+	public void modifyText(ModifyEvent e) {
+		if (modelProperty == null) {
+			return;
+		}
+
+		if (modelProperty.getValue() != null) {
+			if (!isReadOnly() && !modelProperty.getValue().toString().equals(spinner.getText())) {
+				spinner.setBackground(EDIT);
+			} else {
+				spinner.setBackground(DEFAULT);
+			}
+		} else {
+			if (spinner.getText().equals("")) {
+				spinner.setBackground(DEFAULT);
+			} else {
+				spinner.setBackground(EDIT);
+			}
+		}
+	}
+
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/LongEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/LongEditor.java
index 2330d0fb002..b11e57372e9 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/LongEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/LongEditor.java
@@ -1,53 +1,53 @@
-package org.eclipse.papyrus.infra.widgets.editors;

-

-import java.util.Locale;

-

-import org.eclipse.core.databinding.conversion.IConverter;

-import org.eclipse.core.databinding.conversion.NumberToStringConverter;

-import org.eclipse.core.databinding.conversion.StringToNumberConverter;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.swt.widgets.Composite;

-

-import com.ibm.icu.text.NumberFormat;

-

-public class LongEditor extends StringEditor {

-

-	private IConverter targetToModelConverter;

-

-	/**

-	 *

-	 * Constructs an Editor for a Long value. The widget is a Text field.

-	 *

-	 * @param parent

-	 *            The Composite in which the editor is created

-	 * @param style

-	 *            The Text's style

-	 */

-	public LongEditor(Composite parent, int style) {

-		super(parent, style);

-

-		targetToModelConverter = StringToNumberConverter.toLong(NumberFormat.getInstance(Locale.ENGLISH), true);

-		setConverters(targetToModelConverter, NumberToStringConverter.fromLong(NumberFormat.getInstance(Locale.ENGLISH), true));

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object getEditableType() {

-		return Long.class;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Long getValue() {

-		try {

-			return (Long) targetToModelConverter.convert(super.getValue());

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-			return null;

-		}

-	}

-}

+package org.eclipse.papyrus.infra.widgets.editors;
+
+import java.util.Locale;
+
+import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.core.databinding.conversion.NumberToStringConverter;
+import org.eclipse.core.databinding.conversion.StringToNumberConverter;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.swt.widgets.Composite;
+
+import com.ibm.icu.text.NumberFormat;
+
+public class LongEditor extends StringEditor {
+
+	private IConverter targetToModelConverter;
+
+	/**
+	 *
+	 * Constructs an Editor for a Long value. The widget is a Text field.
+	 *
+	 * @param parent
+	 *            The Composite in which the editor is created
+	 * @param style
+	 *            The Text's style
+	 */
+	public LongEditor(Composite parent, int style) {
+		super(parent, style);
+
+		targetToModelConverter = StringToNumberConverter.toLong(NumberFormat.getInstance(Locale.ENGLISH), true);
+		setConverters(targetToModelConverter, NumberToStringConverter.fromLong(NumberFormat.getInstance(Locale.ENGLISH), true));
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object getEditableType() {
+		return Long.class;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Long getValue() {
+		try {
+			return (Long) targetToModelConverter.convert(super.getValue());
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+			return null;
+		}
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleDoubleEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleDoubleEditor.java
index 2ef3751a325..bae688415de 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleDoubleEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleDoubleEditor.java
@@ -1,70 +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:

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-

-import org.eclipse.papyrus.infra.widgets.selectors.RealSelector;

-import org.eclipse.swt.widgets.Composite;

-

-

-public class MultipleDoubleEditor extends MultipleStringEditor {

-

-	/**

-	 * Constructs an Editor for multiple double values

-	 * The widget is a List, with controls to move values up/down, add values

-	 * and remove values.

-	 *

-	 * @param parent

-	 *            The Composite in which this editor is created

-	 * @param style

-	 *            The List's style

-	 */

-	public MultipleDoubleEditor(Composite parent, int style) {

-		super(parent, style, new RealSelector());

-	}

-

-	/**

-	 * Constructs an Editor for multiple double values

-	 * The widget is a List, with controls to move values up/down, add values

-	 * and remove values.

-	 *

-	 * @param parent

-	 *            The Composite in which this editor is created

-	 * @param style

-	 *            The List's style

-	 * @param label

-	 *            The editor's label

-	 */

-	public MultipleDoubleEditor(Composite parent, int style, String label) {

-		super(parent, style, new RealSelector(), label);

-	}

-

-	/**

-	 * Constructs an Editor for multiple double values

-	 * The widget is a List, with controls to move values up/down, add values

-	 * and remove values.

-	 *

-	 * @param parent

-	 *            The Composite in which this editor is created

-	 * @param style

-	 *            The List's style

-	 * @param ordered

-	 *            Indicates if the values should be ordered. If true, the up/down controls will be activated

-	 * @param unique

-	 *            Indicates if the values should be unique.

-	 * @param label

-	 *            The editor's label

-	 */

-	public MultipleDoubleEditor(Composite parent, int style, boolean ordered, boolean unique, String label) {

-		super(parent, style, new RealSelector(), ordered, unique, label);

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+
+import org.eclipse.papyrus.infra.widgets.selectors.RealSelector;
+import org.eclipse.swt.widgets.Composite;
+
+
+public class MultipleDoubleEditor extends MultipleStringEditor {
+
+	/**
+	 * Constructs an Editor for multiple double values
+	 * The widget is a List, with controls to move values up/down, add values
+	 * and remove values.
+	 *
+	 * @param parent
+	 *            The Composite in which this editor is created
+	 * @param style
+	 *            The List's style
+	 */
+	public MultipleDoubleEditor(Composite parent, int style) {
+		super(parent, style, new RealSelector());
+	}
+
+	/**
+	 * Constructs an Editor for multiple double values
+	 * The widget is a List, with controls to move values up/down, add values
+	 * and remove values.
+	 *
+	 * @param parent
+	 *            The Composite in which this editor is created
+	 * @param style
+	 *            The List's style
+	 * @param label
+	 *            The editor's label
+	 */
+	public MultipleDoubleEditor(Composite parent, int style, String label) {
+		super(parent, style, new RealSelector(), label);
+	}
+
+	/**
+	 * Constructs an Editor for multiple double values
+	 * The widget is a List, with controls to move values up/down, add values
+	 * and remove values.
+	 *
+	 * @param parent
+	 *            The Composite in which this editor is created
+	 * @param style
+	 *            The List's style
+	 * @param ordered
+	 *            Indicates if the values should be ordered. If true, the up/down controls will be activated
+	 * @param unique
+	 *            Indicates if the values should be unique.
+	 * @param label
+	 *            The editor's label
+	 */
+	public MultipleDoubleEditor(Composite parent, int style, boolean ordered, boolean unique, String label) {
+		super(parent, style, new RealSelector(), ordered, unique, label);
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleIntegerEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleIntegerEditor.java
index d4b9a8784ee..4b3604e4af6 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleIntegerEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleIntegerEditor.java
@@ -1,75 +1,75 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.papyrus.infra.widgets.selectors.IntegerSelector;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * An editor for multivalued Integer attributes

- *

- * @author Camille Letavernier

- *

- */

-public class MultipleIntegerEditor extends MultipleStringEditor {

-

-	/**

-	 * Constructs an Editor for multiple Integer values

-	 * The widget is a List, with controls to move values up/down, add values

-	 * and remove values.

-	 *

-	 * @param parent

-	 *            The Composite in which this editor is created

-	 * @param style

-	 *            The List's style

-	 */

-	public MultipleIntegerEditor(Composite parent, int style) {

-		super(parent, style, new IntegerSelector());

-	}

-

-	/**

-	 * Constructs an Editor for multiple Integer values

-	 * The widget is a List, with controls to move values up/down, add values

-	 * and remove values.

-	 *

-	 * @param parent

-	 *            The Composite in which this editor is created

-	 * @param style

-	 *            The List's style

-	 * @param label

-	 *            The editor's label

-	 */

-	public MultipleIntegerEditor(Composite parent, int style, String label) {

-		super(parent, style, new IntegerSelector(), label);

-	}

-

-	/**

-	 * Constructs an Editor for multiple Integer values

-	 * The widget is a List, with controls to move values up/down, add values

-	 * and remove values.

-	 *

-	 * @param parent

-	 *            The Composite in which this editor is created

-	 * @param style

-	 *            The List's style

-	 * @param ordered

-	 *            Indicates if the values should be ordered. If true, the up/down controls will be activated

-	 * @param unique

-	 *            Indicates if the values should be unique.

-	 * @param label

-	 *            The editor's label

-	 */

-	public MultipleIntegerEditor(Composite parent, int style, boolean ordered, boolean unique, String label) {

-		super(parent, style, new IntegerSelector(), ordered, unique, label);

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import org.eclipse.papyrus.infra.widgets.selectors.IntegerSelector;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * An editor for multivalued Integer attributes
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class MultipleIntegerEditor extends MultipleStringEditor {
+
+	/**
+	 * Constructs an Editor for multiple Integer values
+	 * The widget is a List, with controls to move values up/down, add values
+	 * and remove values.
+	 *
+	 * @param parent
+	 *            The Composite in which this editor is created
+	 * @param style
+	 *            The List's style
+	 */
+	public MultipleIntegerEditor(Composite parent, int style) {
+		super(parent, style, new IntegerSelector());
+	}
+
+	/**
+	 * Constructs an Editor for multiple Integer values
+	 * The widget is a List, with controls to move values up/down, add values
+	 * and remove values.
+	 *
+	 * @param parent
+	 *            The Composite in which this editor is created
+	 * @param style
+	 *            The List's style
+	 * @param label
+	 *            The editor's label
+	 */
+	public MultipleIntegerEditor(Composite parent, int style, String label) {
+		super(parent, style, new IntegerSelector(), label);
+	}
+
+	/**
+	 * Constructs an Editor for multiple Integer values
+	 * The widget is a List, with controls to move values up/down, add values
+	 * and remove values.
+	 *
+	 * @param parent
+	 *            The Composite in which this editor is created
+	 * @param style
+	 *            The List's style
+	 * @param ordered
+	 *            Indicates if the values should be ordered. If true, the up/down controls will be activated
+	 * @param unique
+	 *            Indicates if the values should be unique.
+	 * @param label
+	 *            The editor's label
+	 */
+	public MultipleIntegerEditor(Composite parent, int style, boolean ordered, boolean unique, String label) {
+		super(parent, style, new IntegerSelector(), ordered, unique, label);
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleReferenceEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleReferenceEditor.java
index 84f16d8bebd..7330d044179 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleReferenceEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleReferenceEditor.java
@@ -1,115 +1,115 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.papyrus.infra.widgets.providers.EmptyContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.WrappedLabelProvider;

-import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * An editor for multivalued references. This editor should be used when

- * there is enough vertical space available. If the vertical space is limited,

- * CompactMultipleReferenceEditor should be used instead.

- *

- * @author Camille Letavernier

- *

- */

-public class MultipleReferenceEditor extends MultipleValueEditor {

-

-	/**

-	 * The element selector for the available values

-	 */

-	protected ReferenceSelector selector;

-

-	protected IStaticContentProvider contentProvider;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The composite in which this editor is created

-	 * @param style

-	 *            The style for this editor's list

-	 * @param ordered

-	 *            True if the list should be ordered

-	 * @param unique

-	 *            True if the list values should be unique

-	 * @param label

-	 *            The label for this editor

-	 */

-	public MultipleReferenceEditor(Composite parent, int style, boolean ordered, boolean unique, String label) {

-		super(parent, style, new ReferenceSelector(unique), ordered, unique, label);

-		this.selector = (ReferenceSelector) super.selector;

-		// Default providers

-		setProviders(EmptyContentProvider.instance, new WrappedLabelProvider());

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The composite in which this editor is created

-	 * @param style

-	 *            The style for this editor's list

-	 * @param label

-	 *            The label for this editor

-	 */

-	public MultipleReferenceEditor(Composite parent, int style, String label) {

-		this(parent, style, false, false, label);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The composite in which this editor is created

-	 * @param style

-	 *            The style for this editor's list

-	 */

-	public MultipleReferenceEditor(Composite parent, int style) {

-		this(parent, style, false, false, null);

-	}

-

-	/**

-	 * Sets the Content and Label providers for this editor

-	 *

-	 * @param contentProvider

-	 *            The content provider describing the elements that can be selected

-	 * @param labelProvider

-	 *            The label provider for the elements

-	 */

-	public void setProviders(IStaticContentProvider contentProvider, ILabelProvider labelProvider) {

-		Assert.isNotNull(contentProvider, "The content provider should be defined"); //$NON-NLS-1$

-

-		this.contentProvider = contentProvider;

-

-		selector.setContentProvider(contentProvider);

-

-		if (labelProvider != null) {

-			selector.setLabelProvider(labelProvider);

-			super.setLabelProvider(labelProvider);

-		}

-	}

-

-	@Override

-	public void setUnique(boolean unique) {

-		selector.setUnique(unique);

-		super.setUnique(unique);

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.widgets.providers.EmptyContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.WrappedLabelProvider;
+import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * An editor for multivalued references. This editor should be used when
+ * there is enough vertical space available. If the vertical space is limited,
+ * CompactMultipleReferenceEditor should be used instead.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class MultipleReferenceEditor extends MultipleValueEditor {
+
+	/**
+	 * The element selector for the available values
+	 */
+	protected ReferenceSelector selector;
+
+	protected IStaticContentProvider contentProvider;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which this editor is created
+	 * @param style
+	 *            The style for this editor's list
+	 * @param ordered
+	 *            True if the list should be ordered
+	 * @param unique
+	 *            True if the list values should be unique
+	 * @param label
+	 *            The label for this editor
+	 */
+	public MultipleReferenceEditor(Composite parent, int style, boolean ordered, boolean unique, String label) {
+		super(parent, style, new ReferenceSelector(unique), ordered, unique, label);
+		this.selector = (ReferenceSelector) super.selector;
+		// Default providers
+		setProviders(EmptyContentProvider.instance, new WrappedLabelProvider());
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which this editor is created
+	 * @param style
+	 *            The style for this editor's list
+	 * @param label
+	 *            The label for this editor
+	 */
+	public MultipleReferenceEditor(Composite parent, int style, String label) {
+		this(parent, style, false, false, label);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which this editor is created
+	 * @param style
+	 *            The style for this editor's list
+	 */
+	public MultipleReferenceEditor(Composite parent, int style) {
+		this(parent, style, false, false, null);
+	}
+
+	/**
+	 * Sets the Content and Label providers for this editor
+	 *
+	 * @param contentProvider
+	 *            The content provider describing the elements that can be selected
+	 * @param labelProvider
+	 *            The label provider for the elements
+	 */
+	public void setProviders(IStaticContentProvider contentProvider, ILabelProvider labelProvider) {
+		Assert.isNotNull(contentProvider, "The content provider should be defined"); //$NON-NLS-1$
+
+		this.contentProvider = contentProvider;
+
+		selector.setContentProvider(contentProvider);
+
+		if (labelProvider != null) {
+			selector.setLabelProvider(labelProvider);
+			super.setLabelProvider(labelProvider);
+		}
+	}
+
+	@Override
+	public void setUnique(boolean unique) {
+		selector.setUnique(unique);
+		super.setUnique(unique);
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleStringEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleStringEditor.java
index 6c231ab29d3..ade19dcc579 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleStringEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleStringEditor.java
@@ -1,181 +1,181 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.papyrus.infra.widgets.creation.StringEditionFactory;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.selectors.StandardSelector;

-import org.eclipse.papyrus.infra.widgets.selectors.StringSelector;

-import org.eclipse.swt.widgets.Composite;

-

-

-/**

- * An editor for multivalued String attributes

- *

- * @author Camille Letavernier

- *

- */

-public class MultipleStringEditor extends MultipleValueEditor {

-

-	/**

-	 * Constructs an Editor for multiple String values

-	 * The widget is a List, with controls to move values up/down, add values

-	 * and remove values.

-	 *

-	 * @param parent

-	 *            The Composite in which this editor is created

-	 * @param style

-	 *            The List's style

-	 */

-	public MultipleStringEditor(Composite parent, int style) {

-		super(parent, style, new StringSelector());

-		init();

-	}

-

-	public MultipleStringEditor(Composite parent, int style, boolean multiline) {

-		super(parent, style, new StringSelector(multiline));

-		init();

-	}

-

-	/**

-	 * Constructs an Editor for multiple String values

-	 * The widget is a List, with controls to move values up/down, add values

-	 * and remove values.

-	 *

-	 * @param parent

-	 *            The Composite in which this editor is created

-	 * @param style

-	 *            The List's style

-	 * @param ordered

-	 *            Indicates if the values should be ordered. If true, the up/down controls will be activated

-	 * @param unique

-	 *            Indicates if the values should be unique.

-	 */

-	public MultipleStringEditor(Composite parent, int style, boolean ordered, boolean unique) {

-		super(parent, style, new StringSelector(), ordered, unique, null);

-		init();

-	}

-

-	/**

-	 * Constructs an Editor for multiple String values

-	 * The widget is a List, with controls to move values up/down, add values

-	 * and remove values.

-	 *

-	 * @param parent

-	 *            The Composite in which this editor is created

-	 * @param style

-	 *            The List's style

-	 * @param ordered

-	 *            Indicates if the values should be ordered. If true, the up/down controls will be activated

-	 * @param unique

-	 *            Indicates if the values should be unique.

-	 * @param label

-	 *            The editor's label

-	 */

-	public MultipleStringEditor(Composite parent, int style, boolean ordered, boolean unique, String label) {

-		super(parent, style, new StringSelector(), ordered, unique, label);

-		init();

-	}

-

-	/**

-	 * Constructs an Editor for multiple String values

-	 * The widget is a List, with controls to move values up/down, add values

-	 * and remove values.

-	 *

-	 * @param parent

-	 *            The Composite in which this editor is created

-	 * @param style

-	 *            The List's style

-	 * @param selector

-	 *            The Element selector for the dialog's left-pane. Used to select values or enter new ones.

-	 * @param ordered

-	 *            Indicates if the values should be ordered. If true, the up/down controls will be activated

-	 * @param unique

-	 *            Indicates if the values should be unique.

-	 * @param label

-	 *            The editor's label

-	 */

-	public MultipleStringEditor(Composite parent, int style, IElementSelector selector, boolean ordered, boolean unique, String label) {

-		super(parent, style, selector, ordered, unique, label);

-		init();

-	}

-

-	/**

-	 * Constructs an Editor for multiple Integer values

-	 * The widget is a List, with controls to move values up/down, add values

-	 * and remove values.

-	 *

-	 * @param parent

-	 *            The Composite in which this editor is created

-	 * @param style

-	 *            The List's style

-	 * @param selector

-	 *            The Element selector for the dialog's left-pane. Used to select values or enter new ones.

-	 */

-	public MultipleStringEditor(Composite parent, int style, IElementSelector selector) {

-		super(parent, style, selector);

-		init();

-	}

-

-	/**

-	 * Constructs an Editor for multiple String values

-	 * The widget is a List, with controls to move values up/down, add values

-	 * and remove values.

-	 *

-	 * @param parent

-	 *            The Composite in which this editor is created

-	 * @param style

-	 *            The List's style

-	 * @param selector

-	 *            The Element selector for the dialog's left-pane. Used to select values or enter new ones.

-	 * @param label

-	 *            The editor's label

-	 */

-	public MultipleStringEditor(Composite parent, int style, IElementSelector selector, String label) {

-		super(parent, style, selector, label);

-		init();

-	}

-

-	/**

-	 * Constructs an Editor for multiple String values

-	 * The widget is a List, with controls to move values up/down, add values

-	 * and remove values.

-	 *

-	 * @param parent

-	 *            The Composite in which this editor is created

-	 * @param style

-	 *            The List's style

-	 * @param label

-	 *            The editor's label

-	 */

-	public MultipleStringEditor(Composite parent, int style, String label) {

-		super(parent, style, new StringSelector(), label);

-		init();

-	}

-

-	private void init() {

-		setFactory(new StringEditionFactory());

-	}

-

-	public void setContentProvider(final IStaticContentProvider provider) {

-		IElementSelector selector = new StandardSelector(StringCombo.class) {

-

-			@Override

-			public void createControls(Composite parent) {

-				super.createControls(parent);

-				((StringCombo) editor).setProviders(provider, null);

-			}

-		};

-		setSelector(selector);

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import org.eclipse.papyrus.infra.widgets.creation.StringEditionFactory;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.selectors.StandardSelector;
+import org.eclipse.papyrus.infra.widgets.selectors.StringSelector;
+import org.eclipse.swt.widgets.Composite;
+
+
+/**
+ * An editor for multivalued String attributes
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class MultipleStringEditor extends MultipleValueEditor {
+
+	/**
+	 * Constructs an Editor for multiple String values
+	 * The widget is a List, with controls to move values up/down, add values
+	 * and remove values.
+	 *
+	 * @param parent
+	 *            The Composite in which this editor is created
+	 * @param style
+	 *            The List's style
+	 */
+	public MultipleStringEditor(Composite parent, int style) {
+		super(parent, style, new StringSelector());
+		init();
+	}
+
+	public MultipleStringEditor(Composite parent, int style, boolean multiline) {
+		super(parent, style, new StringSelector(multiline));
+		init();
+	}
+
+	/**
+	 * Constructs an Editor for multiple String values
+	 * The widget is a List, with controls to move values up/down, add values
+	 * and remove values.
+	 *
+	 * @param parent
+	 *            The Composite in which this editor is created
+	 * @param style
+	 *            The List's style
+	 * @param ordered
+	 *            Indicates if the values should be ordered. If true, the up/down controls will be activated
+	 * @param unique
+	 *            Indicates if the values should be unique.
+	 */
+	public MultipleStringEditor(Composite parent, int style, boolean ordered, boolean unique) {
+		super(parent, style, new StringSelector(), ordered, unique, null);
+		init();
+	}
+
+	/**
+	 * Constructs an Editor for multiple String values
+	 * The widget is a List, with controls to move values up/down, add values
+	 * and remove values.
+	 *
+	 * @param parent
+	 *            The Composite in which this editor is created
+	 * @param style
+	 *            The List's style
+	 * @param ordered
+	 *            Indicates if the values should be ordered. If true, the up/down controls will be activated
+	 * @param unique
+	 *            Indicates if the values should be unique.
+	 * @param label
+	 *            The editor's label
+	 */
+	public MultipleStringEditor(Composite parent, int style, boolean ordered, boolean unique, String label) {
+		super(parent, style, new StringSelector(), ordered, unique, label);
+		init();
+	}
+
+	/**
+	 * Constructs an Editor for multiple String values
+	 * The widget is a List, with controls to move values up/down, add values
+	 * and remove values.
+	 *
+	 * @param parent
+	 *            The Composite in which this editor is created
+	 * @param style
+	 *            The List's style
+	 * @param selector
+	 *            The Element selector for the dialog's left-pane. Used to select values or enter new ones.
+	 * @param ordered
+	 *            Indicates if the values should be ordered. If true, the up/down controls will be activated
+	 * @param unique
+	 *            Indicates if the values should be unique.
+	 * @param label
+	 *            The editor's label
+	 */
+	public MultipleStringEditor(Composite parent, int style, IElementSelector selector, boolean ordered, boolean unique, String label) {
+		super(parent, style, selector, ordered, unique, label);
+		init();
+	}
+
+	/**
+	 * Constructs an Editor for multiple Integer values
+	 * The widget is a List, with controls to move values up/down, add values
+	 * and remove values.
+	 *
+	 * @param parent
+	 *            The Composite in which this editor is created
+	 * @param style
+	 *            The List's style
+	 * @param selector
+	 *            The Element selector for the dialog's left-pane. Used to select values or enter new ones.
+	 */
+	public MultipleStringEditor(Composite parent, int style, IElementSelector selector) {
+		super(parent, style, selector);
+		init();
+	}
+
+	/**
+	 * Constructs an Editor for multiple String values
+	 * The widget is a List, with controls to move values up/down, add values
+	 * and remove values.
+	 *
+	 * @param parent
+	 *            The Composite in which this editor is created
+	 * @param style
+	 *            The List's style
+	 * @param selector
+	 *            The Element selector for the dialog's left-pane. Used to select values or enter new ones.
+	 * @param label
+	 *            The editor's label
+	 */
+	public MultipleStringEditor(Composite parent, int style, IElementSelector selector, String label) {
+		super(parent, style, selector, label);
+		init();
+	}
+
+	/**
+	 * Constructs an Editor for multiple String values
+	 * The widget is a List, with controls to move values up/down, add values
+	 * and remove values.
+	 *
+	 * @param parent
+	 *            The Composite in which this editor is created
+	 * @param style
+	 *            The List's style
+	 * @param label
+	 *            The editor's label
+	 */
+	public MultipleStringEditor(Composite parent, int style, String label) {
+		super(parent, style, new StringSelector(), label);
+		init();
+	}
+
+	private void init() {
+		setFactory(new StringEditionFactory());
+	}
+
+	public void setContentProvider(final IStaticContentProvider provider) {
+		IElementSelector selector = new StandardSelector(StringCombo.class) {
+
+			@Override
+			public void createControls(Composite parent) {
+				super.createControls(parent);
+				((StringCombo) editor).setProviders(provider, null);
+			}
+		};
+		setSelector(selector);
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleStringFileEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleStringFileEditor.java
index 7724d1b8bb1..f69aa41b8ca 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleStringFileEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleStringFileEditor.java
@@ -1,228 +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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import java.io.File;

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.LinkedHashMap;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.papyrus.infra.services.labelprovider.service.impl.LabelProviderServiceImpl;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.papyrus.infra.widgets.messages.Messages;

-import org.eclipse.papyrus.infra.widgets.providers.WorkspaceContentProvider;

-import org.eclipse.papyrus.infra.widgets.selectors.NullSelector;

-import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;

-import org.eclipse.papyrus.infra.widgets.util.FileUtil;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.FileDialog;

-

-/**

- * A Widget for editing multi-valued Strings with File paths

- * The file paths may be absolute (FileSystem paths) or relative to the workspace (Workspace paths)

- *

- * @author Camille Letavernier

- */

-public class MultipleStringFileEditor extends MultipleValueEditor {

-

-	protected boolean allowBrowseWorkspace = true;

-

-	protected boolean allowBrowseFileSystem = true;

-

-	protected Button browseFileSystem;

-

-	protected Button browseWorkspace;

-

-	protected final List<String> filterNames;

-

-	protected final List<String> filterExtensions;

-

-	public static final String browseWorkspaceIcon = "icons/browse-workspace_12x12.png"; //$NON-NLS-1$

-

-	public static final String browseFileSystemIcon = "icons/browse-filesystem_12x12.png"; //$NON-NLS-1$

-

-	public MultipleStringFileEditor(Composite parent, int style) {

-		super(parent, style, NullSelector.instance);

-		setDirectCreation(true);

-

-		filterNames = new LinkedList<String>();

-		filterExtensions = new LinkedList<String>();

-	}

-

-	@Override

-	protected void createListControls() {

-		super.createListControls();

-		add.dispose();

-		edit.dispose();

-

-		browseFileSystem = createButton(Activator.getDefault().getImageFromPlugin(browseFileSystemIcon), Messages.MultipleStringFileEditor_0);

-		browseWorkspace = createButton(Activator.getDefault().getImageFromPlugin(browseWorkspaceIcon), Messages.MultipleStringFileEditor_1);

-

-		browseWorkspace.moveAbove(remove);

-		browseFileSystem.moveAbove(remove);

-	}

-

-	@Override

-	public void setDirectCreation(boolean directCreation) {

-		super.setDirectCreation(true); // Always true

-	}

-

-	@Override

-	protected void updateControls() {

-		remove.setEnabled(!readOnly);

-		up.setEnabled(ordered && !readOnly);

-		down.setEnabled(ordered && !readOnly);

-

-		browseWorkspace.setEnabled(allowBrowseWorkspace && !readOnly);

-		browseFileSystem.setEnabled(allowBrowseFileSystem && !readOnly);

-	}

-

-	public void allowBrowseWorkspace(boolean allowBrowseWorkspace) {

-		this.allowBrowseWorkspace = allowBrowseWorkspace;

-	}

-

-	public void allowBrowseFileSystem(boolean allowBrowseFileSystem) {

-		this.allowBrowseFileSystem = allowBrowseFileSystem;

-	}

-

-	/**

-	 * Handle events occuring on controls

-	 *

-	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)

-	 *

-	 * @param e

-	 */

-	@Override

-	public void widgetSelected(SelectionEvent e) {

-		super.widgetSelected(e);

-		if (e.widget == browseFileSystem) {

-			browseFileSystem();

-		} else if (e.widget == browseWorkspace) {

-			browseWorkspace();

-		}

-	}

-

-	protected void browseFileSystem() {

-		// File file = FileUtil.getFile(text.getText());

-

-		FileDialog dialog = new FileDialog(getShell(), SWT.MULTI | SWT.OPEN);

-		dialog.setFilterExtensions(filterExtensions.toArray(new String[filterExtensions.size()]));

-		dialog.setFilterNames(filterNames.toArray(new String[filterNames.size()]));

-		if (dialog.open() != null) {

-			List<String> filePathList = new ArrayList<String>(modelProperty.size() + dialog.getFileNames().length);

-			filePathList.addAll(modelProperty);

-

-			for (String fileName : dialog.getFileNames()) {

-				filePathList.add(dialog.getFilterPath() + File.separator + fileName);

-			}

-

-			modelProperty.clear();

-			modelProperty.addAll(filePathList);

-			commit();

-		}

-	}

-

-	protected void browseWorkspace() {

-		LabelProviderService labelProviderService = new LabelProviderServiceImpl();

-		try {

-			labelProviderService.startService();

-		} catch (ServiceException ex) {

-			Activator.log.error(ex);

-		}

-

-		ILabelProvider labelProvider = labelProviderService.getLabelProvider();

-

-		ReferenceSelector selector = new ReferenceSelector();

-		selector.setLabelProvider(labelProvider);

-

-

-		// Prepare the WorkspaceContentProvider and use the right filters

-		WorkspaceContentProvider contentProvider = new WorkspaceContentProvider();

-

-		contentProvider.setExtensionFilters(new LinkedHashMap<String, String>()); // Reset the default filters

-		for (int i = 0; i < Math.min(filterNames.size(), filterExtensions.size()); i++) {

-			contentProvider.addExtensionFilter(filterExtensions.get(i), filterNames.get(i));

-		}

-

-		selector.setContentProvider(contentProvider);

-

-

-		MultipleValueSelectorDialog dialog = new MultipleValueSelectorDialog(getShell(), selector);

-		if (labelText != null) {

-			dialog.setTitle(labelText);

-		}

-

-		dialog.setLabelProvider(labelProvider);

-

-		dialog.setOrdered(true);

-		dialog.setUnique(true);

-		selector.setUnique(true);

-

-		int code = dialog.open();

-		if (code == Window.OK) {

-			Object[] result = dialog.getResult();

-			if (result.length > 0) {

-				List<String> filePathResult = new ArrayList<String>(result.length + modelProperty.size());

-				filePathResult.addAll(modelProperty);

-				for (Object file : result) {

-					if (file instanceof IFile) {

-						filePathResult.add(FileUtil.getPath((IFile) file, false));

-					}

-				}

-				modelProperty.clear();

-				modelProperty.addAll(filePathResult);

-				commit();

-			}

-		}

-	}

-

-	public void setFilters(String[] filterExtensions, String[] filterNames) {

-		if (filterExtensions.length != filterNames.length) {

-			// This is a simple warning. Only valid filters will be retained.

-			Activator.log.warn(Messages.MultipleStringFileEditor_2);

-		}

-

-		setFilterNames(getFilterLabels(filterNames, filterExtensions));

-		setFilterExtensions(filterExtensions);

-	}

-

-	protected String[] getFilterLabels(String[] filterNames, String[] filterExtensions) {

-		int size = Math.min(filterNames.length, filterExtensions.length);

-		String[] filters = new String[size];

-		for (int i = 0; i < size; i++) {

-			filters[i] = filterNames[i] + " (" + filterExtensions[i] + ")"; //$NON-NLS-1$ //$NON-NLS-2$

-		}

-		return filters;

-	}

-

-	public void setFilterExtensions(String[] filterExtensions) {

-		this.filterExtensions.clear();

-		this.filterExtensions.addAll(Arrays.asList(filterExtensions));

-	}

-

-	public void setFilterNames(String[] filterNames) {

-		this.filterNames.clear();

-		this.filterNames.addAll(Arrays.asList(filterNames));

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.papyrus.infra.services.labelprovider.service.impl.LabelProviderServiceImpl;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.providers.WorkspaceContentProvider;
+import org.eclipse.papyrus.infra.widgets.selectors.NullSelector;
+import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;
+import org.eclipse.papyrus.infra.widgets.util.FileUtil;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.FileDialog;
+
+/**
+ * A Widget for editing multi-valued Strings with File paths
+ * The file paths may be absolute (FileSystem paths) or relative to the workspace (Workspace paths)
+ *
+ * @author Camille Letavernier
+ */
+public class MultipleStringFileEditor extends MultipleValueEditor {
+
+	protected boolean allowBrowseWorkspace = true;
+
+	protected boolean allowBrowseFileSystem = true;
+
+	protected Button browseFileSystem;
+
+	protected Button browseWorkspace;
+
+	protected final List<String> filterNames;
+
+	protected final List<String> filterExtensions;
+
+	public static final String browseWorkspaceIcon = "icons/browse-workspace_12x12.png"; //$NON-NLS-1$
+
+	public static final String browseFileSystemIcon = "icons/browse-filesystem_12x12.png"; //$NON-NLS-1$
+
+	public MultipleStringFileEditor(Composite parent, int style) {
+		super(parent, style, NullSelector.instance);
+		setDirectCreation(true);
+
+		filterNames = new LinkedList<String>();
+		filterExtensions = new LinkedList<String>();
+	}
+
+	@Override
+	protected void createListControls() {
+		super.createListControls();
+		add.dispose();
+		edit.dispose();
+
+		browseFileSystem = createButton(Activator.getDefault().getImageFromPlugin(browseFileSystemIcon), Messages.MultipleStringFileEditor_0);
+		browseWorkspace = createButton(Activator.getDefault().getImageFromPlugin(browseWorkspaceIcon), Messages.MultipleStringFileEditor_1);
+
+		browseWorkspace.moveAbove(remove);
+		browseFileSystem.moveAbove(remove);
+	}
+
+	@Override
+	public void setDirectCreation(boolean directCreation) {
+		super.setDirectCreation(true); // Always true
+	}
+
+	@Override
+	protected void updateControls() {
+		remove.setEnabled(!readOnly);
+		up.setEnabled(ordered && !readOnly);
+		down.setEnabled(ordered && !readOnly);
+
+		browseWorkspace.setEnabled(allowBrowseWorkspace && !readOnly);
+		browseFileSystem.setEnabled(allowBrowseFileSystem && !readOnly);
+	}
+
+	public void allowBrowseWorkspace(boolean allowBrowseWorkspace) {
+		this.allowBrowseWorkspace = allowBrowseWorkspace;
+	}
+
+	public void allowBrowseFileSystem(boolean allowBrowseFileSystem) {
+		this.allowBrowseFileSystem = allowBrowseFileSystem;
+	}
+
+	/**
+	 * Handle events occuring on controls
+	 *
+	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
+	 *
+	 * @param e
+	 */
+	@Override
+	public void widgetSelected(SelectionEvent e) {
+		super.widgetSelected(e);
+		if (e.widget == browseFileSystem) {
+			browseFileSystem();
+		} else if (e.widget == browseWorkspace) {
+			browseWorkspace();
+		}
+	}
+
+	protected void browseFileSystem() {
+		// File file = FileUtil.getFile(text.getText());
+
+		FileDialog dialog = new FileDialog(getShell(), SWT.MULTI | SWT.OPEN);
+		dialog.setFilterExtensions(filterExtensions.toArray(new String[filterExtensions.size()]));
+		dialog.setFilterNames(filterNames.toArray(new String[filterNames.size()]));
+		if (dialog.open() != null) {
+			List<String> filePathList = new ArrayList<String>(modelProperty.size() + dialog.getFileNames().length);
+			filePathList.addAll(modelProperty);
+
+			for (String fileName : dialog.getFileNames()) {
+				filePathList.add(dialog.getFilterPath() + File.separator + fileName);
+			}
+
+			modelProperty.clear();
+			modelProperty.addAll(filePathList);
+			commit();
+		}
+	}
+
+	protected void browseWorkspace() {
+		LabelProviderService labelProviderService = new LabelProviderServiceImpl();
+		try {
+			labelProviderService.startService();
+		} catch (ServiceException ex) {
+			Activator.log.error(ex);
+		}
+
+		ILabelProvider labelProvider = labelProviderService.getLabelProvider();
+
+		ReferenceSelector selector = new ReferenceSelector();
+		selector.setLabelProvider(labelProvider);
+
+
+		// Prepare the WorkspaceContentProvider and use the right filters
+		WorkspaceContentProvider contentProvider = new WorkspaceContentProvider();
+
+		contentProvider.setExtensionFilters(new LinkedHashMap<String, String>()); // Reset the default filters
+		for (int i = 0; i < Math.min(filterNames.size(), filterExtensions.size()); i++) {
+			contentProvider.addExtensionFilter(filterExtensions.get(i), filterNames.get(i));
+		}
+
+		selector.setContentProvider(contentProvider);
+
+
+		MultipleValueSelectorDialog dialog = new MultipleValueSelectorDialog(getShell(), selector);
+		if (labelText != null) {
+			dialog.setTitle(labelText);
+		}
+
+		dialog.setLabelProvider(labelProvider);
+
+		dialog.setOrdered(true);
+		dialog.setUnique(true);
+		selector.setUnique(true);
+
+		int code = dialog.open();
+		if (code == Window.OK) {
+			Object[] result = dialog.getResult();
+			if (result.length > 0) {
+				List<String> filePathResult = new ArrayList<String>(result.length + modelProperty.size());
+				filePathResult.addAll(modelProperty);
+				for (Object file : result) {
+					if (file instanceof IFile) {
+						filePathResult.add(FileUtil.getPath((IFile) file, false));
+					}
+				}
+				modelProperty.clear();
+				modelProperty.addAll(filePathResult);
+				commit();
+			}
+		}
+	}
+
+	public void setFilters(String[] filterExtensions, String[] filterNames) {
+		if (filterExtensions.length != filterNames.length) {
+			// This is a simple warning. Only valid filters will be retained.
+			Activator.log.warn(Messages.MultipleStringFileEditor_2);
+		}
+
+		setFilterNames(getFilterLabels(filterNames, filterExtensions));
+		setFilterExtensions(filterExtensions);
+	}
+
+	protected String[] getFilterLabels(String[] filterNames, String[] filterExtensions) {
+		int size = Math.min(filterNames.length, filterExtensions.length);
+		String[] filters = new String[size];
+		for (int i = 0; i < size; i++) {
+			filters[i] = filterNames[i] + " (" + filterExtensions[i] + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		return filters;
+	}
+
+	public void setFilterExtensions(String[] filterExtensions) {
+		this.filterExtensions.clear();
+		this.filterExtensions.addAll(Arrays.asList(filterExtensions));
+	}
+
+	public void setFilterNames(String[] filterNames) {
+		this.filterNames.clear();
+		this.filterNames.addAll(Arrays.asList(filterNames));
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueEditor.java
index 5874989e44c..26dce0a5897 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueEditor.java
@@ -1,725 +1,725 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 402525

- *  Christian W. Damus - bug 399859

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import java.util.Arrays;

-import java.util.Collection;

-

-import org.eclipse.core.databinding.observable.ChangeEvent;

-import org.eclipse.core.databinding.observable.IChangeListener;

-import org.eclipse.core.databinding.observable.list.IObservableList;

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.OperationCanceledException;

-import org.eclipse.jface.viewers.IBaseLabelProvider;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.window.Window;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

-import org.eclipse.papyrus.infra.widgets.messages.Messages;

-import org.eclipse.papyrus.infra.widgets.providers.TreeCollectionContentProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.DisposeListener;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.layout.FillLayout;

-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.Tree;

-import org.eclipse.swt.widgets.TreeItem;

-

-/**

- * An editor for multivalued fields.

- *

- * @author Camille Letavernier

- *

- */

-public class MultipleValueEditor extends AbstractListEditor implements SelectionListener, IChangeListener, DisposeListener {

-

-	public static final int MANY = -1;

-

-	/**

-	 * The viewer displaying the current values from

-	 * the model

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * The tree associated to the viewer

-	 */

-	protected Tree tree;

-

-	/**

-	 * A Composite containing the different control buttons

-	 * (Add, remove, ...)

-	 */

-	protected Composite controlsSection;

-

-	/**

-	 * The Add control

-	 */

-	protected Button add;

-

-	/**

-	 * The Remove control

-	 */

-	protected Button remove;

-

-	/**

-	 * The Up control

-	 */

-	protected Button up;

-

-	/**

-	 * The Down control

-	 */

-	protected Button down;

-

-	/**

-	 * The edit control

-	 */

-	protected Button edit;

-

-	/**

-	 * The element selector for this editor's dialog

-	 */

-	protected IElementSelector selector;

-

-	/**

-	 * Indicates whether the underlying is ordered

-	 */

-	protected boolean ordered;

-

-	/**

-	 * Indicates whether the underlying contains unique values

-	 */

-	protected boolean unique;

-

-	/**

-	 * The factory for creating and editing values from

-	 * this editor

-	 */

-	protected ReferenceValueFactory referenceFactory;

-

-	/**

-	 * Indicates if this editor is readOnly

-	 */

-	protected boolean readOnly;

-

-	private boolean directCreation;

-

-	/**

-	 * Indicates the maximum number of values selected.

-	 */

-	protected int upperBound;

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The Composite in which this Editor should be displayed

-	 * @param style

-	 *            This editor's tree style

-	 * @param selector

-	 *            The element selector for this editor's dialog

-	 * @param ordered

-	 *            Specify if the observed collection is ordered. If true, Up and Down controls are displayed.

-	 * @param unique

-	 *            Specify if the observed collection values are unique.

-	 * @param label

-	 *            The label for this editor. If null, the label isn't created.

-	 */

-	public MultipleValueEditor(Composite parent, int style, IElementSelector selector, boolean ordered, boolean unique, String label) {

-		this(parent, style, selector, ordered, unique, label, MANY);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The Composite in which this Editor should be displayed

-	 * @param style

-	 *            This editor's tree style

-	 * @param selector

-	 *            The element selector for this editor's dialog

-	 * @param ordered

-	 *            Specify if the observed collection is ordered. If true, Up and Down controls are displayed.

-	 * @param unique

-	 *            Specify if the observed collection values are unique.

-	 * @param label

-	 *            The label for this editor. If null, the label isn't created.

-	 * @param upperBound

-	 *            The maximum number of values that must appear.

-	 */

-	public MultipleValueEditor(Composite parent, int style, IElementSelector selector, boolean ordered, boolean unique, String label, int upperBound) {

-		super(parent, label);

-		Assert.isNotNull(selector, "The Element Selector must be specified for a MultipleValueEditor"); //$NON-NLS-1$

-

-		setLayout(new GridLayout(label == null ? 1 : 2, false));

-

-		controlsSection = new Composite(this, SWT.NONE);

-		controlsSection.setLayout(new FillLayout());

-		controlsSection.setLayoutData(new GridData(SWT.END, SWT.CENTER, false, false));

-

-		tree = new Tree(this, style | SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER | SWT.FULL_SELECTION);

-		GridData treeData = new GridData(SWT.FILL, SWT.FILL, true, true);

-		treeData.horizontalSpan = 2;

-		treeData.minimumHeight = 80;

-		tree.setLayoutData(treeData);

-

-		tree.addSelectionListener(this);

-

-		treeViewer = new TreeViewer(tree);

-		treeViewer.setContentProvider(TreeCollectionContentProvider.instance);

-

-		createListControls();

-

-		this.selector = selector;

-

-		setLabelProvider(new LabelProvider());

-		setUpperBound(upperBound);

-		this.ordered = ordered;

-		this.unique = unique;

-		updateControls();

-	}

-

-	/**

-	 * Creates the dialog for this editor

-	 *

-	 * @param parent

-	 *            The Composite in which the dialog should be displayed

-	 * @param selector

-	 *            The element selector for this dialog

-	 * @param ordered

-	 *            Specify if the observed collection is ordered. If true, Up and Down controls are displayed.

-	 * @param unique

-	 *            Specify if the observed collection values are unique.

-	 * @param label

-	 *            The editor's label.

-	 * @return The new dialog for this editor

-	 */

-	protected MultipleValueSelectorDialog createMultipleValueSelectorDialog(Composite parent, IElementSelector selector, boolean ordered, boolean unique, String label) {

-		return new MultipleValueSelectorDialog(parent.getShell(), selector, label, unique, ordered);

-	}

-

-	@Override

-	protected GridData getLabelLayoutData() {

-		GridData data = new GridData(SWT.FILL, SWT.CENTER, true, false);

-		return data;

-	}

-

-	public void setSelector(IElementSelector selector) {

-		this.selector = selector;

-	}

-

-	protected void updateControls() {

-

-		boolean enableAddAction = true;

-		if (directCreation) {

-			if (referenceFactory == null || !referenceFactory.canCreateObject()) {

-				enableAddAction = false;

-			}

-		}

-

-		add.setEnabled(!readOnly && enableAddAction);

-		remove.setEnabled(!readOnly);

-		up.setEnabled(ordered && !readOnly);

-		down.setEnabled(ordered && !readOnly);

-

-		if (edit != null) {

-			edit.setEnabled(this.referenceFactory != null && referenceFactory.canEdit() && !readOnly);

-		}

-

-		if (modelProperty != null && this.upperBound != MANY) {

-			if (modelProperty.size() >= this.upperBound) {

-				add.setEnabled(false);

-			}

-		}

-

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The Composite in which this Editor should be displayed

-	 * @param style

-	 *            This editor's tree style

-	 * @param selector

-	 *            The element selector for this editor's dialog

-	 * @param ordered

-	 *            Specify if the observed collection is ordered. If true, Up and Down controls are displayed

-	 */

-	public MultipleValueEditor(Composite parent, int style, IElementSelector selector, boolean ordered) {

-		this(parent, style, selector, ordered, false, null);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The Composite in which this Editor should be displayed

-	 * @param style

-	 *            This editor's tree style

-	 * @param selector

-	 *            The element selector for this editor's dialog

-	 */

-	public MultipleValueEditor(Composite parent, int style, IElementSelector selector) {

-		this(parent, style, selector, false, false, null);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The Composite in which this Editor should be displayed

-	 * @param style

-	 *            This editor's tree style

-	 * @param selector

-	 *            The element selector for this editor's dialog

-	 * @param label

-	 *            The label for this Editor

-	 */

-	public MultipleValueEditor(Composite parent, int style, IElementSelector selector, String label) {

-		this(parent, style, selector, false, false, label);

-	}

-

-	/**

-	 * Sets the label provider for this editor

-	 *

-	 * @param labelProvider

-	 *            The label provider for this editor

-	 */

-	public void setLabelProvider(IBaseLabelProvider labelProvider) {

-		treeViewer.setLabelProvider(labelProvider);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void doBinding() {

-		// We don't do a real Databinding in this case

-		treeViewer.setInput(modelProperty);

-		modelProperty.addChangeListener(this);

-	}

-

-	/**

-	 * @param ordered

-	 */

-	public void setOrdered(boolean ordered) {

-		this.ordered = ordered;

-

-		updateControls();

-	}

-

-	/**

-	 * @param unique

-	 */

-	public void setUnique(boolean unique) {

-		this.unique = unique;

-

-		updateControls();

-	}

-

-	/**

-	 * Creates the Add/Remove controls,

-	 * and the Up/Down controls if the collection is ordered

-	 *

-	 * @param ordered

-	 */

-	protected void createListControls() {

-		up = createButton(Activator.getDefault().getImage("/icons/Up_12x12.gif"), Messages.MultipleValueEditor_MoveSelectedElementsUp); //$NON-NLS-1$

-		down = createButton(Activator.getDefault().getImage("/icons/Down_12x12.gif"), Messages.MultipleValueEditor_MoveSelectedElementsDown); //$NON-NLS-1$

-		add = createButton(Activator.getDefault().getImage("/icons/Add_12x12.gif"), Messages.MultipleValueEditor_AddElements); //$NON-NLS-1$

-		remove = createButton(Activator.getDefault().getImage("/icons/Delete_12x12.gif"), Messages.MultipleValueEditor_RemoveSelectedElements); //$NON-NLS-1$

-		edit = createButton(Activator.getDefault().getImage("/icons/Edit_12x12.gif"), Messages.MultipleValueEditor_EditSelectedValue); //$NON-NLS-1$

-	}

-

-	protected Button createButton(Image image, String toolTipText) {

-		Button button = new Button(controlsSection, SWT.PUSH);

-		button.setImage(image);

-		button.addSelectionListener(this);

-		button.setToolTipText(toolTipText);

-		return button;

-	}

-

-	@Override

-	public Object getEditableType() {

-		return Collection.class;

-	}

-

-	/**

-	 * Handle events occuring on controls

-	 *

-	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)

-	 *

-	 * @param e

-	 */

-	@Override

-	public void widgetSelected(SelectionEvent e) {

-		if (e.widget == null) {

-			return;

-		}

-		if (e.widget == add) {

-			if (this.upperBound == MANY || modelProperty.size() < this.upperBound) {

-				addAction();

-			}

-		} else if (e.widget == remove) {

-			removeAction();

-		} else if (e.widget == up) {

-			upAction();

-		} else if (e.widget == down) {

-			downAction();

-		} else if (e.widget == edit) {

-			editAction();

-		}

-

-		updateBoutons();

-	}

-

-	/**

-	 * Handle add Action

-	 */

-	protected void addAction() {

-		final Object context = getContextElement();

-

-		if (directCreation) {

-			if (referenceFactory != null && referenceFactory.canCreateObject()) {

-				getOperationExecutor(context).execute(new Runnable() {

-

-					@Override

-					public void run() {

-						Object newElement = referenceFactory.createObject(MultipleValueEditor.this, context);

-						if (newElement != null) {

-							modelProperty.add(newElement);

-							commit();

-						}

-					}

-				}, NLS.bind(Messages.MultipleValueEditor_addOperation, labelText));

-			}

-

-			return;

-		}

-

-		getOperationExecutor(context).execute(new Runnable() {

-

-			@Override

-			public void run() {

-				String dialogLabel = label == null ? null : label.getText();

-				MultipleValueSelectorDialog dialog = createMultipleValueSelectorDialog(getParent(), selector, ordered, unique, dialogLabel);

-				dialog.setLabelProvider((ILabelProvider) treeViewer.getLabelProvider());

-				dialog.setFactory(referenceFactory);

-				dialog.setUpperBound(upperBound);

-				dialog.setContextElement(context);

-

-				if (modelProperty != null) {

-					dialog.setInitialSelections(modelProperty.toArray());

-				} else {

-					dialog.setInitialSelections(new Object[0]);

-				}

-

-				int returnCode = dialog.open();

-				if (returnCode == Window.CANCEL) {

-					// Clear out the element selector in case we open this dialog again

-					selector.clearTemporaryElements();

-

-					// Roll back whatever has been done, so far

-					throw new OperationCanceledException();

-				}

-

-				modelProperty.clear();

-

-				Object[] result = dialog.getResult();

-				if (result == null) {

-					return;

-				}

-

-				modelProperty.addAll(Arrays.asList(result));

-

-				commit();

-			}

-		}, NLS.bind(Messages.MultipleValueEditor_addOperation, labelText));

-	}

-

-	@Override

-	protected void commit() {

-		super.commit();

-		if (!isDisposed()) {

-			treeViewer.refresh();

-		}

-	}

-

-	/**

-	 * Handle remove Action

-	 */

-	protected void removeAction() {

-		IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();

-		for (Object value : selection.toArray()) {

-			modelProperty.remove(value);

-		}

-		treeViewer.setSelection(null);

-

-		commit();

-	}

-

-	/**

-	 * Handle up Action

-	 */

-	protected void upAction() {

-		IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();

-		for (Object o : selection.toArray()) {

-			int oldIndex = modelProperty.indexOf(o);

-			if (oldIndex > 0) {

-				modelProperty.move(oldIndex, oldIndex - 1);

-			}

-		}

-

-		IStructuredSelection selectionCopy = new StructuredSelection(selection.toArray());

-		treeViewer.setSelection(selectionCopy);

-

-		commit();

-	}

-

-	/**

-	 * Handle down Action

-	 */

-	protected void downAction() {

-		IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();

-

-		int maxIndex = modelProperty.size() - 1;

-

-		Object[] selectionArray = selection.toArray();

-		for (int i = selectionArray.length - 1; i >= 0; i--) {

-			Object o = selectionArray[i];

-			int oldIndex = modelProperty.indexOf(o);

-			if (oldIndex < maxIndex) {

-				modelProperty.move(oldIndex, oldIndex + 1);

-			}

-		}

-

-		IStructuredSelection selectionCopy = new StructuredSelection(selection.toArray());

-		treeViewer.setSelection(selectionCopy);

-

-		commit();

-	}

-

-	/**

-	 * Handle edit Action

-	 */

-	protected void editAction() {

-		IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();

-

-		if (selection.size() != 1) {

-			return;

-		}

-

-		TreeItem selectedItem = treeViewer.getTree().getSelection()[0];

-		Tree parentTree = selectedItem.getParent();

-

-		final int index = parentTree.indexOf(selectedItem);

-		final Object currentValue = selection.getFirstElement();

-

-		getOperationExecutor(currentValue).execute(new Runnable() {

-

-			@SuppressWarnings("unchecked")

-			@Override

-			public void run() {

-				Object newValue = referenceFactory.edit(MultipleValueEditor.this.edit, currentValue);

-

-				if (newValue != currentValue && newValue != null) {

-					modelProperty.remove(index);

-					modelProperty.add(index, newValue);

-

-					// commit(); // The commit only occurs in the case where we modify the list (We don't commit direct edition on objects)

-				}

-

-				commit();

-			}

-		}, NLS.bind(Messages.MultipleValueEditor_editOperation, labelText));

-	}

-

-	/**

-	 * Sets the {@link ReferenceValueFactory} for this editor. The {@link ReferenceValueFactory} is used to create

-	 * new instances and edit existing ones.

-	 *

-	 * @param factory

-	 *            The {@link ReferenceValueFactory} to be used by this editor

-	 */

-	public void setFactory(ReferenceValueFactory factory) {

-		this.referenceFactory = factory;

-		updateControls();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void widgetDefaultSelected(SelectionEvent e) {

-		if ((e.widget == tree) && (edit != null) && edit.isEnabled()) {

-			editAction();

-		}

-	}

-

-	/**

-	 * Gets the tree viewer associated to this editor

-	 *

-	 * @return the tree viewer associated to this editor

-	 */

-	public TreeViewer getViewer() {

-		return treeViewer;

-	}

-

-	/**

-	 * Refreshes the viewer when a change occurs on the ObservableList

-	 * TODO : Problem : a change occurring on an element of the list is not sent here

-	 * TODO : When undoing a command, the change event is not received (Although it modifies the list itself)

-	 *

-	 * @see org.eclipse.core.databinding.observable.IChangeListener#handleChange(org.eclipse.core.databinding.observable.ChangeEvent)

-	 *

-	 * @param event

-	 */

-	@Override

-	public void handleChange(ChangeEvent event) {

-		if (!isDisposed()) {

-			treeViewer.refresh();

-		}

-	}

-

-	@Override

-	public void dispose() {

-		if (modelProperty != null) {

-			modelProperty.removeChangeListener(this);

-		}

-		super.dispose();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void setReadOnly(boolean readOnly) {

-		this.readOnly = readOnly;

-		updateControls();

-		// tree.setEnabled(!readOnly);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean isReadOnly() {

-		return !tree.isEnabled();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void setLabel(String label) {

-		if (this.label == null) {

-			setLayout(new GridLayout(2, false));

-		}

-		super.setLabel(label);

-	}

-

-	@Override

-	public void setToolTipText(String text) {

-		tree.setToolTipText(text);

-		super.setLabelToolTipText(text);

-	}

-

-	@Override

-	public void setModelObservable(IObservableList modelProperty) {

-		super.setModelObservable(modelProperty);

-		updateControls();

-	}

-

-	@Override

-	public void refreshValue() {

-		treeViewer.refresh();

-	}

-

-	/**

-	 * Sets the direct creation mode.

-	 * If direct creation is set to true, the {@link ReferenceValueFactory#createObject(org.eclipse.swt.widgets.Control)} method will be called when

-	 * to add button is pressed.

-	 * Otherwise, the dialog will be used.

-	 *

-	 * @param directCreation

-	 */

-	public void setDirectCreation(boolean directCreation) {

-		this.directCreation = directCreation;

-		updateControls();

-	}

-

-	/**

-	 * Adds a ISelectionChangedListener to this widget

-	 *

-	 * @param listener

-	 */

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		treeViewer.addSelectionChangedListener(listener);

-	}

-

-	/**

-	 * Removes a ISelectionChangedListener from this widget

-	 *

-	 * @param listener

-	 */

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		treeViewer.removeSelectionChangedListener(listener);

-	}

-

-	/**

-	 * Set the maximum number of values selected.

-	 *

-	 * @param upperBound

-	 */

-	public void setUpperBound(int upperBound) {

-		this.upperBound = upperBound;

-	}

-

-	public void updateBoutons() {

-		/* Disable the button 'add' if the upperBound is reached */

-		if (this.upperBound != MANY) {

-			if (modelProperty.size() >= this.upperBound) {

-				add.setEnabled(false);

-			} else {

-				add.setEnabled(true);

-			}

-		}

-	}

-

-	@Override

-	public void changeColorField() {

-		// nothing to do here

-

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 402525
+ *  Christian W. Damus - bug 399859
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.eclipse.core.databinding.observable.ChangeEvent;
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.jface.viewers.IBaseLabelProvider;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.window.Window;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.providers.TreeCollectionContentProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.FillLayout;
+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.Tree;
+import org.eclipse.swt.widgets.TreeItem;
+
+/**
+ * An editor for multivalued fields.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class MultipleValueEditor extends AbstractListEditor implements SelectionListener, IChangeListener, DisposeListener {
+
+	public static final int MANY = -1;
+
+	/**
+	 * The viewer displaying the current values from
+	 * the model
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * The tree associated to the viewer
+	 */
+	protected Tree tree;
+
+	/**
+	 * A Composite containing the different control buttons
+	 * (Add, remove, ...)
+	 */
+	protected Composite controlsSection;
+
+	/**
+	 * The Add control
+	 */
+	protected Button add;
+
+	/**
+	 * The Remove control
+	 */
+	protected Button remove;
+
+	/**
+	 * The Up control
+	 */
+	protected Button up;
+
+	/**
+	 * The Down control
+	 */
+	protected Button down;
+
+	/**
+	 * The edit control
+	 */
+	protected Button edit;
+
+	/**
+	 * The element selector for this editor's dialog
+	 */
+	protected IElementSelector selector;
+
+	/**
+	 * Indicates whether the underlying is ordered
+	 */
+	protected boolean ordered;
+
+	/**
+	 * Indicates whether the underlying contains unique values
+	 */
+	protected boolean unique;
+
+	/**
+	 * The factory for creating and editing values from
+	 * this editor
+	 */
+	protected ReferenceValueFactory referenceFactory;
+
+	/**
+	 * Indicates if this editor is readOnly
+	 */
+	protected boolean readOnly;
+
+	private boolean directCreation;
+
+	/**
+	 * Indicates the maximum number of values selected.
+	 */
+	protected int upperBound;
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The Composite in which this Editor should be displayed
+	 * @param style
+	 *            This editor's tree style
+	 * @param selector
+	 *            The element selector for this editor's dialog
+	 * @param ordered
+	 *            Specify if the observed collection is ordered. If true, Up and Down controls are displayed.
+	 * @param unique
+	 *            Specify if the observed collection values are unique.
+	 * @param label
+	 *            The label for this editor. If null, the label isn't created.
+	 */
+	public MultipleValueEditor(Composite parent, int style, IElementSelector selector, boolean ordered, boolean unique, String label) {
+		this(parent, style, selector, ordered, unique, label, MANY);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The Composite in which this Editor should be displayed
+	 * @param style
+	 *            This editor's tree style
+	 * @param selector
+	 *            The element selector for this editor's dialog
+	 * @param ordered
+	 *            Specify if the observed collection is ordered. If true, Up and Down controls are displayed.
+	 * @param unique
+	 *            Specify if the observed collection values are unique.
+	 * @param label
+	 *            The label for this editor. If null, the label isn't created.
+	 * @param upperBound
+	 *            The maximum number of values that must appear.
+	 */
+	public MultipleValueEditor(Composite parent, int style, IElementSelector selector, boolean ordered, boolean unique, String label, int upperBound) {
+		super(parent, label);
+		Assert.isNotNull(selector, "The Element Selector must be specified for a MultipleValueEditor"); //$NON-NLS-1$
+
+		setLayout(new GridLayout(label == null ? 1 : 2, false));
+
+		controlsSection = new Composite(this, SWT.NONE);
+		controlsSection.setLayout(new FillLayout());
+		controlsSection.setLayoutData(new GridData(SWT.END, SWT.CENTER, false, false));
+
+		tree = new Tree(this, style | SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER | SWT.FULL_SELECTION);
+		GridData treeData = new GridData(SWT.FILL, SWT.FILL, true, true);
+		treeData.horizontalSpan = 2;
+		treeData.minimumHeight = 80;
+		tree.setLayoutData(treeData);
+
+		tree.addSelectionListener(this);
+
+		treeViewer = new TreeViewer(tree);
+		treeViewer.setContentProvider(TreeCollectionContentProvider.instance);
+
+		createListControls();
+
+		this.selector = selector;
+
+		setLabelProvider(new LabelProvider());
+		setUpperBound(upperBound);
+		this.ordered = ordered;
+		this.unique = unique;
+		updateControls();
+	}
+
+	/**
+	 * Creates the dialog for this editor
+	 *
+	 * @param parent
+	 *            The Composite in which the dialog should be displayed
+	 * @param selector
+	 *            The element selector for this dialog
+	 * @param ordered
+	 *            Specify if the observed collection is ordered. If true, Up and Down controls are displayed.
+	 * @param unique
+	 *            Specify if the observed collection values are unique.
+	 * @param label
+	 *            The editor's label.
+	 * @return The new dialog for this editor
+	 */
+	protected MultipleValueSelectorDialog createMultipleValueSelectorDialog(Composite parent, IElementSelector selector, boolean ordered, boolean unique, String label) {
+		return new MultipleValueSelectorDialog(parent.getShell(), selector, label, unique, ordered);
+	}
+
+	@Override
+	protected GridData getLabelLayoutData() {
+		GridData data = new GridData(SWT.FILL, SWT.CENTER, true, false);
+		return data;
+	}
+
+	public void setSelector(IElementSelector selector) {
+		this.selector = selector;
+	}
+
+	protected void updateControls() {
+
+		boolean enableAddAction = true;
+		if (directCreation) {
+			if (referenceFactory == null || !referenceFactory.canCreateObject()) {
+				enableAddAction = false;
+			}
+		}
+
+		add.setEnabled(!readOnly && enableAddAction);
+		remove.setEnabled(!readOnly);
+		up.setEnabled(ordered && !readOnly);
+		down.setEnabled(ordered && !readOnly);
+
+		if (edit != null) {
+			edit.setEnabled(this.referenceFactory != null && referenceFactory.canEdit() && !readOnly);
+		}
+
+		if (modelProperty != null && this.upperBound != MANY) {
+			if (modelProperty.size() >= this.upperBound) {
+				add.setEnabled(false);
+			}
+		}
+
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The Composite in which this Editor should be displayed
+	 * @param style
+	 *            This editor's tree style
+	 * @param selector
+	 *            The element selector for this editor's dialog
+	 * @param ordered
+	 *            Specify if the observed collection is ordered. If true, Up and Down controls are displayed
+	 */
+	public MultipleValueEditor(Composite parent, int style, IElementSelector selector, boolean ordered) {
+		this(parent, style, selector, ordered, false, null);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The Composite in which this Editor should be displayed
+	 * @param style
+	 *            This editor's tree style
+	 * @param selector
+	 *            The element selector for this editor's dialog
+	 */
+	public MultipleValueEditor(Composite parent, int style, IElementSelector selector) {
+		this(parent, style, selector, false, false, null);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The Composite in which this Editor should be displayed
+	 * @param style
+	 *            This editor's tree style
+	 * @param selector
+	 *            The element selector for this editor's dialog
+	 * @param label
+	 *            The label for this Editor
+	 */
+	public MultipleValueEditor(Composite parent, int style, IElementSelector selector, String label) {
+		this(parent, style, selector, false, false, label);
+	}
+
+	/**
+	 * Sets the label provider for this editor
+	 *
+	 * @param labelProvider
+	 *            The label provider for this editor
+	 */
+	public void setLabelProvider(IBaseLabelProvider labelProvider) {
+		treeViewer.setLabelProvider(labelProvider);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void doBinding() {
+		// We don't do a real Databinding in this case
+		treeViewer.setInput(modelProperty);
+		modelProperty.addChangeListener(this);
+	}
+
+	/**
+	 * @param ordered
+	 */
+	public void setOrdered(boolean ordered) {
+		this.ordered = ordered;
+
+		updateControls();
+	}
+
+	/**
+	 * @param unique
+	 */
+	public void setUnique(boolean unique) {
+		this.unique = unique;
+
+		updateControls();
+	}
+
+	/**
+	 * Creates the Add/Remove controls,
+	 * and the Up/Down controls if the collection is ordered
+	 *
+	 * @param ordered
+	 */
+	protected void createListControls() {
+		up = createButton(Activator.getDefault().getImage("/icons/Up_12x12.gif"), Messages.MultipleValueEditor_MoveSelectedElementsUp); //$NON-NLS-1$
+		down = createButton(Activator.getDefault().getImage("/icons/Down_12x12.gif"), Messages.MultipleValueEditor_MoveSelectedElementsDown); //$NON-NLS-1$
+		add = createButton(Activator.getDefault().getImage("/icons/Add_12x12.gif"), Messages.MultipleValueEditor_AddElements); //$NON-NLS-1$
+		remove = createButton(Activator.getDefault().getImage("/icons/Delete_12x12.gif"), Messages.MultipleValueEditor_RemoveSelectedElements); //$NON-NLS-1$
+		edit = createButton(Activator.getDefault().getImage("/icons/Edit_12x12.gif"), Messages.MultipleValueEditor_EditSelectedValue); //$NON-NLS-1$
+	}
+
+	protected Button createButton(Image image, String toolTipText) {
+		Button button = new Button(controlsSection, SWT.PUSH);
+		button.setImage(image);
+		button.addSelectionListener(this);
+		button.setToolTipText(toolTipText);
+		return button;
+	}
+
+	@Override
+	public Object getEditableType() {
+		return Collection.class;
+	}
+
+	/**
+	 * Handle events occuring on controls
+	 *
+	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
+	 *
+	 * @param e
+	 */
+	@Override
+	public void widgetSelected(SelectionEvent e) {
+		if (e.widget == null) {
+			return;
+		}
+		if (e.widget == add) {
+			if (this.upperBound == MANY || modelProperty.size() < this.upperBound) {
+				addAction();
+			}
+		} else if (e.widget == remove) {
+			removeAction();
+		} else if (e.widget == up) {
+			upAction();
+		} else if (e.widget == down) {
+			downAction();
+		} else if (e.widget == edit) {
+			editAction();
+		}
+
+		updateBoutons();
+	}
+
+	/**
+	 * Handle add Action
+	 */
+	protected void addAction() {
+		final Object context = getContextElement();
+
+		if (directCreation) {
+			if (referenceFactory != null && referenceFactory.canCreateObject()) {
+				getOperationExecutor(context).execute(new Runnable() {
+
+					@Override
+					public void run() {
+						Object newElement = referenceFactory.createObject(MultipleValueEditor.this, context);
+						if (newElement != null) {
+							modelProperty.add(newElement);
+							commit();
+						}
+					}
+				}, NLS.bind(Messages.MultipleValueEditor_addOperation, labelText));
+			}
+
+			return;
+		}
+
+		getOperationExecutor(context).execute(new Runnable() {
+
+			@Override
+			public void run() {
+				String dialogLabel = label == null ? null : label.getText();
+				MultipleValueSelectorDialog dialog = createMultipleValueSelectorDialog(getParent(), selector, ordered, unique, dialogLabel);
+				dialog.setLabelProvider((ILabelProvider) treeViewer.getLabelProvider());
+				dialog.setFactory(referenceFactory);
+				dialog.setUpperBound(upperBound);
+				dialog.setContextElement(context);
+
+				if (modelProperty != null) {
+					dialog.setInitialSelections(modelProperty.toArray());
+				} else {
+					dialog.setInitialSelections(new Object[0]);
+				}
+
+				int returnCode = dialog.open();
+				if (returnCode == Window.CANCEL) {
+					// Clear out the element selector in case we open this dialog again
+					selector.clearTemporaryElements();
+
+					// Roll back whatever has been done, so far
+					throw new OperationCanceledException();
+				}
+
+				modelProperty.clear();
+
+				Object[] result = dialog.getResult();
+				if (result == null) {
+					return;
+				}
+
+				modelProperty.addAll(Arrays.asList(result));
+
+				commit();
+			}
+		}, NLS.bind(Messages.MultipleValueEditor_addOperation, labelText));
+	}
+
+	@Override
+	protected void commit() {
+		super.commit();
+		if (!isDisposed()) {
+			treeViewer.refresh();
+		}
+	}
+
+	/**
+	 * Handle remove Action
+	 */
+	protected void removeAction() {
+		IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+		for (Object value : selection.toArray()) {
+			modelProperty.remove(value);
+		}
+		treeViewer.setSelection(null);
+
+		commit();
+	}
+
+	/**
+	 * Handle up Action
+	 */
+	protected void upAction() {
+		IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+		for (Object o : selection.toArray()) {
+			int oldIndex = modelProperty.indexOf(o);
+			if (oldIndex > 0) {
+				modelProperty.move(oldIndex, oldIndex - 1);
+			}
+		}
+
+		IStructuredSelection selectionCopy = new StructuredSelection(selection.toArray());
+		treeViewer.setSelection(selectionCopy);
+
+		commit();
+	}
+
+	/**
+	 * Handle down Action
+	 */
+	protected void downAction() {
+		IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+
+		int maxIndex = modelProperty.size() - 1;
+
+		Object[] selectionArray = selection.toArray();
+		for (int i = selectionArray.length - 1; i >= 0; i--) {
+			Object o = selectionArray[i];
+			int oldIndex = modelProperty.indexOf(o);
+			if (oldIndex < maxIndex) {
+				modelProperty.move(oldIndex, oldIndex + 1);
+			}
+		}
+
+		IStructuredSelection selectionCopy = new StructuredSelection(selection.toArray());
+		treeViewer.setSelection(selectionCopy);
+
+		commit();
+	}
+
+	/**
+	 * Handle edit Action
+	 */
+	protected void editAction() {
+		IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection();
+
+		if (selection.size() != 1) {
+			return;
+		}
+
+		TreeItem selectedItem = treeViewer.getTree().getSelection()[0];
+		Tree parentTree = selectedItem.getParent();
+
+		final int index = parentTree.indexOf(selectedItem);
+		final Object currentValue = selection.getFirstElement();
+
+		getOperationExecutor(currentValue).execute(new Runnable() {
+
+			@SuppressWarnings("unchecked")
+			@Override
+			public void run() {
+				Object newValue = referenceFactory.edit(MultipleValueEditor.this.edit, currentValue);
+
+				if (newValue != currentValue && newValue != null) {
+					modelProperty.remove(index);
+					modelProperty.add(index, newValue);
+
+					// commit(); // The commit only occurs in the case where we modify the list (We don't commit direct edition on objects)
+				}
+
+				commit();
+			}
+		}, NLS.bind(Messages.MultipleValueEditor_editOperation, labelText));
+	}
+
+	/**
+	 * Sets the {@link ReferenceValueFactory} for this editor. The {@link ReferenceValueFactory} is used to create
+	 * new instances and edit existing ones.
+	 *
+	 * @param factory
+	 *            The {@link ReferenceValueFactory} to be used by this editor
+	 */
+	public void setFactory(ReferenceValueFactory factory) {
+		this.referenceFactory = factory;
+		updateControls();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void widgetDefaultSelected(SelectionEvent e) {
+		if ((e.widget == tree) && (edit != null) && edit.isEnabled()) {
+			editAction();
+		}
+	}
+
+	/**
+	 * Gets the tree viewer associated to this editor
+	 *
+	 * @return the tree viewer associated to this editor
+	 */
+	public TreeViewer getViewer() {
+		return treeViewer;
+	}
+
+	/**
+	 * Refreshes the viewer when a change occurs on the ObservableList
+	 * TODO : Problem : a change occurring on an element of the list is not sent here
+	 * TODO : When undoing a command, the change event is not received (Although it modifies the list itself)
+	 *
+	 * @see org.eclipse.core.databinding.observable.IChangeListener#handleChange(org.eclipse.core.databinding.observable.ChangeEvent)
+	 *
+	 * @param event
+	 */
+	@Override
+	public void handleChange(ChangeEvent event) {
+		if (!isDisposed()) {
+			treeViewer.refresh();
+		}
+	}
+
+	@Override
+	public void dispose() {
+		if (modelProperty != null) {
+			modelProperty.removeChangeListener(this);
+		}
+		super.dispose();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setReadOnly(boolean readOnly) {
+		this.readOnly = readOnly;
+		updateControls();
+		// tree.setEnabled(!readOnly);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isReadOnly() {
+		return !tree.isEnabled();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setLabel(String label) {
+		if (this.label == null) {
+			setLayout(new GridLayout(2, false));
+		}
+		super.setLabel(label);
+	}
+
+	@Override
+	public void setToolTipText(String text) {
+		tree.setToolTipText(text);
+		super.setLabelToolTipText(text);
+	}
+
+	@Override
+	public void setModelObservable(IObservableList modelProperty) {
+		super.setModelObservable(modelProperty);
+		updateControls();
+	}
+
+	@Override
+	public void refreshValue() {
+		treeViewer.refresh();
+	}
+
+	/**
+	 * Sets the direct creation mode.
+	 * If direct creation is set to true, the {@link ReferenceValueFactory#createObject(org.eclipse.swt.widgets.Control)} method will be called when
+	 * to add button is pressed.
+	 * Otherwise, the dialog will be used.
+	 *
+	 * @param directCreation
+	 */
+	public void setDirectCreation(boolean directCreation) {
+		this.directCreation = directCreation;
+		updateControls();
+	}
+
+	/**
+	 * Adds a ISelectionChangedListener to this widget
+	 *
+	 * @param listener
+	 */
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		treeViewer.addSelectionChangedListener(listener);
+	}
+
+	/**
+	 * Removes a ISelectionChangedListener from this widget
+	 *
+	 * @param listener
+	 */
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		treeViewer.removeSelectionChangedListener(listener);
+	}
+
+	/**
+	 * Set the maximum number of values selected.
+	 *
+	 * @param upperBound
+	 */
+	public void setUpperBound(int upperBound) {
+		this.upperBound = upperBound;
+	}
+
+	public void updateBoutons() {
+		/* Disable the button 'add' if the upperBound is reached */
+		if (this.upperBound != MANY) {
+			if (modelProperty.size() >= this.upperBound) {
+				add.setEnabled(false);
+			} else {
+				add.setEnabled(true);
+			}
+		}
+	}
+
+	@Override
+	public void changeColorField() {
+		// nothing to do here
+
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueSelectionDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueSelectionDialog.java
index e46fd9718fc..acab12ca40b 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueSelectionDialog.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueSelectionDialog.java
@@ -1,315 +1,315 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Adapted code from MultipleValueSelectorDialog

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import java.util.List;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

-import org.eclipse.papyrus.infra.widgets.util.ValueUtils;

-import org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.dialogs.SelectionDialog;

-

-/**

- * Object Chooser. Defines a standard popup for selecting

- * multiple values. If this dialog is used to select or create model

- * elements to be added to or removed from some element that is being

- * edited, then it is important to {@linkplain #setContextElement(Object) set that contextual element} in this dialog.

- *

- * @author Vincent Lorenzo

- *

- * @see #setContextElement(Object)

- *

- */

-public class MultipleValueSelectionDialog extends SelectionDialog {

-

-	/**

-	 * the widget providing the contents of the dialog

-	 */

-	protected MultipleValueSelectionWidget widget;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 *            The shell in which this dialog should be opened

-	 * @param selector

-	 *            The element selector used by this dialog

-	 */

-	public MultipleValueSelectionDialog(Shell parentShell, IElementSelector selector) {

-		this(parentShell, selector, null, false, false);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 *            The shell in which this dialog should be opened

-	 * @param selector

-	 *            The element selector used by this dialog

-	 * @param title

-	 *            The title of this dialog

-	 */

-	public MultipleValueSelectionDialog(Shell parentShell, IElementSelector selector, String title) {

-		this(parentShell, selector, title, false, false);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 *            The shell in which this dialog should be opened

-	 * @param selector

-	 *            The element selector used by this dialog

-	 * @param unique

-	 *            True if the values returned by this dialog should be unique

-	 */

-	public MultipleValueSelectionDialog(Shell parentShell, IElementSelector selector, boolean unique) {

-		this(parentShell, selector, null, unique, false);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 *            The shell in which this dialog should be opened

-	 * @param selector

-	 *            The element selector used by this dialog

-	 * @param title

-	 *            The title of this dialog

-	 * @param unique

-	 *            True if the values returned by this dialog should be unique

-	 */

-	public MultipleValueSelectionDialog(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered) {

-		this(parentShell, selector, title, unique, false, ValueUtils.MANY);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 *            The shell in which this dialog should be opened

-	 * @param selector

-	 *            The element selector used by this dialog

-	 * @param title

-	 *            The title of this dialog

-	 * @param unique

-	 *            True if the values returned by this dialog should be unique

-	 * @param upperBound

-	 *            The maximum number of values selected.

-	 */

-	public MultipleValueSelectionDialog(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered, int upperBound) {

-		super(parentShell);

-		Assert.isNotNull(selector, "The element selector should be defined"); //$NON-NLS-1$

-		setHelpAvailable(false);

-		setTitle(title);

-		this.widget = createWidget(selector, unique, ordered, upperBound);

-	}

-

-	/**

-	 * 

-	 * @param selector

-	 *            The element selector used by this dialog

-	 * @param unique

-	 *            True if the values returned by this dialog should be unique

-	 * @param ordered

-	 *            <code>true</code> if the edited feature is ordered

-	 * @param upperBound

-	 *            The maximum number of values selected.

-	 */

-	protected MultipleValueSelectionWidget createWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {

-		return new MultipleValueSelectionWidget(selector, unique, ordered, upperBound);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.ui.dialogs.SelectionDialog#configureShell(org.eclipse.swt.widgets.Shell)

-	 *

-	 * @param shell

-	 */

-	@Override

-	protected void configureShell(Shell shell) {

-		super.configureShell(shell);

-		shell.setImage(org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage("/icons/papyrus.png")); //$NON-NLS-1$

-	}

-

-	/**

-	 * @see org.eclipse.ui.dialogs.SelectionDialog#setInitialElementSelections(java.util.List)

-	 *

-	 * @param selectedElements

-	 */

-	@Override

-	public void setInitialElementSelections(@SuppressWarnings("rawtypes") List selectedElements) {

-		super.setInitialElementSelections(selectedElements);

-		widget.setInitialSelections(getInitialElementSelections());

-	}

-

-

-	/**

-	 * @see org.eclipse.ui.dialogs.SelectionDialog#setInitialSelections(java.lang.Object[])

-	 *

-	 * @param selectedElements

-	 */

-	@Override

-	public void setInitialSelections(Object[] selectedElements) {

-		super.setInitialSelections(selectedElements);

-		widget.setInitialSelections(getInitialElementSelections());

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void create() {

-		super.create();

-		createDialogContents();

-		getShell().pack();

-

-		this.widget.updateControls();

-

-	}

-

-	/**

-	 * Create the contents of the dialog

-	 */

-	protected void createDialogContents() {

-		Composite parent = getDialogArea();

-		this.widget.create(parent);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Composite getDialogArea() {

-		return (Composite) super.getDialogArea();

-	}

-

-

-	/**

-	 * Sets the {@link ReferenceValueFactory} for this editor. The {@link ReferenceValueFactory} is used to create

-	 * new instances and edit existing ones.

-	 *

-	 * @param factory

-	 *            The {@link ReferenceValueFactory} to be used by this editor

-	 */

-	public void setFactory(ReferenceValueFactory factory) {

-		this.widget.setFactory(factory);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()

-	 *

-	 */

-	@Override

-	protected void okPressed() {

-		setResult(this.widget.getSelection());

-		super.okPressed();

-	}

-

-	/**

-	 * Indicates if the selected values should be unique (According to Object.equals())

-	 *

-	 * @param unique

-	 */

-	public void setUnique(boolean unique) {

-		this.widget.setUnique(unique);

-	}

-

-	/**

-	 * Indicates if the selected elements should be ordered

-	 *

-	 * @param ordered

-	 */

-	public void setOrdered(boolean ordered) {

-		this.widget.setOrdered(ordered);

-	}

-

-	/**

-	 * Set the selector to use

-	 *

-	 * @param selector

-	 *            the selector to use in the dialog

-	 */

-	public void setSelector(IElementSelector selector) {

-		this.widget.setSelector(selector);

-	}

-

-	/**

-	 * Set the maximum number of values selected.

-	 *

-	 * @param upperBound

-	 */

-	public void setUpperBound(int upperBound) {

-		this.widget.setUpperBound(upperBound);

-	}

-

-	/**

-	 * Sets the optional context of the element that is being edited, in which others will be added and removed.

-	 *

-	 * @param contextElement

-	 *            the model element that is being edited

-	 */

-	public void setContextElement(Object contextElement) {

-		this.widget.setContextElement(contextElement);

-	}

-

-	/**

-	 * Queries the optional context of the element that is being edited, in which others will be added and removed.

-	 *

-	 * @return the model element that is being edited

-	 */

-	public Object getContextElement() {

-		return this.widget.getContextElement();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.dialogs.Dialog#close()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean close() {

-		if (this.widget != null) {

-			this.widget.dispose();

-		}

-		return super.close();

-	}

-

-	/**

-	 * Sets the label provider used to display the selected elements

-	 *

-	 * @param labelProvider

-	 */

-	public void setLabelProvider(ILabelProvider labelProvider) {

-		this.widget.setLabelProvider(labelProvider);

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the widget

-	 */

-	protected MultipleValueSelectionWidget getWidget() {

-		return this.widget;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Adapted code from MultipleValueSelectorDialog
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.papyrus.infra.widgets.util.ValueUtils;
+import org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.dialogs.SelectionDialog;
+
+/**
+ * Object Chooser. Defines a standard popup for selecting
+ * multiple values. If this dialog is used to select or create model
+ * elements to be added to or removed from some element that is being
+ * edited, then it is important to {@linkplain #setContextElement(Object) set that contextual element} in this dialog.
+ *
+ * @author Vincent Lorenzo
+ *
+ * @see #setContextElement(Object)
+ *
+ */
+public class MultipleValueSelectionDialog extends SelectionDialog {
+
+	/**
+	 * the widget providing the contents of the dialog
+	 */
+	protected MultipleValueSelectionWidget widget;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 *            The shell in which this dialog should be opened
+	 * @param selector
+	 *            The element selector used by this dialog
+	 */
+	public MultipleValueSelectionDialog(Shell parentShell, IElementSelector selector) {
+		this(parentShell, selector, null, false, false);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 *            The shell in which this dialog should be opened
+	 * @param selector
+	 *            The element selector used by this dialog
+	 * @param title
+	 *            The title of this dialog
+	 */
+	public MultipleValueSelectionDialog(Shell parentShell, IElementSelector selector, String title) {
+		this(parentShell, selector, title, false, false);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 *            The shell in which this dialog should be opened
+	 * @param selector
+	 *            The element selector used by this dialog
+	 * @param unique
+	 *            True if the values returned by this dialog should be unique
+	 */
+	public MultipleValueSelectionDialog(Shell parentShell, IElementSelector selector, boolean unique) {
+		this(parentShell, selector, null, unique, false);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 *            The shell in which this dialog should be opened
+	 * @param selector
+	 *            The element selector used by this dialog
+	 * @param title
+	 *            The title of this dialog
+	 * @param unique
+	 *            True if the values returned by this dialog should be unique
+	 */
+	public MultipleValueSelectionDialog(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered) {
+		this(parentShell, selector, title, unique, false, ValueUtils.MANY);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 *            The shell in which this dialog should be opened
+	 * @param selector
+	 *            The element selector used by this dialog
+	 * @param title
+	 *            The title of this dialog
+	 * @param unique
+	 *            True if the values returned by this dialog should be unique
+	 * @param upperBound
+	 *            The maximum number of values selected.
+	 */
+	public MultipleValueSelectionDialog(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered, int upperBound) {
+		super(parentShell);
+		Assert.isNotNull(selector, "The element selector should be defined"); //$NON-NLS-1$
+		setHelpAvailable(false);
+		setTitle(title);
+		this.widget = createWidget(selector, unique, ordered, upperBound);
+	}
+
+	/**
+	 * 
+	 * @param selector
+	 *            The element selector used by this dialog
+	 * @param unique
+	 *            True if the values returned by this dialog should be unique
+	 * @param ordered
+	 *            <code>true</code> if the edited feature is ordered
+	 * @param upperBound
+	 *            The maximum number of values selected.
+	 */
+	protected MultipleValueSelectionWidget createWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {
+		return new MultipleValueSelectionWidget(selector, unique, ordered, upperBound);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.ui.dialogs.SelectionDialog#configureShell(org.eclipse.swt.widgets.Shell)
+	 *
+	 * @param shell
+	 */
+	@Override
+	protected void configureShell(Shell shell) {
+		super.configureShell(shell);
+		shell.setImage(org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage("/icons/papyrus.png")); //$NON-NLS-1$
+	}
+
+	/**
+	 * @see org.eclipse.ui.dialogs.SelectionDialog#setInitialElementSelections(java.util.List)
+	 *
+	 * @param selectedElements
+	 */
+	@Override
+	public void setInitialElementSelections(@SuppressWarnings("rawtypes") List selectedElements) {
+		super.setInitialElementSelections(selectedElements);
+		widget.setInitialSelections(getInitialElementSelections());
+	}
+
+
+	/**
+	 * @see org.eclipse.ui.dialogs.SelectionDialog#setInitialSelections(java.lang.Object[])
+	 *
+	 * @param selectedElements
+	 */
+	@Override
+	public void setInitialSelections(Object[] selectedElements) {
+		super.setInitialSelections(selectedElements);
+		widget.setInitialSelections(getInitialElementSelections());
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void create() {
+		super.create();
+		createDialogContents();
+		getShell().pack();
+
+		this.widget.updateControls();
+
+	}
+
+	/**
+	 * Create the contents of the dialog
+	 */
+	protected void createDialogContents() {
+		Composite parent = getDialogArea();
+		this.widget.create(parent);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected Composite getDialogArea() {
+		return (Composite) super.getDialogArea();
+	}
+
+
+	/**
+	 * Sets the {@link ReferenceValueFactory} for this editor. The {@link ReferenceValueFactory} is used to create
+	 * new instances and edit existing ones.
+	 *
+	 * @param factory
+	 *            The {@link ReferenceValueFactory} to be used by this editor
+	 */
+	public void setFactory(ReferenceValueFactory factory) {
+		this.widget.setFactory(factory);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
+	 *
+	 */
+	@Override
+	protected void okPressed() {
+		setResult(this.widget.getSelection());
+		super.okPressed();
+	}
+
+	/**
+	 * Indicates if the selected values should be unique (According to Object.equals())
+	 *
+	 * @param unique
+	 */
+	public void setUnique(boolean unique) {
+		this.widget.setUnique(unique);
+	}
+
+	/**
+	 * Indicates if the selected elements should be ordered
+	 *
+	 * @param ordered
+	 */
+	public void setOrdered(boolean ordered) {
+		this.widget.setOrdered(ordered);
+	}
+
+	/**
+	 * Set the selector to use
+	 *
+	 * @param selector
+	 *            the selector to use in the dialog
+	 */
+	public void setSelector(IElementSelector selector) {
+		this.widget.setSelector(selector);
+	}
+
+	/**
+	 * Set the maximum number of values selected.
+	 *
+	 * @param upperBound
+	 */
+	public void setUpperBound(int upperBound) {
+		this.widget.setUpperBound(upperBound);
+	}
+
+	/**
+	 * Sets the optional context of the element that is being edited, in which others will be added and removed.
+	 *
+	 * @param contextElement
+	 *            the model element that is being edited
+	 */
+	public void setContextElement(Object contextElement) {
+		this.widget.setContextElement(contextElement);
+	}
+
+	/**
+	 * Queries the optional context of the element that is being edited, in which others will be added and removed.
+	 *
+	 * @return the model element that is being edited
+	 */
+	public Object getContextElement() {
+		return this.widget.getContextElement();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.dialogs.Dialog#close()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean close() {
+		if (this.widget != null) {
+			this.widget.dispose();
+		}
+		return super.close();
+	}
+
+	/**
+	 * Sets the label provider used to display the selected elements
+	 *
+	 * @param labelProvider
+	 */
+	public void setLabelProvider(ILabelProvider labelProvider) {
+		this.widget.setLabelProvider(labelProvider);
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         the widget
+	 */
+	protected MultipleValueSelectionWidget getWidget() {
+		return this.widget;
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueSelectionWithCheckBoxDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueSelectionWithCheckBoxDialog.java
index 001b924c0bd..78b7823878f 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueSelectionWithCheckBoxDialog.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueSelectionWithCheckBoxDialog.java
@@ -1,158 +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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget;

-import org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWithCheckboxWidget;

-import org.eclipse.swt.widgets.Shell;

-

-/**

- * This dialog adds a checkbox at the end of the {@link MultipleValueSelectorDialog}

- *

- * @author vl222926

- *

- */

-public class MultipleValueSelectionWithCheckBoxDialog extends MultipleValueSelectionDialog {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param selector

-	 * @param unique

-	 */

-	public MultipleValueSelectionWithCheckBoxDialog(Shell parentShell, IElementSelector selector, boolean unique) {

-		super(parentShell, selector, unique);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param selector

-	 * @param title

-	 * @param unique

-	 * @param ordered

-	 * @param upperBound

-	 */

-	public MultipleValueSelectionWithCheckBoxDialog(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered, int upperBound) {

-		super(parentShell, selector, title, unique, ordered, upperBound);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param selector

-	 * @param title

-	 * @param unique

-	 * @param ordered

-	 */

-	public MultipleValueSelectionWithCheckBoxDialog(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered) {

-		super(parentShell, selector, title, unique, ordered);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param selector

-	 * @param title

-	 */

-	public MultipleValueSelectionWithCheckBoxDialog(Shell parentShell, IElementSelector selector, String title) {

-		super(parentShell, selector, title);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param selector

-	 */

-	public MultipleValueSelectionWithCheckBoxDialog(Shell parentShell, IElementSelector selector) {

-		super(parentShell, selector);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.editors.MultipleValueSelectionDialog#createWidget(org.eclipse.papyrus.infra.widgets.editors.IElementSelector, boolean, boolean, int)

-	 *

-	 * @param selector

-	 * @param unique

-	 * @param ordered

-	 * @param upperbound

-	 * @return

-	 */

-	@Override

-	protected MultipleValueSelectionWidget createWidget(IElementSelector selector, boolean unique, boolean ordered, int upperbound) {

-		return new MultipleValueSelectionWithCheckboxWidget(selector, unique, ordered, upperbound);

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the widget

-	 */

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.editors.MultipleValueSelectionDialog#getWidget()

-	 *

-	 * @return

-	 */

-	@Override

-	protected MultipleValueSelectionWithCheckboxWidget getWidget() {

-		return (MultipleValueSelectionWithCheckboxWidget) super.getWidget();

-	}

-

-	/**

-	 *

-	 * @param text

-	 *            the text to display near the checkbox

-	 * @param tooltip

-	 *            the tooltip to display for the checkbox

-	 * @param isChecked

-	 *            the initial state of the checkbox

-	 */

-	public void setCheckBoxValues(final String text, final String tooltip, final boolean isChecked) {

-		MultipleValueSelectionWithCheckboxWidget w = getWidget();

-		w.setCheckBoxValues(text, tooltip, isChecked);

-	}

-

-	/**

-	 * this method allows to display or hide the checkbox

-	 */

-	public void setDisplayCheckBox(boolean displayCheckBox) {

-		getWidget().setDisplayCheckBox(displayCheckBox);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the state of the checkbox button

-	 */

-	public boolean isChecked() {

-		return getWidget().isChecked();

-	}

-

-	/**

-	 * 

-	 * @return <code>true</code> if the checkbox must be displayed

-	 */

-	public boolean isDisplayingCheckBox() {

-		return getWidget().isDisplayingCheckBox();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.widgets.editors;
+
+import org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget;
+import org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWithCheckboxWidget;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * This dialog adds a checkbox at the end of the {@link MultipleValueSelectorDialog}
+ *
+ * @author vl222926
+ *
+ */
+public class MultipleValueSelectionWithCheckBoxDialog extends MultipleValueSelectionDialog {
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param selector
+	 * @param unique
+	 */
+	public MultipleValueSelectionWithCheckBoxDialog(Shell parentShell, IElementSelector selector, boolean unique) {
+		super(parentShell, selector, unique);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param selector
+	 * @param title
+	 * @param unique
+	 * @param ordered
+	 * @param upperBound
+	 */
+	public MultipleValueSelectionWithCheckBoxDialog(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered, int upperBound) {
+		super(parentShell, selector, title, unique, ordered, upperBound);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param selector
+	 * @param title
+	 * @param unique
+	 * @param ordered
+	 */
+	public MultipleValueSelectionWithCheckBoxDialog(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered) {
+		super(parentShell, selector, title, unique, ordered);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param selector
+	 * @param title
+	 */
+	public MultipleValueSelectionWithCheckBoxDialog(Shell parentShell, IElementSelector selector, String title) {
+		super(parentShell, selector, title);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param selector
+	 */
+	public MultipleValueSelectionWithCheckBoxDialog(Shell parentShell, IElementSelector selector) {
+		super(parentShell, selector);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.editors.MultipleValueSelectionDialog#createWidget(org.eclipse.papyrus.infra.widgets.editors.IElementSelector, boolean, boolean, int)
+	 *
+	 * @param selector
+	 * @param unique
+	 * @param ordered
+	 * @param upperbound
+	 * @return
+	 */
+	@Override
+	protected MultipleValueSelectionWidget createWidget(IElementSelector selector, boolean unique, boolean ordered, int upperbound) {
+		return new MultipleValueSelectionWithCheckboxWidget(selector, unique, ordered, upperbound);
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         the widget
+	 */
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.editors.MultipleValueSelectionDialog#getWidget()
+	 *
+	 * @return
+	 */
+	@Override
+	protected MultipleValueSelectionWithCheckboxWidget getWidget() {
+		return (MultipleValueSelectionWithCheckboxWidget) super.getWidget();
+	}
+
+	/**
+	 *
+	 * @param text
+	 *            the text to display near the checkbox
+	 * @param tooltip
+	 *            the tooltip to display for the checkbox
+	 * @param isChecked
+	 *            the initial state of the checkbox
+	 */
+	public void setCheckBoxValues(final String text, final String tooltip, final boolean isChecked) {
+		MultipleValueSelectionWithCheckboxWidget w = getWidget();
+		w.setCheckBoxValues(text, tooltip, isChecked);
+	}
+
+	/**
+	 * this method allows to display or hide the checkbox
+	 */
+	public void setDisplayCheckBox(boolean displayCheckBox) {
+		getWidget().setDisplayCheckBox(displayCheckBox);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the state of the checkbox button
+	 */
+	public boolean isChecked() {
+		return getWidget().isChecked();
+	}
+
+	/**
+	 * 
+	 * @return <code>true</code> if the checkbox must be displayed
+	 */
+	public boolean isDisplayingCheckBox() {
+		return getWidget().isDisplayingCheckBox();
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueSelectorDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueSelectorDialog.java
index bccf2e90d55..64256737146 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueSelectorDialog.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueSelectorDialog.java
@@ -1,777 +1,777 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation

- *  Christian W. Damus (CEA) - bug 402525

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.LinkedHashSet;

-import java.util.LinkedList;

-import java.util.Set;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.OperationCanceledException;

-import org.eclipse.jface.viewers.DoubleClickEvent;

-import org.eclipse.jface.viewers.IDoubleClickListener;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

-import org.eclipse.papyrus.infra.widgets.messages.Messages;

-import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.layout.FillLayout;

-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.Control;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.ui.dialogs.SelectionDialog;

-

-/**

- * Object Chooser. Defines a standard popup for selecting

- * multiple values. If this dialog is used to select or create model

- * elements to be added to or removed from some element that is being

- * edited, then it is important to {@linkplain #setContextElement(Object) set that contextual element} in this dialog.

- *

- * @author Camille Letavernier

- *

- * @see #setContextElement(Object)

- *

- * @deprecated use MultipleValueSelectionDialog instead

- * @since Papyrus 1.1

- */

-@Deprecated

-public class MultipleValueSelectorDialog extends SelectionDialog implements ISelectionChangedListener, IDoubleClickListener, IElementSelectionListener, SelectionListener {

-

-	public static final int MANY = -1;

-

-	/**

-	 * The object selector

-	 */

-	protected IElementSelector selector;

-

-	/**

-	 * The SWT Composite in which the selector is drawn

-	 */

-	protected Composite selectorSection;

-

-	/**

-	 * The add/remove/addAll buttons section

-	 */

-	protected Composite buttonsSection;

-

-	/**

-	 * The up/down buttons section

-	 */

-	protected Composite rightButtonsSection;

-

-	/**

-	 * The listViewer for chosen elements

-	 */

-	protected StructuredViewer selectedElementsViewer;

-

-	/**

-	 * The list for chosen elements

-	 */

-	protected Tree selectedElements;

-

-	/**

-	 * The add action button

-	 */

-	protected Button add;

-

-	/**

-	 * The create action button

-	 */

-	protected Button create;

-

-	/**

-	 * The delete action button

-	 */

-	protected Button delete;

-

-	/**

-	 * The remove action button

-	 */

-	protected Button remove;

-

-	/**

-	 * The add all action button

-	 */

-	protected Button addAll;

-

-	/**

-	 * The remove all action button

-	 */

-	protected Button removeAll;

-

-	/**

-	 * the up action button

-	 */

-	protected Button up;

-

-	/**

-	 * the down action button

-	 */

-	protected Button down;

-

-	/**

-	 * The label provider for the listViewer of chosen elements

-	 */

-	protected ILabelProvider labelProvider;

-

-	/**

-	 * The currently chosen elements

-	 */

-	protected final Collection<Object> allElements;

-

-	/**

-	 * Indicates if the values should be unique (according to Object.equals())

-	 */

-	protected boolean unique;

-

-	/**

-	 * Indicates if the list is ordered

-	 */

-	protected boolean ordered;

-

-	/**

-	 * The factory for creating new elements

-	 */

-	protected ReferenceValueFactory factory;

-

-	/**

-	 * The model element being edited (if any), to which elements are to be added or removed.

-	 */

-	protected Object contextElement;

-

-	/**

-	 * The list of newly created objects

-	 */

-	protected Set<Object> newObjects = new HashSet<Object>();

-

-

-	/**

-	 * The maximum number of values selected.

-	 */

-	protected int upperBound;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 *            The shell in which this dialog should be opened

-	 * @param selector

-	 *            The element selector used by this dialog

-	 */

-	public MultipleValueSelectorDialog(Shell parentShell, IElementSelector selector) {

-		this(parentShell, selector, null, false, false);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 *            The shell in which this dialog should be opened

-	 * @param selector

-	 *            The element selector used by this dialog

-	 * @param title

-	 *            The title of this dialog

-	 */

-	public MultipleValueSelectorDialog(Shell parentShell, IElementSelector selector, String title) {

-		this(parentShell, selector, title, false, false);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 *            The shell in which this dialog should be opened

-	 * @param selector

-	 *            The element selector used by this dialog

-	 * @param unique

-	 *            True if the values returned by this dialog should be unique

-	 */

-	public MultipleValueSelectorDialog(Shell parentShell, IElementSelector selector, boolean unique) {

-		this(parentShell, selector, null, unique, false);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 *            The shell in which this dialog should be opened

-	 * @param selector

-	 *            The element selector used by this dialog

-	 * @param title

-	 *            The title of this dialog

-	 * @param unique

-	 *            True if the values returned by this dialog should be unique

-	 */

-	public MultipleValueSelectorDialog(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered) {

-		this(parentShell, selector, title, unique, false, MANY);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 *            The shell in which this dialog should be opened

-	 * @param selector

-	 *            The element selector used by this dialog

-	 * @param title

-	 *            The title of this dialog

-	 * @param unique

-	 *            True if the values returned by this dialog should be unique

-	 * @param upperBound

-	 *            The maximum number of values selected.

-	 */

-	public MultipleValueSelectorDialog(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered, int upperBound) {

-		super(parentShell);

-		Assert.isNotNull(selector, "The element selector should be defined"); //$NON-NLS-1$

-		this.selector = selector;

-		allElements = unique ? new LinkedHashSet<Object>() : new LinkedList<Object>();

-		setHelpAvailable(false);

-		setTitle(title);

-		this.unique = unique;

-		this.ordered = ordered;

-		this.upperBound = upperBound;

-		selector.addElementSelectionListener(this);

-	}

-

-	@Override

-	protected void configureShell(Shell shell) {

-		super.configureShell(shell);

-		shell.setImage(Activator.getDefault().getImage("/icons/papyrus.png")); //$NON-NLS-1$

-	}

-

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void create() {

-		super.create();

-		createDialogContents();

-		getShell().pack();

-

-		updateControls();

-	}

-

-	/**

-	 * Create the contents of the dialog

-	 */

-	protected void createDialogContents() {

-		Composite parent = getDialogArea();

-		GridLayout layout = (GridLayout) parent.getLayout();

-		layout.numColumns = 2;

-		layout.makeColumnsEqualWidth = true;

-

-		Composite selectorPane = new Composite(parent, SWT.NONE);

-		selectorPane.setLayout(new GridLayout(2, false));

-		selectorPane.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-

-		Composite selectedPane = new Composite(parent, SWT.NONE);

-		selectedPane.setLayout(new GridLayout(2, false));

-		selectedPane.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-

-		createSelectorSection(selectorPane);

-		createControlsSection(selectorPane);

-		createListSection(selectedPane);

-		createRightButtonsSection(selectedPane);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Composite getDialogArea() {

-		return (Composite) super.getDialogArea();

-	}

-

-	/**

-	 * Creates the selector section

-	 *

-	 * @param parent

-	 *            The composite in which the section is created

-	 */

-	private void createSelectorSection(Composite parent) {

-		selectorSection = new Composite(parent, SWT.NONE);

-		selectorSection.setLayout(new FillLayout());

-		selectorSection.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-		selector.createControls(selectorSection);

-	}

-

-	/**

-	 * Creates the main controls section (Add, remove, Add all, remove all)

-	 *

-	 * @param parent

-	 *            The composite in which the section is created

-	 */

-	private void createControlsSection(Composite parent) {

-		buttonsSection = new Composite(parent, SWT.NONE);

-		buttonsSection.setLayout(new GridLayout(1, true));

-

-		add = new Button(buttonsSection, SWT.PUSH);

-		add.setImage(Activator.getDefault().getImage("/icons/arrow_right.gif")); //$NON-NLS-1$

-		add.addSelectionListener(this);

-		add.setToolTipText(Messages.MultipleValueSelectorDialog_AddSelectedElements);

-

-		remove = new Button(buttonsSection, SWT.PUSH);

-		remove.setImage(Activator.getDefault().getImage("/icons/arrow_left.gif")); //$NON-NLS-1$

-		remove.addSelectionListener(this);

-		remove.setToolTipText(Messages.MultipleValueEditor_RemoveSelectedElements);

-

-		addAll = new Button(buttonsSection, SWT.PUSH);

-		addAll.setImage(Activator.getDefault().getImage("/icons/arrow_double.gif")); //$NON-NLS-1$

-		addAll.addSelectionListener(this);

-		addAll.setToolTipText(Messages.MultipleValueSelectorDialog_AddAllElements);

-

-		/* Disable the bouton 'addAll' if currently chosen elements is greater than the maximum number of values selected */

-		if (this.upperBound != MANY && allElements.size() > this.upperBound) {

-			addAll.setEnabled(false);

-		}

-

-

-		removeAll = new Button(buttonsSection, SWT.PUSH);

-		removeAll.setImage(Activator.getDefault().getImage("/icons/arrow_left_double.gif")); //$NON-NLS-1$

-		removeAll.addSelectionListener(this);

-		removeAll.setToolTipText(Messages.MultipleValueSelectorDialog_RemoveAllElements);

-	}

-

-	/**

-	 * Creates the list displaying the currently selected elements

-	 *

-	 * @param parent

-	 *            The composite in which the section is created

-	 */

-	private void createListSection(Composite parent) {

-

-		selectedElements = new Tree(parent, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);

-		// selectedElements.addSelectionListener(this);

-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);

-		selectedElements.setLayoutData(data);

-		selectedElementsViewer = new TreeViewer(selectedElements);

-

-		selectedElementsViewer.addSelectionChangedListener(this);

-		selectedElementsViewer.addDoubleClickListener(this);

-

-		selectedElementsViewer.setContentProvider(CollectionContentProvider.instance);

-

-		if (labelProvider != null) {

-			selectedElementsViewer.setLabelProvider(labelProvider);

-		}

-

-		selectedElementsViewer.setInput(allElements);

-		selector.setSelectedElements(allElements.toArray());

-	}

-

-	/**

-	 * Creates the up/down controls section

-	 *

-	 * @param parent

-	 *            The composite in which the section is created

-	 */

-	private void createRightButtonsSection(Composite parent) {

-		rightButtonsSection = new Composite(parent, SWT.NONE);

-		rightButtonsSection.setLayout(new GridLayout(1, true));

-

-		up = new Button(rightButtonsSection, SWT.PUSH);

-		up.setImage(Activator.getDefault().getImage("/icons/Up_12x12.gif")); //$NON-NLS-1$

-		up.addSelectionListener(this);

-		up.setToolTipText(Messages.MultipleValueEditor_MoveSelectedElementsUp);

-

-		down = new Button(rightButtonsSection, SWT.PUSH);

-		down.setImage(Activator.getDefault().getImage("/icons/Down_12x12.gif")); //$NON-NLS-1$

-		down.addSelectionListener(this);

-		down.setToolTipText(Messages.MultipleValueEditor_MoveSelectedElementsDown);

-

-		create = new Button(rightButtonsSection, SWT.PUSH);

-		create.setImage(Activator.getDefault().getImage("/icons/Add_12x12.gif")); //$NON-NLS-1$

-		create.addSelectionListener(this);

-		create.setToolTipText(Messages.MultipleValueSelectorDialog_CreateNewElement);

-

-		delete = new Button(rightButtonsSection, SWT.PUSH);

-		delete.setImage(Activator.getDefault().getImage("/icons/Delete_12x12.gif")); //$NON-NLS-1$

-		delete.addSelectionListener(this);

-		delete.setToolTipText(Messages.MultipleValueSelectorDialog_DeleteNewElement);

-		delete.setEnabled(false);

-	}

-

-	/**

-	 * Sets the label provider used to display the selected elements

-	 *

-	 * @param labelProvider

-	 */

-	public void setLabelProvider(ILabelProvider labelProvider) {

-		this.labelProvider = labelProvider;

-	}

-

-	/**

-	 * {@inheritDoc} Handles the events on one of the control buttons

-	 *

-	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)

-	 *

-	 * @param e

-	 *            The event that occurred

-	 */

-	@Override

-	public void widgetSelected(SelectionEvent e) {

-		if (e.widget == add) {

-			addAction();

-		} else if (e.widget == remove) {

-			removeAction();

-		} else if (e.widget == addAll) {

-			addAllAction();

-		} else if (e.widget == removeAll) {

-			removeAllAction();

-		} else if (e.widget == up) {

-			upAction();

-		} else if (e.widget == down) {

-			downAction();

-		} else if (e.widget == create) {

-			createAction();

-		}

-

-		updateControls();

-	}

-

-	/**

-	 * Sets the {@link ReferenceValueFactory} for this editor. The {@link ReferenceValueFactory} is used to create

-	 * new instances and edit existing ones.

-	 *

-	 * @param factory

-	 *            The {@link ReferenceValueFactory} to be used by this editor

-	 */

-	public void setFactory(ReferenceValueFactory factory) {

-		this.factory = factory;

-		updateControls();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public int open() {

-		allElements.clear();

-		allElements.addAll(getInitialElementSelections());

-		return super.open();

-	}

-

-	/**

-	 * Handles the "Add" action

-	 */

-	protected void addAction() {

-		Object[] elements = selector.getSelectedElements();

-		addElements(elements);

-	}

-

-	/**

-	 * Handles the "Up" action

-	 */

-	protected void upAction() {

-		IStructuredSelection selection = (IStructuredSelection) selectedElementsViewer.getSelection();

-

-		// We need a list to move objects. LinkedHashSet can't do that

-		java.util.List<Object> list = new LinkedList<Object>(allElements);

-		for (Object o : selection.toArray()) {

-			int oldIndex = list.indexOf(o);

-			if (oldIndex > 0) {

-				move(list, oldIndex, oldIndex - 1);

-			}

-		}

-

-		allElements.clear();

-		allElements.addAll(list);

-

-		IStructuredSelection selectionCopy = new StructuredSelection(selection.toArray());

-		selectedElementsViewer.setSelection(selectionCopy);

-		selectedElementsViewer.refresh();

-	}

-

-	/**

-	 * Handles the "Down" action

-	 */

-	protected void downAction() {

-		IStructuredSelection selection = (IStructuredSelection) selectedElementsViewer.getSelection();

-

-		// We need a list to move objects. LinkedHashSet can't do that

-		java.util.List<Object> list = new LinkedList<Object>(allElements);

-

-		int maxIndex = list.size() - 1;

-

-		Object[] selectionArray = selection.toArray();

-		for (int i = selectionArray.length - 1; i >= 0; i--) {

-			Object o = selectionArray[i];

-			int oldIndex = list.indexOf(o);

-			if (oldIndex < maxIndex) {

-				move(list, oldIndex, oldIndex + 1);

-			}

-		}

-

-		allElements.clear();

-		allElements.addAll(list);

-

-		IStructuredSelection selectionCopy = new StructuredSelection(selection.toArray());

-		selectedElementsViewer.setSelection(selectionCopy);

-		selectedElementsViewer.refresh();

-	}

-

-	/**

-	 * Handles the "Create" action

-	 */

-	protected void createAction() {

-		if (factory == null) {

-			return;

-		}

-

-		Object newObject;

-

-		try {

-			newObject = factory.createObject(this.create, contextElement);

-		} catch (OperationCanceledException e) {

-			// The user cancelled and we rolled back pending model changes

-			newObject = null;

-		}

-

-		if (newObject == null) {

-			return;

-		}

-

-		newObjects.add(newObject);

-		selector.newObjectCreated(newObject);

-

-		Object[] createdObjects = new Object[] { newObject };

-		addElements(createdObjects);

-

-		selector.setSelectedElements(allElements.toArray());

-	}

-

-	/**

-	 * Moves an element from oldIndex to newIndex

-	 *

-	 * @param list

-	 *            The list in which to move the object

-	 * @param oldIndex

-	 * @param newIndex

-	 */

-	private void move(java.util.List<Object> list, int oldIndex, int newIndex) {

-		int size = list.size();

-

-		if (oldIndex < 0 || oldIndex >= size) {

-			throw new IndexOutOfBoundsException("oldIndex: " + oldIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-		if (newIndex < 0 || newIndex >= size) {

-			throw new IndexOutOfBoundsException("newIndex: " + newIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-		Object element = list.remove(oldIndex);

-		list.add(newIndex, element);

-	}

-

-	/**

-	 * Handles the "Remove" action

-	 */

-	protected void removeAction() {

-		IStructuredSelection selection = (IStructuredSelection) selectedElementsViewer.getSelection();

-		if (selection.isEmpty()) {

-			return;

-		}

-

-		for (Object element : selection.toArray()) {

-			allElements.remove(element);

-		}

-

-		selector.setSelectedElements(allElements.toArray());

-		selectedElementsViewer.setSelection(null);

-		selectedElementsViewer.refresh();

-	}

-

-	/**

-	 * Handles the "Delete" action

-	 */

-	protected void deleteAction() {

-		// nothing to do here

-	}

-

-	/**

-	 * Handles the "Remove all" action

-	 */

-	protected void removeAllAction() {

-		allElements.clear();

-		selector.setSelectedElements(new Object[0]);

-		selectedElementsViewer.setSelection(null);

-		selectedElementsViewer.refresh();

-	}

-

-	/**

-	 * Handles the "Add All" action

-	 */

-	protected void addAllAction() {

-		Object[] elements = selector.getAllElements();

-		addElements(elements);

-	}

-

-	/**

-	 * Adds the specified elements to the currently selected elements (For

-	 * "Add" and "Add all" actions)

-	 *

-	 * @param elements

-	 *            The elements to be added

-	 */

-	@Override

-	public void addElements(Object[] elements) {

-		if (elements != null) {

-			allElements.addAll(Arrays.asList(elements));

-			selectedElementsViewer.refresh();

-		}

-	}

-

-	@Override

-	protected void okPressed() {

-		if (factory != null) {

-			java.util.List<Object> objectsToValidate = new LinkedList<Object>();

-			for (Object object : newObjects) {

-				if (allElements.contains(object)) {

-					objectsToValidate.add(object);

-				}

-			}

-			factory.validateObjects(objectsToValidate);

-			selector.clearTemporaryElements();

-		}

-

-		setResult(new LinkedList<Object>(allElements));

-

-		super.okPressed();

-	}

-

-	@Override

-	public void widgetDefaultSelected(SelectionEvent e) {

-		// Nothing (see #doubleClick())

-	}

-

-	/**

-	 * Indicates if the selected values should be unique (According to Object.equals())

-	 *

-	 * @param unique

-	 */

-	public void setUnique(boolean unique) {

-		this.unique = unique;

-		updateControls();

-	}

-

-	/**

-	 * Indicates if the selected elements should be ordered

-	 *

-	 * @param ordered

-	 */

-	public void setOrdered(boolean ordered) {

-		this.ordered = ordered;

-		updateControls();

-	}

-

-	private void updateControls() {

-		updateControl(up, ordered);

-		updateControl(down, ordered);

-		updateControl(create, this.factory != null && this.factory.canCreateObject());

-

-		/* Disable the bouton 'add' if the upperBound is reached */

-		boolean canAdd = true;

-		if (this.upperBound != MANY) {

-			if (allElements.size() >= this.upperBound) {

-				canAdd = false;

-			}

-		}

-		updateControl(add, canAdd);

-	}

-

-	private void updateControl(Control control, boolean enabled) {

-		if (control != null) {

-			control.setEnabled(enabled);

-		}

-	}

-

-	public void setSelector(IElementSelector selector) {

-		this.selector = selector;

-	}

-

-	/**

-	 * Set the maximum number of values selected.

-	 *

-	 * @param upperBound

-	 */

-	public void setUpperBound(int upperBound) {

-		this.upperBound = upperBound;

-	}

-

-	/**

-	 * Sets the optional context of the element that is being edited, in which others will be added and removed.

-	 *

-	 * @param contextElement

-	 *            the model element that is being edited

-	 */

-	public void setContextElement(Object contextElement) {

-		this.contextElement = contextElement;

-	}

-

-	/**

-	 * Queries the optional context of the element that is being edited, in which others will be added and removed.

-	 *

-	 * @return the model element that is being edited

-	 */

-	public Object getContextElement() {

-		return contextElement;

-	}

-

-	@Override

-	public boolean close() {

-		selector.removeElementSelectionListener(this);

-		return super.close();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * Handles double click event on the right-panel tree viewer {@link #selectedElementsViewer}

-	 *

-	 */

-	@Override

-	public void doubleClick(DoubleClickEvent event) {

-		removeAction();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * Handles selection change event on the right-panel tree viewer {@link #selectedElementsViewer}

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		updateControls();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *  Christian W. Damus (CEA) - bug 402525
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.Set;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.FillLayout;
+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.Control;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.ui.dialogs.SelectionDialog;
+
+/**
+ * Object Chooser. Defines a standard popup for selecting
+ * multiple values. If this dialog is used to select or create model
+ * elements to be added to or removed from some element that is being
+ * edited, then it is important to {@linkplain #setContextElement(Object) set that contextual element} in this dialog.
+ *
+ * @author Camille Letavernier
+ *
+ * @see #setContextElement(Object)
+ *
+ * @deprecated use MultipleValueSelectionDialog instead
+ * @since Papyrus 1.1
+ */
+@Deprecated
+public class MultipleValueSelectorDialog extends SelectionDialog implements ISelectionChangedListener, IDoubleClickListener, IElementSelectionListener, SelectionListener {
+
+	public static final int MANY = -1;
+
+	/**
+	 * The object selector
+	 */
+	protected IElementSelector selector;
+
+	/**
+	 * The SWT Composite in which the selector is drawn
+	 */
+	protected Composite selectorSection;
+
+	/**
+	 * The add/remove/addAll buttons section
+	 */
+	protected Composite buttonsSection;
+
+	/**
+	 * The up/down buttons section
+	 */
+	protected Composite rightButtonsSection;
+
+	/**
+	 * The listViewer for chosen elements
+	 */
+	protected StructuredViewer selectedElementsViewer;
+
+	/**
+	 * The list for chosen elements
+	 */
+	protected Tree selectedElements;
+
+	/**
+	 * The add action button
+	 */
+	protected Button add;
+
+	/**
+	 * The create action button
+	 */
+	protected Button create;
+
+	/**
+	 * The delete action button
+	 */
+	protected Button delete;
+
+	/**
+	 * The remove action button
+	 */
+	protected Button remove;
+
+	/**
+	 * The add all action button
+	 */
+	protected Button addAll;
+
+	/**
+	 * The remove all action button
+	 */
+	protected Button removeAll;
+
+	/**
+	 * the up action button
+	 */
+	protected Button up;
+
+	/**
+	 * the down action button
+	 */
+	protected Button down;
+
+	/**
+	 * The label provider for the listViewer of chosen elements
+	 */
+	protected ILabelProvider labelProvider;
+
+	/**
+	 * The currently chosen elements
+	 */
+	protected final Collection<Object> allElements;
+
+	/**
+	 * Indicates if the values should be unique (according to Object.equals())
+	 */
+	protected boolean unique;
+
+	/**
+	 * Indicates if the list is ordered
+	 */
+	protected boolean ordered;
+
+	/**
+	 * The factory for creating new elements
+	 */
+	protected ReferenceValueFactory factory;
+
+	/**
+	 * The model element being edited (if any), to which elements are to be added or removed.
+	 */
+	protected Object contextElement;
+
+	/**
+	 * The list of newly created objects
+	 */
+	protected Set<Object> newObjects = new HashSet<Object>();
+
+
+	/**
+	 * The maximum number of values selected.
+	 */
+	protected int upperBound;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 *            The shell in which this dialog should be opened
+	 * @param selector
+	 *            The element selector used by this dialog
+	 */
+	public MultipleValueSelectorDialog(Shell parentShell, IElementSelector selector) {
+		this(parentShell, selector, null, false, false);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 *            The shell in which this dialog should be opened
+	 * @param selector
+	 *            The element selector used by this dialog
+	 * @param title
+	 *            The title of this dialog
+	 */
+	public MultipleValueSelectorDialog(Shell parentShell, IElementSelector selector, String title) {
+		this(parentShell, selector, title, false, false);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 *            The shell in which this dialog should be opened
+	 * @param selector
+	 *            The element selector used by this dialog
+	 * @param unique
+	 *            True if the values returned by this dialog should be unique
+	 */
+	public MultipleValueSelectorDialog(Shell parentShell, IElementSelector selector, boolean unique) {
+		this(parentShell, selector, null, unique, false);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 *            The shell in which this dialog should be opened
+	 * @param selector
+	 *            The element selector used by this dialog
+	 * @param title
+	 *            The title of this dialog
+	 * @param unique
+	 *            True if the values returned by this dialog should be unique
+	 */
+	public MultipleValueSelectorDialog(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered) {
+		this(parentShell, selector, title, unique, false, MANY);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 *            The shell in which this dialog should be opened
+	 * @param selector
+	 *            The element selector used by this dialog
+	 * @param title
+	 *            The title of this dialog
+	 * @param unique
+	 *            True if the values returned by this dialog should be unique
+	 * @param upperBound
+	 *            The maximum number of values selected.
+	 */
+	public MultipleValueSelectorDialog(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered, int upperBound) {
+		super(parentShell);
+		Assert.isNotNull(selector, "The element selector should be defined"); //$NON-NLS-1$
+		this.selector = selector;
+		allElements = unique ? new LinkedHashSet<Object>() : new LinkedList<Object>();
+		setHelpAvailable(false);
+		setTitle(title);
+		this.unique = unique;
+		this.ordered = ordered;
+		this.upperBound = upperBound;
+		selector.addElementSelectionListener(this);
+	}
+
+	@Override
+	protected void configureShell(Shell shell) {
+		super.configureShell(shell);
+		shell.setImage(Activator.getDefault().getImage("/icons/papyrus.png")); //$NON-NLS-1$
+	}
+
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void create() {
+		super.create();
+		createDialogContents();
+		getShell().pack();
+
+		updateControls();
+	}
+
+	/**
+	 * Create the contents of the dialog
+	 */
+	protected void createDialogContents() {
+		Composite parent = getDialogArea();
+		GridLayout layout = (GridLayout) parent.getLayout();
+		layout.numColumns = 2;
+		layout.makeColumnsEqualWidth = true;
+
+		Composite selectorPane = new Composite(parent, SWT.NONE);
+		selectorPane.setLayout(new GridLayout(2, false));
+		selectorPane.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+		Composite selectedPane = new Composite(parent, SWT.NONE);
+		selectedPane.setLayout(new GridLayout(2, false));
+		selectedPane.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+		createSelectorSection(selectorPane);
+		createControlsSection(selectorPane);
+		createListSection(selectedPane);
+		createRightButtonsSection(selectedPane);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected Composite getDialogArea() {
+		return (Composite) super.getDialogArea();
+	}
+
+	/**
+	 * Creates the selector section
+	 *
+	 * @param parent
+	 *            The composite in which the section is created
+	 */
+	private void createSelectorSection(Composite parent) {
+		selectorSection = new Composite(parent, SWT.NONE);
+		selectorSection.setLayout(new FillLayout());
+		selectorSection.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		selector.createControls(selectorSection);
+	}
+
+	/**
+	 * Creates the main controls section (Add, remove, Add all, remove all)
+	 *
+	 * @param parent
+	 *            The composite in which the section is created
+	 */
+	private void createControlsSection(Composite parent) {
+		buttonsSection = new Composite(parent, SWT.NONE);
+		buttonsSection.setLayout(new GridLayout(1, true));
+
+		add = new Button(buttonsSection, SWT.PUSH);
+		add.setImage(Activator.getDefault().getImage("/icons/arrow_right.gif")); //$NON-NLS-1$
+		add.addSelectionListener(this);
+		add.setToolTipText(Messages.MultipleValueSelectorDialog_AddSelectedElements);
+
+		remove = new Button(buttonsSection, SWT.PUSH);
+		remove.setImage(Activator.getDefault().getImage("/icons/arrow_left.gif")); //$NON-NLS-1$
+		remove.addSelectionListener(this);
+		remove.setToolTipText(Messages.MultipleValueEditor_RemoveSelectedElements);
+
+		addAll = new Button(buttonsSection, SWT.PUSH);
+		addAll.setImage(Activator.getDefault().getImage("/icons/arrow_double.gif")); //$NON-NLS-1$
+		addAll.addSelectionListener(this);
+		addAll.setToolTipText(Messages.MultipleValueSelectorDialog_AddAllElements);
+
+		/* Disable the bouton 'addAll' if currently chosen elements is greater than the maximum number of values selected */
+		if (this.upperBound != MANY && allElements.size() > this.upperBound) {
+			addAll.setEnabled(false);
+		}
+
+
+		removeAll = new Button(buttonsSection, SWT.PUSH);
+		removeAll.setImage(Activator.getDefault().getImage("/icons/arrow_left_double.gif")); //$NON-NLS-1$
+		removeAll.addSelectionListener(this);
+		removeAll.setToolTipText(Messages.MultipleValueSelectorDialog_RemoveAllElements);
+	}
+
+	/**
+	 * Creates the list displaying the currently selected elements
+	 *
+	 * @param parent
+	 *            The composite in which the section is created
+	 */
+	private void createListSection(Composite parent) {
+
+		selectedElements = new Tree(parent, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
+		// selectedElements.addSelectionListener(this);
+		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
+		selectedElements.setLayoutData(data);
+		selectedElementsViewer = new TreeViewer(selectedElements);
+
+		selectedElementsViewer.addSelectionChangedListener(this);
+		selectedElementsViewer.addDoubleClickListener(this);
+
+		selectedElementsViewer.setContentProvider(CollectionContentProvider.instance);
+
+		if (labelProvider != null) {
+			selectedElementsViewer.setLabelProvider(labelProvider);
+		}
+
+		selectedElementsViewer.setInput(allElements);
+		selector.setSelectedElements(allElements.toArray());
+	}
+
+	/**
+	 * Creates the up/down controls section
+	 *
+	 * @param parent
+	 *            The composite in which the section is created
+	 */
+	private void createRightButtonsSection(Composite parent) {
+		rightButtonsSection = new Composite(parent, SWT.NONE);
+		rightButtonsSection.setLayout(new GridLayout(1, true));
+
+		up = new Button(rightButtonsSection, SWT.PUSH);
+		up.setImage(Activator.getDefault().getImage("/icons/Up_12x12.gif")); //$NON-NLS-1$
+		up.addSelectionListener(this);
+		up.setToolTipText(Messages.MultipleValueEditor_MoveSelectedElementsUp);
+
+		down = new Button(rightButtonsSection, SWT.PUSH);
+		down.setImage(Activator.getDefault().getImage("/icons/Down_12x12.gif")); //$NON-NLS-1$
+		down.addSelectionListener(this);
+		down.setToolTipText(Messages.MultipleValueEditor_MoveSelectedElementsDown);
+
+		create = new Button(rightButtonsSection, SWT.PUSH);
+		create.setImage(Activator.getDefault().getImage("/icons/Add_12x12.gif")); //$NON-NLS-1$
+		create.addSelectionListener(this);
+		create.setToolTipText(Messages.MultipleValueSelectorDialog_CreateNewElement);
+
+		delete = new Button(rightButtonsSection, SWT.PUSH);
+		delete.setImage(Activator.getDefault().getImage("/icons/Delete_12x12.gif")); //$NON-NLS-1$
+		delete.addSelectionListener(this);
+		delete.setToolTipText(Messages.MultipleValueSelectorDialog_DeleteNewElement);
+		delete.setEnabled(false);
+	}
+
+	/**
+	 * Sets the label provider used to display the selected elements
+	 *
+	 * @param labelProvider
+	 */
+	public void setLabelProvider(ILabelProvider labelProvider) {
+		this.labelProvider = labelProvider;
+	}
+
+	/**
+	 * {@inheritDoc} Handles the events on one of the control buttons
+	 *
+	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
+	 *
+	 * @param e
+	 *            The event that occurred
+	 */
+	@Override
+	public void widgetSelected(SelectionEvent e) {
+		if (e.widget == add) {
+			addAction();
+		} else if (e.widget == remove) {
+			removeAction();
+		} else if (e.widget == addAll) {
+			addAllAction();
+		} else if (e.widget == removeAll) {
+			removeAllAction();
+		} else if (e.widget == up) {
+			upAction();
+		} else if (e.widget == down) {
+			downAction();
+		} else if (e.widget == create) {
+			createAction();
+		}
+
+		updateControls();
+	}
+
+	/**
+	 * Sets the {@link ReferenceValueFactory} for this editor. The {@link ReferenceValueFactory} is used to create
+	 * new instances and edit existing ones.
+	 *
+	 * @param factory
+	 *            The {@link ReferenceValueFactory} to be used by this editor
+	 */
+	public void setFactory(ReferenceValueFactory factory) {
+		this.factory = factory;
+		updateControls();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public int open() {
+		allElements.clear();
+		allElements.addAll(getInitialElementSelections());
+		return super.open();
+	}
+
+	/**
+	 * Handles the "Add" action
+	 */
+	protected void addAction() {
+		Object[] elements = selector.getSelectedElements();
+		addElements(elements);
+	}
+
+	/**
+	 * Handles the "Up" action
+	 */
+	protected void upAction() {
+		IStructuredSelection selection = (IStructuredSelection) selectedElementsViewer.getSelection();
+
+		// We need a list to move objects. LinkedHashSet can't do that
+		java.util.List<Object> list = new LinkedList<Object>(allElements);
+		for (Object o : selection.toArray()) {
+			int oldIndex = list.indexOf(o);
+			if (oldIndex > 0) {
+				move(list, oldIndex, oldIndex - 1);
+			}
+		}
+
+		allElements.clear();
+		allElements.addAll(list);
+
+		IStructuredSelection selectionCopy = new StructuredSelection(selection.toArray());
+		selectedElementsViewer.setSelection(selectionCopy);
+		selectedElementsViewer.refresh();
+	}
+
+	/**
+	 * Handles the "Down" action
+	 */
+	protected void downAction() {
+		IStructuredSelection selection = (IStructuredSelection) selectedElementsViewer.getSelection();
+
+		// We need a list to move objects. LinkedHashSet can't do that
+		java.util.List<Object> list = new LinkedList<Object>(allElements);
+
+		int maxIndex = list.size() - 1;
+
+		Object[] selectionArray = selection.toArray();
+		for (int i = selectionArray.length - 1; i >= 0; i--) {
+			Object o = selectionArray[i];
+			int oldIndex = list.indexOf(o);
+			if (oldIndex < maxIndex) {
+				move(list, oldIndex, oldIndex + 1);
+			}
+		}
+
+		allElements.clear();
+		allElements.addAll(list);
+
+		IStructuredSelection selectionCopy = new StructuredSelection(selection.toArray());
+		selectedElementsViewer.setSelection(selectionCopy);
+		selectedElementsViewer.refresh();
+	}
+
+	/**
+	 * Handles the "Create" action
+	 */
+	protected void createAction() {
+		if (factory == null) {
+			return;
+		}
+
+		Object newObject;
+
+		try {
+			newObject = factory.createObject(this.create, contextElement);
+		} catch (OperationCanceledException e) {
+			// The user cancelled and we rolled back pending model changes
+			newObject = null;
+		}
+
+		if (newObject == null) {
+			return;
+		}
+
+		newObjects.add(newObject);
+		selector.newObjectCreated(newObject);
+
+		Object[] createdObjects = new Object[] { newObject };
+		addElements(createdObjects);
+
+		selector.setSelectedElements(allElements.toArray());
+	}
+
+	/**
+	 * Moves an element from oldIndex to newIndex
+	 *
+	 * @param list
+	 *            The list in which to move the object
+	 * @param oldIndex
+	 * @param newIndex
+	 */
+	private void move(java.util.List<Object> list, int oldIndex, int newIndex) {
+		int size = list.size();
+
+		if (oldIndex < 0 || oldIndex >= size) {
+			throw new IndexOutOfBoundsException("oldIndex: " + oldIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (newIndex < 0 || newIndex >= size) {
+			throw new IndexOutOfBoundsException("newIndex: " + newIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		Object element = list.remove(oldIndex);
+		list.add(newIndex, element);
+	}
+
+	/**
+	 * Handles the "Remove" action
+	 */
+	protected void removeAction() {
+		IStructuredSelection selection = (IStructuredSelection) selectedElementsViewer.getSelection();
+		if (selection.isEmpty()) {
+			return;
+		}
+
+		for (Object element : selection.toArray()) {
+			allElements.remove(element);
+		}
+
+		selector.setSelectedElements(allElements.toArray());
+		selectedElementsViewer.setSelection(null);
+		selectedElementsViewer.refresh();
+	}
+
+	/**
+	 * Handles the "Delete" action
+	 */
+	protected void deleteAction() {
+		// nothing to do here
+	}
+
+	/**
+	 * Handles the "Remove all" action
+	 */
+	protected void removeAllAction() {
+		allElements.clear();
+		selector.setSelectedElements(new Object[0]);
+		selectedElementsViewer.setSelection(null);
+		selectedElementsViewer.refresh();
+	}
+
+	/**
+	 * Handles the "Add All" action
+	 */
+	protected void addAllAction() {
+		Object[] elements = selector.getAllElements();
+		addElements(elements);
+	}
+
+	/**
+	 * Adds the specified elements to the currently selected elements (For
+	 * "Add" and "Add all" actions)
+	 *
+	 * @param elements
+	 *            The elements to be added
+	 */
+	@Override
+	public void addElements(Object[] elements) {
+		if (elements != null) {
+			allElements.addAll(Arrays.asList(elements));
+			selectedElementsViewer.refresh();
+		}
+	}
+
+	@Override
+	protected void okPressed() {
+		if (factory != null) {
+			java.util.List<Object> objectsToValidate = new LinkedList<Object>();
+			for (Object object : newObjects) {
+				if (allElements.contains(object)) {
+					objectsToValidate.add(object);
+				}
+			}
+			factory.validateObjects(objectsToValidate);
+			selector.clearTemporaryElements();
+		}
+
+		setResult(new LinkedList<Object>(allElements));
+
+		super.okPressed();
+	}
+
+	@Override
+	public void widgetDefaultSelected(SelectionEvent e) {
+		// Nothing (see #doubleClick())
+	}
+
+	/**
+	 * Indicates if the selected values should be unique (According to Object.equals())
+	 *
+	 * @param unique
+	 */
+	public void setUnique(boolean unique) {
+		this.unique = unique;
+		updateControls();
+	}
+
+	/**
+	 * Indicates if the selected elements should be ordered
+	 *
+	 * @param ordered
+	 */
+	public void setOrdered(boolean ordered) {
+		this.ordered = ordered;
+		updateControls();
+	}
+
+	private void updateControls() {
+		updateControl(up, ordered);
+		updateControl(down, ordered);
+		updateControl(create, this.factory != null && this.factory.canCreateObject());
+
+		/* Disable the bouton 'add' if the upperBound is reached */
+		boolean canAdd = true;
+		if (this.upperBound != MANY) {
+			if (allElements.size() >= this.upperBound) {
+				canAdd = false;
+			}
+		}
+		updateControl(add, canAdd);
+	}
+
+	private void updateControl(Control control, boolean enabled) {
+		if (control != null) {
+			control.setEnabled(enabled);
+		}
+	}
+
+	public void setSelector(IElementSelector selector) {
+		this.selector = selector;
+	}
+
+	/**
+	 * Set the maximum number of values selected.
+	 *
+	 * @param upperBound
+	 */
+	public void setUpperBound(int upperBound) {
+		this.upperBound = upperBound;
+	}
+
+	/**
+	 * Sets the optional context of the element that is being edited, in which others will be added and removed.
+	 *
+	 * @param contextElement
+	 *            the model element that is being edited
+	 */
+	public void setContextElement(Object contextElement) {
+		this.contextElement = contextElement;
+	}
+
+	/**
+	 * Queries the optional context of the element that is being edited, in which others will be added and removed.
+	 *
+	 * @return the model element that is being edited
+	 */
+	public Object getContextElement() {
+		return contextElement;
+	}
+
+	@Override
+	public boolean close() {
+		selector.removeElementSelectionListener(this);
+		return super.close();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * Handles double click event on the right-panel tree viewer {@link #selectedElementsViewer}
+	 *
+	 */
+	@Override
+	public void doubleClick(DoubleClickEvent event) {
+		removeAction();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * Handles selection change event on the right-panel tree viewer {@link #selectedElementsViewer}
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		updateControls();
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueSelectorDialogWithCheckBox.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueSelectorDialogWithCheckBox.java
index 74293b9fad8..7d52b37c49b 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueSelectorDialogWithCheckBox.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleValueSelectorDialogWithCheckBox.java
@@ -1,180 +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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Shell;

-

-/**

- * This dialog adds a checkbox at the end of the {@link MultipleValueSelectorDialog}

- *

- * @author vl222926

- * 

- *  @deprecated use {@link MultipleValueSelectionWithCheckBoxDialog} instead

- *  @since Papyrus 1.1.0

- */

-@Deprecated 

-public class MultipleValueSelectorDialogWithCheckBox extends MultipleValueSelectorDialog {

-

-	/** boolean indicating if the checkbox is checked */

-	protected boolean isChecked;

-

-	/** The text to display for the checkbox */

-	protected String text;

-

-	/** the tooltip to display for the checkbox */

-	protected String tooltip;

-

-	/** indicates if the checkbox must be displayed or not */

-	protected boolean displayCheckBox = true;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param selector

-	 * @param unique

-	 */

-	public MultipleValueSelectorDialogWithCheckBox(Shell parentShell, IElementSelector selector, boolean unique) {

-		super(parentShell, selector, unique);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param selector

-	 * @param title

-	 * @param unique

-	 * @param ordered

-	 * @param upperBound

-	 */

-	public MultipleValueSelectorDialogWithCheckBox(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered, int upperBound) {

-		super(parentShell, selector, title, unique, ordered, upperBound);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param selector

-	 * @param title

-	 * @param unique

-	 * @param ordered

-	 */

-	public MultipleValueSelectorDialogWithCheckBox(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered) {

-		super(parentShell, selector, title, unique, ordered);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param selector

-	 * @param title

-	 */

-	public MultipleValueSelectorDialogWithCheckBox(Shell parentShell, IElementSelector selector, String title) {

-		super(parentShell, selector, title);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 * @param selector

-	 */

-	public MultipleValueSelectorDialogWithCheckBox(Shell parentShell, IElementSelector selector) {

-		super(parentShell, selector);

-	}

-

-	/**

-	 *

-	 * @param text

-	 *            the text to display near the checkbox

-	 * @param tooltip

-	 *            the tooltip to display for the checkbox

-	 * @param isChecked

-	 *            the initial state of the checkbox

-	 */

-	public void setCheckBoxValues(final String text, final String tooltip, final boolean isChecked) {

-		this.text = text;

-		this.tooltip = tooltip;

-		this.isChecked = isChecked;

-	}

-

-	/**

-	 * this method allows to display or hide the checkbox

-	 */

-	public void setDisplayCheckBox(boolean displayCheckBox) {

-		this.displayCheckBox = displayCheckBox;

-	}

-

-	/**

-	 *

-	 * @return

-	 *         <code>true</code> if the disalog is displaying the checkbox

-	 */

-	public boolean isDisplayingCheckBox() {

-		return this.displayCheckBox;

-	}

-

-	/**

-	 * We Add a checkbox at the end of the dialog

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.editors.MultipleValueSelectorDialog#createDialogContents()

-	 *

-	 */

-	@Override

-	protected void createDialogContents() {

-		super.createDialogContents();

-		if (this.displayCheckBox) {

-			final Composite parent = getDialogArea();

-			final Button button = new Button(parent, SWT.CHECK);

-			button.setText(this.text);

-			button.setToolTipText(this.tooltip);

-			button.setSelection(this.isChecked);

-			final SelectionListener listener = new SelectionListener() {

-

-				@Override

-				public void widgetSelected(SelectionEvent e) {

-					isChecked = button.getSelection();

-				}

-

-				@Override

-				public void widgetDefaultSelected(SelectionEvent e) {

-				}

-			};

-			button.addSelectionListener(listener);

-		}

-	}

-

-

-	/**

-	 *

-	 * @return

-	 *         the state of the checkbox button

-	 */

-	public boolean isChecked() {

-		return this.isChecked;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.widgets.editors;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * This dialog adds a checkbox at the end of the {@link MultipleValueSelectorDialog}
+ *
+ * @author vl222926
+ * 
+ *  @deprecated use {@link MultipleValueSelectionWithCheckBoxDialog} instead
+ *  @since Papyrus 1.1.0
+ */
+@Deprecated 
+public class MultipleValueSelectorDialogWithCheckBox extends MultipleValueSelectorDialog {
+
+	/** boolean indicating if the checkbox is checked */
+	protected boolean isChecked;
+
+	/** The text to display for the checkbox */
+	protected String text;
+
+	/** the tooltip to display for the checkbox */
+	protected String tooltip;
+
+	/** indicates if the checkbox must be displayed or not */
+	protected boolean displayCheckBox = true;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param selector
+	 * @param unique
+	 */
+	public MultipleValueSelectorDialogWithCheckBox(Shell parentShell, IElementSelector selector, boolean unique) {
+		super(parentShell, selector, unique);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param selector
+	 * @param title
+	 * @param unique
+	 * @param ordered
+	 * @param upperBound
+	 */
+	public MultipleValueSelectorDialogWithCheckBox(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered, int upperBound) {
+		super(parentShell, selector, title, unique, ordered, upperBound);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param selector
+	 * @param title
+	 * @param unique
+	 * @param ordered
+	 */
+	public MultipleValueSelectorDialogWithCheckBox(Shell parentShell, IElementSelector selector, String title, boolean unique, boolean ordered) {
+		super(parentShell, selector, title, unique, ordered);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param selector
+	 * @param title
+	 */
+	public MultipleValueSelectorDialogWithCheckBox(Shell parentShell, IElementSelector selector, String title) {
+		super(parentShell, selector, title);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 * @param selector
+	 */
+	public MultipleValueSelectorDialogWithCheckBox(Shell parentShell, IElementSelector selector) {
+		super(parentShell, selector);
+	}
+
+	/**
+	 *
+	 * @param text
+	 *            the text to display near the checkbox
+	 * @param tooltip
+	 *            the tooltip to display for the checkbox
+	 * @param isChecked
+	 *            the initial state of the checkbox
+	 */
+	public void setCheckBoxValues(final String text, final String tooltip, final boolean isChecked) {
+		this.text = text;
+		this.tooltip = tooltip;
+		this.isChecked = isChecked;
+	}
+
+	/**
+	 * this method allows to display or hide the checkbox
+	 */
+	public void setDisplayCheckBox(boolean displayCheckBox) {
+		this.displayCheckBox = displayCheckBox;
+	}
+
+	/**
+	 *
+	 * @return
+	 *         <code>true</code> if the disalog is displaying the checkbox
+	 */
+	public boolean isDisplayingCheckBox() {
+		return this.displayCheckBox;
+	}
+
+	/**
+	 * We Add a checkbox at the end of the dialog
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.editors.MultipleValueSelectorDialog#createDialogContents()
+	 *
+	 */
+	@Override
+	protected void createDialogContents() {
+		super.createDialogContents();
+		if (this.displayCheckBox) {
+			final Composite parent = getDialogArea();
+			final Button button = new Button(parent, SWT.CHECK);
+			button.setText(this.text);
+			button.setToolTipText(this.tooltip);
+			button.setSelection(this.isChecked);
+			final SelectionListener listener = new SelectionListener() {
+
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					isChecked = button.getSelection();
+				}
+
+				@Override
+				public void widgetDefaultSelected(SelectionEvent e) {
+				}
+			};
+			button.addSelectionListener(listener);
+		}
+	}
+
+
+	/**
+	 *
+	 * @return
+	 *         the state of the checkbox button
+	 */
+	public boolean isChecked() {
+		return this.isChecked;
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultiplicityDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultiplicityDialog.java
index d110af0edff..d110af0edff 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultiplicityDialog.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultiplicityDialog.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ReferenceCombo.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ReferenceCombo.java
index 39a6f30ddcd..10cfb693326 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ReferenceCombo.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ReferenceCombo.java
@@ -1,330 +1,330 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation

- *  Christian W. Damus (CEA) - bug 435420

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.core.databinding.observable.value.IObservableValue;

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.jface.fieldassist.ControlDecoration;

-import org.eclipse.jface.fieldassist.FieldDecoration;

-import org.eclipse.jface.fieldassist.FieldDecorationRegistry;

-import org.eclipse.jface.viewers.ComboViewer;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.infra.tools.databinding.AggregatedObservable;

-import org.eclipse.papyrus.infra.widgets.databinding.ComboObservableValue;

-import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.UnchangedObject;

-import org.eclipse.papyrus.infra.widgets.providers.UnsetObject;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CCombo;

-import org.eclipse.swt.events.FocusAdapter;

-import org.eclipse.swt.events.FocusEvent;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-

-

-/**

- * An editor representing a single reference as a Combo Box

- * This Editor needs a ContentProvider and a LabelProvider,

- * describing the objects that can be referred by this property

- *

- * @author Camille Letavernier

- *

- */

-public class ReferenceCombo extends AbstractValueEditor { // implements SelectionListener {

-

-	/**

-	 * The viewer displaying the available values from the model

-	 */

-	protected ComboViewer viewer;

-

-	/**

-	 * The combo used to select the reference

-	 */

-	protected CCombo combo;

-

-	protected boolean unsettable;

-

-	// protected Button unset;

-

-	protected EncapsulatedContentProvider contentProvider;

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The Composite in which this editor is diplayed

-	 * @param style

-	 *            The style for this editor's combo

-	 */

-	public ReferenceCombo(Composite parent, int style) {

-		this(parent, style, null);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The Composite in which this editor is diplayed

-	 * @param style

-	 *            The style for this editor's combo

-	 * @param label

-	 *            The label for this editor

-	 */

-	public ReferenceCombo(Composite parent, int style, String label) {

-		super(parent, label);

-

-		combo = factory.createCCombo(this, style | SWT.BORDER);

-		combo.setBackground(new Color(combo.getDisplay(), 255, 255, 255));

-		combo.setLayoutData(getDefaultLayoutData());

-		combo.setEditable(false);

-

-		viewer = new ComboViewer(combo);

-

-		// unset = new Button(this, SWT.PUSH);

-		// unset.setImage(Activator.getDefault().getImage("/icons/Delete_12x12.gif")); //$NON-NLS-1$

-		// unset.setToolTipText("Unset the current value");

-		// unset.addSelectionListener(this);

-

-		((GridLayout) getLayout()).numColumns++;

-

-		setCommitOnFocusLost(combo);

-		controlDecoration = new ControlDecoration(combo, SWT.TOP | SWT.LEFT);

-		GridData gridData = getDefaultLayoutData();

-		combo.setLayoutData(gridData);

-		gridData.horizontalIndent = FieldDecorationRegistry.getDefault().getMaximumDecorationWidth();

-

-		combo.addFocusListener(new FocusAdapter() {

-

-			@Override

-			public void focusGained(FocusEvent paramFocusEvent) {

-				acceptingFocus();

-			}

-		});

-	}

-

-	/**

-	 * Sets the Content and Label providers for this editor

-	 *

-	 * @param contentProvider

-	 *

-	 * @param labelProvider

-	 */

-	public void setProviders(IStaticContentProvider contentProvider, ILabelProvider labelProvider) {

-		Assert.isNotNull(contentProvider, "The content provider should not be null"); //$NON-NLS-1$

-		setContentProvider(contentProvider);

-

-		if (labelProvider != null) {

-			setLabelProvider(labelProvider);

-		}

-	}

-

-	/**

-	 * Sets the content provider for this combo. The Content provider should

-	 * specify the objects that can be referred by this property

-	 *

-	 * @param provider

-	 */

-	public void setContentProvider(IStaticContentProvider provider) {

-		this.contentProvider = new EncapsulatedContentProvider(provider);

-		viewer.setContentProvider(contentProvider);

-		viewer.setInput(""); //$NON-NLS-1$

-		updateControls();

-		doBinding();

-	}

-

-	@Override

-	protected void doBinding() {

-		if (contentProvider == null || modelProperty == null) {

-			return;

-		}

-

-		if (widgetObservable == null) {

-			setWidgetObservable(getObservableValue(), true);

-		}

-

-		if (modelProperty instanceof AggregatedObservable) {

-			if (((AggregatedObservable) modelProperty).hasDifferentValues()) {

-				contentProvider.addTemporaryElement(UnchangedObject.instance);

-				viewer.refresh();

-			}

-		}

-		super.doBinding();

-	}

-

-	protected IObservableValue getObservableValue() {

-		return new ComboObservableValue(viewer, modelProperty);

-	}

-

-	/**

-	 * The Label provider associated to the available objects that

-	 * can be referred by this property

-	 *

-	 * @param provider

-	 */

-	public void setLabelProvider(ILabelProvider provider) {

-		viewer.setLabelProvider(provider);

-	}

-

-	/**

-	 * Retrieves the ComboViewer associated to this Editor

-	 *

-	 * @return

-	 * 		The ComboViewer associated to this editor

-	 */

-	public ComboViewer getViewer() {

-		return viewer;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object getEditableType() {

-		return Object.class;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object getValue() {

-		IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();

-		if (selection.isEmpty()) {

-			return null;

-		}

-		return selection.getFirstElement();

-	}

-

-	/**

-	 * Sets the value for this widget

-	 *

-	 * @param value

-	 */

-	public void setValue(Object value) {

-		if (value == null) {

-			viewer.setSelection(new StructuredSelection());

-		} else {

-			viewer.setSelection(new StructuredSelection(value), true);

-		}

-	}

-

-	@Override

-	public void setReadOnly(boolean readOnly) {

-		combo.setEnabled(!readOnly);

-		updateControls();

-	}

-

-	@Override

-	public boolean isReadOnly() {

-		return !combo.isEnabled();

-	}

-

-	@Override

-	public void setToolTipText(String text) {

-		combo.setToolTipText(text);

-		super.setLabelToolTipText(text);

-	}

-

-	public void setUnsettable(boolean unsettable) {

-		this.unsettable = unsettable;

-		updateControls();

-	}

-

-	/**

-	 * Updates the controls display

-	 */

-	protected void updateControls() {

-		// setExclusion(unset, !unsettable);

-

-		// if(isReadOnly() && unsettable) {

-		// unset.setEnabled(false);

-		// }

-

-		if (contentProvider != null) {

-			if (unsettable) {

-				contentProvider.addTemporaryElement(UnsetObject.instance);

-			} else {

-				contentProvider.removeTemporaryElement(UnsetObject.instance);

-			}

-			viewer.refresh();

-		}

-	}

-

-	/**

-	 * Changes the viewer for this editor.

-	 * The viewer should use a CCombo

-	 *

-	 * @param comboViewer

-	 */

-	public void setViewer(ComboViewer comboViewer) {

-		this.viewer = comboViewer;

-		this.combo = viewer.getCCombo();

-	}

-

-	// FIXME error avec multiplicit� nulllpointerexception l285

-	@Override

-	public void updateStatus(IStatus status) {

-		switch (status.getSeverity()) {

-		case IStatus.OK:

-			controlDecoration.hide();

-			break;

-		case IStatus.WARNING:

-			FieldDecoration warning = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_WARNING);

-			controlDecoration.setImage(warning.getImage());

-			controlDecoration.showHoverText(status.getMessage());

-			controlDecoration.setDescriptionText(status.getMessage());

-			controlDecoration.show();

-			break;

-		case IStatus.ERROR:

-			FieldDecoration error = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_ERROR);

-			controlDecoration.setImage(error.getImage());

-			controlDecoration.showHoverText(status.getMessage());

-			controlDecoration.setDescriptionText(status.getMessage());

-			controlDecoration.show();

-			break;

-		default:

-			controlDecoration.hide();

-			break;

-		}

-

-

-	}

-

-	// protected void unsetAction() {

-	// viewer.setSelection(StructuredSelection.EMPTY);

-	// if(modelProperty != null) {

-	// modelProperty.setValue(null);

-	// }

-	// }

-

-	// public void widgetSelected(SelectionEvent e) {

-	// if(e.widget == unset) {

-	// unsetAction();

-	// }

-	// }

-

-	// public void widgetDefaultSelected(SelectionEvent e) {

-	// //Nothing

-	// }

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *  Christian W. Damus (CEA) - bug 435420
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.fieldassist.ControlDecoration;
+import org.eclipse.jface.fieldassist.FieldDecoration;
+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.infra.tools.databinding.AggregatedObservable;
+import org.eclipse.papyrus.infra.widgets.databinding.ComboObservableValue;
+import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.UnchangedObject;
+import org.eclipse.papyrus.infra.widgets.providers.UnsetObject;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CCombo;
+import org.eclipse.swt.events.FocusAdapter;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+
+
+/**
+ * An editor representing a single reference as a Combo Box
+ * This Editor needs a ContentProvider and a LabelProvider,
+ * describing the objects that can be referred by this property
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class ReferenceCombo extends AbstractValueEditor { // implements SelectionListener {
+
+	/**
+	 * The viewer displaying the available values from the model
+	 */
+	protected ComboViewer viewer;
+
+	/**
+	 * The combo used to select the reference
+	 */
+	protected CCombo combo;
+
+	protected boolean unsettable;
+
+	// protected Button unset;
+
+	protected EncapsulatedContentProvider contentProvider;
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The Composite in which this editor is diplayed
+	 * @param style
+	 *            The style for this editor's combo
+	 */
+	public ReferenceCombo(Composite parent, int style) {
+		this(parent, style, null);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The Composite in which this editor is diplayed
+	 * @param style
+	 *            The style for this editor's combo
+	 * @param label
+	 *            The label for this editor
+	 */
+	public ReferenceCombo(Composite parent, int style, String label) {
+		super(parent, label);
+
+		combo = factory.createCCombo(this, style | SWT.BORDER);
+		combo.setBackground(new Color(combo.getDisplay(), 255, 255, 255));
+		combo.setLayoutData(getDefaultLayoutData());
+		combo.setEditable(false);
+
+		viewer = new ComboViewer(combo);
+
+		// unset = new Button(this, SWT.PUSH);
+		// unset.setImage(Activator.getDefault().getImage("/icons/Delete_12x12.gif")); //$NON-NLS-1$
+		// unset.setToolTipText("Unset the current value");
+		// unset.addSelectionListener(this);
+
+		((GridLayout) getLayout()).numColumns++;
+
+		setCommitOnFocusLost(combo);
+		controlDecoration = new ControlDecoration(combo, SWT.TOP | SWT.LEFT);
+		GridData gridData = getDefaultLayoutData();
+		combo.setLayoutData(gridData);
+		gridData.horizontalIndent = FieldDecorationRegistry.getDefault().getMaximumDecorationWidth();
+
+		combo.addFocusListener(new FocusAdapter() {
+
+			@Override
+			public void focusGained(FocusEvent paramFocusEvent) {
+				acceptingFocus();
+			}
+		});
+	}
+
+	/**
+	 * Sets the Content and Label providers for this editor
+	 *
+	 * @param contentProvider
+	 *
+	 * @param labelProvider
+	 */
+	public void setProviders(IStaticContentProvider contentProvider, ILabelProvider labelProvider) {
+		Assert.isNotNull(contentProvider, "The content provider should not be null"); //$NON-NLS-1$
+		setContentProvider(contentProvider);
+
+		if (labelProvider != null) {
+			setLabelProvider(labelProvider);
+		}
+	}
+
+	/**
+	 * Sets the content provider for this combo. The Content provider should
+	 * specify the objects that can be referred by this property
+	 *
+	 * @param provider
+	 */
+	public void setContentProvider(IStaticContentProvider provider) {
+		this.contentProvider = new EncapsulatedContentProvider(provider);
+		viewer.setContentProvider(contentProvider);
+		viewer.setInput(""); //$NON-NLS-1$
+		updateControls();
+		doBinding();
+	}
+
+	@Override
+	protected void doBinding() {
+		if (contentProvider == null || modelProperty == null) {
+			return;
+		}
+
+		if (widgetObservable == null) {
+			setWidgetObservable(getObservableValue(), true);
+		}
+
+		if (modelProperty instanceof AggregatedObservable) {
+			if (((AggregatedObservable) modelProperty).hasDifferentValues()) {
+				contentProvider.addTemporaryElement(UnchangedObject.instance);
+				viewer.refresh();
+			}
+		}
+		super.doBinding();
+	}
+
+	protected IObservableValue getObservableValue() {
+		return new ComboObservableValue(viewer, modelProperty);
+	}
+
+	/**
+	 * The Label provider associated to the available objects that
+	 * can be referred by this property
+	 *
+	 * @param provider
+	 */
+	public void setLabelProvider(ILabelProvider provider) {
+		viewer.setLabelProvider(provider);
+	}
+
+	/**
+	 * Retrieves the ComboViewer associated to this Editor
+	 *
+	 * @return
+	 * 		The ComboViewer associated to this editor
+	 */
+	public ComboViewer getViewer() {
+		return viewer;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object getEditableType() {
+		return Object.class;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object getValue() {
+		IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
+		if (selection.isEmpty()) {
+			return null;
+		}
+		return selection.getFirstElement();
+	}
+
+	/**
+	 * Sets the value for this widget
+	 *
+	 * @param value
+	 */
+	public void setValue(Object value) {
+		if (value == null) {
+			viewer.setSelection(new StructuredSelection());
+		} else {
+			viewer.setSelection(new StructuredSelection(value), true);
+		}
+	}
+
+	@Override
+	public void setReadOnly(boolean readOnly) {
+		combo.setEnabled(!readOnly);
+		updateControls();
+	}
+
+	@Override
+	public boolean isReadOnly() {
+		return !combo.isEnabled();
+	}
+
+	@Override
+	public void setToolTipText(String text) {
+		combo.setToolTipText(text);
+		super.setLabelToolTipText(text);
+	}
+
+	public void setUnsettable(boolean unsettable) {
+		this.unsettable = unsettable;
+		updateControls();
+	}
+
+	/**
+	 * Updates the controls display
+	 */
+	protected void updateControls() {
+		// setExclusion(unset, !unsettable);
+
+		// if(isReadOnly() && unsettable) {
+		// unset.setEnabled(false);
+		// }
+
+		if (contentProvider != null) {
+			if (unsettable) {
+				contentProvider.addTemporaryElement(UnsetObject.instance);
+			} else {
+				contentProvider.removeTemporaryElement(UnsetObject.instance);
+			}
+			viewer.refresh();
+		}
+	}
+
+	/**
+	 * Changes the viewer for this editor.
+	 * The viewer should use a CCombo
+	 *
+	 * @param comboViewer
+	 */
+	public void setViewer(ComboViewer comboViewer) {
+		this.viewer = comboViewer;
+		this.combo = viewer.getCCombo();
+	}
+
+	// FIXME error avec multiplicit� nulllpointerexception l285
+	@Override
+	public void updateStatus(IStatus status) {
+		switch (status.getSeverity()) {
+		case IStatus.OK:
+			controlDecoration.hide();
+			break;
+		case IStatus.WARNING:
+			FieldDecoration warning = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_WARNING);
+			controlDecoration.setImage(warning.getImage());
+			controlDecoration.showHoverText(status.getMessage());
+			controlDecoration.setDescriptionText(status.getMessage());
+			controlDecoration.show();
+			break;
+		case IStatus.ERROR:
+			FieldDecoration error = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_ERROR);
+			controlDecoration.setImage(error.getImage());
+			controlDecoration.showHoverText(status.getMessage());
+			controlDecoration.setDescriptionText(status.getMessage());
+			controlDecoration.show();
+			break;
+		default:
+			controlDecoration.hide();
+			break;
+		}
+
+
+	}
+
+	// protected void unsetAction() {
+	// viewer.setSelection(StructuredSelection.EMPTY);
+	// if(modelProperty != null) {
+	// modelProperty.setValue(null);
+	// }
+	// }
+
+	// public void widgetSelected(SelectionEvent e) {
+	// if(e.widget == unset) {
+	// unsetAction();
+	// }
+	// }
+
+	// public void widgetDefaultSelected(SelectionEvent e) {
+	// //Nothing
+	// }
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ReferenceDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ReferenceDialog.java
index 95775b4483d..95775b4483d 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ReferenceDialog.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/ReferenceDialog.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/SelectionEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/SelectionEditor.java
index 7500c90f2cf..e385f80a43d 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/SelectionEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/SelectionEditor.java
@@ -1,543 +1,543 @@
-/*****************************************************************************

- * 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedList;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.papyrus.infra.widgets.messages.Messages;

-import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.layout.FillLayout;

-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.Label;

-import org.eclipse.swt.widgets.List;

-

-/**

- *

- * This class provides an editor to select easily elements

- * In the left side, we have the possible element to select and in the right side, we have the current selection

- * Moreover, its possible to add a Button to provide some action. Often this button shall be used to create new element

- *

- */

-public class SelectionEditor extends Composite implements SelectionListener {

-

-	/** the initial selection */

-	protected final java.util.List<Object> initialSelection;

-

-	/** The object selector */

-	private IElementSelector selector;

-

-	/** The SWT Composite in which the selector is drawn */

-	protected Composite selectorSection;

-

-	/** The message section */

-	protected Composite messageSection;

-

-	/** The additional button section */

-	protected Composite createAdditionalButtonSection;

-

-	/** The up/down buttons section */

-	protected Composite rightButtonsSection;

-

-	/** The listViewer for chosen elements */

-	protected ListViewer selectedElementsViewer;

-

-	/** The list for chosen elements */

-	protected List selectedElements;

-

-	/** The add action button */

-	private Button add;

-

-	/** The remove action button */

-	private Button remove;

-

-	/** The add all action button */

-	private Button addAll;

-

-	/** The remove all action button */

-	private Button removeAll;

-

-	/** the up action button */

-	private Button up;

-

-	/** the down action button */

-	private Button down;

-

-	/** The label provider for the listViewer of chosen elements */

-	private ILabelProvider labelProvider;

-

-	/** The currently chosen elements */

-	protected final Collection<Object> currentSelection;

-

-	/** the listener for the additional button */

-	private SelectionListener additionalButtonSelectionListener;

-

-	/** the message for the editor */

-	private String message;

-

-

-	/*

-	 * This dialog can provide a Button to do some optional action

-	 */

-

-	/** Indicates if the dialog provides a button */

-	private boolean withAdditionalButton = false;

-

-	/** the label of the button */

-	private String additionalButtonLabel = null;

-

-	/** the button */

-	private Button additionalButton;

-

-	/** The add/remove/addAll buttons section */

-	protected Composite buttonSection;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            the parent of this composite

-	 * @param selector

-	 *            the selector

-	 * @param labelProvider

-	 *            the label provider

-	 * @param initialSelection

-	 *            the initial selection

-	 */

-	public SelectionEditor(Composite parent, IElementSelector selector, ILabelProvider labelProvider, java.util.List<Object> initialSelection) {

-		super(parent, SWT.NONE);

-		this.selector = selector;

-		this.labelProvider = labelProvider;

-		this.initialSelection = new ArrayList<Object>();

-		for (Object current : initialSelection) {

-			this.initialSelection.add(current);

-		}

-		currentSelection = initialSelection;

-	}

-

-	/**

-	 * This methods create this editor

-	 */

-	public void create() {

-		Composite parent = this;

-		GridLayout layout = new GridLayout(1, true);

-		GridData data = new GridData();

-		data.grabExcessHorizontalSpace = true;

-		data.grabExcessVerticalSpace = true;

-		parent.setLayout(layout);

-		createMessageSection(parent);

-		createBody(parent);

-		createCreateButtonSection(parent);

-	}

-

-	/**

-	 * This method create the body of the editor :

-	 * <ul>

-	 * <li>the selector</li>

-	 * <li>the list</li>

-	 * <li>the buttons Add, AddAll, Remove, RemoveAll, Up, Down</li>

-	 * </ul>

-	 *

-	 * @param parent

-	 *            the parent composite

-	 */

-	protected void createBody(Composite parent) {

-

-		Composite par = new Composite(parent, SWT.NONE);

-		createSelectorSection(par);

-		createControlsSection(par);

-		createListSection(par);

-		createRightButtonsSection(par);

-		GridLayout layout = new GridLayout();

-		layout.makeColumnsEqualWidth = false;

-		layout.numColumns = 4;

-		par.setLayout(layout);

-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);

-		par.setLayoutData(data);

-

-	}

-

-	/**

-	 * Creates the Message section

-	 *

-	 * @param parent

-	 *            the parent of the {@link Composite}

-	 */

-	protected void createMessageSection(Composite parent) {

-		messageSection = new Composite(parent, SWT.NONE);

-		Label label = new Label(messageSection, SWT.NONE);

-		label.setText(message);

-		messageSection.setLayout(new FillLayout(SWT.HORIZONTAL));

-	}

-

-	/**

-	 * Creates the button section

-	 *

-	 * @param parent

-	 *            the parent of the {@link Composite}

-	 */

-	protected void createCreateButtonSection(Composite parent) {

-		if (this.withAdditionalButton) {

-			buttonSection = new Composite(parent, SWT.NONE);

-			additionalButton = new Button(buttonSection, SWT.PUSH);

-			if (additionalButtonLabel != null) {

-				additionalButton.setText(additionalButtonLabel);

-			}

-			buttonSection.setLayout(new FillLayout());

-			this.additionalButton.addSelectionListener(additionalButtonSelectionListener);

-		}

-	}

-

-	/**

-	 * Creates the selector section

-	 *

-	 * @param parent

-	 *            The composite in which the section is created

-	 */

-	protected void createSelectorSection(Composite parent) {

-		selectorSection = new Composite(parent, SWT.NONE);

-		selectorSection.setLayout(new FillLayout());

-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);

-		data.widthHint = 400;

-

-		// data.exclude = true;

-		selectorSection.setLayoutData(data);

-		selector.createControls(selectorSection);

-

-	}

-

-	/**

-	 * Creates the main controls section (Add, remove, Add all, remove all)

-	 *

-	 * @param parent

-	 *            The composite in which the section is created

-	 */

-	protected void createControlsSection(Composite parent) {

-		buttonSection = new Composite(parent, SWT.NONE);

-		buttonSection.setLayout(new GridLayout(1, true));

-

-		add = new Button(buttonSection, SWT.PUSH);

-		add.setImage(Activator.getDefault().getImage("/icons/arrow_right.gif")); //$NON-NLS-1$

-		add.addSelectionListener(this);

-		add.setToolTipText(Messages.MultipleValueSelectorDialog_AddSelectedElements);

-

-		remove = new Button(buttonSection, SWT.PUSH);

-		remove.setImage(Activator.getDefault().getImage("/icons/arrow_left.gif")); //$NON-NLS-1$

-		remove.addSelectionListener(this);

-		remove.setToolTipText(Messages.MultipleValueEditor_RemoveSelectedElements);

-

-		addAll = new Button(buttonSection, SWT.PUSH);

-		addAll.setImage(Activator.getDefault().getImage("/icons/arrow_double.gif")); //$NON-NLS-1$

-		addAll.addSelectionListener(this);

-		addAll.setToolTipText(Messages.MultipleValueSelectorDialog_AddAllElements);

-

-		removeAll = new Button(buttonSection, SWT.PUSH);

-		removeAll.setImage(Activator.getDefault().getImage("/icons/arrow_left_double.gif")); //$NON-NLS-1$

-		removeAll.addSelectionListener(this);

-		removeAll.setToolTipText(Messages.MultipleValueSelectorDialog_RemoveAllElements);

-	}

-

-

-	/**

-	 * Creates the list displaying the currently selected elements

-	 *

-	 * @param parent

-	 *            The composite in which the section is created

-	 */

-	protected void createListSection(Composite parent) {

-		Composite listSection = new Composite(parent, SWT.NONE);

-		selectedElements = new List(listSection, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);

-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);

-		data.widthHint = 400;

-		listSection.setLayout(new FillLayout());

-		listSection.setLayoutData(data);

-

-		selectedElementsViewer = new ListViewer(selectedElements);

-

-		selectedElementsViewer.setContentProvider(CollectionContentProvider.instance);

-

-		if (labelProvider != null) {

-			selectedElementsViewer.setLabelProvider(labelProvider);

-		}

-

-		selectedElementsViewer.setInput(currentSelection);

-		selector.setSelectedElements(currentSelection.toArray());

-

-	}

-

-	/**

-	 * Creates the up/down controls section

-	 *

-	 * @param parent

-	 *            The composite in which the section is created

-	 */

-	protected void createRightButtonsSection(Composite parent) {

-		rightButtonsSection = new Composite(parent, SWT.NONE);

-		rightButtonsSection.setLayout(new GridLayout(1, true));

-

-		up = new Button(rightButtonsSection, SWT.PUSH);

-		up.setImage(Activator.getDefault().getImage("/icons/Up_12x12.gif")); //$NON-NLS-1$

-		up.addSelectionListener(this);

-		up.setToolTipText(Messages.MultipleValueEditor_MoveSelectedElementsUp);

-

-		down = new Button(rightButtonsSection, SWT.PUSH);

-		down.setImage(Activator.getDefault().getImage("/icons/Down_12x12.gif")); //$NON-NLS-1$

-		down.addSelectionListener(this);

-		down.setToolTipText(Messages.MultipleValueEditor_MoveSelectedElementsDown);

-	}

-

-

-

-	/**

-	 * {@inheritDoc} Handles the events on one of the control buttons

-	 *

-	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)

-	 *

-	 * @param e

-	 *            The event that occurred

-	 */

-	@Override

-	public void widgetSelected(SelectionEvent e) {

-		if (e.widget == add) {

-			addAction();

-		} else if (e.widget == remove) {

-			removeAction();

-		} else if (e.widget == addAll) {

-			addAllAction();

-		} else if (e.widget == removeAll) {

-			removeAllAction();

-		} else if (e.widget == up) {

-			upAction();

-		} else if (e.widget == down) {

-			downAction();

-		}

-	}

-

-	/**

-	 * Handles the "Add" action

-	 */

-	protected void addAction() {

-		Object[] elements = selector.getSelectedElements();

-		addElements(elements);

-	}

-

-	/**

-	 * Handles the "Up" action

-	 */

-	protected void upAction() {

-		IStructuredSelection selection = (IStructuredSelection) selectedElementsViewer.getSelection();

-

-		// We need a list to move objects. LinkedHashSet can't do that

-		java.util.List<Object> list = new LinkedList<Object>(currentSelection);

-		for (Object o : selection.toArray()) {

-			int oldIndex = list.indexOf(o);

-			if (oldIndex > 0) {

-				move(list, oldIndex, oldIndex - 1);

-			}

-		}

-

-		currentSelection.clear();

-		currentSelection.addAll(list);

-

-		IStructuredSelection selectionCopy = new StructuredSelection(selection.toArray());

-		selectedElementsViewer.setSelection(selectionCopy);

-		selectedElementsViewer.refresh();

-	}

-

-	/**

-	 * Handles the "Down" action

-	 */

-	protected void downAction() {

-		IStructuredSelection selection = (IStructuredSelection) selectedElementsViewer.getSelection();

-

-		// We need a list to move objects. LinkedHashSet can't do that

-		java.util.List<Object> list = new LinkedList<Object>(currentSelection);

-

-		int maxIndex = list.size() - 1;

-

-		Object[] selectionArray = selection.toArray();

-		for (int i = selectionArray.length - 1; i >= 0; i--) {

-			Object o = selectionArray[i];

-			int oldIndex = list.indexOf(o);

-			if (oldIndex < maxIndex) {

-				move(list, oldIndex, oldIndex + 1);

-			}

-		}

-

-		currentSelection.clear();

-		currentSelection.addAll(list);

-

-		IStructuredSelection selectionCopy = new StructuredSelection(selection.toArray());

-		selectedElementsViewer.setSelection(selectionCopy);

-		selectedElementsViewer.refresh();

-	}

-

-	/**

-	 * Moves an element from oldIndex to newIndex

-	 *

-	 * @param list

-	 *            The list in which to move the object

-	 * @param oldIndex

-	 * @param newIndex

-	 */

-	protected void move(java.util.List<Object> list, int oldIndex, int newIndex) {

-		int size = list.size();

-

-		if (oldIndex < 0 || oldIndex >= size)

-		{

-			throw new IndexOutOfBoundsException("oldIndex: " + oldIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-		if (newIndex < 0 || newIndex >= size)

-		{

-			throw new IndexOutOfBoundsException("newIndex: " + newIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-		Object element = list.remove(oldIndex);

-		list.add(newIndex, element);

-	}

-

-	/**

-	 * Handles the "Remove" action

-	 */

-	protected void removeAction() {

-		IStructuredSelection selection = (IStructuredSelection) selectedElementsViewer.getSelection();

-		if (selection.isEmpty()) {

-			return;

-		}

-

-		for (Object element : selection.toArray()) {

-			currentSelection.remove(element);

-		}

-

-		selector.setSelectedElements(currentSelection.toArray());

-		selectedElementsViewer.setSelection(null);

-		selectedElementsViewer.refresh();

-	}

-

-	/**

-	 * Handles the "Remove all" action

-	 */

-	protected void removeAllAction() {

-		currentSelection.clear();

-		selector.setSelectedElements(new Object[0]);

-		selectedElementsViewer.setSelection(null);

-		selectedElementsViewer.refresh();

-	}

-

-	/**

-	 * Handles the "Add All" action

-	 */

-	protected void addAllAction() {

-		Object[] elements = selector.getAllElements();

-		addElements(elements);

-	}

-

-	/**

-	 * Adds the specified elements to the currently selected elements (For

-	 * "Add" and "Add all" actions)

-	 *

-	 * @param elements

-	 *            The elements to be added

-	 */

-	protected void addElements(Object[] elements) {

-		if (elements != null) {

-			currentSelection.addAll(Arrays.asList(elements));

-			selectedElementsViewer.refresh();

-		}

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)

-	 *

-	 * @param e

-	 */

-	@Override

-	public void widgetDefaultSelected(SelectionEvent e) {

-		// Nothing to do

-	}

-

-	public void setAdditionalButton(boolean withAdditionalButton, String messageButton, SelectionListener listener) {

-		this.withAdditionalButton = withAdditionalButton;

-		this.additionalButtonLabel = messageButton;

-		this.additionalButtonSelectionListener = listener;

-	}

-

-	/**

-	 * Set the message displayed by the Editor

-	 *

-	 * @param string

-	 *            the message displayed by the editor

-	 */

-	public void setMessage(String string) {

-		this.message = string;

-	}

-

-	/**

-	 * Returns all selected elements

-	 *

-	 * @return

-	 *         all selected elements

-	 */

-	public Collection<?> getSelectedElements() {

-		return currentSelection;

-	}

-

-

-	/**

-	 * Returns the list of the elements to remove

-	 *

-	 * @return

-	 *         the list of the elements to remove

-	 */

-	public java.util.List<Object> getElementToRemove() {

-		java.util.List<Object> removedObject = new ArrayList<Object>();

-		for (Object current : this.initialSelection) {

-			if (!getSelectedElements().contains(current)) {

-				removedObject.add(current);

-			}

-		}

-		return removedObject;

-	}

-

-	/**

-	 * Returns the list of the elements to add

-	 *

-	 * @return

-	 *         the list of the elements to add

-	 */

-	public java.util.List<Object> getElementToAdd() {

-		java.util.List<Object> addedObject = new ArrayList<Object>();

-		for (Object current : getSelectedElements()) {

-			if (!this.initialSelection.contains(current)) {

-				addedObject.add(current);

-			}

-		}

-		return addedObject;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedList;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.FillLayout;
+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.Label;
+import org.eclipse.swt.widgets.List;
+
+/**
+ *
+ * This class provides an editor to select easily elements
+ * In the left side, we have the possible element to select and in the right side, we have the current selection
+ * Moreover, its possible to add a Button to provide some action. Often this button shall be used to create new element
+ *
+ */
+public class SelectionEditor extends Composite implements SelectionListener {
+
+	/** the initial selection */
+	protected final java.util.List<Object> initialSelection;
+
+	/** The object selector */
+	private IElementSelector selector;
+
+	/** The SWT Composite in which the selector is drawn */
+	protected Composite selectorSection;
+
+	/** The message section */
+	protected Composite messageSection;
+
+	/** The additional button section */
+	protected Composite createAdditionalButtonSection;
+
+	/** The up/down buttons section */
+	protected Composite rightButtonsSection;
+
+	/** The listViewer for chosen elements */
+	protected ListViewer selectedElementsViewer;
+
+	/** The list for chosen elements */
+	protected List selectedElements;
+
+	/** The add action button */
+	private Button add;
+
+	/** The remove action button */
+	private Button remove;
+
+	/** The add all action button */
+	private Button addAll;
+
+	/** The remove all action button */
+	private Button removeAll;
+
+	/** the up action button */
+	private Button up;
+
+	/** the down action button */
+	private Button down;
+
+	/** The label provider for the listViewer of chosen elements */
+	private ILabelProvider labelProvider;
+
+	/** The currently chosen elements */
+	protected final Collection<Object> currentSelection;
+
+	/** the listener for the additional button */
+	private SelectionListener additionalButtonSelectionListener;
+
+	/** the message for the editor */
+	private String message;
+
+
+	/*
+	 * This dialog can provide a Button to do some optional action
+	 */
+
+	/** Indicates if the dialog provides a button */
+	private boolean withAdditionalButton = false;
+
+	/** the label of the button */
+	private String additionalButtonLabel = null;
+
+	/** the button */
+	private Button additionalButton;
+
+	/** The add/remove/addAll buttons section */
+	protected Composite buttonSection;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            the parent of this composite
+	 * @param selector
+	 *            the selector
+	 * @param labelProvider
+	 *            the label provider
+	 * @param initialSelection
+	 *            the initial selection
+	 */
+	public SelectionEditor(Composite parent, IElementSelector selector, ILabelProvider labelProvider, java.util.List<Object> initialSelection) {
+		super(parent, SWT.NONE);
+		this.selector = selector;
+		this.labelProvider = labelProvider;
+		this.initialSelection = new ArrayList<Object>();
+		for (Object current : initialSelection) {
+			this.initialSelection.add(current);
+		}
+		currentSelection = initialSelection;
+	}
+
+	/**
+	 * This methods create this editor
+	 */
+	public void create() {
+		Composite parent = this;
+		GridLayout layout = new GridLayout(1, true);
+		GridData data = new GridData();
+		data.grabExcessHorizontalSpace = true;
+		data.grabExcessVerticalSpace = true;
+		parent.setLayout(layout);
+		createMessageSection(parent);
+		createBody(parent);
+		createCreateButtonSection(parent);
+	}
+
+	/**
+	 * This method create the body of the editor :
+	 * <ul>
+	 * <li>the selector</li>
+	 * <li>the list</li>
+	 * <li>the buttons Add, AddAll, Remove, RemoveAll, Up, Down</li>
+	 * </ul>
+	 *
+	 * @param parent
+	 *            the parent composite
+	 */
+	protected void createBody(Composite parent) {
+
+		Composite par = new Composite(parent, SWT.NONE);
+		createSelectorSection(par);
+		createControlsSection(par);
+		createListSection(par);
+		createRightButtonsSection(par);
+		GridLayout layout = new GridLayout();
+		layout.makeColumnsEqualWidth = false;
+		layout.numColumns = 4;
+		par.setLayout(layout);
+		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
+		par.setLayoutData(data);
+
+	}
+
+	/**
+	 * Creates the Message section
+	 *
+	 * @param parent
+	 *            the parent of the {@link Composite}
+	 */
+	protected void createMessageSection(Composite parent) {
+		messageSection = new Composite(parent, SWT.NONE);
+		Label label = new Label(messageSection, SWT.NONE);
+		label.setText(message);
+		messageSection.setLayout(new FillLayout(SWT.HORIZONTAL));
+	}
+
+	/**
+	 * Creates the button section
+	 *
+	 * @param parent
+	 *            the parent of the {@link Composite}
+	 */
+	protected void createCreateButtonSection(Composite parent) {
+		if (this.withAdditionalButton) {
+			buttonSection = new Composite(parent, SWT.NONE);
+			additionalButton = new Button(buttonSection, SWT.PUSH);
+			if (additionalButtonLabel != null) {
+				additionalButton.setText(additionalButtonLabel);
+			}
+			buttonSection.setLayout(new FillLayout());
+			this.additionalButton.addSelectionListener(additionalButtonSelectionListener);
+		}
+	}
+
+	/**
+	 * Creates the selector section
+	 *
+	 * @param parent
+	 *            The composite in which the section is created
+	 */
+	protected void createSelectorSection(Composite parent) {
+		selectorSection = new Composite(parent, SWT.NONE);
+		selectorSection.setLayout(new FillLayout());
+		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
+		data.widthHint = 400;
+
+		// data.exclude = true;
+		selectorSection.setLayoutData(data);
+		selector.createControls(selectorSection);
+
+	}
+
+	/**
+	 * Creates the main controls section (Add, remove, Add all, remove all)
+	 *
+	 * @param parent
+	 *            The composite in which the section is created
+	 */
+	protected void createControlsSection(Composite parent) {
+		buttonSection = new Composite(parent, SWT.NONE);
+		buttonSection.setLayout(new GridLayout(1, true));
+
+		add = new Button(buttonSection, SWT.PUSH);
+		add.setImage(Activator.getDefault().getImage("/icons/arrow_right.gif")); //$NON-NLS-1$
+		add.addSelectionListener(this);
+		add.setToolTipText(Messages.MultipleValueSelectorDialog_AddSelectedElements);
+
+		remove = new Button(buttonSection, SWT.PUSH);
+		remove.setImage(Activator.getDefault().getImage("/icons/arrow_left.gif")); //$NON-NLS-1$
+		remove.addSelectionListener(this);
+		remove.setToolTipText(Messages.MultipleValueEditor_RemoveSelectedElements);
+
+		addAll = new Button(buttonSection, SWT.PUSH);
+		addAll.setImage(Activator.getDefault().getImage("/icons/arrow_double.gif")); //$NON-NLS-1$
+		addAll.addSelectionListener(this);
+		addAll.setToolTipText(Messages.MultipleValueSelectorDialog_AddAllElements);
+
+		removeAll = new Button(buttonSection, SWT.PUSH);
+		removeAll.setImage(Activator.getDefault().getImage("/icons/arrow_left_double.gif")); //$NON-NLS-1$
+		removeAll.addSelectionListener(this);
+		removeAll.setToolTipText(Messages.MultipleValueSelectorDialog_RemoveAllElements);
+	}
+
+
+	/**
+	 * Creates the list displaying the currently selected elements
+	 *
+	 * @param parent
+	 *            The composite in which the section is created
+	 */
+	protected void createListSection(Composite parent) {
+		Composite listSection = new Composite(parent, SWT.NONE);
+		selectedElements = new List(listSection, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
+		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
+		data.widthHint = 400;
+		listSection.setLayout(new FillLayout());
+		listSection.setLayoutData(data);
+
+		selectedElementsViewer = new ListViewer(selectedElements);
+
+		selectedElementsViewer.setContentProvider(CollectionContentProvider.instance);
+
+		if (labelProvider != null) {
+			selectedElementsViewer.setLabelProvider(labelProvider);
+		}
+
+		selectedElementsViewer.setInput(currentSelection);
+		selector.setSelectedElements(currentSelection.toArray());
+
+	}
+
+	/**
+	 * Creates the up/down controls section
+	 *
+	 * @param parent
+	 *            The composite in which the section is created
+	 */
+	protected void createRightButtonsSection(Composite parent) {
+		rightButtonsSection = new Composite(parent, SWT.NONE);
+		rightButtonsSection.setLayout(new GridLayout(1, true));
+
+		up = new Button(rightButtonsSection, SWT.PUSH);
+		up.setImage(Activator.getDefault().getImage("/icons/Up_12x12.gif")); //$NON-NLS-1$
+		up.addSelectionListener(this);
+		up.setToolTipText(Messages.MultipleValueEditor_MoveSelectedElementsUp);
+
+		down = new Button(rightButtonsSection, SWT.PUSH);
+		down.setImage(Activator.getDefault().getImage("/icons/Down_12x12.gif")); //$NON-NLS-1$
+		down.addSelectionListener(this);
+		down.setToolTipText(Messages.MultipleValueEditor_MoveSelectedElementsDown);
+	}
+
+
+
+	/**
+	 * {@inheritDoc} Handles the events on one of the control buttons
+	 *
+	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
+	 *
+	 * @param e
+	 *            The event that occurred
+	 */
+	@Override
+	public void widgetSelected(SelectionEvent e) {
+		if (e.widget == add) {
+			addAction();
+		} else if (e.widget == remove) {
+			removeAction();
+		} else if (e.widget == addAll) {
+			addAllAction();
+		} else if (e.widget == removeAll) {
+			removeAllAction();
+		} else if (e.widget == up) {
+			upAction();
+		} else if (e.widget == down) {
+			downAction();
+		}
+	}
+
+	/**
+	 * Handles the "Add" action
+	 */
+	protected void addAction() {
+		Object[] elements = selector.getSelectedElements();
+		addElements(elements);
+	}
+
+	/**
+	 * Handles the "Up" action
+	 */
+	protected void upAction() {
+		IStructuredSelection selection = (IStructuredSelection) selectedElementsViewer.getSelection();
+
+		// We need a list to move objects. LinkedHashSet can't do that
+		java.util.List<Object> list = new LinkedList<Object>(currentSelection);
+		for (Object o : selection.toArray()) {
+			int oldIndex = list.indexOf(o);
+			if (oldIndex > 0) {
+				move(list, oldIndex, oldIndex - 1);
+			}
+		}
+
+		currentSelection.clear();
+		currentSelection.addAll(list);
+
+		IStructuredSelection selectionCopy = new StructuredSelection(selection.toArray());
+		selectedElementsViewer.setSelection(selectionCopy);
+		selectedElementsViewer.refresh();
+	}
+
+	/**
+	 * Handles the "Down" action
+	 */
+	protected void downAction() {
+		IStructuredSelection selection = (IStructuredSelection) selectedElementsViewer.getSelection();
+
+		// We need a list to move objects. LinkedHashSet can't do that
+		java.util.List<Object> list = new LinkedList<Object>(currentSelection);
+
+		int maxIndex = list.size() - 1;
+
+		Object[] selectionArray = selection.toArray();
+		for (int i = selectionArray.length - 1; i >= 0; i--) {
+			Object o = selectionArray[i];
+			int oldIndex = list.indexOf(o);
+			if (oldIndex < maxIndex) {
+				move(list, oldIndex, oldIndex + 1);
+			}
+		}
+
+		currentSelection.clear();
+		currentSelection.addAll(list);
+
+		IStructuredSelection selectionCopy = new StructuredSelection(selection.toArray());
+		selectedElementsViewer.setSelection(selectionCopy);
+		selectedElementsViewer.refresh();
+	}
+
+	/**
+	 * Moves an element from oldIndex to newIndex
+	 *
+	 * @param list
+	 *            The list in which to move the object
+	 * @param oldIndex
+	 * @param newIndex
+	 */
+	protected void move(java.util.List<Object> list, int oldIndex, int newIndex) {
+		int size = list.size();
+
+		if (oldIndex < 0 || oldIndex >= size)
+		{
+			throw new IndexOutOfBoundsException("oldIndex: " + oldIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (newIndex < 0 || newIndex >= size)
+		{
+			throw new IndexOutOfBoundsException("newIndex: " + newIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		Object element = list.remove(oldIndex);
+		list.add(newIndex, element);
+	}
+
+	/**
+	 * Handles the "Remove" action
+	 */
+	protected void removeAction() {
+		IStructuredSelection selection = (IStructuredSelection) selectedElementsViewer.getSelection();
+		if (selection.isEmpty()) {
+			return;
+		}
+
+		for (Object element : selection.toArray()) {
+			currentSelection.remove(element);
+		}
+
+		selector.setSelectedElements(currentSelection.toArray());
+		selectedElementsViewer.setSelection(null);
+		selectedElementsViewer.refresh();
+	}
+
+	/**
+	 * Handles the "Remove all" action
+	 */
+	protected void removeAllAction() {
+		currentSelection.clear();
+		selector.setSelectedElements(new Object[0]);
+		selectedElementsViewer.setSelection(null);
+		selectedElementsViewer.refresh();
+	}
+
+	/**
+	 * Handles the "Add All" action
+	 */
+	protected void addAllAction() {
+		Object[] elements = selector.getAllElements();
+		addElements(elements);
+	}
+
+	/**
+	 * Adds the specified elements to the currently selected elements (For
+	 * "Add" and "Add all" actions)
+	 *
+	 * @param elements
+	 *            The elements to be added
+	 */
+	protected void addElements(Object[] elements) {
+		if (elements != null) {
+			currentSelection.addAll(Arrays.asList(elements));
+			selectedElementsViewer.refresh();
+		}
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
+	 *
+	 * @param e
+	 */
+	@Override
+	public void widgetDefaultSelected(SelectionEvent e) {
+		// Nothing to do
+	}
+
+	public void setAdditionalButton(boolean withAdditionalButton, String messageButton, SelectionListener listener) {
+		this.withAdditionalButton = withAdditionalButton;
+		this.additionalButtonLabel = messageButton;
+		this.additionalButtonSelectionListener = listener;
+	}
+
+	/**
+	 * Set the message displayed by the Editor
+	 *
+	 * @param string
+	 *            the message displayed by the editor
+	 */
+	public void setMessage(String string) {
+		this.message = string;
+	}
+
+	/**
+	 * Returns all selected elements
+	 *
+	 * @return
+	 *         all selected elements
+	 */
+	public Collection<?> getSelectedElements() {
+		return currentSelection;
+	}
+
+
+	/**
+	 * Returns the list of the elements to remove
+	 *
+	 * @return
+	 *         the list of the elements to remove
+	 */
+	public java.util.List<Object> getElementToRemove() {
+		java.util.List<Object> removedObject = new ArrayList<Object>();
+		for (Object current : this.initialSelection) {
+			if (!getSelectedElements().contains(current)) {
+				removedObject.add(current);
+			}
+		}
+		return removedObject;
+	}
+
+	/**
+	 * Returns the list of the elements to add
+	 *
+	 * @return
+	 *         the list of the elements to add
+	 */
+	public java.util.List<Object> getElementToAdd() {
+		java.util.List<Object> addedObject = new ArrayList<Object>();
+		for (Object current : getSelectedElements()) {
+			if (!this.initialSelection.contains(current)) {
+				addedObject.add(current);
+			}
+		}
+		return addedObject;
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/SelectionMenu.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/SelectionMenu.java
index 22a624ecf77..22a624ecf77 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/SelectionMenu.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/SelectionMenu.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringCombo.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringCombo.java
index 6234e5db3b6..6234e5db3b6 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringCombo.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringCombo.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringEditor.java
index 0defe69096d..1b3cdb80c4f 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringEditor.java
@@ -1,480 +1,480 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import java.util.Timer;

-import java.util.TimerTask;

-

-import org.eclipse.core.databinding.observable.value.IObservableValue;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.jface.fieldassist.ControlDecoration;

-import org.eclipse.jface.fieldassist.FieldDecoration;

-import org.eclipse.jface.fieldassist.FieldDecorationRegistry;

-import org.eclipse.papyrus.infra.widgets.databinding.TextObservableValue;

-import org.eclipse.papyrus.infra.widgets.selectors.StringSelector;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.KeyEvent;

-import org.eclipse.swt.events.KeyListener;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Event;

-import org.eclipse.swt.widgets.Text;

-

-/**

- * A Property Editor representing a single-line or multi-line String value as a

- * Text. This editor's content is validated when the focus is lost, or, if the

- * editor is single-line, when the Carriage Return is pressed. For a multi-line

- * editor, ctrl+enter will also validate the editor's content.

- *

- * @see SWT#MULTI

- *

- * @author Camille Letavernier

- */

-public class StringEditor extends AbstractValueEditor implements KeyListener, ModifyListener {

-

-	/**

-	 * The text box for editing this editor's value

-	 */

-	protected final Text text;

-

-	private int delay = 600;

-

-	private boolean validateOnDelay = false;

-

-	private Timer timer;

-

-	private TimerTask currentValidateTask;

-

-	private TimerTask changeColorTask;

-

-	private final static int DEFAULT_HEIGHT_HINT = 55;

-

-	private final static int DEFAULT_WIDTH_HINT = 100;

-

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The composite in which this editor should be displayed

-	 * @param style

-	 *            The style for this editor's text box

-	 */

-	public StringEditor(Composite parent, int style) {

-		this(parent, style, null, DEFAULT_HEIGHT_HINT, DEFAULT_WIDTH_HINT);

-

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The composite in which this editor should be displayed

-	 * @param style

-	 *            The style for this editor's text box

-	 * @param label

-	 *            The label for this editor

-	 */

-	public StringEditor(Composite parent, int style, String label) {

-		this(parent, style, label, DEFAULT_HEIGHT_HINT, DEFAULT_WIDTH_HINT);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The composite in which this editor should be displayed

-	 * @param style

-	 *            The style for this editor's text box

-	 * @param heighHint

-	 *            Height hint of the text area in multiline mode

-	 * @param widthHint

-	 *            Width hint of the text area in multiline mode

-	 */

-	public StringEditor(Composite parent, int style, int heighHint, int widthHint) {

-		this(parent, style, null, heighHint, widthHint);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The composite in which this editor should be displayed

-	 * @param style

-	 *            The style for this editor's text box

-	 * @param label

-	 *            The label for this editor

-	 * @param heighHint

-	 *            Height hint of the text area in multiline mode

-	 * @param widthHint

-	 *            Width hint of the text area in multiline mode

-	 */

-	public StringEditor(Composite parent, int style, String label, int heighHint, int widthHint) {

-		super(parent, label);

-

-		GridData data = getDefaultLayoutData();

-		data.grabExcessVerticalSpace = true;

-		data.grabExcessHorizontalSpace = true;

-		data.verticalAlignment = SWT.FILL;

-

-		if ((style & SWT.MULTI) != 0) {

-			data.minimumHeight = heighHint;

-			data.minimumWidth = widthHint;

-			style = style | SWT.V_SCROLL;

-		}

-

-		text = factory.createText(this, null, style);

-		text.setLayoutData(data);

-

-		if (label != null) {

-			super.label.setLayoutData(getLabelLayoutData());

-

-		}

-		text.addKeyListener(this);

-		text.addModifyListener(this);

-		setCommitOnFocusLost(text);

-		controlDecoration = new ControlDecoration(text, SWT.LEFT | SWT.TOP);

-		controlDecoration.hide();

-		data.horizontalIndent = FieldDecorationRegistry.getDefault().getMaximumDecorationWidth();

-		pack();

-

-	}

-

-	@Override

-	protected GridData getLabelLayoutData() {

-		GridData result = super.getLabelLayoutData();

-		if (text != null) {

-			if ((text.getStyle() & SWT.MULTI) != 0) {

-				result.verticalAlignment = SWT.BEGINNING;

-			}

-		}

-		return result;

-	}

-

-	/**

-	 * Ignored

-	 */

-	@Override

-	public void keyPressed(KeyEvent e) {

-		// Nothing

-

-

-

-	}

-

-	/**

-	 * Validates this editor when one of the following events occur : - CR

-	 * released - Keypad CR released - Ctrl + [CR | Keypad CR] released

-	 *

-	 * @see org.eclipse.swt.events.KeyListener#keyReleased(org.eclipse.swt.events.KeyEvent)

-	 *

-	 * @param e

-	 */

-	// TODO : we should prevent the \n from being written when validating the

-	// multi-line field with Ctrl + CR

-	@Override

-	public void keyReleased(KeyEvent e) {

-		// We listen on Carriage Return or Ctrl+ Carriage return, depending on

-		// whether the editor is single- or multi-line

-		if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) {

-			if ((text.getStyle() & SWT.MULTI) == 0) { // Single-line : Enter

-				if (e.stateMask == SWT.NONE) {

-					notifyChange();

-				}

-			} else { // Multi-line : Ctrl+Enter

-				if (e.stateMask == SWT.CTRL) {

-					String str = text.getText();

-					if (str.endsWith(StringSelector.LINE_SEPARATOR)) {

-						int newLength = str.length() - StringSelector.LINE_SEPARATOR.length();

-						text.setText(str.substring(0, newLength));

-						text.setSelection(newLength);

-					}

-					notifyChange();

-				}

-			}

-		}

-

-

-	}

-

-	@Override

-	public void setModelObservable(IObservableValue observable) {

-		setWidgetObservable(new TextObservableValue(text, observable, SWT.FocusOut), true);

-		super.setModelObservable(observable);

-

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object getEditableType() {

-		return String.class;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object getValue() {

-		return text.getText();

-	}

-

-	@Override

-	public void setReadOnly(boolean readOnly) {

-		text.setEnabled(!readOnly);

-	}

-

-	@Override

-	public boolean isReadOnly() {

-		return !text.isEnabled();

-	}

-

-	protected void notifyChange() {

-

-		text.notifyListeners(SWT.FocusOut, new Event());

-		commit();

-		changeColorField();

-	}

-

-	@Override

-	public void setToolTipText(String tooltip) {

-		text.setToolTipText(tooltip);

-		super.setLabelToolTipText(tooltip);

-	}

-

-	/**

-	 * Sets the current text value for this editor

-	 *

-	 * @param value

-	 */

-	public void setValue(Object value) {

-		if (value instanceof String) {

-			this.text.setText((String) value);

-		} else {

-			this.text.setText(""); //$NON-NLS-1$;

-		}

-	}

-

-	/**

-	 * Indicates that this editor should be automatically validated after a

-	 * timer.

-	 *

-	 * @param validateOnDelay

-	 */

-	public void setValidateOnDelay(boolean validateOnDelay) {

-		this.validateOnDelay = validateOnDelay;

-

-		if (validateOnDelay) {

-			text.addModifyListener(this);

-		} else {

-			text.removeModifyListener(this);

-			cancelCurrentTask();

-		}

-	}

-

-	/**

-	 * Indicates that this editor should be automatically validated after the

-	 * given timer

-	 *

-	 * @param millis

-	 *            The delay after which the editor should be automatically

-	 *            validated, in milliseconds. The default is 600ms

-	 */

-	public void setValidateOnDelay(int millis) {

-		this.delay = millis;

-		setValidateOnDelay(true);

-		if (delay == 0) {

-			cancelCurrentTask();

-		}

-	}

-

-	private void cancelCurrentTask() {

-		if (currentValidateTask != null) {

-			currentValidateTask.cancel();

-			currentValidateTask = null;

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-

-	@Override

-	public void modifyText(ModifyEvent e) {

-

-		// SWT Thread

-		if (validateOnDelay) {

-			if (delay == 0) {

-				commit(); // Direct commit on edition, to avoid creating useless

-				// threads

-

-				return;

-			}

-

-			if (timer == null) {

-				timer = new Timer(true);

-			}

-

-			cancelCurrentTask();

-			currentValidateTask = new TimerTask() {

-

-				// Timer thread

-				@Override

-				public void run() {

-					StringEditor.this.getDisplay().syncExec(new Runnable() {

-

-						// SWT Thread

-						@Override

-						public void run() {

-

-							commit();

-						}

-					});

-				}

-			};

-			timer.schedule(currentValidateTask, delay);

-		}

-		if (targetValidator != null) {

-			IStatus status = targetValidator.validate(text.getText());

-			updateStatus(status);

-		}

-		if (modelValidator != null) {

-			IStatus status = modelValidator.validate(text.getText());

-			updateStatus(status);

-			if (binding == null) {

-				update();

-			}

-		}

-

-		if (modelProperty != null) { // Bug 433169: The widget may be used without an Observable Value (setValue + getValue)

-			if (modelProperty.getValue() != null) {

-				if (!isReadOnly() && !modelProperty.getValue().toString().equals(text.getText())) {

-					text.setBackground(EDIT);

-				} else {

-					text.setBackground(DEFAULT);

-				}

-			} else {

-				if (text.getText().equals("")) {

-					text.setBackground(DEFAULT);

-				} else {

-					text.setBackground(EDIT);

-				}

-			}

-		}

-	}

-

-	@Override

-	public void dispose() {

-		cancelCurrentTask();

-		cancelChangeColorTask();

-		if (timer != null) {

-			timer.cancel();

-			timer = null;

-		}

-		super.dispose();

-	}

-

-	public Text getText() {

-		return text;

-	}

-

-	@Override

-	public void updateStatus(IStatus status) {

-		switch (status.getSeverity()) {

-		case IStatus.OK:

-			controlDecoration.hide();

-			break;

-		case IStatus.WARNING:

-			FieldDecoration warning = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_WARNING);

-			controlDecoration.setImage(warning.getImage());

-			controlDecoration.showHoverText(status.getMessage());

-			controlDecoration.setDescriptionText(status.getMessage());

-			controlDecoration.show();

-			break;

-		case IStatus.ERROR:

-			FieldDecoration error = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_ERROR);

-			controlDecoration.setImage(error.getImage());

-			controlDecoration.showHoverText(status.getMessage());

-			controlDecoration.setDescriptionText(status.getMessage());

-			controlDecoration.show();

-			break;

-		default:

-			controlDecoration.hide();

-			break;

-		}

-

-	}

-

-	@Override

-	public void changeColorField() {

-		if (binding != null) {

-

-			if (timer == null) {

-				timer = new Timer(true);

-			}

-

-			cancelChangeColorTask();

-			changeColorTask = new TimerTask() {

-

-				@Override

-				public void run() {

-					if (StringEditor.this.isDisposed()) {

-						return;

-					}

-					StringEditor.this.getDisplay().syncExec(new Runnable() {

-

-						@Override

-						public void run() {

-							text.setBackground(DEFAULT);

-							text.update();

-						}

-					});

-				}

-			};

-			if (errorBinding) {

-				text.setBackground(ERROR);

-				text.update();

-			} else {

-				IStatus status = (IStatus) binding.getValidationStatus().getValue();

-				switch (status.getSeverity()) {

-				case IStatus.OK:

-				case IStatus.WARNING:

-					timer.schedule(changeColorTask, 600);

-					text.setBackground(VALID);

-					text.update();

-					break;

-				case IStatus.ERROR:

-					text.setBackground(ERROR);

-					text.update();

-					break;

-

-				}

-			}

-		}

-	}

-

-	private void cancelChangeColorTask() {

-		if (changeColorTask != null) {

-			changeColorTask.cancel();

-			changeColorTask = null;

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.fieldassist.ControlDecoration;
+import org.eclipse.jface.fieldassist.FieldDecoration;
+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
+import org.eclipse.papyrus.infra.widgets.databinding.TextObservableValue;
+import org.eclipse.papyrus.infra.widgets.selectors.StringSelector;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * A Property Editor representing a single-line or multi-line String value as a
+ * Text. This editor's content is validated when the focus is lost, or, if the
+ * editor is single-line, when the Carriage Return is pressed. For a multi-line
+ * editor, ctrl+enter will also validate the editor's content.
+ *
+ * @see SWT#MULTI
+ *
+ * @author Camille Letavernier
+ */
+public class StringEditor extends AbstractValueEditor implements KeyListener, ModifyListener {
+
+	/**
+	 * The text box for editing this editor's value
+	 */
+	protected final Text text;
+
+	private int delay = 600;
+
+	private boolean validateOnDelay = false;
+
+	private Timer timer;
+
+	private TimerTask currentValidateTask;
+
+	private TimerTask changeColorTask;
+
+	private final static int DEFAULT_HEIGHT_HINT = 55;
+
+	private final static int DEFAULT_WIDTH_HINT = 100;
+
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which this editor should be displayed
+	 * @param style
+	 *            The style for this editor's text box
+	 */
+	public StringEditor(Composite parent, int style) {
+		this(parent, style, null, DEFAULT_HEIGHT_HINT, DEFAULT_WIDTH_HINT);
+
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which this editor should be displayed
+	 * @param style
+	 *            The style for this editor's text box
+	 * @param label
+	 *            The label for this editor
+	 */
+	public StringEditor(Composite parent, int style, String label) {
+		this(parent, style, label, DEFAULT_HEIGHT_HINT, DEFAULT_WIDTH_HINT);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which this editor should be displayed
+	 * @param style
+	 *            The style for this editor's text box
+	 * @param heighHint
+	 *            Height hint of the text area in multiline mode
+	 * @param widthHint
+	 *            Width hint of the text area in multiline mode
+	 */
+	public StringEditor(Composite parent, int style, int heighHint, int widthHint) {
+		this(parent, style, null, heighHint, widthHint);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The composite in which this editor should be displayed
+	 * @param style
+	 *            The style for this editor's text box
+	 * @param label
+	 *            The label for this editor
+	 * @param heighHint
+	 *            Height hint of the text area in multiline mode
+	 * @param widthHint
+	 *            Width hint of the text area in multiline mode
+	 */
+	public StringEditor(Composite parent, int style, String label, int heighHint, int widthHint) {
+		super(parent, label);
+
+		GridData data = getDefaultLayoutData();
+		data.grabExcessVerticalSpace = true;
+		data.grabExcessHorizontalSpace = true;
+		data.verticalAlignment = SWT.FILL;
+
+		if ((style & SWT.MULTI) != 0) {
+			data.minimumHeight = heighHint;
+			data.minimumWidth = widthHint;
+			style = style | SWT.V_SCROLL;
+		}
+
+		text = factory.createText(this, null, style);
+		text.setLayoutData(data);
+
+		if (label != null) {
+			super.label.setLayoutData(getLabelLayoutData());
+
+		}
+		text.addKeyListener(this);
+		text.addModifyListener(this);
+		setCommitOnFocusLost(text);
+		controlDecoration = new ControlDecoration(text, SWT.LEFT | SWT.TOP);
+		controlDecoration.hide();
+		data.horizontalIndent = FieldDecorationRegistry.getDefault().getMaximumDecorationWidth();
+		pack();
+
+	}
+
+	@Override
+	protected GridData getLabelLayoutData() {
+		GridData result = super.getLabelLayoutData();
+		if (text != null) {
+			if ((text.getStyle() & SWT.MULTI) != 0) {
+				result.verticalAlignment = SWT.BEGINNING;
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Ignored
+	 */
+	@Override
+	public void keyPressed(KeyEvent e) {
+		// Nothing
+
+
+
+	}
+
+	/**
+	 * Validates this editor when one of the following events occur : - CR
+	 * released - Keypad CR released - Ctrl + [CR | Keypad CR] released
+	 *
+	 * @see org.eclipse.swt.events.KeyListener#keyReleased(org.eclipse.swt.events.KeyEvent)
+	 *
+	 * @param e
+	 */
+	// TODO : we should prevent the \n from being written when validating the
+	// multi-line field with Ctrl + CR
+	@Override
+	public void keyReleased(KeyEvent e) {
+		// We listen on Carriage Return or Ctrl+ Carriage return, depending on
+		// whether the editor is single- or multi-line
+		if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) {
+			if ((text.getStyle() & SWT.MULTI) == 0) { // Single-line : Enter
+				if (e.stateMask == SWT.NONE) {
+					notifyChange();
+				}
+			} else { // Multi-line : Ctrl+Enter
+				if (e.stateMask == SWT.CTRL) {
+					String str = text.getText();
+					if (str.endsWith(StringSelector.LINE_SEPARATOR)) {
+						int newLength = str.length() - StringSelector.LINE_SEPARATOR.length();
+						text.setText(str.substring(0, newLength));
+						text.setSelection(newLength);
+					}
+					notifyChange();
+				}
+			}
+		}
+
+
+	}
+
+	@Override
+	public void setModelObservable(IObservableValue observable) {
+		setWidgetObservable(new TextObservableValue(text, observable, SWT.FocusOut), true);
+		super.setModelObservable(observable);
+
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object getEditableType() {
+		return String.class;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object getValue() {
+		return text.getText();
+	}
+
+	@Override
+	public void setReadOnly(boolean readOnly) {
+		text.setEnabled(!readOnly);
+	}
+
+	@Override
+	public boolean isReadOnly() {
+		return !text.isEnabled();
+	}
+
+	protected void notifyChange() {
+
+		text.notifyListeners(SWT.FocusOut, new Event());
+		commit();
+		changeColorField();
+	}
+
+	@Override
+	public void setToolTipText(String tooltip) {
+		text.setToolTipText(tooltip);
+		super.setLabelToolTipText(tooltip);
+	}
+
+	/**
+	 * Sets the current text value for this editor
+	 *
+	 * @param value
+	 */
+	public void setValue(Object value) {
+		if (value instanceof String) {
+			this.text.setText((String) value);
+		} else {
+			this.text.setText(""); //$NON-NLS-1$;
+		}
+	}
+
+	/**
+	 * Indicates that this editor should be automatically validated after a
+	 * timer.
+	 *
+	 * @param validateOnDelay
+	 */
+	public void setValidateOnDelay(boolean validateOnDelay) {
+		this.validateOnDelay = validateOnDelay;
+
+		if (validateOnDelay) {
+			text.addModifyListener(this);
+		} else {
+			text.removeModifyListener(this);
+			cancelCurrentTask();
+		}
+	}
+
+	/**
+	 * Indicates that this editor should be automatically validated after the
+	 * given timer
+	 *
+	 * @param millis
+	 *            The delay after which the editor should be automatically
+	 *            validated, in milliseconds. The default is 600ms
+	 */
+	public void setValidateOnDelay(int millis) {
+		this.delay = millis;
+		setValidateOnDelay(true);
+		if (delay == 0) {
+			cancelCurrentTask();
+		}
+	}
+
+	private void cancelCurrentTask() {
+		if (currentValidateTask != null) {
+			currentValidateTask.cancel();
+			currentValidateTask = null;
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+
+	@Override
+	public void modifyText(ModifyEvent e) {
+
+		// SWT Thread
+		if (validateOnDelay) {
+			if (delay == 0) {
+				commit(); // Direct commit on edition, to avoid creating useless
+				// threads
+
+				return;
+			}
+
+			if (timer == null) {
+				timer = new Timer(true);
+			}
+
+			cancelCurrentTask();
+			currentValidateTask = new TimerTask() {
+
+				// Timer thread
+				@Override
+				public void run() {
+					StringEditor.this.getDisplay().syncExec(new Runnable() {
+
+						// SWT Thread
+						@Override
+						public void run() {
+
+							commit();
+						}
+					});
+				}
+			};
+			timer.schedule(currentValidateTask, delay);
+		}
+		if (targetValidator != null) {
+			IStatus status = targetValidator.validate(text.getText());
+			updateStatus(status);
+		}
+		if (modelValidator != null) {
+			IStatus status = modelValidator.validate(text.getText());
+			updateStatus(status);
+			if (binding == null) {
+				update();
+			}
+		}
+
+		if (modelProperty != null) { // Bug 433169: The widget may be used without an Observable Value (setValue + getValue)
+			if (modelProperty.getValue() != null) {
+				if (!isReadOnly() && !modelProperty.getValue().toString().equals(text.getText())) {
+					text.setBackground(EDIT);
+				} else {
+					text.setBackground(DEFAULT);
+				}
+			} else {
+				if (text.getText().equals("")) {
+					text.setBackground(DEFAULT);
+				} else {
+					text.setBackground(EDIT);
+				}
+			}
+		}
+	}
+
+	@Override
+	public void dispose() {
+		cancelCurrentTask();
+		cancelChangeColorTask();
+		if (timer != null) {
+			timer.cancel();
+			timer = null;
+		}
+		super.dispose();
+	}
+
+	public Text getText() {
+		return text;
+	}
+
+	@Override
+	public void updateStatus(IStatus status) {
+		switch (status.getSeverity()) {
+		case IStatus.OK:
+			controlDecoration.hide();
+			break;
+		case IStatus.WARNING:
+			FieldDecoration warning = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_WARNING);
+			controlDecoration.setImage(warning.getImage());
+			controlDecoration.showHoverText(status.getMessage());
+			controlDecoration.setDescriptionText(status.getMessage());
+			controlDecoration.show();
+			break;
+		case IStatus.ERROR:
+			FieldDecoration error = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_ERROR);
+			controlDecoration.setImage(error.getImage());
+			controlDecoration.showHoverText(status.getMessage());
+			controlDecoration.setDescriptionText(status.getMessage());
+			controlDecoration.show();
+			break;
+		default:
+			controlDecoration.hide();
+			break;
+		}
+
+	}
+
+	@Override
+	public void changeColorField() {
+		if (binding != null) {
+
+			if (timer == null) {
+				timer = new Timer(true);
+			}
+
+			cancelChangeColorTask();
+			changeColorTask = new TimerTask() {
+
+				@Override
+				public void run() {
+					if (StringEditor.this.isDisposed()) {
+						return;
+					}
+					StringEditor.this.getDisplay().syncExec(new Runnable() {
+
+						@Override
+						public void run() {
+							text.setBackground(DEFAULT);
+							text.update();
+						}
+					});
+				}
+			};
+			if (errorBinding) {
+				text.setBackground(ERROR);
+				text.update();
+			} else {
+				IStatus status = (IStatus) binding.getValidationStatus().getValue();
+				switch (status.getSeverity()) {
+				case IStatus.OK:
+				case IStatus.WARNING:
+					timer.schedule(changeColorTask, 600);
+					text.setBackground(VALID);
+					text.update();
+					break;
+				case IStatus.ERROR:
+					text.setBackground(ERROR);
+					text.update();
+					break;
+
+				}
+			}
+		}
+	}
+
+	private void cancelChangeColorTask() {
+		if (changeColorTask != null) {
+			changeColorTask.cancel();
+			changeColorTask = null;
+		}
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringEditorWithCompletionWrapper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringEditorWithCompletionWrapper.java
index 7de49d963cc..7de49d963cc 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringEditorWithCompletionWrapper.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringEditorWithCompletionWrapper.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringFileSelector.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringFileSelector.java
index 65e72c438c3..941c2711c9e 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringFileSelector.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringFileSelector.java
@@ -1,244 +1,244 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import java.io.File;

-import java.util.Arrays;

-import java.util.LinkedHashMap;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.papyrus.infra.services.labelprovider.service.impl.LabelProviderServiceImpl;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.papyrus.infra.widgets.messages.Messages;

-import org.eclipse.papyrus.infra.widgets.providers.WorkspaceContentProvider;

-import org.eclipse.papyrus.infra.widgets.util.FileUtil;

-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.Button;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.FileDialog;

-

-/**

- * A Widget for editing Strings with File paths

- * The file paths may be absolute (FileSystem paths) or relative to the workspace (Workspace paths)

- *

- * @author Camille Letavernier

- */

-public class StringFileSelector extends StringEditor {

-

-	private Button browse;

-

-	private Button browseWorkspace;

-

-	private List<String> filterNames;

-

-	private List<String> filterExtensions;

-

-	private boolean allowWorkspace = true, allowFileSystem = true;

-

-	private boolean readOnly = false;

-

-	public StringFileSelector(Composite parent, int style) {

-		super(parent, style);

-		((GridLayout) getLayout()).numColumns = 5;

-

-		browse = factory.createButton(this, Messages.StringFileSelector_Browse, SWT.PUSH);

-		browse.setLayoutData(new GridData());

-		browseWorkspace = factory.createButton(this, Messages.StringFileSelector_BrowseWorkspace, SWT.PUSH);

-		browseWorkspace.setLayoutData(new GridData());

-

-		filterNames = new LinkedList<String>();

-		filterExtensions = new LinkedList<String>();

-

-		browse.addSelectionListener(new SelectionListener() {

-

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				File file = FileUtil.getFile(text.getText());

-

-				FileDialog dialog = new FileDialog(getShell());

-				if (labelText != null) {

-					dialog.setText(labelText);

-				}

-				dialog.setFileName(file.getAbsolutePath());

-				dialog.setFilterExtensions(filterExtensions.toArray(new String[filterExtensions.size()]));

-				dialog.setFilterNames(filterNames.toArray(new String[filterNames.size()]));

-				String result = dialog.open();

-				if (result == null) { // Cancel

-					return;

-				}

-				setResult(result);

-			}

-

-			@Override

-			public void widgetDefaultSelected(SelectionEvent e) {

-				// Nothing

-			}

-

-		});

-

-		browseWorkspace.addSelectionListener(new SelectionListener() {

-

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				LabelProviderService labelProviderService = new LabelProviderServiceImpl();

-				try {

-					labelProviderService.startService();

-				} catch (ServiceException ex) {

-					Activator.log.error(ex);

-				}

-

-				ILabelProvider labelProvider = labelProviderService.getLabelProvider();

-

-				IFile currentFile = FileUtil.getIFile(text.getText());

-

-				TreeSelectorDialog dialog = new TreeSelectorDialog(getShell());

-				if (labelText != null) {

-					dialog.setTitle(labelText);

-				}

-

-				WorkspaceContentProvider contentProvider = new WorkspaceContentProvider();

-

-				if (!(filterExtensions.isEmpty() || filterNames.isEmpty())) {

-					// The filters have been defined

-					contentProvider.setExtensionFilters(new LinkedHashMap<String, String>()); // Reset the default filters

-

-					// Use our own filters

-					for (int i = 0; i < Math.min(filterNames.size(), filterExtensions.size()); i++) {

-						contentProvider.addExtensionFilter(filterExtensions.get(i), filterNames.get(i));

-					}

-				}

-

-				dialog.setContentProvider(contentProvider);

-				dialog.setLabelProvider(labelProvider);

-

-

-				if (currentFile != null && currentFile.exists()) {

-					dialog.setInitialSelections(new IFile[] { currentFile });

-				}

-

-				int code = dialog.open();

-				if (code == Window.OK) {

-					Object[] result = dialog.getResult();

-					if (result.length > 0) {

-						Object file = result[0];

-						if (file instanceof IFile) {

-							setResult((IFile) file);

-						}

-					}

-				}

-			}

-

-			@Override

-			public void widgetDefaultSelected(SelectionEvent e) {

-				// Nothing

-			}

-

-		});

-	}

-

-	protected void setResult(IFile file) {

-		text.setText(file.getFullPath().toString());

-		notifyChange();

-	}

-

-	protected void setResult(File file) {

-		text.setText(file.getAbsolutePath());

-		notifyChange();

-	}

-

-	protected void setResult(String path) {

-		text.setText(path);

-		notifyChange();

-	}

-

-	public void setFilters(String[] filterExtensions, String[] filterNames) {

-		if (filterExtensions.length != filterNames.length) {

-			// This is a simple warning. Only valid filters will be retained.

-			Activator.log.warn(Messages.StringFileSelector_0);

-		}

-

-		setFilterNames(getFilterLabels(filterNames, filterExtensions));

-		setFilterExtensions(filterExtensions);

-	}

-

-	protected String[] getFilterLabels(String[] filterNames, String[] filterExtensions) {

-		int size = Math.min(filterNames.length, filterExtensions.length);

-		String[] filters = new String[size];

-		for (int i = 0; i < size; i++) {

-			filters[i] = filterNames[i] + " (" + filterExtensions[i] + ")"; //$NON-NLS-1$ //$NON-NLS-2$

-		}

-		return filters;

-	}

-

-	public void setFilterExtensions(String[] filterExtensions) {

-		this.filterExtensions = Arrays.asList(filterExtensions);

-	}

-

-	public void setFilterNames(String[] filterNames) {

-		this.filterNames = Arrays.asList(filterNames);

-	}

-

-	public void addFilteredExtension(String filteredExtension, String filterName) {

-		if (filteredExtension != null) {

-			if (filterName == null) {

-				filterName = filteredExtension;

-			}

-

-			filterExtensions.add(filteredExtension);

-			filterNames.add(filterName);

-		}

-	}

-

-	@Override

-	public Object getEditableType() {

-		return String.class;

-	}

-

-	@Override

-	public void setReadOnly(boolean readOnly) {

-		super.setReadOnly(readOnly);

-		this.readOnly = readOnly;

-		updateButtons();

-	}

-

-	public void setAllowWorkspace(boolean allowWorkspace) {

-		this.allowWorkspace = allowWorkspace;

-		updateButtons();

-	}

-

-	public void setAllowFileSystem(boolean allowFileSystem) {

-

-		this.allowFileSystem = allowFileSystem;

-		updateButtons();

-	}

-

-	private void updateButtons() {

-		boolean enableWorkspace = !readOnly && allowWorkspace;

-		boolean enableFileSystem = !readOnly && allowFileSystem;

-		// ((GridData)browseWorkspace.getLayoutData()).exclude = !allowWorkspace;

-		// ((GridData)browse.getLayoutData()).exclude = !allowFileSystem;

-		browseWorkspace.setEnabled(enableWorkspace);

-		browse.setEnabled(enableFileSystem);

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.papyrus.infra.services.labelprovider.service.impl.LabelProviderServiceImpl;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.providers.WorkspaceContentProvider;
+import org.eclipse.papyrus.infra.widgets.util.FileUtil;
+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.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.FileDialog;
+
+/**
+ * A Widget for editing Strings with File paths
+ * The file paths may be absolute (FileSystem paths) or relative to the workspace (Workspace paths)
+ *
+ * @author Camille Letavernier
+ */
+public class StringFileSelector extends StringEditor {
+
+	private Button browse;
+
+	private Button browseWorkspace;
+
+	private List<String> filterNames;
+
+	private List<String> filterExtensions;
+
+	private boolean allowWorkspace = true, allowFileSystem = true;
+
+	private boolean readOnly = false;
+
+	public StringFileSelector(Composite parent, int style) {
+		super(parent, style);
+		((GridLayout) getLayout()).numColumns = 5;
+
+		browse = factory.createButton(this, Messages.StringFileSelector_Browse, SWT.PUSH);
+		browse.setLayoutData(new GridData());
+		browseWorkspace = factory.createButton(this, Messages.StringFileSelector_BrowseWorkspace, SWT.PUSH);
+		browseWorkspace.setLayoutData(new GridData());
+
+		filterNames = new LinkedList<String>();
+		filterExtensions = new LinkedList<String>();
+
+		browse.addSelectionListener(new SelectionListener() {
+
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				File file = FileUtil.getFile(text.getText());
+
+				FileDialog dialog = new FileDialog(getShell());
+				if (labelText != null) {
+					dialog.setText(labelText);
+				}
+				dialog.setFileName(file.getAbsolutePath());
+				dialog.setFilterExtensions(filterExtensions.toArray(new String[filterExtensions.size()]));
+				dialog.setFilterNames(filterNames.toArray(new String[filterNames.size()]));
+				String result = dialog.open();
+				if (result == null) { // Cancel
+					return;
+				}
+				setResult(result);
+			}
+
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// Nothing
+			}
+
+		});
+
+		browseWorkspace.addSelectionListener(new SelectionListener() {
+
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				LabelProviderService labelProviderService = new LabelProviderServiceImpl();
+				try {
+					labelProviderService.startService();
+				} catch (ServiceException ex) {
+					Activator.log.error(ex);
+				}
+
+				ILabelProvider labelProvider = labelProviderService.getLabelProvider();
+
+				IFile currentFile = FileUtil.getIFile(text.getText());
+
+				TreeSelectorDialog dialog = new TreeSelectorDialog(getShell());
+				if (labelText != null) {
+					dialog.setTitle(labelText);
+				}
+
+				WorkspaceContentProvider contentProvider = new WorkspaceContentProvider();
+
+				if (!(filterExtensions.isEmpty() || filterNames.isEmpty())) {
+					// The filters have been defined
+					contentProvider.setExtensionFilters(new LinkedHashMap<String, String>()); // Reset the default filters
+
+					// Use our own filters
+					for (int i = 0; i < Math.min(filterNames.size(), filterExtensions.size()); i++) {
+						contentProvider.addExtensionFilter(filterExtensions.get(i), filterNames.get(i));
+					}
+				}
+
+				dialog.setContentProvider(contentProvider);
+				dialog.setLabelProvider(labelProvider);
+
+
+				if (currentFile != null && currentFile.exists()) {
+					dialog.setInitialSelections(new IFile[] { currentFile });
+				}
+
+				int code = dialog.open();
+				if (code == Window.OK) {
+					Object[] result = dialog.getResult();
+					if (result.length > 0) {
+						Object file = result[0];
+						if (file instanceof IFile) {
+							setResult((IFile) file);
+						}
+					}
+				}
+			}
+
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// Nothing
+			}
+
+		});
+	}
+
+	protected void setResult(IFile file) {
+		text.setText(file.getFullPath().toString());
+		notifyChange();
+	}
+
+	protected void setResult(File file) {
+		text.setText(file.getAbsolutePath());
+		notifyChange();
+	}
+
+	protected void setResult(String path) {
+		text.setText(path);
+		notifyChange();
+	}
+
+	public void setFilters(String[] filterExtensions, String[] filterNames) {
+		if (filterExtensions.length != filterNames.length) {
+			// This is a simple warning. Only valid filters will be retained.
+			Activator.log.warn(Messages.StringFileSelector_0);
+		}
+
+		setFilterNames(getFilterLabels(filterNames, filterExtensions));
+		setFilterExtensions(filterExtensions);
+	}
+
+	protected String[] getFilterLabels(String[] filterNames, String[] filterExtensions) {
+		int size = Math.min(filterNames.length, filterExtensions.length);
+		String[] filters = new String[size];
+		for (int i = 0; i < size; i++) {
+			filters[i] = filterNames[i] + " (" + filterExtensions[i] + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		return filters;
+	}
+
+	public void setFilterExtensions(String[] filterExtensions) {
+		this.filterExtensions = Arrays.asList(filterExtensions);
+	}
+
+	public void setFilterNames(String[] filterNames) {
+		this.filterNames = Arrays.asList(filterNames);
+	}
+
+	public void addFilteredExtension(String filteredExtension, String filterName) {
+		if (filteredExtension != null) {
+			if (filterName == null) {
+				filterName = filteredExtension;
+			}
+
+			filterExtensions.add(filteredExtension);
+			filterNames.add(filterName);
+		}
+	}
+
+	@Override
+	public Object getEditableType() {
+		return String.class;
+	}
+
+	@Override
+	public void setReadOnly(boolean readOnly) {
+		super.setReadOnly(readOnly);
+		this.readOnly = readOnly;
+		updateButtons();
+	}
+
+	public void setAllowWorkspace(boolean allowWorkspace) {
+		this.allowWorkspace = allowWorkspace;
+		updateButtons();
+	}
+
+	public void setAllowFileSystem(boolean allowFileSystem) {
+
+		this.allowFileSystem = allowFileSystem;
+		updateButtons();
+	}
+
+	private void updateButtons() {
+		boolean enableWorkspace = !readOnly && allowWorkspace;
+		boolean enableFileSystem = !readOnly && allowFileSystem;
+		// ((GridData)browseWorkspace.getLayoutData()).exclude = !allowWorkspace;
+		// ((GridData)browse.getLayoutData()).exclude = !allowFileSystem;
+		browseWorkspace.setEnabled(enableWorkspace);
+		browse.setEnabled(enableFileSystem);
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringLabel.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringLabel.java
index 02b7c1164b1..28b1e0bd892 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringLabel.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringLabel.java
@@ -1,161 +1,161 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.core.databinding.observable.ChangeEvent;

-import org.eclipse.core.databinding.observable.IChangeListener;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.swt.custom.CLabel;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * A Read only widget to display Strings as a CLabel.

- * May also be used to display an Object with an ILabelProvider

- *

- * @author Camille Letavernier

- */

-public class StringLabel extends AbstractValueEditor implements IChangeListener {

-

-	private final CLabel valueLabel;

-

-	private ILabelProvider labelProvider;

-

-	private Object value;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param parent

-	 *            The Composite widget in which this editor is created

-	 * @param style

-	 *            The style to be applied to this editor's CLabel

-	 */

-	public StringLabel(final Composite parent, final int style) {

-		super(parent, style);

-		this.valueLabel = factory.createCLabel(this, "", style); //$NON-NLS-1$

-		this.valueLabel.setLayoutData(getDefaultLayoutData());

-		this.labelProvider = new LabelProvider();

-	}

-

-	/**

-	 * @return

-	 *         The CLabel used to display this editor's value

-	 */

-	public CLabel getValueLabel() {

-		return this.valueLabel;

-	}

-

-	/**

-	 * Sets the label provider for this editor. Useful when the value is not a

-	 * String

-	 *

-	 * @param labelProvider

-	 *            The Label provider used to display the current value

-	 */

-	public void setLabelProvider(final ILabelProvider labelProvider) {

-		if (labelProvider == null) {

-			return;

-		}

-

-		this.labelProvider = labelProvider;

-		if (this.binding != null) {

-			this.binding.updateModelToTarget();

-		}

-	}

-

-	@Override

-	public void doBinding() {

-		// We don't do a real databinding here

-		this.modelProperty.addChangeListener(this);

-		valueLabel.addDisposeListener(this);

-		updateLabel();

-	}

-

-	/**

-	 * Updates the CLabel's display

-	 */

-	protected void updateLabel() {

-		if (valueLabel.isDisposed()) {

-			Activator.log.warn("Widget is disposed"); //$NON-NLS-1$

-			return;

-		}

-

-		Object value = getValue();

-

-		String text = this.labelProvider.getText(value);

-		Image image = this.labelProvider.getImage(value);

-

-		this.valueLabel.setText(text);

-		this.valueLabel.setImage(image);

-	}

-

-	@Override

-	public Object getValue() {

-		if (modelProperty != null) {

-			return modelProperty.getValue();

-		}

-		return value;

-	}

-

-	public void setValue(Object value) {

-		if (modelProperty != null) {

-			modelProperty.setValue(value);

-		}

-		this.value = value;

-

-		updateLabel();

-	}

-

-	@Override

-	public Object getEditableType() {

-		return String.class;

-	}

-

-	@Override

-	public void setReadOnly(final boolean readOnly) {

-		// Nothing

-	}

-

-	@Override

-	public boolean isReadOnly() {

-		return !this.valueLabel.isEnabled();

-	}

-

-	@Override

-	public void setToolTipText(final String text) {

-		this.valueLabel.setToolTipText(text);

-		super.setLabelToolTipText(text);

-	}

-

-	@Override

-	public void handleChange(final ChangeEvent event) {

-		updateLabel();

-	}

-

-	@Override

-	public void dispose() {

-		if (this.modelProperty != null) {

-			this.modelProperty.removeChangeListener(this);

-		}

-		super.dispose();

-	}

-

-	@Override

-	public void refreshValue() {

-		updateLabel();

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import org.eclipse.core.databinding.observable.ChangeEvent;
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A Read only widget to display Strings as a CLabel.
+ * May also be used to display an Object with an ILabelProvider
+ *
+ * @author Camille Letavernier
+ */
+public class StringLabel extends AbstractValueEditor implements IChangeListener {
+
+	private final CLabel valueLabel;
+
+	private ILabelProvider labelProvider;
+
+	private Object value;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The Composite widget in which this editor is created
+	 * @param style
+	 *            The style to be applied to this editor's CLabel
+	 */
+	public StringLabel(final Composite parent, final int style) {
+		super(parent, style);
+		this.valueLabel = factory.createCLabel(this, "", style); //$NON-NLS-1$
+		this.valueLabel.setLayoutData(getDefaultLayoutData());
+		this.labelProvider = new LabelProvider();
+	}
+
+	/**
+	 * @return
+	 *         The CLabel used to display this editor's value
+	 */
+	public CLabel getValueLabel() {
+		return this.valueLabel;
+	}
+
+	/**
+	 * Sets the label provider for this editor. Useful when the value is not a
+	 * String
+	 *
+	 * @param labelProvider
+	 *            The Label provider used to display the current value
+	 */
+	public void setLabelProvider(final ILabelProvider labelProvider) {
+		if (labelProvider == null) {
+			return;
+		}
+
+		this.labelProvider = labelProvider;
+		if (this.binding != null) {
+			this.binding.updateModelToTarget();
+		}
+	}
+
+	@Override
+	public void doBinding() {
+		// We don't do a real databinding here
+		this.modelProperty.addChangeListener(this);
+		valueLabel.addDisposeListener(this);
+		updateLabel();
+	}
+
+	/**
+	 * Updates the CLabel's display
+	 */
+	protected void updateLabel() {
+		if (valueLabel.isDisposed()) {
+			Activator.log.warn("Widget is disposed"); //$NON-NLS-1$
+			return;
+		}
+
+		Object value = getValue();
+
+		String text = this.labelProvider.getText(value);
+		Image image = this.labelProvider.getImage(value);
+
+		this.valueLabel.setText(text);
+		this.valueLabel.setImage(image);
+	}
+
+	@Override
+	public Object getValue() {
+		if (modelProperty != null) {
+			return modelProperty.getValue();
+		}
+		return value;
+	}
+
+	public void setValue(Object value) {
+		if (modelProperty != null) {
+			modelProperty.setValue(value);
+		}
+		this.value = value;
+
+		updateLabel();
+	}
+
+	@Override
+	public Object getEditableType() {
+		return String.class;
+	}
+
+	@Override
+	public void setReadOnly(final boolean readOnly) {
+		// Nothing
+	}
+
+	@Override
+	public boolean isReadOnly() {
+		return !this.valueLabel.isEnabled();
+	}
+
+	@Override
+	public void setToolTipText(final String text) {
+		this.valueLabel.setToolTipText(text);
+		super.setLabelToolTipText(text);
+	}
+
+	@Override
+	public void handleChange(final ChangeEvent event) {
+		updateLabel();
+	}
+
+	@Override
+	public void dispose() {
+		if (this.modelProperty != null) {
+			this.modelProperty.removeChangeListener(this);
+		}
+		super.dispose();
+	}
+
+	@Override
+	public void refreshValue() {
+		updateLabel();
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringMask.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringMask.java
index b05052fab2a..7ab1b6f7bc1 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringMask.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StringMask.java
@@ -1,222 +1,222 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Map;

-import java.util.Map.Entry;

-import java.util.Set;

-

-import org.eclipse.core.databinding.observable.ChangeEvent;

-import org.eclipse.core.databinding.observable.IChangeListener;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.DisposeListener;

-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.Composite;

-

-/**

- * A Widget to manipulate a list of values.

- *

- * The widget is configured with a Map of (String, String) entries (Key -> Label).

- * It returns the list of selected keys.

- *

- * @author Camille Letavernier

- */

-public class StringMask extends AbstractListEditor implements SelectionListener, IChangeListener, DisposeListener {

-

-	private Button[] checkboxes;

-

-	private Collection<String> currentValue;

-

-	private final Composite checkboxContainer;

-

-	private boolean refreshCheckboxes = true;

-

-	private boolean isReadOnly = false;

-

-	public static final String DATA_KEY = "stringValue"; //$NON-NLS-1$

-

-	public StringMask(final Composite parent, final int style) {

-		super(parent, style);

-		checkboxContainer = new Composite(this, style);

-		checkboxContainer.setLayoutData(getDefaultLayoutData());

-		checkboxContainer.setLayout(new GridLayout(2, true));

-		checkboxContainer.addDisposeListener(this);

-	}

-

-	@Override

-	protected GridData getLabelLayoutData() {

-		GridData data = super.getLabelLayoutData();

-		data.verticalAlignment = SWT.BEGINNING;

-		return data;

-	}

-

-	public Collection<String> getValue() {

-		Set<String> values = new HashSet<String>();

-		for (Button button : checkboxes) {

-			if (button.getSelection()) {

-				String value = (String) button.getData(DATA_KEY);

-				values.add(value);

-			}

-		}

-		return values;

-	}

-

-	@Override

-	public void dispose() {

-		if (modelProperty != null) {

-			modelProperty.removeChangeListener(this);

-		}

-		super.dispose();

-	}

-

-	@Override

-	public Object getEditableType() {

-		return String.class;

-	}

-

-	@Override

-	public void setReadOnly(final boolean readOnly) {

-		this.isReadOnly = readOnly;

-		for (Button button : checkboxes) {

-			button.setEnabled(!readOnly);

-		}

-	}

-

-	@Override

-	public boolean isReadOnly() {

-		return isReadOnly;

-	}

-

-	public void setMasks(final Map<String, String> values) {

-		if (checkboxes != null) {

-			disposeCheckboxes();

-		}

-

-		checkboxes = new Button[values.size()];

-

-		int i = 0;

-		for (Entry<String, String> mask : values.entrySet()) {

-			String stringValue = mask.getKey();

-			String label = mask.getValue();

-

-			checkboxes[i] = new Button(checkboxContainer, SWT.CHECK);

-			checkboxes[i].setText(label);

-			checkboxes[i].setData(DATA_KEY, stringValue);

-			checkboxes[i].addSelectionListener(this);

-			checkboxes[i].setToolTipText(stringValue);

-			i++;

-		}

-	}

-

-	protected void disposeCheckboxes() {

-		for (Button button : checkboxes) {

-			button.removeSelectionListener(this);

-			button.dispose();

-		}

-	}

-

-	public void setNumColumns(final int numColumns) {

-		((GridLayout) checkboxContainer.getLayout()).numColumns = numColumns;

-		checkboxContainer.layout();

-		layout();

-	}

-

-	@Override

-	public void doBinding() {

-		// We don't do a real databinding here

-		modelProperty.addChangeListener(this);

-

-		refreshCheckboxes();

-	}

-

-	protected void refreshCheckboxes() {

-		if (!refreshCheckboxes) {

-			return;

-		}

-

-		Collection<String> values = getCurrentValue();

-		for (Button button : checkboxes) {

-			String value = (String) button.getData(DATA_KEY);

-			button.setSelection(values.contains(value));

-		}

-	}

-

-	@Override

-	public void setToolTipText(final String text) {

-		super.setLabelToolTipText(text);

-	}

-

-	@Override

-	public void widgetSelected(final SelectionEvent e) {

-		Button button = (Button) e.widget;

-		String value = (String) button.getData(DATA_KEY);

-		Collection<String> values = new HashSet<String>(getCurrentValue());

-		if (button.getSelection()) {

-			values.add(value);

-		} else {

-			values.remove(value);

-		}

-		setCurrentValue(values);

-	}

-

-	protected void setCurrentValue(final Collection<String> values) {

-		if (modelProperty != null) {

-			refreshCheckboxes = false;

-			modelProperty.clear();

-			modelProperty.addAll(values);

-			refreshCheckboxes = true;

-		}

-		currentValue = values;

-

-		commit();

-	}

-

-	protected Collection<String> getCurrentValue() {

-		if (modelProperty != null) {

-			return modelProperty;

-		} else {

-			return currentValue;

-		}

-	}

-

-	@Override

-	public void widgetDefaultSelected(final SelectionEvent e) {

-		// Nothing

-	}

-

-	public int getNumColumns() {

-		return ((GridLayout) checkboxContainer.getLayout()).numColumns;

-	}

-

-	@Override

-	public void handleChange(final ChangeEvent event) {

-		refreshCheckboxes();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.editors.AbstractEditor#changeColorField()

-	 *

-	 */

-

-	@Override

-	public void changeColorField() {

-		// TODO Auto-generated method stub

-

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.eclipse.core.databinding.observable.ChangeEvent;
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeListener;
+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.Composite;
+
+/**
+ * A Widget to manipulate a list of values.
+ *
+ * The widget is configured with a Map of (String, String) entries (Key -> Label).
+ * It returns the list of selected keys.
+ *
+ * @author Camille Letavernier
+ */
+public class StringMask extends AbstractListEditor implements SelectionListener, IChangeListener, DisposeListener {
+
+	private Button[] checkboxes;
+
+	private Collection<String> currentValue;
+
+	private final Composite checkboxContainer;
+
+	private boolean refreshCheckboxes = true;
+
+	private boolean isReadOnly = false;
+
+	public static final String DATA_KEY = "stringValue"; //$NON-NLS-1$
+
+	public StringMask(final Composite parent, final int style) {
+		super(parent, style);
+		checkboxContainer = new Composite(this, style);
+		checkboxContainer.setLayoutData(getDefaultLayoutData());
+		checkboxContainer.setLayout(new GridLayout(2, true));
+		checkboxContainer.addDisposeListener(this);
+	}
+
+	@Override
+	protected GridData getLabelLayoutData() {
+		GridData data = super.getLabelLayoutData();
+		data.verticalAlignment = SWT.BEGINNING;
+		return data;
+	}
+
+	public Collection<String> getValue() {
+		Set<String> values = new HashSet<String>();
+		for (Button button : checkboxes) {
+			if (button.getSelection()) {
+				String value = (String) button.getData(DATA_KEY);
+				values.add(value);
+			}
+		}
+		return values;
+	}
+
+	@Override
+	public void dispose() {
+		if (modelProperty != null) {
+			modelProperty.removeChangeListener(this);
+		}
+		super.dispose();
+	}
+
+	@Override
+	public Object getEditableType() {
+		return String.class;
+	}
+
+	@Override
+	public void setReadOnly(final boolean readOnly) {
+		this.isReadOnly = readOnly;
+		for (Button button : checkboxes) {
+			button.setEnabled(!readOnly);
+		}
+	}
+
+	@Override
+	public boolean isReadOnly() {
+		return isReadOnly;
+	}
+
+	public void setMasks(final Map<String, String> values) {
+		if (checkboxes != null) {
+			disposeCheckboxes();
+		}
+
+		checkboxes = new Button[values.size()];
+
+		int i = 0;
+		for (Entry<String, String> mask : values.entrySet()) {
+			String stringValue = mask.getKey();
+			String label = mask.getValue();
+
+			checkboxes[i] = new Button(checkboxContainer, SWT.CHECK);
+			checkboxes[i].setText(label);
+			checkboxes[i].setData(DATA_KEY, stringValue);
+			checkboxes[i].addSelectionListener(this);
+			checkboxes[i].setToolTipText(stringValue);
+			i++;
+		}
+	}
+
+	protected void disposeCheckboxes() {
+		for (Button button : checkboxes) {
+			button.removeSelectionListener(this);
+			button.dispose();
+		}
+	}
+
+	public void setNumColumns(final int numColumns) {
+		((GridLayout) checkboxContainer.getLayout()).numColumns = numColumns;
+		checkboxContainer.layout();
+		layout();
+	}
+
+	@Override
+	public void doBinding() {
+		// We don't do a real databinding here
+		modelProperty.addChangeListener(this);
+
+		refreshCheckboxes();
+	}
+
+	protected void refreshCheckboxes() {
+		if (!refreshCheckboxes) {
+			return;
+		}
+
+		Collection<String> values = getCurrentValue();
+		for (Button button : checkboxes) {
+			String value = (String) button.getData(DATA_KEY);
+			button.setSelection(values.contains(value));
+		}
+	}
+
+	@Override
+	public void setToolTipText(final String text) {
+		super.setLabelToolTipText(text);
+	}
+
+	@Override
+	public void widgetSelected(final SelectionEvent e) {
+		Button button = (Button) e.widget;
+		String value = (String) button.getData(DATA_KEY);
+		Collection<String> values = new HashSet<String>(getCurrentValue());
+		if (button.getSelection()) {
+			values.add(value);
+		} else {
+			values.remove(value);
+		}
+		setCurrentValue(values);
+	}
+
+	protected void setCurrentValue(final Collection<String> values) {
+		if (modelProperty != null) {
+			refreshCheckboxes = false;
+			modelProperty.clear();
+			modelProperty.addAll(values);
+			refreshCheckboxes = true;
+		}
+		currentValue = values;
+
+		commit();
+	}
+
+	protected Collection<String> getCurrentValue() {
+		if (modelProperty != null) {
+			return modelProperty;
+		} else {
+			return currentValue;
+		}
+	}
+
+	@Override
+	public void widgetDefaultSelected(final SelectionEvent e) {
+		// Nothing
+	}
+
+	public int getNumColumns() {
+		return ((GridLayout) checkboxContainer.getLayout()).numColumns;
+	}
+
+	@Override
+	public void handleChange(final ChangeEvent event) {
+		refreshCheckboxes();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.editors.AbstractEditor#changeColorField()
+	 *
+	 */
+
+	@Override
+	public void changeColorField() {
+		// TODO Auto-generated method stub
+
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StyledTextReferenceDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StyledTextReferenceDialog.java
index 9206ebbec79..9206ebbec79 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StyledTextReferenceDialog.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StyledTextReferenceDialog.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StyledTextStringEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StyledTextStringEditor.java
index becc57dd823..becc57dd823 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StyledTextStringEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/StyledTextStringEditor.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/TreeSelectorDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/TreeSelectorDialog.java
index 6d09eb33775..6d09eb33775 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/TreeSelectorDialog.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/TreeSelectorDialog.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/TwoInputDialog.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/TwoInputDialog.java
index 6783b9eb708..cab1ce17e24 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/TwoInputDialog.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/TwoInputDialog.java
@@ -1,134 +1,134 @@
-/*****************************************************************************

- * 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.jface.dialogs.IDialogConstants;

-import org.eclipse.jface.dialogs.IInputValidator;

-import org.eclipse.jface.dialogs.InputDialog;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.swt.widgets.Text;

-

-/**

- * This Dialog provides 2 texts field. It was created to be used during the table creation.

- * It doesn't provide validator for the second field.

- *

- *

- */

-public class TwoInputDialog extends InputDialog {

-

-	/** widget for the second value */

-	private Text text_2;

-

-	/** the second values */

-	private String value_2;

-

-	/** the message for the second Text */

-	protected String message_2;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 *            the parent shell

-	 * @param dialogTitle

-	 *            the dialog title

-	 * @param message1

-	 *            the first message for the dialog

-	 * @param message2

-	 *            the second message for the dialog

-	 * @param initialValue1

-	 *            the first initial value

-	 * @param initialValue2

-	 *            the second initial value

-	 * @param validator

-	 *            the validator

-	 */

-	public TwoInputDialog(Shell parentShell, String dialogTitle, String message1, String message2, String initialValue1, String initialValue2, IInputValidator validator) {

-		super(parentShell, dialogTitle, message1, initialValue1, validator);

-		this.message_2 = message2;

-		this.value_2 = initialValue2;

-	}

-

-	/**

-	 * Create the second Text Area

-	 *

-	 * @see org.eclipse.jface.dialogs.InputDialog#createDialogArea(org.eclipse.swt.widgets.Composite)

-	 *

-	 * @param parent

-	 * @return

-	 */

-	@Override

-	protected Control createDialogArea(Composite parent) {

-		Composite composite = (Composite) super.createDialogArea(parent);

-		if (message_2 != null) {

-			Label label = new Label(composite, SWT.WRAP);

-			label.setText(message_2);

-			GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);

-			data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);

-			label.setLayoutData(data);

-			label.setFont(parent.getFont());

-		}

-		text_2 = new Text(composite, getInputTextStyle());

-		text_2.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));

-		applyDialogFont(composite);

-		return composite;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.dialogs.InputDialog#buttonPressed(int)

-	 *

-	 * @param buttonId

-	 */

-	@Override

-	protected void buttonPressed(int buttonId) {

-		if (buttonId == IDialogConstants.OK_ID) {

-			this.value_2 = this.text_2.getText();

-		} else {

-			this.value_2 = null;

-		}

-		super.buttonPressed(buttonId);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.dialogs.InputDialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)

-	 *

-	 * @param parent

-	 */

-	@Override

-	protected void createButtonsForButtonBar(Composite parent) {

-		super.createButtonsForButtonBar(parent);

-		if (value_2 != null) {

-			text_2.setText(value_2);

-		}

-	}

-

-	/**

-	 * Getter for {@link #value_2}

-	 *

-	 * @return

-	 *         the description for the table

-	 */

-	public String getValue_2() {

-		return this.value_2;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.editors;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * This Dialog provides 2 texts field. It was created to be used during the table creation.
+ * It doesn't provide validator for the second field.
+ *
+ *
+ */
+public class TwoInputDialog extends InputDialog {
+
+	/** widget for the second value */
+	private Text text_2;
+
+	/** the second values */
+	private String value_2;
+
+	/** the message for the second Text */
+	protected String message_2;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param parentShell
+	 *            the parent shell
+	 * @param dialogTitle
+	 *            the dialog title
+	 * @param message1
+	 *            the first message for the dialog
+	 * @param message2
+	 *            the second message for the dialog
+	 * @param initialValue1
+	 *            the first initial value
+	 * @param initialValue2
+	 *            the second initial value
+	 * @param validator
+	 *            the validator
+	 */
+	public TwoInputDialog(Shell parentShell, String dialogTitle, String message1, String message2, String initialValue1, String initialValue2, IInputValidator validator) {
+		super(parentShell, dialogTitle, message1, initialValue1, validator);
+		this.message_2 = message2;
+		this.value_2 = initialValue2;
+	}
+
+	/**
+	 * Create the second Text Area
+	 *
+	 * @see org.eclipse.jface.dialogs.InputDialog#createDialogArea(org.eclipse.swt.widgets.Composite)
+	 *
+	 * @param parent
+	 * @return
+	 */
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		Composite composite = (Composite) super.createDialogArea(parent);
+		if (message_2 != null) {
+			Label label = new Label(composite, SWT.WRAP);
+			label.setText(message_2);
+			GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
+			data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
+			label.setLayoutData(data);
+			label.setFont(parent.getFont());
+		}
+		text_2 = new Text(composite, getInputTextStyle());
+		text_2.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
+		applyDialogFont(composite);
+		return composite;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.dialogs.InputDialog#buttonPressed(int)
+	 *
+	 * @param buttonId
+	 */
+	@Override
+	protected void buttonPressed(int buttonId) {
+		if (buttonId == IDialogConstants.OK_ID) {
+			this.value_2 = this.text_2.getText();
+		} else {
+			this.value_2 = null;
+		}
+		super.buttonPressed(buttonId);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.dialogs.InputDialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
+	 *
+	 * @param parent
+	 */
+	@Override
+	protected void createButtonsForButtonBar(Composite parent) {
+		super.createButtonsForButtonBar(parent);
+		if (value_2 != null) {
+			text_2.setText(value_2);
+		}
+	}
+
+	/**
+	 * Getter for {@link #value_2}
+	 *
+	 * @return
+	 *         the description for the table
+	 */
+	public String getValue_2() {
+		return this.value_2;
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/UnlimitedNaturalEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/UnlimitedNaturalEditor.java
index 533fe51c7ff..35aa1aa7b42 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/UnlimitedNaturalEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/UnlimitedNaturalEditor.java
@@ -1,125 +1,125 @@
-package org.eclipse.papyrus.infra.widgets.editors;

-

-import org.eclipse.core.databinding.conversion.IConverter;

-import org.eclipse.core.databinding.conversion.StringToNumberConverter;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.papyrus.infra.widgets.validator.UnlimitedNaturalValidator;

-import org.eclipse.swt.widgets.Composite;

-

-public class UnlimitedNaturalEditor extends StringEditor {

-	/**

-	 * The IConverter for converting data from the widget to the model

-	 */

-	private IConverter targetToModelConverter;

-

-	/**

-	 * Constructs an editor for Integer values. The widget is a Text field.

-	 *

-	 * @param parent

-	 *            The Composite in which this editor is created

-	 * @param style

-	 *            The Text's style

-	 */

-	public UnlimitedNaturalEditor(Composite parent, int style) {

-		this(parent, style, null);

-	}

-

-	/**

-	 * Constructs an editor for Integer values. The widget is a Text field.

-	 *

-	 * @param parent

-	 *            The Composite in which this editor is created

-	 * @param style

-	 *            The Text's style

-	 * @param label

-	 *            The editor's label

-	 */

-	public UnlimitedNaturalEditor(Composite parent, int style, String label) {

-		super(parent, style, label);

-

-		targetValidator = new UnlimitedNaturalValidator();

-

-		targetToModelConverter = new IConverter() {

-

-			@Override

-			public Object getToType() {

-				return Integer.class;

-			}

-

-			@Override

-			public Object getFromType() {

-				return String.class;

-			}

-

-			@Override

-			public Integer convert(Object fromObject) {

-				if (fromObject instanceof String) {

-					String newString = ((String) fromObject).replaceAll(" ", ""); //$NON-NLS-1$ //$NON-NLS-2$

-					if (newString.equals("*"))

-					{

-						return -1;

-					}

-					return (Integer) StringToNumberConverter.toInteger(false).convert(newString);

-				}

-				return 0;

-			}

-		};

-

-		IConverter integerToString = new IConverter() {

-

-			@Override

-			public Object getToType() {

-				return String.class;

-			}

-

-			@Override

-			public Object getFromType() {

-				return Integer.class;

-			}

-

-			@Override

-			public Object convert(Object fromObject) {

-				if (fromObject instanceof Integer) {

-					if (((Integer) fromObject).intValue() == -1) {

-						return "*"; //$NON-NLS-1$

-					}

-					return Integer.toString((Integer) fromObject);

-				}

-				return ""; //$NON-NLS-1$

-			}

-		};

-		setValidateOnDelay(true);

-

-		setConverters(targetToModelConverter, integerToString);

-		setTargetAfterGetValidator(targetValidator);

-

-	}

-

-

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object getEditableType() {

-		return Integer.class;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Integer getValue() {

-		try {

-

-			return (Integer) targetToModelConverter.convert(super.getValue());

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-			return null;

-		}

-	}

-

-

-

-

-}

+package org.eclipse.papyrus.infra.widgets.editors;
+
+import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.core.databinding.conversion.StringToNumberConverter;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.validator.UnlimitedNaturalValidator;
+import org.eclipse.swt.widgets.Composite;
+
+public class UnlimitedNaturalEditor extends StringEditor {
+	/**
+	 * The IConverter for converting data from the widget to the model
+	 */
+	private IConverter targetToModelConverter;
+
+	/**
+	 * Constructs an editor for Integer values. The widget is a Text field.
+	 *
+	 * @param parent
+	 *            The Composite in which this editor is created
+	 * @param style
+	 *            The Text's style
+	 */
+	public UnlimitedNaturalEditor(Composite parent, int style) {
+		this(parent, style, null);
+	}
+
+	/**
+	 * Constructs an editor for Integer values. The widget is a Text field.
+	 *
+	 * @param parent
+	 *            The Composite in which this editor is created
+	 * @param style
+	 *            The Text's style
+	 * @param label
+	 *            The editor's label
+	 */
+	public UnlimitedNaturalEditor(Composite parent, int style, String label) {
+		super(parent, style, label);
+
+		targetValidator = new UnlimitedNaturalValidator();
+
+		targetToModelConverter = new IConverter() {
+
+			@Override
+			public Object getToType() {
+				return Integer.class;
+			}
+
+			@Override
+			public Object getFromType() {
+				return String.class;
+			}
+
+			@Override
+			public Integer convert(Object fromObject) {
+				if (fromObject instanceof String) {
+					String newString = ((String) fromObject).replaceAll(" ", ""); //$NON-NLS-1$ //$NON-NLS-2$
+					if (newString.equals("*"))
+					{
+						return -1;
+					}
+					return (Integer) StringToNumberConverter.toInteger(false).convert(newString);
+				}
+				return 0;
+			}
+		};
+
+		IConverter integerToString = new IConverter() {
+
+			@Override
+			public Object getToType() {
+				return String.class;
+			}
+
+			@Override
+			public Object getFromType() {
+				return Integer.class;
+			}
+
+			@Override
+			public Object convert(Object fromObject) {
+				if (fromObject instanceof Integer) {
+					if (((Integer) fromObject).intValue() == -1) {
+						return "*"; //$NON-NLS-1$
+					}
+					return Integer.toString((Integer) fromObject);
+				}
+				return ""; //$NON-NLS-1$
+			}
+		};
+		setValidateOnDelay(true);
+
+		setConverters(targetToModelConverter, integerToString);
+		setTargetAfterGetValidator(targetValidator);
+
+	}
+
+
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object getEditableType() {
+		return Integer.class;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Integer getValue() {
+		try {
+
+			return (Integer) targetToModelConverter.convert(super.getValue());
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+			return null;
+		}
+	}
+
+
+
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/messages/Messages.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/messages/Messages.java
index 9cc4b1d79c0..9cc4b1d79c0 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/messages/Messages.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/messages/Messages.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/messages/messages.properties b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/messages/messages.properties
index 2aa21d64ea1..2aa21d64ea1 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/messages/messages.properties
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/messages/messages.properties
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractFilteredContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractFilteredContentProvider.java
index d8682b6da1f..7b3ca25ce68 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractFilteredContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractFilteredContentProvider.java
@@ -1,106 +1,106 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.jface.viewers.ViewerFilter;

-import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;

-import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;

-import org.eclipse.papyrus.infra.widgets.editors.StringEditor;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Composite;

-

-

-/**

- * A generic implementation for a IGraphicalContentProvider.

- * This class doesn't provide any element, and should be extended.

- *

- * It implements a filter for List or Tree elements, based on the label

- * provided by the viewer's label provider (Or Object#toString() if the viewer

- * doesn't have a label provider).

- *

- * A Text widget is added before the display control to insert the filter

- * pattern. An element is matched if at least one of these conditions is

- * matched :

- * - The element's name matches the pattern

- * - One of the element's children matches the pattern

- * - One of the element's parent matches the pattern

- *

- * The elements' hierarchy is obtained via the viewer's ContentProvider.

- *

- * @author Camille Letavernier

- */

-// TODO : Encapsulate a IStructuredContentProvider and make this class concrete

-public abstract class AbstractFilteredContentProvider implements IGraphicalContentProvider {

-

-	protected StructuredViewer viewer;

-

-	private StringEditor filterPattern;

-

-	private PatternViewerFilter filter;

-

-	public static final String BASE_PATTERN = "*"; //$NON-NLS-1$

-

-	protected boolean showIfHasVisibleParent = false;

-

-	@Override

-	public void dispose() {

-		// Nothing

-	}

-

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		if (viewer instanceof StructuredViewer) {

-			this.viewer = (StructuredViewer) viewer;

-			updateFilter();

-		}

-	}

-

-	private void updateFilter() {

-		if (this.viewer != null && filterPattern != null) {

-			this.viewer.setFilters(new ViewerFilter[] { filter });

-		}

-	}

-

-	@Override

-	public void createBefore(Composite parent) {

-		filterPattern = new StringEditor(parent, SWT.NONE, "Filter : "); //$NON-NLS-1$

-		filterPattern.setValidateOnDelay(true);

-		filterPattern.setValue(BASE_PATTERN);

-		filter = getViewerFilter();

-		filterPattern.addCommitListener(new ICommitListener() {

-

-			@Override

-			public void commit(AbstractEditor editor) {

-				filter.setPattern((String) filterPattern.getValue());

-				viewer.refresh();

-			}

-

-		});

-		updateFilter();

-	}

-

-	@Override

-	public void createAfter(Composite parent) {

-		// Nothing

-	}

-

-	protected PatternViewerFilter getViewerFilter() {

-		PatternViewerFilter filter = new PatternViewerFilter();

-		filter.setStrict(false);

-		filter.setPattern(BASE_PATTERN);

-		filter.setShowIfHasVisibleParent(showIfHasVisibleParent);

-		return filter;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
+import org.eclipse.papyrus.infra.widgets.editors.StringEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+
+
+/**
+ * A generic implementation for a IGraphicalContentProvider.
+ * This class doesn't provide any element, and should be extended.
+ *
+ * It implements a filter for List or Tree elements, based on the label
+ * provided by the viewer's label provider (Or Object#toString() if the viewer
+ * doesn't have a label provider).
+ *
+ * A Text widget is added before the display control to insert the filter
+ * pattern. An element is matched if at least one of these conditions is
+ * matched :
+ * - The element's name matches the pattern
+ * - One of the element's children matches the pattern
+ * - One of the element's parent matches the pattern
+ *
+ * The elements' hierarchy is obtained via the viewer's ContentProvider.
+ *
+ * @author Camille Letavernier
+ */
+// TODO : Encapsulate a IStructuredContentProvider and make this class concrete
+public abstract class AbstractFilteredContentProvider implements IGraphicalContentProvider {
+
+	protected StructuredViewer viewer;
+
+	private StringEditor filterPattern;
+
+	private PatternViewerFilter filter;
+
+	public static final String BASE_PATTERN = "*"; //$NON-NLS-1$
+
+	protected boolean showIfHasVisibleParent = false;
+
+	@Override
+	public void dispose() {
+		// Nothing
+	}
+
+	@Override
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		if (viewer instanceof StructuredViewer) {
+			this.viewer = (StructuredViewer) viewer;
+			updateFilter();
+		}
+	}
+
+	private void updateFilter() {
+		if (this.viewer != null && filterPattern != null) {
+			this.viewer.setFilters(new ViewerFilter[] { filter });
+		}
+	}
+
+	@Override
+	public void createBefore(Composite parent) {
+		filterPattern = new StringEditor(parent, SWT.NONE, "Filter : "); //$NON-NLS-1$
+		filterPattern.setValidateOnDelay(true);
+		filterPattern.setValue(BASE_PATTERN);
+		filter = getViewerFilter();
+		filterPattern.addCommitListener(new ICommitListener() {
+
+			@Override
+			public void commit(AbstractEditor editor) {
+				filter.setPattern((String) filterPattern.getValue());
+				viewer.refresh();
+			}
+
+		});
+		updateFilter();
+	}
+
+	@Override
+	public void createAfter(Composite parent) {
+		// Nothing
+	}
+
+	protected PatternViewerFilter getViewerFilter() {
+		PatternViewerFilter filter = new PatternViewerFilter();
+		filter.setStrict(false);
+		filter.setPattern(BASE_PATTERN);
+		filter.setShowIfHasVisibleParent(showIfHasVisibleParent);
+		return filter;
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractRestrictedContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractRestrictedContentProvider.java
index bb98cf95742..975d647d439 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractRestrictedContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractRestrictedContentProvider.java
@@ -1,111 +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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import org.eclipse.jface.viewers.Viewer;

-

-/**

- * Abstract Implementation for {@link IRestrictedContentProvider}

- *

- * @author JC236769

- *

- */

-public abstract class AbstractRestrictedContentProvider implements IRestrictedContentProvider {

-

-	/**

-	 * flag to indicate the useage of the restriction in the content provider

-	 */

-	private boolean isRestricted;

-

-	/**

-	 * if <code>false</code> the inherited features will be displayed

-	 */

-	private boolean ignoreInheritedFeatures;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param isRestricted

-	 */

-	public AbstractRestrictedContentProvider(final boolean isRestricted) {

-		this.isRestricted = isRestricted;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider#setRestriction(boolean)

-	 *

-	 * @param isRestricted

-	 */

-	@Override

-	public final void setRestriction(boolean isRestricted) {

-		this.isRestricted = isRestricted;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)

-	 *

-	 * @param viewer

-	 * @param oldInput

-	 * @param newInput

-	 */

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IInheritedElementContentProvider#setIgnoreInheritedElements(boolean)

-	 *

-	 * @param ignoreInheritedElements

-	 */

-	@Override

-	public void setIgnoreInheritedElements(boolean ignoreInheritedElements) {

-		this.ignoreInheritedFeatures = ignoreInheritedElements;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IInheritedElementContentProvider#isIgnoringInheritedElements()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isIgnoringInheritedElements() {

-		return this.ignoreInheritedFeatures;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider#isRestricted()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isRestricted() {

-		return this.isRestricted;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import org.eclipse.jface.viewers.Viewer;
+
+/**
+ * Abstract Implementation for {@link IRestrictedContentProvider}
+ *
+ * @author JC236769
+ *
+ */
+public abstract class AbstractRestrictedContentProvider implements IRestrictedContentProvider {
+
+	/**
+	 * flag to indicate the useage of the restriction in the content provider
+	 */
+	private boolean isRestricted;
+
+	/**
+	 * if <code>false</code> the inherited features will be displayed
+	 */
+	private boolean ignoreInheritedFeatures;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param isRestricted
+	 */
+	public AbstractRestrictedContentProvider(final boolean isRestricted) {
+		this.isRestricted = isRestricted;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider#setRestriction(boolean)
+	 *
+	 * @param isRestricted
+	 */
+	@Override
+	public final void setRestriction(boolean isRestricted) {
+		this.isRestricted = isRestricted;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+	 *
+	 * @param viewer
+	 * @param oldInput
+	 * @param newInput
+	 */
+	@Override
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.providers.IInheritedElementContentProvider#setIgnoreInheritedElements(boolean)
+	 *
+	 * @param ignoreInheritedElements
+	 */
+	@Override
+	public void setIgnoreInheritedElements(boolean ignoreInheritedElements) {
+		this.ignoreInheritedFeatures = ignoreInheritedElements;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.providers.IInheritedElementContentProvider#isIgnoringInheritedElements()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isIgnoringInheritedElements() {
+		return this.ignoreInheritedFeatures;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider#isRestricted()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isRestricted() {
+		return this.isRestricted;
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractStaticContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractStaticContentProvider.java
index a803713bf50..3f41f74abc8 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractStaticContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractStaticContentProvider.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import org.eclipse.jface.viewers.Viewer;

-

-/**

- * An empty implementation of IStaticContentProvider

- *

- * @author Camille Letavernier

- *

- */

-public abstract class AbstractStaticContentProvider implements IStaticContentProvider {

-

-	@Override

-	public void dispose() {

-		// Nothing

-	}

-

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		// Nothing

-	}

-

-	@Override

-	public Object[] getElements(Object inputElement) {

-		return getElements();

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import org.eclipse.jface.viewers.Viewer;
+
+/**
+ * An empty implementation of IStaticContentProvider
+ *
+ * @author Camille Letavernier
+ *
+ */
+public abstract class AbstractStaticContentProvider implements IStaticContentProvider {
+
+	@Override
+	public void dispose() {
+		// Nothing
+	}
+
+	@Override
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		// Nothing
+	}
+
+	@Override
+	public Object[] getElements(Object inputElement) {
+		return getElements();
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractTreeFilter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractTreeFilter.java
index b1bfd158311..6d1a42c2492 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractTreeFilter.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractTreeFilter.java
@@ -1,182 +1,182 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.Map;

-import java.util.Set;

-

-import org.eclipse.jface.viewers.IContentProvider;

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.jface.viewers.ViewerFilter;

-import org.eclipse.papyrus.infra.widgets.strategy.IStrategyBasedContentProvider;

-import org.eclipse.papyrus.infra.widgets.strategy.ProviderBasedBrowseStrategy;

-import org.eclipse.papyrus.infra.widgets.strategy.TreeBrowseStrategy;

-

-/**

- * An abstract ViewerFilter for TreeViewers.

- *

- * You should extend this class whenever you want to implement a filter

- * for a Tree. An element is visible :

- * - If the method isVisible() returns true

- * - If one of its children is visible

- * - Optionally, if one of its parents is visible ({@link #showIfHasVisibleParent})

- *

- * This class can implements a cache, which should be cleaned each time

- * a parameter influencing the result of the {@link #isVisible(Viewer, Object, Object)} method is changed ({@link #clearCache()}).

- *

- * @author Camille Letavernier

- */

-public abstract class AbstractTreeFilter extends ViewerFilter {

-

-	/**

-	 * If set to true, the results of the filter will be cached, to improve

-	 * performance.

-	 *

-	 * Implementers are responsible of cleaning the cache (by calling {@link #clearCache()} when the result of the filter on a given

-	 * element might change.

-	 *

-	 * For example, a string-pattern-based filter should clear the cache when

-	 * the pattern changes. The viewer should also be refreshed.

-	 */

-	protected boolean useCache = true;

-

-	/**

-	 * Indicates if an element should be visible when one its parents is visible.

-	 * This may be useful, for example, when you want to display all the contents

-	 * of a given package, by entering a filter that will match this package.

-	 */

-	protected boolean showIfHasVisibleParent = false;

-

-	/**

-	 * Cache

-	 */

-	protected final Map<Object, Boolean> visibleElement = new HashMap<Object, Boolean>();

-

-	/**

-	 * Cache

-	 */

-	protected final Map<Object, Boolean> visibleParent = new HashMap<Object, Boolean>();

-

-	/**

-	 * Cache

-	 */

-	protected final Map<Object, Boolean> visibleChild = new HashMap<Object, Boolean>();

-

-	@Override

-	public boolean select(Viewer viewer, Object parentElement, Object element) {

-

-		TreeBrowseStrategy strategy = null;

-

-		if (viewer instanceof StructuredViewer) {

-			IContentProvider baseContentProvider = ((StructuredViewer) viewer).getContentProvider();

-			if (baseContentProvider instanceof IStrategyBasedContentProvider) {

-				strategy = ((IStrategyBasedContentProvider) baseContentProvider).getRevealStrategy();

-			}

-

-			if (strategy == null && baseContentProvider instanceof ITreeContentProvider) {

-				strategy = new ProviderBasedBrowseStrategy((ITreeContentProvider) baseContentProvider);

-			}

-		}

-

-		if (strategy == null) { // The contentProvider is not a TreeContentProvider

-			return isVisible(viewer, parentElement, element);

-		}

-

-		return select(viewer, parentElement, element, strategy);

-	}

-

-	protected boolean select(Viewer viewer, Object parentElement, Object element, TreeBrowseStrategy strategy) {

-		Set<Object> visitedChildren = new HashSet<Object>();

-		Set<Object> visitedParents = new HashSet<Object>();

-		if (useCache && visibleElement.containsKey(element)) {

-			return visibleElement.get(element);

-		}

-

-		boolean isVisible = isVisible(viewer, parentElement, element) || hasOneVisibleChild(viewer, element, strategy, visitedChildren);

-

-		if (showIfHasVisibleParent) {

-			isVisible = isVisible || hasOneVisibleParent(viewer, element, strategy, visitedParents);

-		}

-

-		if (useCache) {

-			visibleElement.put(element, isVisible);

-		}

-

-		return isVisible;

-	}

-

-	protected boolean hasOneVisibleChild(Viewer viewer, Object element, TreeBrowseStrategy strategy, Set<Object> visitedElements) {

-		// TODO : separate this method in -hasOneVisibleChild() and #doHasOneVisibleChild(), to handle the cache management in a private method,

-		// while letting the opportunity to override the method

-		if (useCache && visibleChild.containsKey(element)) {

-			return visibleChild.get(element);

-		}

-

-		boolean result = false;

-		if (!visitedElements.contains(element)) {

-			visitedElements.add(element);

-

-			for (Object childElement : strategy.getChildren(element)) {

-				if (isVisible(viewer, element, childElement) || hasOneVisibleChild(viewer, childElement, strategy, visitedElements)) {

-					result = true;

-					break;

-				}

-			}

-		}

-

-		if (useCache) {

-			visibleChild.put(element, result);

-		}

-		return result;

-	}

-

-	protected boolean hasOneVisibleParent(Viewer viewer, Object element, TreeBrowseStrategy strategy, Set<Object> visitedElements) {

-		if (useCache && visibleParent.containsKey(element)) {

-			return visibleParent.get(element);

-		}

-

-		boolean result = false;

-		if (!visitedElements.contains(element)) {

-

-			visitedElements.add(element);

-

-			Object parentElement = strategy.getParent(element);

-			if (parentElement == element || parentElement == null) {

-				result = isVisible(viewer, parentElement, element);

-			} else {

-				result = isVisible(viewer, null, parentElement) || hasOneVisibleParent(viewer, parentElement, strategy, visitedElements);

-			}

-		}

-

-		if (useCache) {

-			visibleParent.put(element, result);

-		}

-

-		return result;

-	}

-

-	protected void clearCache() {

-		visibleElement.clear();

-		visibleParent.clear();

-		visibleChild.clear();

-	}

-

-	public abstract boolean isVisible(Viewer viewer, Object parentElement, Object element);

-

-	public void setShowIfHasVisibleParent(boolean showIfHasVisibleParent) {

-		this.showIfHasVisibleParent = showIfHasVisibleParent;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.jface.viewers.IContentProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.papyrus.infra.widgets.strategy.IStrategyBasedContentProvider;
+import org.eclipse.papyrus.infra.widgets.strategy.ProviderBasedBrowseStrategy;
+import org.eclipse.papyrus.infra.widgets.strategy.TreeBrowseStrategy;
+
+/**
+ * An abstract ViewerFilter for TreeViewers.
+ *
+ * You should extend this class whenever you want to implement a filter
+ * for a Tree. An element is visible :
+ * - If the method isVisible() returns true
+ * - If one of its children is visible
+ * - Optionally, if one of its parents is visible ({@link #showIfHasVisibleParent})
+ *
+ * This class can implements a cache, which should be cleaned each time
+ * a parameter influencing the result of the {@link #isVisible(Viewer, Object, Object)} method is changed ({@link #clearCache()}).
+ *
+ * @author Camille Letavernier
+ */
+public abstract class AbstractTreeFilter extends ViewerFilter {
+
+	/**
+	 * If set to true, the results of the filter will be cached, to improve
+	 * performance.
+	 *
+	 * Implementers are responsible of cleaning the cache (by calling {@link #clearCache()} when the result of the filter on a given
+	 * element might change.
+	 *
+	 * For example, a string-pattern-based filter should clear the cache when
+	 * the pattern changes. The viewer should also be refreshed.
+	 */
+	protected boolean useCache = true;
+
+	/**
+	 * Indicates if an element should be visible when one its parents is visible.
+	 * This may be useful, for example, when you want to display all the contents
+	 * of a given package, by entering a filter that will match this package.
+	 */
+	protected boolean showIfHasVisibleParent = false;
+
+	/**
+	 * Cache
+	 */
+	protected final Map<Object, Boolean> visibleElement = new HashMap<Object, Boolean>();
+
+	/**
+	 * Cache
+	 */
+	protected final Map<Object, Boolean> visibleParent = new HashMap<Object, Boolean>();
+
+	/**
+	 * Cache
+	 */
+	protected final Map<Object, Boolean> visibleChild = new HashMap<Object, Boolean>();
+
+	@Override
+	public boolean select(Viewer viewer, Object parentElement, Object element) {
+
+		TreeBrowseStrategy strategy = null;
+
+		if (viewer instanceof StructuredViewer) {
+			IContentProvider baseContentProvider = ((StructuredViewer) viewer).getContentProvider();
+			if (baseContentProvider instanceof IStrategyBasedContentProvider) {
+				strategy = ((IStrategyBasedContentProvider) baseContentProvider).getRevealStrategy();
+			}
+
+			if (strategy == null && baseContentProvider instanceof ITreeContentProvider) {
+				strategy = new ProviderBasedBrowseStrategy((ITreeContentProvider) baseContentProvider);
+			}
+		}
+
+		if (strategy == null) { // The contentProvider is not a TreeContentProvider
+			return isVisible(viewer, parentElement, element);
+		}
+
+		return select(viewer, parentElement, element, strategy);
+	}
+
+	protected boolean select(Viewer viewer, Object parentElement, Object element, TreeBrowseStrategy strategy) {
+		Set<Object> visitedChildren = new HashSet<Object>();
+		Set<Object> visitedParents = new HashSet<Object>();
+		if (useCache && visibleElement.containsKey(element)) {
+			return visibleElement.get(element);
+		}
+
+		boolean isVisible = isVisible(viewer, parentElement, element) || hasOneVisibleChild(viewer, element, strategy, visitedChildren);
+
+		if (showIfHasVisibleParent) {
+			isVisible = isVisible || hasOneVisibleParent(viewer, element, strategy, visitedParents);
+		}
+
+		if (useCache) {
+			visibleElement.put(element, isVisible);
+		}
+
+		return isVisible;
+	}
+
+	protected boolean hasOneVisibleChild(Viewer viewer, Object element, TreeBrowseStrategy strategy, Set<Object> visitedElements) {
+		// TODO : separate this method in -hasOneVisibleChild() and #doHasOneVisibleChild(), to handle the cache management in a private method,
+		// while letting the opportunity to override the method
+		if (useCache && visibleChild.containsKey(element)) {
+			return visibleChild.get(element);
+		}
+
+		boolean result = false;
+		if (!visitedElements.contains(element)) {
+			visitedElements.add(element);
+
+			for (Object childElement : strategy.getChildren(element)) {
+				if (isVisible(viewer, element, childElement) || hasOneVisibleChild(viewer, childElement, strategy, visitedElements)) {
+					result = true;
+					break;
+				}
+			}
+		}
+
+		if (useCache) {
+			visibleChild.put(element, result);
+		}
+		return result;
+	}
+
+	protected boolean hasOneVisibleParent(Viewer viewer, Object element, TreeBrowseStrategy strategy, Set<Object> visitedElements) {
+		if (useCache && visibleParent.containsKey(element)) {
+			return visibleParent.get(element);
+		}
+
+		boolean result = false;
+		if (!visitedElements.contains(element)) {
+
+			visitedElements.add(element);
+
+			Object parentElement = strategy.getParent(element);
+			if (parentElement == element || parentElement == null) {
+				result = isVisible(viewer, parentElement, element);
+			} else {
+				result = isVisible(viewer, null, parentElement) || hasOneVisibleParent(viewer, parentElement, strategy, visitedElements);
+			}
+		}
+
+		if (useCache) {
+			visibleParent.put(element, result);
+		}
+
+		return result;
+	}
+
+	protected void clearCache() {
+		visibleElement.clear();
+		visibleParent.clear();
+		visibleChild.clear();
+	}
+
+	public abstract boolean isVisible(Viewer viewer, Object parentElement, Object element);
+
+	public void setShowIfHasVisibleParent(boolean showIfHasVisibleParent) {
+		this.showIfHasVisibleParent = showIfHasVisibleParent;
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CollectionContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CollectionContentProvider.java
index e3a2c0ff3a4..44f3743b265 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CollectionContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CollectionContentProvider.java
@@ -1,86 +1,86 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import java.util.Collection;

-

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.viewers.Viewer;

-

-/**

- * A Content Provider converting the input list to an array containing the same elements

- *

- * @author Camille Letavernier

- *

- */

-public class CollectionContentProvider implements ITreeContentProvider {

-

-	private CollectionContentProvider() {

-

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void dispose() {

-		// Nothing

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		// Nothing

-	}

-

-	/**

-	 * Converts the input List to an Array containing the same elements

-	 *

-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)

-	 *

-	 * @param inputElement

-	 * @return

-	 * 		The Array containing the input elements

-	 */

-	@Override

-	public Object[] getElements(Object inputElement) {

-		if (inputElement instanceof Collection) {

-			return ((Collection<?>) inputElement).toArray();

-		} else if (inputElement instanceof Object[]) {

-			return (Object[]) inputElement;

-		}

-

-		return new Object[] {};

-	}

-

-	/**

-	 * The Singleton instance

-	 */

-	public static final CollectionContentProvider instance = new CollectionContentProvider();

-

-	@Override

-	public Object[] getChildren(Object parentElement) {

-		return new Object[0]; // Flat tree

-	}

-

-	@Override

-	public Object getParent(Object element) {

-		return null; // Flat tree

-	}

-

-	@Override

-	public boolean hasChildren(Object element) {

-		return false;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import java.util.Collection;
+
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+
+/**
+ * A Content Provider converting the input list to an array containing the same elements
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class CollectionContentProvider implements ITreeContentProvider {
+
+	private CollectionContentProvider() {
+
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void dispose() {
+		// Nothing
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		// Nothing
+	}
+
+	/**
+	 * Converts the input List to an Array containing the same elements
+	 *
+	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+	 *
+	 * @param inputElement
+	 * @return
+	 * 		The Array containing the input elements
+	 */
+	@Override
+	public Object[] getElements(Object inputElement) {
+		if (inputElement instanceof Collection) {
+			return ((Collection<?>) inputElement).toArray();
+		} else if (inputElement instanceof Object[]) {
+			return (Object[]) inputElement;
+		}
+
+		return new Object[] {};
+	}
+
+	/**
+	 * The Singleton instance
+	 */
+	public static final CollectionContentProvider instance = new CollectionContentProvider();
+
+	@Override
+	public Object[] getChildren(Object parentElement) {
+		return new Object[0]; // Flat tree
+	}
+
+	@Override
+	public Object getParent(Object element) {
+		return null; // Flat tree
+	}
+
+	@Override
+	public boolean hasChildren(Object element) {
+		return false;
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/ComboLabelProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/ComboLabelProvider.java
index 6bb45bfbee7..67b65053a55 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/ComboLabelProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/ComboLabelProvider.java
@@ -1,43 +1,43 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import org.eclipse.jface.viewers.IBaseLabelProvider;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.swt.graphics.Image;

-

-

-public class ComboLabelProvider extends LabelProvider {

-

-	private ILabelProvider labelProvider;

-

-	public ComboLabelProvider(IBaseLabelProvider encapsulated) {

-		this.labelProvider = (ILabelProvider) encapsulated;

-	}

-

-	@Override

-	public String getText(Object value) {

-		if (value == UnsetObject.instance || value == UnchangedObject.instance) {

-			return value.toString();

-		}

-		return labelProvider.getText(value);

-	}

-

-	@Override

-	public Image getImage(Object value) {

-		if (value == UnsetObject.instance || value == UnchangedObject.instance) {

-			return null;

-		}

-		return labelProvider.getImage(value);

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import org.eclipse.jface.viewers.IBaseLabelProvider;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.swt.graphics.Image;
+
+
+public class ComboLabelProvider extends LabelProvider {
+
+	private ILabelProvider labelProvider;
+
+	public ComboLabelProvider(IBaseLabelProvider encapsulated) {
+		this.labelProvider = (ILabelProvider) encapsulated;
+	}
+
+	@Override
+	public String getText(Object value) {
+		if (value == UnsetObject.instance || value == UnchangedObject.instance) {
+			return value.toString();
+		}
+		return labelProvider.getText(value);
+	}
+
+	@Override
+	public Image getImage(Object value) {
+		if (value == UnsetObject.instance || value == UnchangedObject.instance) {
+			return null;
+		}
+		return labelProvider.getImage(value);
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CompositeContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CompositeContentProvider.java
index 91bd6ae32ce..91bd6ae32ce 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CompositeContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CompositeContentProvider.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CompoundFilteredRestrictedContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CompoundFilteredRestrictedContentProvider.java
index 35bb39a2eb5..9a72314334f 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CompoundFilteredRestrictedContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/CompoundFilteredRestrictedContentProvider.java
@@ -1,149 +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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.List;

-

-/**

- * This class allows to use several content provider for the same widget

- * + restriction behavior see {@link IRestrictedContentProvider} documentation

- *

- * @author JC236769

- *

- */

-public class CompoundFilteredRestrictedContentProvider extends AbstractFilteredContentProvider implements IRestrictedContentProvider {

-

-	private List<IRestrictedContentProvider> encapsulatedContentProviders = new ArrayList<IRestrictedContentProvider>();

-

-	public boolean add(IRestrictedContentProvider o) {

-		if (o != null) {

-			return encapsulatedContentProviders.add(o);

-		}

-		return false;

-	}

-

-

-	@Override

-	public Object[] getElements(Object inputElement) {

-		Collection<Object> asList = new HashSet<Object>();

-

-		for (IRestrictedContentProvider encapsulatedContentProvider : encapsulatedContentProviders) {

-			Object[] directElements = encapsulatedContentProvider.getElements(inputElement);

-			asList.addAll(Arrays.asList(directElements));

-		}

-		return asList.toArray();

-	}

-

-

-	@Override

-	public Object[] getChildren(Object parentElement) {

-		Collection<Object> asList = new HashSet<Object>();

-

-		for (IRestrictedContentProvider encapsulatedContentProvider : encapsulatedContentProviders) {

-			Object[] directElements = encapsulatedContentProvider.getChildren(parentElement);

-			if (directElements != null && directElements.length != 0) {

-				asList.addAll(Arrays.asList(directElements));

-			}

-		}

-		return asList.toArray();

-	}

-

-

-	@Override

-	public Object getParent(Object element) {

-		for (IRestrictedContentProvider encapsulatedContentProvider : encapsulatedContentProviders) {

-			Object parent = encapsulatedContentProvider.getParent(element);

-			if (parent != null) {

-				return parent;

-			}

-		}

-		return null;

-	}

-

-	@Override

-	public boolean hasChildren(Object element) {

-		return true;

-	}

-

-

-

-	@Override

-	public void dispose() {

-		super.dispose();

-		this.encapsulatedContentProviders.clear();

-	}

-

-	@Override

-	public void setRestriction(boolean isRestricted) {

-		for (IRestrictedContentProvider current : encapsulatedContentProviders) {

-			current.setRestriction(isRestricted);

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider#isRestricted()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isRestricted() {

-		if (!encapsulatedContentProviders.isEmpty()) {

-			return encapsulatedContentProviders.get(0).isRestricted();

-		}

-		throw new UnsupportedOperationException();

-	}

-

-	@Override

-	public boolean isValidValue(Object element) {

-		boolean result = false;

-		for (final IRestrictedContentProvider current : encapsulatedContentProviders) {

-			result = result || current.isValidValue(element);

-		}

-		return result;

-	}

-

-	@Override

-	public Object[] getElements() {

-		return getElements(null);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IInheritedElementContentProvider#setIgnoreInheritedElements(boolean)

-	 *

-	 * @param ignoreInheritedElements

-	 */

-	@Override

-	public void setIgnoreInheritedElements(boolean ignoreInheritedElements) {

-		for (final IRestrictedContentProvider current : encapsulatedContentProviders) {

-			current.setIgnoreInheritedElements(ignoreInheritedElements);

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IInheritedElementContentProvider#isIgnoringInheritedElements()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isIgnoringInheritedElements() {

-		return encapsulatedContentProviders.get(0).isIgnoringInheritedElements();// the value is the same for all encapsulated content 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:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+
+/**
+ * This class allows to use several content provider for the same widget
+ * + restriction behavior see {@link IRestrictedContentProvider} documentation
+ *
+ * @author JC236769
+ *
+ */
+public class CompoundFilteredRestrictedContentProvider extends AbstractFilteredContentProvider implements IRestrictedContentProvider {
+
+	private List<IRestrictedContentProvider> encapsulatedContentProviders = new ArrayList<IRestrictedContentProvider>();
+
+	public boolean add(IRestrictedContentProvider o) {
+		if (o != null) {
+			return encapsulatedContentProviders.add(o);
+		}
+		return false;
+	}
+
+
+	@Override
+	public Object[] getElements(Object inputElement) {
+		Collection<Object> asList = new HashSet<Object>();
+
+		for (IRestrictedContentProvider encapsulatedContentProvider : encapsulatedContentProviders) {
+			Object[] directElements = encapsulatedContentProvider.getElements(inputElement);
+			asList.addAll(Arrays.asList(directElements));
+		}
+		return asList.toArray();
+	}
+
+
+	@Override
+	public Object[] getChildren(Object parentElement) {
+		Collection<Object> asList = new HashSet<Object>();
+
+		for (IRestrictedContentProvider encapsulatedContentProvider : encapsulatedContentProviders) {
+			Object[] directElements = encapsulatedContentProvider.getChildren(parentElement);
+			if (directElements != null && directElements.length != 0) {
+				asList.addAll(Arrays.asList(directElements));
+			}
+		}
+		return asList.toArray();
+	}
+
+
+	@Override
+	public Object getParent(Object element) {
+		for (IRestrictedContentProvider encapsulatedContentProvider : encapsulatedContentProviders) {
+			Object parent = encapsulatedContentProvider.getParent(element);
+			if (parent != null) {
+				return parent;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public boolean hasChildren(Object element) {
+		return true;
+	}
+
+
+
+	@Override
+	public void dispose() {
+		super.dispose();
+		this.encapsulatedContentProviders.clear();
+	}
+
+	@Override
+	public void setRestriction(boolean isRestricted) {
+		for (IRestrictedContentProvider current : encapsulatedContentProviders) {
+			current.setRestriction(isRestricted);
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider#isRestricted()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isRestricted() {
+		if (!encapsulatedContentProviders.isEmpty()) {
+			return encapsulatedContentProviders.get(0).isRestricted();
+		}
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public boolean isValidValue(Object element) {
+		boolean result = false;
+		for (final IRestrictedContentProvider current : encapsulatedContentProviders) {
+			result = result || current.isValidValue(element);
+		}
+		return result;
+	}
+
+	@Override
+	public Object[] getElements() {
+		return getElements(null);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.providers.IInheritedElementContentProvider#setIgnoreInheritedElements(boolean)
+	 *
+	 * @param ignoreInheritedElements
+	 */
+	@Override
+	public void setIgnoreInheritedElements(boolean ignoreInheritedElements) {
+		for (final IRestrictedContentProvider current : encapsulatedContentProviders) {
+			current.setIgnoreInheritedElements(ignoreInheritedElements);
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.providers.IInheritedElementContentProvider#isIgnoringInheritedElements()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isIgnoringInheritedElements() {
+		return encapsulatedContentProviders.get(0).isIgnoringInheritedElements();// the value is the same for all encapsulated content provider
+	}
+
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/DelegatingLabelProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/DelegatingLabelProvider.java
index cdfdef64464..cdfdef64464 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/DelegatingLabelProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/DelegatingLabelProvider.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/DelegatingStyledLabelProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/DelegatingStyledLabelProvider.java
index b08a0ac5b89..b08a0ac5b89 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/DelegatingStyledLabelProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/DelegatingStyledLabelProvider.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/EmptyContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/EmptyContentProvider.java
index 28254c00c21..c0e8ec807f6 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/EmptyContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/EmptyContentProvider.java
@@ -1,45 +1,45 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-

-/**

- * A ContentProvider returning empty collections

- *

- * @author Camille Letavernier

- *

- */

-public class EmptyContentProvider extends AbstractStaticContentProvider {

-

-	/**

-	 * Singleton instance

-	 */

-	public static final EmptyContentProvider instance = new EmptyContentProvider();

-

-	private final Object[] value = new Object[0];

-

-	private EmptyContentProvider() {

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider#getElements()

-	 *

-	 * @return

-	 * 		an empty array

-	 */

-	@Override

-	public Object[] getElements() {

-		return value;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+
+/**
+ * A ContentProvider returning empty collections
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class EmptyContentProvider extends AbstractStaticContentProvider {
+
+	/**
+	 * Singleton instance
+	 */
+	public static final EmptyContentProvider instance = new EmptyContentProvider();
+
+	private final Object[] value = new Object[0];
+
+	private EmptyContentProvider() {
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider#getElements()
+	 *
+	 * @return
+	 * 		an empty array
+	 */
+	@Override
+	public Object[] getElements() {
+		return value;
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/EncapsulatedContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/EncapsulatedContentProvider.java
index db678c08437..db678c08437 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/EncapsulatedContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/EncapsulatedContentProvider.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/FileExtensions.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/FileExtensions.java
index d86d3edb11c..230efa8981d 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/FileExtensions.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/FileExtensions.java
@@ -1,48 +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:

- *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import java.util.LinkedHashMap;

-import java.util.Map;

-

-/**

- * Standard file extensions used in Papyrus

- *

- * @author Camille Letavernier

- *

- */

-public class FileExtensions {

-

-	public static final Map<String, String> umlExtensions = new LinkedHashMap<String, String>();

-

-	public static final Map<String, String> umlProfileExtensions = new LinkedHashMap<String, String>();

-

-	public static final Map<String, String> cssStylesheetsExtension = new LinkedHashMap<String, String>();

-

-	public static final Map<String, String> allFilesExtensions = new LinkedHashMap<String, String>();

-

-	static {

-		umlExtensions.put("*.uml", "UML (*.uml)"); //$NON-NLS-1$ //$NON-NLS-2$

-		umlExtensions.put("*.profile.uml", "UML Profiles (*.profile.uml)"); //$NON-NLS-1$ //$NON-NLS-2$

-

-		umlProfileExtensions.put("*.profile.uml", "UML Profiles (*.profile.uml)"); //$NON-NLS-1$ //$NON-NLS-2$

-		umlProfileExtensions.put("*.uml", "UML (*.uml)"); //$NON-NLS-1$ //$NON-NLS-2$

-

-		cssStylesheetsExtension.put("*.css", "CSS Stylesheets (*.css)"); //$NON-NLS-1$ //$NON-NLS-2$

-

-		allFilesExtensions.put("*", "All (*)"); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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 (camille.letavernier@cea.fr) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * Standard file extensions used in Papyrus
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class FileExtensions {
+
+	public static final Map<String, String> umlExtensions = new LinkedHashMap<String, String>();
+
+	public static final Map<String, String> umlProfileExtensions = new LinkedHashMap<String, String>();
+
+	public static final Map<String, String> cssStylesheetsExtension = new LinkedHashMap<String, String>();
+
+	public static final Map<String, String> allFilesExtensions = new LinkedHashMap<String, String>();
+
+	static {
+		umlExtensions.put("*.uml", "UML (*.uml)"); //$NON-NLS-1$ //$NON-NLS-2$
+		umlExtensions.put("*.profile.uml", "UML Profiles (*.profile.uml)"); //$NON-NLS-1$ //$NON-NLS-2$
+
+		umlProfileExtensions.put("*.profile.uml", "UML Profiles (*.profile.uml)"); //$NON-NLS-1$ //$NON-NLS-2$
+		umlProfileExtensions.put("*.uml", "UML (*.uml)"); //$NON-NLS-1$ //$NON-NLS-2$
+
+		cssStylesheetsExtension.put("*.css", "CSS Stylesheets (*.css)"); //$NON-NLS-1$ //$NON-NLS-2$
+
+		allFilesExtensions.put("*", "All (*)"); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/FilteredContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/FilteredContentProvider.java
index a5e5fa867a1..a400c8bbf91 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/FilteredContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/FilteredContentProvider.java
@@ -1,107 +1,107 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;

-import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;

-import org.eclipse.papyrus.infra.widgets.editors.StringEditor;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Composite;

-

-

-/**

- * A generic implementation for a IGraphicalContentProvider.

- * This class doesn't provide any element, and should be extended.

- *

- * It implements a filter for List or Tree elements, based on the label

- * provided by the viewer's label provider (Or Object#toString() if the viewer

- * doesn't have a label provider).

- *

- * A Text widget is added before the display control to insert the filter

- * pattern. An element is matched if at least one of these conditions is

- * matched :

- * - The element's name matches the pattern

- * - One of the element's children matches the pattern

- * - One of the element's parent matches the pattern

- *

- * The elements' hierarchy is obtained via the viewer's ContentProvider.

- *

- * @author Camille Letavernier

- */

-public class FilteredContentProvider extends EncapsulatedContentProvider {

-

-	protected StructuredViewer viewer;

-

-	private StringEditor filterPattern;

-

-	private PatternViewerFilter filter;

-

-	public static final String BASE_PATTERN = "*"; //$NON-NLS-1$

-

-	protected boolean showIfHasVisibleParent = false;

-

-	public FilteredContentProvider(IStructuredContentProvider encapsulated) {

-		super(encapsulated);

-	}

-

-	public FilteredContentProvider() {

-		super();

-	}

-

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		super.inputChanged(viewer, oldInput, newInput);

-		if (viewer instanceof StructuredViewer) {

-			this.viewer = (StructuredViewer) viewer;

-			updateFilter();

-		}

-	}

-

-	private void updateFilter() {

-		if (this.viewer != null && filterPattern != null) {

-			addViewerFilter(viewer, filter);

-		}

-	}

-

-	@Override

-	public void createBefore(Composite parent) {

-		super.createBefore(parent);

-		filterPattern = new StringEditor(parent, SWT.NONE, "Filter: ");

-		filterPattern.setValidateOnDelay(true);

-		filterPattern.setValue(BASE_PATTERN);

-		filter = getViewerFilter();

-		filterPattern.addCommitListener(new ICommitListener() {

-

-			@Override

-			public void commit(AbstractEditor editor) {

-				filter.setPattern((String) filterPattern.getValue());

-				if (viewer != null) {

-					viewer.refresh();

-				}

-			}

-

-		});

-		updateFilter();

-	}

-

-	protected PatternViewerFilter getViewerFilter() {

-		PatternViewerFilter filter = new PatternViewerFilter();

-		filter.setStrict(false);

-		filter.setPattern(BASE_PATTERN);

-		filter.setShowIfHasVisibleParent(showIfHasVisibleParent);

-		return filter;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
+import org.eclipse.papyrus.infra.widgets.editors.StringEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+
+
+/**
+ * A generic implementation for a IGraphicalContentProvider.
+ * This class doesn't provide any element, and should be extended.
+ *
+ * It implements a filter for List or Tree elements, based on the label
+ * provided by the viewer's label provider (Or Object#toString() if the viewer
+ * doesn't have a label provider).
+ *
+ * A Text widget is added before the display control to insert the filter
+ * pattern. An element is matched if at least one of these conditions is
+ * matched :
+ * - The element's name matches the pattern
+ * - One of the element's children matches the pattern
+ * - One of the element's parent matches the pattern
+ *
+ * The elements' hierarchy is obtained via the viewer's ContentProvider.
+ *
+ * @author Camille Letavernier
+ */
+public class FilteredContentProvider extends EncapsulatedContentProvider {
+
+	protected StructuredViewer viewer;
+
+	private StringEditor filterPattern;
+
+	private PatternViewerFilter filter;
+
+	public static final String BASE_PATTERN = "*"; //$NON-NLS-1$
+
+	protected boolean showIfHasVisibleParent = false;
+
+	public FilteredContentProvider(IStructuredContentProvider encapsulated) {
+		super(encapsulated);
+	}
+
+	public FilteredContentProvider() {
+		super();
+	}
+
+	@Override
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		super.inputChanged(viewer, oldInput, newInput);
+		if (viewer instanceof StructuredViewer) {
+			this.viewer = (StructuredViewer) viewer;
+			updateFilter();
+		}
+	}
+
+	private void updateFilter() {
+		if (this.viewer != null && filterPattern != null) {
+			addViewerFilter(viewer, filter);
+		}
+	}
+
+	@Override
+	public void createBefore(Composite parent) {
+		super.createBefore(parent);
+		filterPattern = new StringEditor(parent, SWT.NONE, "Filter: ");
+		filterPattern.setValidateOnDelay(true);
+		filterPattern.setValue(BASE_PATTERN);
+		filter = getViewerFilter();
+		filterPattern.addCommitListener(new ICommitListener() {
+
+			@Override
+			public void commit(AbstractEditor editor) {
+				filter.setPattern((String) filterPattern.getValue());
+				if (viewer != null) {
+					viewer.refresh();
+				}
+			}
+
+		});
+		updateFilter();
+	}
+
+	protected PatternViewerFilter getViewerFilter() {
+		PatternViewerFilter filter = new PatternViewerFilter();
+		filter.setStrict(false);
+		filter.setPattern(BASE_PATTERN);
+		filter.setShowIfHasVisibleParent(showIfHasVisibleParent);
+		return filter;
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/FlattenableRestrictedFilteredContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/FlattenableRestrictedFilteredContentProvider.java
index 40347f26a4d..cc79b0ba368 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/FlattenableRestrictedFilteredContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/FlattenableRestrictedFilteredContentProvider.java
@@ -1,203 +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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.widgets.messages.Messages;

-import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- *

- * @author JC236769

- *

- */

-public class FlattenableRestrictedFilteredContentProvider extends AbstractFilteredContentProvider implements IStaticContentProvider, IRestrictedContentProvider, IFlattenableContentProvider {

-

-	private boolean isFlat = false;

-

-	private ReferenceSelector selector;

-

-	protected IRestrictedContentProvider provider;

-

-	protected HierarchicToFlatContentProvider flatProvider;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param provider

-	 *            the encapsulated content provider

-	 * @param selector

-	 *            the reference selector (we need it to refresh it)

-	 */

-	public FlattenableRestrictedFilteredContentProvider(IRestrictedContentProvider provider, ReferenceSelector selector) {

-		this.provider = provider;

-		flatProvider = new HierarchicToFlatContentProvider(provider);

-		this.selector = selector;

-	}

-

-	/**

-	 * Add 2 checkboxes to the dialog

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.providers.AbstractFilteredContentProvider#createAfter(org.eclipse.swt.widgets.Composite)

-	 *

-	 * @param parent

-	 */

-	@Override

-	public void createAfter(final Composite parent) {

-

-		super.createAfter(parent);

-		Composite checkboxSection = new Composite(parent, SWT.NONE);

-		checkboxSection.setLayout(new FillLayout(SWT.VERTICAL));

-		final Button onlyCurrentContainersCheckbox = new Button(checkboxSection, SWT.CHECK);

-		onlyCurrentContainersCheckbox.setText(Messages.FlattenableRestrictedFilteredContentProvider_AllPossibleContentsMessage);

-

-		final Button showFlatListOfFeaturesCheckbox = new Button(checkboxSection, SWT.CHECK);

-		showFlatListOfFeaturesCheckbox.setText(Messages.FlattenableRestrictedFilteredContentProvider_FlatViewMessage);

-		onlyCurrentContainersCheckbox.addSelectionListener(new SelectionListener() {

-

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				setRestriction(!onlyCurrentContainersCheckbox.getSelection());

-				viewer.refresh();

-				selector.refresh();

-			}

-

-			@Override

-			public void widgetDefaultSelected(SelectionEvent e) {

-

-			}

-		});

-		showFlatListOfFeaturesCheckbox.addSelectionListener(new SelectionListener() {

-

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-

-				setFlat(showFlatListOfFeaturesCheckbox.getSelection());

-				viewer.refresh();

-				selector.refresh();

-

-			}

-

-			@Override

-			public void widgetDefaultSelected(SelectionEvent e) {

-

-			}

-		});

-	}

-

-	@Override

-	public Object[] getElements(Object inputElement) {

-		if (isFlat) {

-			return flatProvider.getElements(inputElement);

-		}

-		return provider.getElements(inputElement);

-	}

-

-	@Override

-	public void dispose() {

-		flatProvider.dispose();

-		provider.dispose();

-	}

-

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		super.inputChanged(viewer, oldInput, newInput);

-		flatProvider.inputChanged(viewer, oldInput, newInput);

-		provider.inputChanged(viewer, oldInput, newInput);

-	}

-

-	@Override

-	public boolean isValidValue(Object element) {

-		return provider.isValidValue(element);

-	}

-

-	@Override

-	public Object[] getChildren(Object parentElement) {

-		if (isFlat) {

-			return new Object[0];

-		}

-		return provider.getChildren(parentElement);

-	}

-

-	@Override

-	public Object getParent(Object element) {

-		if (isFlat) {

-			return null;

-		}

-		return provider.getParent(element);

-	}

-

-	@Override

-	public boolean hasChildren(Object element) {

-		if (isFlat) {

-			return false;

-		}

-		return provider.hasChildren(element);

-	}

-

-	@Override

-	public void setRestriction(boolean isRestricted) {

-		provider.setRestriction(isRestricted);

-	}

-

-	@Override

-	public void setFlat(boolean flat) {

-		this.isFlat = flat;

-

-	}

-

-	@Override

-	public Object[] getElements() {

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IInheritedElementContentProvider#setIgnoreInheritedElements(boolean)

-	 *

-	 * @param ignoreInheritedElements

-	 */

-	@Override

-	public void setIgnoreInheritedElements(boolean ignoreInheritedElements) {

-		provider.setIgnoreInheritedElements(ignoreInheritedElements);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IInheritedElementContentProvider#isIgnoringInheritedElements()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isIgnoringInheritedElements() {

-		return provider.isIgnoringInheritedElements();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider#isRestricted()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isRestricted() {

-		return provider.isRestricted();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ *
+ * @author JC236769
+ *
+ */
+public class FlattenableRestrictedFilteredContentProvider extends AbstractFilteredContentProvider implements IStaticContentProvider, IRestrictedContentProvider, IFlattenableContentProvider {
+
+	private boolean isFlat = false;
+
+	private ReferenceSelector selector;
+
+	protected IRestrictedContentProvider provider;
+
+	protected HierarchicToFlatContentProvider flatProvider;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param provider
+	 *            the encapsulated content provider
+	 * @param selector
+	 *            the reference selector (we need it to refresh it)
+	 */
+	public FlattenableRestrictedFilteredContentProvider(IRestrictedContentProvider provider, ReferenceSelector selector) {
+		this.provider = provider;
+		flatProvider = new HierarchicToFlatContentProvider(provider);
+		this.selector = selector;
+	}
+
+	/**
+	 * Add 2 checkboxes to the dialog
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.providers.AbstractFilteredContentProvider#createAfter(org.eclipse.swt.widgets.Composite)
+	 *
+	 * @param parent
+	 */
+	@Override
+	public void createAfter(final Composite parent) {
+
+		super.createAfter(parent);
+		Composite checkboxSection = new Composite(parent, SWT.NONE);
+		checkboxSection.setLayout(new FillLayout(SWT.VERTICAL));
+		final Button onlyCurrentContainersCheckbox = new Button(checkboxSection, SWT.CHECK);
+		onlyCurrentContainersCheckbox.setText(Messages.FlattenableRestrictedFilteredContentProvider_AllPossibleContentsMessage);
+
+		final Button showFlatListOfFeaturesCheckbox = new Button(checkboxSection, SWT.CHECK);
+		showFlatListOfFeaturesCheckbox.setText(Messages.FlattenableRestrictedFilteredContentProvider_FlatViewMessage);
+		onlyCurrentContainersCheckbox.addSelectionListener(new SelectionListener() {
+
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				setRestriction(!onlyCurrentContainersCheckbox.getSelection());
+				viewer.refresh();
+				selector.refresh();
+			}
+
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) {
+
+			}
+		});
+		showFlatListOfFeaturesCheckbox.addSelectionListener(new SelectionListener() {
+
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+
+				setFlat(showFlatListOfFeaturesCheckbox.getSelection());
+				viewer.refresh();
+				selector.refresh();
+
+			}
+
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) {
+
+			}
+		});
+	}
+
+	@Override
+	public Object[] getElements(Object inputElement) {
+		if (isFlat) {
+			return flatProvider.getElements(inputElement);
+		}
+		return provider.getElements(inputElement);
+	}
+
+	@Override
+	public void dispose() {
+		flatProvider.dispose();
+		provider.dispose();
+	}
+
+	@Override
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		super.inputChanged(viewer, oldInput, newInput);
+		flatProvider.inputChanged(viewer, oldInput, newInput);
+		provider.inputChanged(viewer, oldInput, newInput);
+	}
+
+	@Override
+	public boolean isValidValue(Object element) {
+		return provider.isValidValue(element);
+	}
+
+	@Override
+	public Object[] getChildren(Object parentElement) {
+		if (isFlat) {
+			return new Object[0];
+		}
+		return provider.getChildren(parentElement);
+	}
+
+	@Override
+	public Object getParent(Object element) {
+		if (isFlat) {
+			return null;
+		}
+		return provider.getParent(element);
+	}
+
+	@Override
+	public boolean hasChildren(Object element) {
+		if (isFlat) {
+			return false;
+		}
+		return provider.hasChildren(element);
+	}
+
+	@Override
+	public void setRestriction(boolean isRestricted) {
+		provider.setRestriction(isRestricted);
+	}
+
+	@Override
+	public void setFlat(boolean flat) {
+		this.isFlat = flat;
+
+	}
+
+	@Override
+	public Object[] getElements() {
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.providers.IInheritedElementContentProvider#setIgnoreInheritedElements(boolean)
+	 *
+	 * @param ignoreInheritedElements
+	 */
+	@Override
+	public void setIgnoreInheritedElements(boolean ignoreInheritedElements) {
+		provider.setIgnoreInheritedElements(ignoreInheritedElements);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.providers.IInheritedElementContentProvider#isIgnoringInheritedElements()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isIgnoringInheritedElements() {
+		return provider.isIgnoringInheritedElements();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider#isRestricted()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isRestricted() {
+		return provider.isRestricted();
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/HierarchicToFlatContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/HierarchicToFlatContentProvider.java
index ebc1d9fd834..75b7a51b148 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/HierarchicToFlatContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/HierarchicToFlatContentProvider.java
@@ -1,87 +1,87 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.LinkedHashSet;

-import java.util.Set;

-

-import org.eclipse.jface.viewers.Viewer;

-

-//FIXME : Adapt this code to TreeBrowseStrategy

-public class HierarchicToFlatContentProvider extends TreeToFlatContentProvider {

-

-	protected IHierarchicContentProvider contentProvider;

-

-	public HierarchicToFlatContentProvider(IHierarchicContentProvider provider) {

-		super(provider);

-		if (!(provider instanceof IStaticContentProvider)) {

-			throw new IllegalArgumentException();

-		}

-		contentProvider = provider;

-	}

-

-	@Override

-	public void dispose() {

-		contentProvider.dispose();

-	}

-

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		super.inputChanged(viewer, oldInput, newInput);

-		contentProvider.inputChanged(viewer, oldInput, newInput);

-	}

-

-	@Override

-	protected Collection<Object> getElementsList() {

-		Collection<Object> result = new LinkedHashSet<Object>();

-		Set<Object> browsedElements = new HashSet<Object>();

-

-		for (Object root : ((IStaticContentProvider) contentProvider).getElements()) {

-			if (exploreBranch(null, root)) {

-				if (contentProvider.isValidValue(root)) {

-					result.add(getValue(root));

-				}

-				getElementsList(root, result, browsedElements);

-			}

-		}

-

-		return result;

-	}

-

-	@Override

-	protected void getElementsList(Object parent, Collection<Object> result, Set<Object> browsedElements) {

-		if (!browsedElements.add(parent)) {

-			return;

-		}

-

-		Object[] children = contentProvider.getChildren(parent);

-		if (children == null) {

-			return;

-		}

-

-		for (Object child : children) {

-			Object childValue = getValue(child);

-			if (result.contains(childValue)) {

-				continue; // Avoid infinite recursion

-			}

-			if (exploreBranch(parent, child)) {

-				if (contentProvider.isValidValue(child)) {

-					result.add(childValue);

-				}

-				getElementsList(child, result, browsedElements);

-			}

-		}

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.eclipse.jface.viewers.Viewer;
+
+//FIXME : Adapt this code to TreeBrowseStrategy
+public class HierarchicToFlatContentProvider extends TreeToFlatContentProvider {
+
+	protected IHierarchicContentProvider contentProvider;
+
+	public HierarchicToFlatContentProvider(IHierarchicContentProvider provider) {
+		super(provider);
+		if (!(provider instanceof IStaticContentProvider)) {
+			throw new IllegalArgumentException();
+		}
+		contentProvider = provider;
+	}
+
+	@Override
+	public void dispose() {
+		contentProvider.dispose();
+	}
+
+	@Override
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		super.inputChanged(viewer, oldInput, newInput);
+		contentProvider.inputChanged(viewer, oldInput, newInput);
+	}
+
+	@Override
+	protected Collection<Object> getElementsList() {
+		Collection<Object> result = new LinkedHashSet<Object>();
+		Set<Object> browsedElements = new HashSet<Object>();
+
+		for (Object root : ((IStaticContentProvider) contentProvider).getElements()) {
+			if (exploreBranch(null, root)) {
+				if (contentProvider.isValidValue(root)) {
+					result.add(getValue(root));
+				}
+				getElementsList(root, result, browsedElements);
+			}
+		}
+
+		return result;
+	}
+
+	@Override
+	protected void getElementsList(Object parent, Collection<Object> result, Set<Object> browsedElements) {
+		if (!browsedElements.add(parent)) {
+			return;
+		}
+
+		Object[] children = contentProvider.getChildren(parent);
+		if (children == null) {
+			return;
+		}
+
+		for (Object child : children) {
+			Object childValue = getValue(child);
+			if (result.contains(childValue)) {
+				continue; // Avoid infinite recursion
+			}
+			if (exploreBranch(parent, child)) {
+				if (contentProvider.isValidValue(child)) {
+					result.add(childValue);
+				}
+				getElementsList(child, result, browsedElements);
+			}
+		}
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IAdaptableContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IAdaptableContentProvider.java
index 48f15f1aca8..a277766a9a9 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IAdaptableContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IAdaptableContentProvider.java
@@ -1,42 +1,42 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-

-/**

- * A content provider that can be adapted from container value

- * to semantic value. Useful when you want to display wrapped

- * values, but still keep an access to the actual semantic values

- *

- * @author Camille Letavernier

- */

-public interface IAdaptableContentProvider extends IStructuredContentProvider {

-

-	/**

-	 * Returns the semantic Object contained in the given selection

-	 *

-	 * @param containerElement

-	 * @return

-	 *         The semantic element contained in the given containerElement

-	 */

-	public Object getAdaptedValue(Object containerElement);

-

-	/**

-	 * Return an object wrapping the given semanticElement

-	 *

-	 * @param semanticElement

-	 * @return

-	 *         The container object wrapping the semantic element

-	 */

-	// public Object getContainerValue(Object semanticElement);

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+
+/**
+ * A content provider that can be adapted from container value
+ * to semantic value. Useful when you want to display wrapped
+ * values, but still keep an access to the actual semantic values
+ *
+ * @author Camille Letavernier
+ */
+public interface IAdaptableContentProvider extends IStructuredContentProvider {
+
+	/**
+	 * Returns the semantic Object contained in the given selection
+	 *
+	 * @param containerElement
+	 * @return
+	 *         The semantic element contained in the given containerElement
+	 */
+	public Object getAdaptedValue(Object containerElement);
+
+	/**
+	 * Return an object wrapping the given semanticElement
+	 *
+	 * @param semanticElement
+	 * @return
+	 *         The container object wrapping the semantic element
+	 */
+	// public Object getContainerValue(Object semanticElement);
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/ICompositeContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/ICompositeContentProvider.java
index 3134effb915..0804e6efaa9 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/ICompositeContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/ICompositeContentProvider.java
@@ -1,22 +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:

- *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import org.eclipse.jface.viewers.ITreeContentProvider;

-

-

-public interface ICompositeContentProvider extends IHierarchicContentProvider {

-

-	public void appendContentProvider(ITreeContentProvider treeContentProvider);

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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 (camille.letavernier@cea.fr) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import org.eclipse.jface.viewers.ITreeContentProvider;
+
+
+public interface ICompositeContentProvider extends IHierarchicContentProvider {
+
+	public void appendContentProvider(ITreeContentProvider treeContentProvider);
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IFlattenableContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IFlattenableContentProvider.java
index ecf613732e6..cd274e712f2 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IFlattenableContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IFlattenableContentProvider.java
@@ -1,27 +1,27 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-/**

- *

- * Interfaces for a content provider which can be flat or not

- *

- */

-public interface IFlattenableContentProvider {

-

-	/**

-	 *

-	 * @param isFlat

-	 *            <code>true</code> if we display the possible value as a flat view

-	 */

-	public void setFlat(boolean isFlat);

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+/**
+ *
+ * Interfaces for a content provider which can be flat or not
+ *
+ */
+public interface IFlattenableContentProvider {
+
+	/**
+	 *
+	 * @param isFlat
+	 *            <code>true</code> if we display the possible value as a flat view
+	 */
+	public void setFlat(boolean isFlat);
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IGraphicalContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IGraphicalContentProvider.java
index 7980b8101ea..8015b5db800 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IGraphicalContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IGraphicalContentProvider.java
@@ -1,41 +1,41 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import org.eclipse.jface.viewers.IContentProvider;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * An interface for implementing a ContentProvider which requires

- * graphical elements for features such as filters.

- *

- * @author Camille Letavernier

- *

- */

-public interface IGraphicalContentProvider extends IContentProvider {

-

-	/**

-	 * Create graphical elements, which will appear before the widget

-	 * used to display the provided elements

-	 *

-	 * @param parent

-	 */

-	public abstract void createBefore(Composite parent);

-

-	/**

-	 * Create graphical elements, which will appear after the widget

-	 * used to display the provided elements

-	 *

-	 * @param parent

-	 */

-	public abstract void createAfter(Composite parent);

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import org.eclipse.jface.viewers.IContentProvider;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * An interface for implementing a ContentProvider which requires
+ * graphical elements for features such as filters.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public interface IGraphicalContentProvider extends IContentProvider {
+
+	/**
+	 * Create graphical elements, which will appear before the widget
+	 * used to display the provided elements
+	 *
+	 * @param parent
+	 */
+	public abstract void createBefore(Composite parent);
+
+	/**
+	 * Create graphical elements, which will appear after the widget
+	 * used to display the provided elements
+	 *
+	 * @param parent
+	 */
+	public abstract void createAfter(Composite parent);
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IHierarchicContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IHierarchicContentProvider.java
index f71db3baa30..7da7d3b9d55 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IHierarchicContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IHierarchicContentProvider.java
@@ -1,38 +1,38 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import org.eclipse.jface.viewers.ITreeContentProvider;

-

-/**

- * A Hierarchic content provider. In some cases, we want to be able to display

- * elements as a Tree, but we are only interested in some specific elements.

- * The other ones are displayed only to show the hierarchy.

- * This interface allows the user to specify which elements he is interested

- * in.

- *

- * @author Camille Letavernier

- *

- */

-public interface IHierarchicContentProvider extends ITreeContentProvider {

-

-	/**

-	 * Indicates if the given is a valid value. Only valid values can be

-	 * chosen.

-	 *

-	 * @param element

-	 *            The element to test

-	 * @return

-	 *         True if the element is a valid value

-	 */

-	public boolean isValidValue(Object element);

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import org.eclipse.jface.viewers.ITreeContentProvider;
+
+/**
+ * A Hierarchic content provider. In some cases, we want to be able to display
+ * elements as a Tree, but we are only interested in some specific elements.
+ * The other ones are displayed only to show the hierarchy.
+ * This interface allows the user to specify which elements he is interested
+ * in.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public interface IHierarchicContentProvider extends ITreeContentProvider {
+
+	/**
+	 * Indicates if the given is a valid value. Only valid values can be
+	 * chosen.
+	 *
+	 * @param element
+	 *            The element to test
+	 * @return
+	 *         True if the element is a valid value
+	 */
+	public boolean isValidValue(Object element);
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IInheritedElementContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IInheritedElementContentProvider.java
index 6ab2933f48c..130ec453193 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IInheritedElementContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IInheritedElementContentProvider.java
@@ -1,39 +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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-

-/**

- * This interface

- *

- * @author vl222926

- *

- */

-public interface IInheritedElementContentProvider extends IStructuredContentProvider {

-

-	/**

-	 *

-	 * @param ignoreInheritedElements

-	 *            if <code>true</code> the inherited elements won't be returned

-	 */

-	public void setIgnoreInheritedElements(final boolean ignoreInheritedElements);

-

-	/**

-	 *

-	 * @return

-	 *         <code>true</code> if the content provider is ignoring the inherited elements

-	 */

-	public boolean isIgnoringInheritedElements();

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.widgets.providers;
+
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+
+/**
+ * This interface
+ *
+ * @author vl222926
+ *
+ */
+public interface IInheritedElementContentProvider extends IStructuredContentProvider {
+
+	/**
+	 *
+	 * @param ignoreInheritedElements
+	 *            if <code>true</code> the inherited elements won't be returned
+	 */
+	public void setIgnoreInheritedElements(final boolean ignoreInheritedElements);
+
+	/**
+	 *
+	 * @return
+	 *         <code>true</code> if the content provider is ignoring the inherited elements
+	 */
+	public boolean isIgnoringInheritedElements();
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IRestrictedContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IRestrictedContentProvider.java
index 760a898712d..ed7333329ff 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IRestrictedContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IRestrictedContentProvider.java
@@ -1,40 +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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-

-/**

- * Add a boolean to choose the display mode :

- * <ul>

- * <li>display all possible values according to the model (restricted==false)</li>

- * <li>display all possible values according to current edited object (restricted==true)</li>

- * </ul>

- *

- * @author JC236769

- *

- */

-public interface IRestrictedContentProvider extends IHierarchicContentProvider, IStaticContentProvider, IInheritedElementContentProvider {

-

-	/**

-	 *

-	 * @param isRestricted

-	 */

-	public void setRestriction(boolean isRestricted);

-

-	/**

-	 *

-	 * @return

-	 *         <code>true</code> if the content provider is restricted

-	 */

-	public boolean isRestricted();

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+
+/**
+ * Add a boolean to choose the display mode :
+ * <ul>
+ * <li>display all possible values according to the model (restricted==false)</li>
+ * <li>display all possible values according to current edited object (restricted==true)</li>
+ * </ul>
+ *
+ * @author JC236769
+ *
+ */
+public interface IRestrictedContentProvider extends IHierarchicContentProvider, IStaticContentProvider, IInheritedElementContentProvider {
+
+	/**
+	 *
+	 * @param isRestricted
+	 */
+	public void setRestriction(boolean isRestricted);
+
+	/**
+	 *
+	 * @return
+	 *         <code>true</code> if the content provider is restricted
+	 */
+	public boolean isRestricted();
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IStaticContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IStaticContentProvider.java
index 0940c5bc982..75b726009e0 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IStaticContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/IStaticContentProvider.java
@@ -1,33 +1,33 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-

-/**

- * A ContentProvider which returns values that don't depend

- * on an input value

- *

- * In most cases, you should extend the Abstract implementation {@link AbstractStaticContentProvider}

- *

- * @author Camille Letavernier

- *

- * @see AbstractStaticContentProvider

- *

- */

-public interface IStaticContentProvider extends IStructuredContentProvider {

-

-	/**

-	 * @return the elements provided by this class

-	 */

-	public Object[] getElements();

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+
+/**
+ * A ContentProvider which returns values that don't depend
+ * on an input value
+ *
+ * In most cases, you should extend the Abstract implementation {@link AbstractStaticContentProvider}
+ *
+ * @author Camille Letavernier
+ *
+ * @see AbstractStaticContentProvider
+ *
+ */
+public interface IStaticContentProvider extends IStructuredContentProvider {
+
+	/**
+	 * @return the elements provided by this class
+	 */
+	public Object[] getElements();
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/MapLabelProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/MapLabelProvider.java
index 84cd05a2613..43c3a4ad795 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/MapLabelProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/MapLabelProvider.java
@@ -1,25 +1,25 @@
-package org.eclipse.papyrus.infra.widgets.providers;

-

-import java.util.Map;

-

-import org.eclipse.jface.viewers.LabelProvider;

-

-/**

- * A LabelProvider based on a Map

- *

- * @author Camille Letavernier

- */

-public class MapLabelProvider extends LabelProvider {

-

-	protected final Map<Object, String> objectsToLabels;

-

-	public MapLabelProvider(Map<Object, String> objectsToLabels) {

-		this.objectsToLabels = objectsToLabels;

-	}

-

-	@Override

-	public String getText(Object element) {

-		return objectsToLabels.get(element);

-	}

-

-}

+package org.eclipse.papyrus.infra.widgets.providers;
+
+import java.util.Map;
+
+import org.eclipse.jface.viewers.LabelProvider;
+
+/**
+ * A LabelProvider based on a Map
+ *
+ * @author Camille Letavernier
+ */
+public class MapLabelProvider extends LabelProvider {
+
+	protected final Map<Object, String> objectsToLabels;
+
+	public MapLabelProvider(Map<Object, String> objectsToLabels) {
+		this.objectsToLabels = objectsToLabels;
+	}
+
+	@Override
+	public String getText(Object element) {
+		return objectsToLabels.get(element);
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/PatternViewerFilter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/PatternViewerFilter.java
index e060ed0ce2d..ee7080a20f4 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/PatternViewerFilter.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/PatternViewerFilter.java
@@ -1,83 +1,83 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import org.eclipse.jface.viewers.IBaseLabelProvider;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.ui.internal.misc.StringMatcher;

-

-/**

- * A ViewerFilter which can be used to match a pattern.

- *

- * The pattern accepts wildcards (* and ?), and ; as a pattern-separator

- *

- * For example:

- * foo;bar will match either "foo" or "bar"

- * foo* will match "foobar"

- *

- * @author Camille Letavernier

- *

- */

-public class PatternViewerFilter extends AbstractTreeFilter {

-

-	private StringMatcher[] validPatterns = new StringMatcher[] { new StringMatcher("*", true, false) };

-

-	private String currentPattern;

-

-	private boolean strict = false;

-

-	/**

-	 * If the pattern is not strict, wildcards (*) will be added at the beginning and the end of the pattern

-	 * The pattern foo becomes equivalent to *foo*

-	 *

-	 * @param strict

-	 */

-	public void setStrict(boolean strict) {

-		this.strict = strict;

-	}

-

-	public void setPattern(String value) {

-		if (value.equals(currentPattern)) {

-			return;

-		}

-

-		currentPattern = value;

-

-		String[] patterns = value.split(";");

-		this.validPatterns = new StringMatcher[patterns.length];

-		int i = 0;

-		for (String pattern : patterns) {

-			if (!strict) {

-				pattern = "*" + pattern.trim() + "*";

-			}

-			validPatterns[i++] = new StringMatcher(pattern, true, false);

-		}

-

-		clearCache();

-	}

-

-	@Override

-	public boolean isVisible(Viewer viewer, Object parentElement, Object element) {

-		IBaseLabelProvider labelProvider = ((StructuredViewer) viewer).getLabelProvider();

-		if (labelProvider instanceof ILabelProvider) {

-			for (StringMatcher pattern : validPatterns) {

-				if (pattern.match(((ILabelProvider) labelProvider).getText(element))) {

-					return true;

-				}

-			}

-		}

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import org.eclipse.jface.viewers.IBaseLabelProvider;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.ui.internal.misc.StringMatcher;
+
+/**
+ * A ViewerFilter which can be used to match a pattern.
+ *
+ * The pattern accepts wildcards (* and ?), and ; as a pattern-separator
+ *
+ * For example:
+ * foo;bar will match either "foo" or "bar"
+ * foo* will match "foobar"
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class PatternViewerFilter extends AbstractTreeFilter {
+
+	private StringMatcher[] validPatterns = new StringMatcher[] { new StringMatcher("*", true, false) };
+
+	private String currentPattern;
+
+	private boolean strict = false;
+
+	/**
+	 * If the pattern is not strict, wildcards (*) will be added at the beginning and the end of the pattern
+	 * The pattern foo becomes equivalent to *foo*
+	 *
+	 * @param strict
+	 */
+	public void setStrict(boolean strict) {
+		this.strict = strict;
+	}
+
+	public void setPattern(String value) {
+		if (value.equals(currentPattern)) {
+			return;
+		}
+
+		currentPattern = value;
+
+		String[] patterns = value.split(";");
+		this.validPatterns = new StringMatcher[patterns.length];
+		int i = 0;
+		for (String pattern : patterns) {
+			if (!strict) {
+				pattern = "*" + pattern.trim() + "*";
+			}
+			validPatterns[i++] = new StringMatcher(pattern, true, false);
+		}
+
+		clearCache();
+	}
+
+	@Override
+	public boolean isVisible(Viewer viewer, Object parentElement, Object element) {
+		IBaseLabelProvider labelProvider = ((StructuredViewer) viewer).getLabelProvider();
+		if (labelProvider instanceof ILabelProvider) {
+			for (StringMatcher pattern : validPatterns) {
+				if (pattern.match(((ILabelProvider) labelProvider).getText(element))) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/SemanticWorkspaceContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/SemanticWorkspaceContentProvider.java
index ce8cf7333fd..41a41e2fe65 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/SemanticWorkspaceContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/SemanticWorkspaceContentProvider.java
@@ -1,151 +1,151 @@
-/*****************************************************************************

- * 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.widgets.providers;

-

-import java.util.Collections;

-import java.util.Comparator;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IWorkspaceRoot;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.papyrus.infra.tools.util.ListHelper;

-import org.eclipse.papyrus.infra.widgets.Activator;

-

-import com.ibm.icu.text.Collator;

-

-/**

- * A ContentProvider for resources located in the current workspace

- *

- * @author Camille Letavernier

- */

-public class SemanticWorkspaceContentProvider extends AbstractStaticContentProvider implements IHierarchicContentProvider {

-

-	/**

-	 * Constructor

-	 */

-	public SemanticWorkspaceContentProvider() {

-

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object[] getElements() {

-		try {

-			return filterAccessibleElements(ResourcesPlugin.getWorkspace().getRoot().members());

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-			return new Object[0];

-		}

-	}

-

-	protected Object[] filterAccessibleElements(IResource[] members) {

-		List<IResource> accessibleElements = ListHelper.asList(members);

-

-		Iterator<IResource> resourceIterator = accessibleElements.iterator();

-		while (resourceIterator.hasNext()) {

-			IResource resource = resourceIterator.next();

-			if (!resource.isAccessible()) {

-				resourceIterator.remove();

-			}

-		}

-

-		Collections.sort(accessibleElements, resourceComparator);

-

-		return accessibleElements.toArray();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object[] getChildren(Object parentElement) {

-		if (parentElement instanceof IContainer) {

-			try {

-				IResource[] members = ((IContainer) parentElement).members();

-

-				return filterAccessibleElements(members);

-			} catch (CoreException ex) {

-				Activator.log.error(ex);

-			}

-		}

-		return new Object[0];

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object getParent(Object element) {

-		if (element instanceof IContainer) {

-			return ((IContainer) element).getParent();

-		}

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean hasChildren(Object element) {

-		return getChildren(element).length > 0;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean isValidValue(Object element) {

-		return !(element instanceof IWorkspaceRoot);

-	}

-

-	/**

-	 * Compares two resources (IResource)

-	 */

-	private static final Comparator<IResource> resourceComparator = createComparator();

-

-	private static Comparator<IResource> createComparator() {

-		final int folderTypes = IResource.FOLDER | IResource.PROJECT | IResource.ROOT;

-		return new Comparator<IResource>() {

-

-			@Override

-			public int compare(IResource resource1, IResource resource2) {

-				int typeCompare = compareType(resource1, resource2);

-				if (typeCompare == 0) {

-					return compareName(resource1, resource2);

-				}

-				return typeCompare;

-			}

-

-			private int compareType(IResource resource1, IResource resource2) {

-				if (resource1.getType() == resource2.getType()) {

-					return 0;

-				}

-				if ((resource1.getType() & folderTypes) > (resource2.getType() & folderTypes)) {

-					return -1;

-				} else {

-					return 1;

-				}

-			}

-

-			private int compareName(IResource resource1, IResource resource2) {

-				return Collator.getInstance().compare(resource1.getName(), resource2.getName());

-			}

-

-		};

-	}

-}

+/*****************************************************************************
+ * 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.widgets.providers;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.papyrus.infra.tools.util.ListHelper;
+import org.eclipse.papyrus.infra.widgets.Activator;
+
+import com.ibm.icu.text.Collator;
+
+/**
+ * A ContentProvider for resources located in the current workspace
+ *
+ * @author Camille Letavernier
+ */
+public class SemanticWorkspaceContentProvider extends AbstractStaticContentProvider implements IHierarchicContentProvider {
+
+	/**
+	 * Constructor
+	 */
+	public SemanticWorkspaceContentProvider() {
+
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object[] getElements() {
+		try {
+			return filterAccessibleElements(ResourcesPlugin.getWorkspace().getRoot().members());
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+			return new Object[0];
+		}
+	}
+
+	protected Object[] filterAccessibleElements(IResource[] members) {
+		List<IResource> accessibleElements = ListHelper.asList(members);
+
+		Iterator<IResource> resourceIterator = accessibleElements.iterator();
+		while (resourceIterator.hasNext()) {
+			IResource resource = resourceIterator.next();
+			if (!resource.isAccessible()) {
+				resourceIterator.remove();
+			}
+		}
+
+		Collections.sort(accessibleElements, resourceComparator);
+
+		return accessibleElements.toArray();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object[] getChildren(Object parentElement) {
+		if (parentElement instanceof IContainer) {
+			try {
+				IResource[] members = ((IContainer) parentElement).members();
+
+				return filterAccessibleElements(members);
+			} catch (CoreException ex) {
+				Activator.log.error(ex);
+			}
+		}
+		return new Object[0];
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object getParent(Object element) {
+		if (element instanceof IContainer) {
+			return ((IContainer) element).getParent();
+		}
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean hasChildren(Object element) {
+		return getChildren(element).length > 0;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isValidValue(Object element) {
+		return !(element instanceof IWorkspaceRoot);
+	}
+
+	/**
+	 * Compares two resources (IResource)
+	 */
+	private static final Comparator<IResource> resourceComparator = createComparator();
+
+	private static Comparator<IResource> createComparator() {
+		final int folderTypes = IResource.FOLDER | IResource.PROJECT | IResource.ROOT;
+		return new Comparator<IResource>() {
+
+			@Override
+			public int compare(IResource resource1, IResource resource2) {
+				int typeCompare = compareType(resource1, resource2);
+				if (typeCompare == 0) {
+					return compareName(resource1, resource2);
+				}
+				return typeCompare;
+			}
+
+			private int compareType(IResource resource1, IResource resource2) {
+				if (resource1.getType() == resource2.getType()) {
+					return 0;
+				}
+				if ((resource1.getType() & folderTypes) > (resource2.getType() & folderTypes)) {
+					return -1;
+				} else {
+					return 1;
+				}
+			}
+
+			private int compareName(IResource resource1, IResource resource2) {
+				return Collator.getInstance().compare(resource1.getName(), resource2.getName());
+			}
+
+		};
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/StaticContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/StaticContentProvider.java
index c34b7c37250..171aaf58450 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/StaticContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/StaticContentProvider.java
@@ -1,75 +1,75 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import org.eclipse.jface.viewers.Viewer;

-

-/**

- * Default implementation of IStaticContentProvider, creating a ContentProvider

- * from an Array of objects.

- *

- * @author Camille Letavernier

- *

- */

-public class StaticContentProvider extends AbstractStaticContentProvider {

-

-	/**

-	 * The elements for this content provider

-	 */

-	private Object[] elements;

-

-	/**

-	 * The JFace viewer on which this content provider is applied

-	 */

-	private Viewer viewer;

-

-	/**

-	 *

-	 * Constructor. Creates a new ContentProvider with the given elements

-	 *

-	 * @param elements

-	 *            The elements known by this ContentProvider

-	 */

-	public StaticContentProvider(Object[] elements) {

-		this.elements = elements;

-	}

-

-	/**

-	 * Changes the elements known by this ContentProvider

-	 *

-	 * @param elements

-	 *            The elements known by this ContentProvider

-	 */

-	public void setElements(Object[] elements) {

-		this.elements = elements;

-		if (viewer != null) {

-			viewer.refresh();

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		this.viewer = viewer;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object[] getElements() {

-		return elements;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import org.eclipse.jface.viewers.Viewer;
+
+/**
+ * Default implementation of IStaticContentProvider, creating a ContentProvider
+ * from an Array of objects.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class StaticContentProvider extends AbstractStaticContentProvider {
+
+	/**
+	 * The elements for this content provider
+	 */
+	private Object[] elements;
+
+	/**
+	 * The JFace viewer on which this content provider is applied
+	 */
+	private Viewer viewer;
+
+	/**
+	 *
+	 * Constructor. Creates a new ContentProvider with the given elements
+	 *
+	 * @param elements
+	 *            The elements known by this ContentProvider
+	 */
+	public StaticContentProvider(Object[] elements) {
+		this.elements = elements;
+	}
+
+	/**
+	 * Changes the elements known by this ContentProvider
+	 *
+	 * @param elements
+	 *            The elements known by this ContentProvider
+	 */
+	public void setElements(Object[] elements) {
+		this.elements = elements;
+		if (viewer != null) {
+			viewer.refresh();
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		this.viewer = viewer;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object[] getElements() {
+		return elements;
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/TreeCollectionContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/TreeCollectionContentProvider.java
index bd933315d68..73deef70ce1 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/TreeCollectionContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/TreeCollectionContentProvider.java
@@ -1,73 +1,73 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import java.util.Collection;

-

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.viewers.Viewer;

-

-

-public class TreeCollectionContentProvider implements ITreeContentProvider {

-

-	private TreeCollectionContentProvider() {

-

-	}

-

-	@Override

-	public Object[] getChildren(Object parentElement) {

-		return new Object[0];

-	}

-

-	@Override

-	public Object getParent(Object element) {

-		return null;

-	}

-

-	@Override

-	public boolean hasChildren(Object element) {

-		return false;

-	}

-

-	public static final TreeCollectionContentProvider instance = new TreeCollectionContentProvider();

-

-	@Override

-	public void dispose() {

-		// Nothing

-	}

-

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		// Nothing

-	}

-

-	/**

-	 * Converts the input List to an Array containing the same elements

-	 *

-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)

-	 *

-	 * @param inputElement

-	 * @return

-	 * 		The Array containing the input elements

-	 */

-	@Override

-	public Object[] getElements(Object inputElement) {

-		if (inputElement instanceof Collection) {

-			return ((Collection<?>) inputElement).toArray();

-		} else if (inputElement instanceof Object[]) {

-			return (Object[]) inputElement;

-		}

-

-		return new Object[] {};

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import java.util.Collection;
+
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+
+
+public class TreeCollectionContentProvider implements ITreeContentProvider {
+
+	private TreeCollectionContentProvider() {
+
+	}
+
+	@Override
+	public Object[] getChildren(Object parentElement) {
+		return new Object[0];
+	}
+
+	@Override
+	public Object getParent(Object element) {
+		return null;
+	}
+
+	@Override
+	public boolean hasChildren(Object element) {
+		return false;
+	}
+
+	public static final TreeCollectionContentProvider instance = new TreeCollectionContentProvider();
+
+	@Override
+	public void dispose() {
+		// Nothing
+	}
+
+	@Override
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		// Nothing
+	}
+
+	/**
+	 * Converts the input List to an Array containing the same elements
+	 *
+	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+	 *
+	 * @param inputElement
+	 * @return
+	 * 		The Array containing the input elements
+	 */
+	@Override
+	public Object[] getElements(Object inputElement) {
+		if (inputElement instanceof Collection) {
+			return ((Collection<?>) inputElement).toArray();
+		} else if (inputElement instanceof Object[]) {
+			return (Object[]) inputElement;
+		}
+
+		return new Object[] {};
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/TreeToFlatContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/TreeToFlatContentProvider.java
index aa33bf55a1a..680cb658b10 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/TreeToFlatContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/TreeToFlatContentProvider.java
@@ -1,112 +1,112 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.LinkedHashSet;

-import java.util.Set;

-

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.jface.viewers.ViewerFilter;

-

-//FIXME : Adapt this code to TreeBrowseStrategy

-public class TreeToFlatContentProvider extends AbstractStaticContentProvider {

-

-	private ITreeContentProvider contentProvider;

-

-	private StructuredViewer viewer;

-

-	public TreeToFlatContentProvider(ITreeContentProvider provider) {

-		if (!(provider instanceof IStaticContentProvider)) {

-			throw new IllegalArgumentException();

-		}

-		this.contentProvider = provider;

-	}

-

-	@Override

-	public void dispose() {

-		contentProvider.dispose();

-	}

-

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		if (viewer instanceof StructuredViewer) {

-			this.viewer = (StructuredViewer) viewer;

-		}

-

-		contentProvider.inputChanged(viewer, oldInput, newInput);

-	}

-

-	@Override

-	public Object[] getElements() {

-		return getElementsList().toArray();

-	}

-

-	/**

-	 * Returns the concrete value from the given Object

-	 * For example, if the content provider is an IAdaptableContentProvider,

-	 * returns the adapted value.

-	 *

-	 * @param value

-	 * @return

-	 */

-	protected Object getValue(Object value) {

-		if (contentProvider instanceof IAdaptableContentProvider) {

-			return ((IAdaptableContentProvider) contentProvider).getAdaptedValue(value);

-		} else {

-			return value;

-		}

-	}

-

-	protected boolean exploreBranch(Object parentElement, Object element) {

-		if (viewer == null) {

-			return true;

-		}

-

-		for (ViewerFilter filter : viewer.getFilters()) {

-			if (!filter.select(viewer, parentElement, element)) {

-				return false;

-			}

-		}

-

-		return true;

-	}

-

-	protected Collection<Object> getElementsList() {

-		Collection<Object> result = new LinkedHashSet<Object>();

-		Set<Object> browsedElements = new HashSet<Object>();

-

-		for (Object root : ((IStaticContentProvider) contentProvider).getElements()) {

-			if (exploreBranch(null, root)) {

-				result.add(root);

-				getElementsList(root, result, browsedElements);

-			}

-		}

-

-		return result;

-	}

-

-	protected void getElementsList(Object parent, Collection<Object> result, Set<Object> browsedElements) {

-		for (Object child : contentProvider.getChildren(parent)) {

-			Object childValue = getValue(child);

-			if (!result.contains(childValue)) { // Avoid infinite recursion

-				result.add(childValue);

-				if (exploreBranch(parent, child)) {

-					getElementsList(child, result, browsedElements);

-				}

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+
+//FIXME : Adapt this code to TreeBrowseStrategy
+public class TreeToFlatContentProvider extends AbstractStaticContentProvider {
+
+	private ITreeContentProvider contentProvider;
+
+	private StructuredViewer viewer;
+
+	public TreeToFlatContentProvider(ITreeContentProvider provider) {
+		if (!(provider instanceof IStaticContentProvider)) {
+			throw new IllegalArgumentException();
+		}
+		this.contentProvider = provider;
+	}
+
+	@Override
+	public void dispose() {
+		contentProvider.dispose();
+	}
+
+	@Override
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		if (viewer instanceof StructuredViewer) {
+			this.viewer = (StructuredViewer) viewer;
+		}
+
+		contentProvider.inputChanged(viewer, oldInput, newInput);
+	}
+
+	@Override
+	public Object[] getElements() {
+		return getElementsList().toArray();
+	}
+
+	/**
+	 * Returns the concrete value from the given Object
+	 * For example, if the content provider is an IAdaptableContentProvider,
+	 * returns the adapted value.
+	 *
+	 * @param value
+	 * @return
+	 */
+	protected Object getValue(Object value) {
+		if (contentProvider instanceof IAdaptableContentProvider) {
+			return ((IAdaptableContentProvider) contentProvider).getAdaptedValue(value);
+		} else {
+			return value;
+		}
+	}
+
+	protected boolean exploreBranch(Object parentElement, Object element) {
+		if (viewer == null) {
+			return true;
+		}
+
+		for (ViewerFilter filter : viewer.getFilters()) {
+			if (!filter.select(viewer, parentElement, element)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	protected Collection<Object> getElementsList() {
+		Collection<Object> result = new LinkedHashSet<Object>();
+		Set<Object> browsedElements = new HashSet<Object>();
+
+		for (Object root : ((IStaticContentProvider) contentProvider).getElements()) {
+			if (exploreBranch(null, root)) {
+				result.add(root);
+				getElementsList(root, result, browsedElements);
+			}
+		}
+
+		return result;
+	}
+
+	protected void getElementsList(Object parent, Collection<Object> result, Set<Object> browsedElements) {
+		for (Object child : contentProvider.getChildren(parent)) {
+			Object childValue = getValue(child);
+			if (!result.contains(childValue)) { // Avoid infinite recursion
+				result.add(childValue);
+				if (exploreBranch(parent, child)) {
+					getElementsList(child, result, browsedElements);
+				}
+			}
+		}
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/UnchangedObject.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/UnchangedObject.java
index 1bb422895fd..a6369991fa1 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/UnchangedObject.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/UnchangedObject.java
@@ -1,29 +1,29 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import org.eclipse.papyrus.infra.widgets.messages.Messages;

-

-

-public class UnchangedObject {

-

-	private UnchangedObject() {

-

-	}

-

-	@Override

-	public String toString() {

-		return Messages.ReferenceDialogObservable_Unchanged;

-	}

-

-	public static final UnchangedObject instance = new UnchangedObject();

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+
+
+public class UnchangedObject {
+
+	private UnchangedObject() {
+
+	}
+
+	@Override
+	public String toString() {
+		return Messages.ReferenceDialogObservable_Unchanged;
+	}
+
+	public static final UnchangedObject instance = new UnchangedObject();
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/UnsetObject.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/UnsetObject.java
index 2ffe30fb160..897a36d56a1 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/UnsetObject.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/UnsetObject.java
@@ -1,29 +1,29 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import org.eclipse.papyrus.infra.widgets.messages.Messages;

-

-

-public class UnsetObject {

-

-	@Override

-	public String toString() {

-		return Messages.ReferenceDialog_Unset;

-	}

-

-	private UnsetObject() {

-

-	}

-

-	public static final UnsetObject instance = new UnsetObject();

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+
+
+public class UnsetObject {
+
+	@Override
+	public String toString() {
+		return Messages.ReferenceDialog_Unset;
+	}
+
+	private UnsetObject() {
+
+	}
+
+	public static final UnsetObject instance = new UnsetObject();
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/WorkbenchFilteredLabelProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/WorkbenchFilteredLabelProvider.java
index 02098bb8020..39b05f847ab 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/WorkbenchFilteredLabelProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/WorkbenchFilteredLabelProvider.java
@@ -1,70 +1,70 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * 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

- *  Christian W. Damus - bug 469188

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import org.eclipse.core.resources.IResource;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.ui.model.WorkbenchLabelProvider;

-

-

-/**

- * A LabelProvider contribution to handle Workspace elements

- *

- * @author Camille Letavernier

- */

-public class WorkbenchFilteredLabelProvider extends LabelProvider implements IFilteredLabelProvider {

-

-	private final ILabelProvider workbenchLabelProvider;

-

-	public WorkbenchFilteredLabelProvider() {

-		workbenchLabelProvider = WorkbenchLabelProvider.getDecoratingWorkbenchLabelProvider();

-	}

-

-	@Override

-	public String getText(Object element) {

-		return workbenchLabelProvider.getText(unwrapSelection(element));

-	}

-

-	@Override

-	public Image getImage(Object element) {

-		return workbenchLabelProvider.getImage(unwrapSelection(element));

-	}

-

-	@Override

-	public boolean accept(Object element) {

-		return unwrapSelection(element) instanceof IResource;

-	}

-

-	/**

-	 * Unwraps a single selection to get the element inside it.

-	 * 

-	 * @param selection

-	 * @return

-	 */

-	Object unwrapSelection(Object possibleSelection) {

-		Object result = possibleSelection;

-

-		if (possibleSelection instanceof IStructuredSelection) {

-			IStructuredSelection selection = (IStructuredSelection) possibleSelection;

-			if (selection.size() == 1) {

-				result = selection.getFirstElement();

-			}

-		}

-

-		return result;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * 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
+ *  Christian W. Damus - bug 469188
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.model.WorkbenchLabelProvider;
+
+
+/**
+ * A LabelProvider contribution to handle Workspace elements
+ *
+ * @author Camille Letavernier
+ */
+public class WorkbenchFilteredLabelProvider extends LabelProvider implements IFilteredLabelProvider {
+
+	private final ILabelProvider workbenchLabelProvider;
+
+	public WorkbenchFilteredLabelProvider() {
+		workbenchLabelProvider = WorkbenchLabelProvider.getDecoratingWorkbenchLabelProvider();
+	}
+
+	@Override
+	public String getText(Object element) {
+		return workbenchLabelProvider.getText(unwrapSelection(element));
+	}
+
+	@Override
+	public Image getImage(Object element) {
+		return workbenchLabelProvider.getImage(unwrapSelection(element));
+	}
+
+	@Override
+	public boolean accept(Object element) {
+		return unwrapSelection(element) instanceof IResource;
+	}
+
+	/**
+	 * Unwraps a single selection to get the element inside it.
+	 * 
+	 * @param selection
+	 * @return
+	 */
+	Object unwrapSelection(Object possibleSelection) {
+		Object result = possibleSelection;
+
+		if (possibleSelection instanceof IStructuredSelection) {
+			IStructuredSelection selection = (IStructuredSelection) possibleSelection;
+			if (selection.size() == 1) {
+				result = selection.getFirstElement();
+			}
+		}
+
+		return result;
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/WorkspaceContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/WorkspaceContentProvider.java
index bfb616b23a4..1562e0ea009 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/WorkspaceContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/WorkspaceContentProvider.java
@@ -1,135 +1,135 @@
-/*****************************************************************************

- * 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.widgets.providers;

-

-import java.util.LinkedHashMap;

-import java.util.Map;

-

-import org.eclipse.jface.viewers.ComboViewer;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.widgets.strategy.ProviderBasedBrowseStrategy;

-import org.eclipse.papyrus.infra.widgets.strategy.StrategyBasedContentProvider;

-import org.eclipse.papyrus.infra.widgets.strategy.TreeBrowseStrategy;

-import org.eclipse.papyrus.infra.widgets.strategy.WorkspaceRevealStrategy;

-import org.eclipse.swt.widgets.Composite;

-

-

-/**

- * A Workspace content provider with search possibilities and filters (By file name and by file extension)

- *

- * @author Camille Letavernier

- */

-public class WorkspaceContentProvider extends EncapsulatedContentProvider {

-

-	private Map<String, String> extensionFilters = new LinkedHashMap<String, String>();

-

-	private PatternViewerFilter extensionViewerFilter = new PatternViewerFilter();

-

-	private ISelectionChangedListener extensionFiltersListener = new ISelectionChangedListener() {

-

-		@Override

-		public void selectionChanged(SelectionChangedEvent event) {

-

-			String patternString = "*";

-			if (!event.getSelection().isEmpty()) {

-				patternString = (String) ((IStructuredSelection) event.getSelection()).getFirstElement();

-			}

-			extensionViewerFilter.setPattern(patternString);

-			viewer.refresh();

-		}

-	};

-

-	protected StructuredViewer viewer;

-

-	/**

-	 * Constructor

-	 */

-	public WorkspaceContentProvider() {

-		super();

-		this.encapsulated = encapsulateProvider(getSemanticProvider());

-		extensionFilters.put("*", "All (*)");

-	}

-

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		super.inputChanged(viewer, oldInput, newInput);

-

-		if (viewer instanceof StructuredViewer) {

-			this.viewer = (StructuredViewer) viewer;

-			addViewerFilter(this.viewer, extensionViewerFilter);

-		}

-	}

-

-	protected static IHierarchicContentProvider getSemanticProvider() {

-		return new SemanticWorkspaceContentProvider();

-	}

-

-	public void setExtensionFilters(Map<String, String> extensionFilters) {

-		this.extensionFilters = extensionFilters;

-	}

-

-	public void addExtensionFilter(String pattern, String label) {

-		this.extensionFilters.put(pattern, label);

-	}

-

-	protected IStructuredContentProvider encapsulateProvider(IHierarchicContentProvider provider) {

-		TreeBrowseStrategy browseStrategy = new ProviderBasedBrowseStrategy(provider);

-		TreeBrowseStrategy revealStrategy = new WorkspaceRevealStrategy(provider);

-		StrategyBasedContentProvider strategyProvider = new StrategyBasedContentProvider(browseStrategy, revealStrategy);

-

-

-		EncapsulatedContentProvider graphicalProvider = new ExtensionFilteredContentProvider(strategyProvider);

-

-		return graphicalProvider;

-	}

-

-	private class ExtensionFilteredContentProvider extends FilteredContentProvider {

-

-		public ExtensionFilteredContentProvider(IHierarchicContentProvider semanticProvider) {

-			super(semanticProvider);

-		}

-

-		@Override

-		public void createAfter(Composite parent) {

-			super.createAfter(parent);

-			ComboViewer extensionFiltersViewer = new ComboViewer(parent);

-

-			extensionFiltersViewer.setContentProvider(CollectionContentProvider.instance);

-			extensionFiltersViewer.setLabelProvider(new LabelProvider() {

-

-				@Override

-				public String getText(Object element) {

-					if (extensionFilters.containsKey(element)) {

-						return extensionFilters.get(element);

-					} else {

-						return super.getText(element);

-					}

-				}

-			});

-

-			extensionFiltersViewer.addSelectionChangedListener(extensionFiltersListener);

-

-			extensionFiltersViewer.setInput(extensionFilters.keySet());

-			if (!extensionFilters.isEmpty()) {

-				extensionFiltersViewer.setSelection(new StructuredSelection(extensionFilters.keySet().iterator().next()));

-			}

-		}

-	}

-

-}

+/*****************************************************************************
+ * 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.widgets.providers;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.widgets.strategy.ProviderBasedBrowseStrategy;
+import org.eclipse.papyrus.infra.widgets.strategy.StrategyBasedContentProvider;
+import org.eclipse.papyrus.infra.widgets.strategy.TreeBrowseStrategy;
+import org.eclipse.papyrus.infra.widgets.strategy.WorkspaceRevealStrategy;
+import org.eclipse.swt.widgets.Composite;
+
+
+/**
+ * A Workspace content provider with search possibilities and filters (By file name and by file extension)
+ *
+ * @author Camille Letavernier
+ */
+public class WorkspaceContentProvider extends EncapsulatedContentProvider {
+
+	private Map<String, String> extensionFilters = new LinkedHashMap<String, String>();
+
+	private PatternViewerFilter extensionViewerFilter = new PatternViewerFilter();
+
+	private ISelectionChangedListener extensionFiltersListener = new ISelectionChangedListener() {
+
+		@Override
+		public void selectionChanged(SelectionChangedEvent event) {
+
+			String patternString = "*";
+			if (!event.getSelection().isEmpty()) {
+				patternString = (String) ((IStructuredSelection) event.getSelection()).getFirstElement();
+			}
+			extensionViewerFilter.setPattern(patternString);
+			viewer.refresh();
+		}
+	};
+
+	protected StructuredViewer viewer;
+
+	/**
+	 * Constructor
+	 */
+	public WorkspaceContentProvider() {
+		super();
+		this.encapsulated = encapsulateProvider(getSemanticProvider());
+		extensionFilters.put("*", "All (*)");
+	}
+
+	@Override
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		super.inputChanged(viewer, oldInput, newInput);
+
+		if (viewer instanceof StructuredViewer) {
+			this.viewer = (StructuredViewer) viewer;
+			addViewerFilter(this.viewer, extensionViewerFilter);
+		}
+	}
+
+	protected static IHierarchicContentProvider getSemanticProvider() {
+		return new SemanticWorkspaceContentProvider();
+	}
+
+	public void setExtensionFilters(Map<String, String> extensionFilters) {
+		this.extensionFilters = extensionFilters;
+	}
+
+	public void addExtensionFilter(String pattern, String label) {
+		this.extensionFilters.put(pattern, label);
+	}
+
+	protected IStructuredContentProvider encapsulateProvider(IHierarchicContentProvider provider) {
+		TreeBrowseStrategy browseStrategy = new ProviderBasedBrowseStrategy(provider);
+		TreeBrowseStrategy revealStrategy = new WorkspaceRevealStrategy(provider);
+		StrategyBasedContentProvider strategyProvider = new StrategyBasedContentProvider(browseStrategy, revealStrategy);
+
+
+		EncapsulatedContentProvider graphicalProvider = new ExtensionFilteredContentProvider(strategyProvider);
+
+		return graphicalProvider;
+	}
+
+	private class ExtensionFilteredContentProvider extends FilteredContentProvider {
+
+		public ExtensionFilteredContentProvider(IHierarchicContentProvider semanticProvider) {
+			super(semanticProvider);
+		}
+
+		@Override
+		public void createAfter(Composite parent) {
+			super.createAfter(parent);
+			ComboViewer extensionFiltersViewer = new ComboViewer(parent);
+
+			extensionFiltersViewer.setContentProvider(CollectionContentProvider.instance);
+			extensionFiltersViewer.setLabelProvider(new LabelProvider() {
+
+				@Override
+				public String getText(Object element) {
+					if (extensionFilters.containsKey(element)) {
+						return extensionFilters.get(element);
+					} else {
+						return super.getText(element);
+					}
+				}
+			});
+
+			extensionFiltersViewer.addSelectionChangedListener(extensionFiltersListener);
+
+			extensionFiltersViewer.setInput(extensionFilters.keySet());
+			if (!extensionFilters.isEmpty()) {
+				extensionFiltersViewer.setSelection(new StructuredSelection(extensionFilters.keySet().iterator().next()));
+			}
+		}
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/WrappedLabelProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/WrappedLabelProvider.java
index 9bd70facae6..0b6d84d2160 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/WrappedLabelProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/WrappedLabelProvider.java
@@ -1,121 +1,121 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.providers;

-

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ILabelProviderListener;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * A mutable wrapper for {@link ILabelProvider}s

- * May be used when you need to instantiate a component with a labelProvider,

- * and you don't have one yet.

- * If there is no wrapped label provider, the default toString method will be called

- * on non-null objects.

- *

- * @author Camille Letavernier

- *

- */

-public class WrappedLabelProvider implements ILabelProvider {

-

-	/**

-	 * The wrapped LabelProvider

-	 */

-	private ILabelProvider labelProvider;

-

-	/**

-	 * Constructs a new empty Label provider wrapper.

-	 */

-	public WrappedLabelProvider() {

-

-	}

-

-	/**

-	 *

-	 * Constructs a new Label provider, wrapping the specified label provider.

-	 *

-	 * @param provider

-	 *            The wrapped label provider

-	 */

-	public WrappedLabelProvider(ILabelProvider provider) {

-		this.labelProvider = provider;

-	}

-

-	/**

-	 * Changes the wrapped label provider

-	 *

-	 * @param provider

-	 *            The new wrapped label provider

-	 */

-	public void setLabelProvider(ILabelProvider provider) {

-		this.labelProvider = provider;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void addListener(ILabelProviderListener listener) {

-		// Nothing

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void dispose() {

-		// Nothing

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean isLabelProperty(Object element, String property) {

-		return true;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void removeListener(ILabelProviderListener listener) {

-		// Nothing

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Image getImage(Object element) {

-		if (labelProvider != null) {

-			return labelProvider.getImage(element);

-		}

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public String getText(Object element) {

-		if (labelProvider != null) {

-			return labelProvider.getText(element);

-		}

-		if (element == null)

-		{

-			return "null"; //$NON-NLS-1$

-		}

-		return element.toString();

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.providers;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * A mutable wrapper for {@link ILabelProvider}s
+ * May be used when you need to instantiate a component with a labelProvider,
+ * and you don't have one yet.
+ * If there is no wrapped label provider, the default toString method will be called
+ * on non-null objects.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class WrappedLabelProvider implements ILabelProvider {
+
+	/**
+	 * The wrapped LabelProvider
+	 */
+	private ILabelProvider labelProvider;
+
+	/**
+	 * Constructs a new empty Label provider wrapper.
+	 */
+	public WrappedLabelProvider() {
+
+	}
+
+	/**
+	 *
+	 * Constructs a new Label provider, wrapping the specified label provider.
+	 *
+	 * @param provider
+	 *            The wrapped label provider
+	 */
+	public WrappedLabelProvider(ILabelProvider provider) {
+		this.labelProvider = provider;
+	}
+
+	/**
+	 * Changes the wrapped label provider
+	 *
+	 * @param provider
+	 *            The new wrapped label provider
+	 */
+	public void setLabelProvider(ILabelProvider provider) {
+		this.labelProvider = provider;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void addListener(ILabelProviderListener listener) {
+		// Nothing
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void dispose() {
+		// Nothing
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isLabelProperty(Object element, String property) {
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void removeListener(ILabelProviderListener listener) {
+		// Nothing
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Image getImage(Object element) {
+		if (labelProvider != null) {
+			return labelProvider.getImage(element);
+		}
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getText(Object element) {
+		if (labelProvider != null) {
+			return labelProvider.getText(element);
+		}
+		if (element == null)
+		{
+			return "null"; //$NON-NLS-1$
+		}
+		return element.toString();
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/BooleanSelector.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/BooleanSelector.java
index 27d936337e6..76e56655549 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/BooleanSelector.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/BooleanSelector.java
@@ -1,49 +1,49 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.selectors;

-

-import org.eclipse.papyrus.infra.tools.util.BooleanHelper;

-

-

-

-/**

- * A Selector for Integer values

- *

- * @author Camille Letavernier

- *

- */

-public class BooleanSelector extends StringSelector {

-

-	/**

-	 * Constructs a Selector for Integer values

-	 */

-	public BooleanSelector() {

-		super();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Boolean[] getSelectedElements() {

-		Boolean[] result = new Boolean[0];

-		try {

-			if (BooleanHelper.isBoolean(text.getText())) {

-				result = new Boolean[] { new Boolean(text.getText()) };

-				text.setText(""); //$NON-NLS-1$

-			}

-		} catch (NumberFormatException ex) {

-			// nothing to do

-		}

-		return result;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.selectors;
+
+import org.eclipse.papyrus.infra.tools.util.BooleanHelper;
+
+
+
+/**
+ * A Selector for Integer values
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class BooleanSelector extends StringSelector {
+
+	/**
+	 * Constructs a Selector for Integer values
+	 */
+	public BooleanSelector() {
+		super();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Boolean[] getSelectedElements() {
+		Boolean[] result = new Boolean[0];
+		try {
+			if (BooleanHelper.isBoolean(text.getText())) {
+				result = new Boolean[] { new Boolean(text.getText()) };
+				text.setText(""); //$NON-NLS-1$
+			}
+		} catch (NumberFormatException ex) {
+			// nothing to do
+		}
+		return result;
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/IntegerSelector.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/IntegerSelector.java
index f779abe5757..d53f22ef52b 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/IntegerSelector.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/IntegerSelector.java
@@ -1,44 +1,44 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.selectors;

-

-

-/**

- * A Selector for Integer values

- *

- * @author Camille Letavernier

- *

- */

-public class IntegerSelector extends StringSelector {

-

-	/**

-	 * Constructs a Selector for Integer values

-	 */

-	public IntegerSelector() {

-		super();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Integer[] getSelectedElements() {

-		Integer[] result;

-		try {

-			result = new Integer[] { Integer.parseInt(text.getText()) };

-			text.setText(""); //$NON-NLS-1$

-		} catch (NumberFormatException ex) {

-			result = new Integer[0];

-		}

-		return result;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.selectors;
+
+
+/**
+ * A Selector for Integer values
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class IntegerSelector extends StringSelector {
+
+	/**
+	 * Constructs a Selector for Integer values
+	 */
+	public IntegerSelector() {
+		super();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Integer[] getSelectedElements() {
+		Integer[] result;
+		try {
+			result = new Integer[] { Integer.parseInt(text.getText()) };
+			text.setText(""); //$NON-NLS-1$
+		} catch (NumberFormatException ex) {
+			result = new Integer[0];
+		}
+		return result;
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/NullSelector.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/NullSelector.java
index 6609086db03..e8d764bfe34 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/NullSelector.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/NullSelector.java
@@ -1,61 +1,61 @@
-package org.eclipse.papyrus.infra.widgets.selectors;

-

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * A Null implementation of the IElementSelector interface

- *

- * @author Camille Letavernier

- *

- */

-public class NullSelector implements IElementSelector {

-

-	private NullSelector() {

-

-	}

-

-	@Override

-	public Object[] getSelectedElements() {

-		return new Object[0];

-	}

-

-	@Override

-	public void setSelectedElements(Object[] elements) {

-		// Nothing

-	}

-

-	@Override

-	public Object[] getAllElements() {

-		return new Object[0];

-	}

-

-	@Override

-	public void createControls(Composite parent) {

-		// Nothing

-	}

-

-	@Override

-	public void newObjectCreated(Object newObject) {

-		// Nothing

-	}

-

-	@Override

-	public void clearTemporaryElements() {

-		// Nothing

-	}

-

-	@Override

-	public void addElementSelectionListener(IElementSelectionListener listener) {

-		// Nothing

-	}

-

-	@Override

-	public void removeElementSelectionListener(IElementSelectionListener listener) {

-		// Nothing

-	}

-

-	public final static NullSelector instance = new NullSelector();

-

-}

+package org.eclipse.papyrus.infra.widgets.selectors;
+
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A Null implementation of the IElementSelector interface
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class NullSelector implements IElementSelector {
+
+	private NullSelector() {
+
+	}
+
+	@Override
+	public Object[] getSelectedElements() {
+		return new Object[0];
+	}
+
+	@Override
+	public void setSelectedElements(Object[] elements) {
+		// Nothing
+	}
+
+	@Override
+	public Object[] getAllElements() {
+		return new Object[0];
+	}
+
+	@Override
+	public void createControls(Composite parent) {
+		// Nothing
+	}
+
+	@Override
+	public void newObjectCreated(Object newObject) {
+		// Nothing
+	}
+
+	@Override
+	public void clearTemporaryElements() {
+		// Nothing
+	}
+
+	@Override
+	public void addElementSelectionListener(IElementSelectionListener listener) {
+		// Nothing
+	}
+
+	@Override
+	public void removeElementSelectionListener(IElementSelectionListener listener) {
+		// Nothing
+	}
+
+	public final static NullSelector instance = new NullSelector();
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/RealSelector.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/RealSelector.java
index b75f40efc6b..b12922c959e 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/RealSelector.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/RealSelector.java
@@ -1,44 +1,44 @@
-/*****************************************************************************

- * 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.selectors;

-

-

-/**

- * A Selector for Real values

- *

- * @author Vincent Lorenzo

- *

- */

-public class RealSelector extends StringSelector {

-

-	/**

-	 * Constructs a Selector for Real values

-	 */

-	public RealSelector() {

-		super();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Double[] getSelectedElements() {

-		Double[] result;

-		try {

-			result = new Double[] { Double.parseDouble((text.getText())) };

-			text.setText(""); //$NON-NLS-1$

-		} catch (NumberFormatException ex) {

-			result = new Double[0];

-		}

-		return result;

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.selectors;
+
+
+/**
+ * A Selector for Real values
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class RealSelector extends StringSelector {
+
+	/**
+	 * Constructs a Selector for Real values
+	 */
+	public RealSelector() {
+		super();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Double[] getSelectedElements() {
+		Double[] result;
+		try {
+			result = new Double[] { Double.parseDouble((text.getText())) };
+			text.setText(""); //$NON-NLS-1$
+		} catch (NumberFormatException ex) {
+			result = new Double[0];
+		}
+		return result;
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/ReferenceSelector.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/ReferenceSelector.java
index 8fbe01b4940..9522a9364c0 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/ReferenceSelector.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/ReferenceSelector.java
@@ -1,436 +1,436 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.selectors;

-

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.jface.viewers.DoubleClickEvent;

-import org.eclipse.jface.viewers.IDoubleClickListener;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.ViewerFilter;

-import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IGraphicalContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.strategy.ProviderBasedBrowseStrategy;

-import org.eclipse.papyrus.infra.widgets.strategy.StrategyBasedContentProvider;

-import org.eclipse.papyrus.infra.widgets.strategy.TreeBrowseStrategy;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.TreeItem;

-import org.eclipse.ui.dialogs.PatternFilter;

-

-

-/**

- * A Selector for Multiple Reference values, with a filter

- *

- * This selector is compatible with {@link org.eclipse.papyrus.infra.widgets.providers.IAdaptableContentProvider}

- *

- * @author Camille Letavernier

- *

- */

-public class ReferenceSelector implements IElementSelector {

-

-	/**

-	 * The tree viewer

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * The content provider, returning the available reference values

-	 */

-	protected EncapsulatedContentProvider contentProvider;

-

-	/**

-	 * The content provider, returning the available reference labels

-	 */

-	protected ILabelProvider labelProvider;

-

-	/**

-	 * Indicates if the reference values should be unique

-	 */

-	protected boolean unique;

-

-	/**

-	 * Indicates if this selector should be able to return more than one value

-	 * at a time.

-	 */

-	protected boolean multiSelection;

-

-

-	protected final List<ICommitListener> commitListeners;

-

-

-	private Set<IElementSelectionListener> elementSelectionListeners = new HashSet<IElementSelectionListener>();

-

-	/**

-	 * The set of selected elements. If the selector is marked as "unique",

-	 * these elements will be filtered in the Tree.

-	 *

-	 * The Elements are in their container form

-	 */

-	protected Set<Object> selectedElements = new HashSet<Object>();

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param unique

-	 *            Indicates if the values are unique. If true, they are removed

-	 *            from the list when they are chosen

-	 */

-	public ReferenceSelector(boolean unique) {

-		this.unique = unique;

-		this.multiSelection = true;

-		commitListeners = new LinkedList<ICommitListener>();

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 * Builds a new ReferenceSelector for a single element

-	 *

-	 */

-	public ReferenceSelector() {

-		this(false);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object[] getSelectedElements() {

-		ISelection selection = treeViewer.getSelection();

-

-		if (selection instanceof IStructuredSelection) {

-			Object[] containerElementsToMove = getElementsToMove(((IStructuredSelection) selection).toArray());

-			Object[] semanticElementsToMove = getSemanticElements(containerElementsToMove);

-			addSelectedElements(semanticElementsToMove);

-			return semanticElementsToMove;

-		}

-

-		return new Object[0];

-	}

-

-	/**

-	 * This method is used for handling correctly the IAdaptableContentProvider

-	 * The objects can be in two different forms :

-	 * - The semantic element

-	 * - The container element

-	 *

-	 * This methods returns an array of semantic elements from an array of

-	 * container elements. This is useful for retrieving the semantic elements

-	 * from a viewer's selection when the viewer uses an IAdaptableContentProvider

-	 *

-	 * @param containerElements

-	 *            The array of elements wrapped in their container

-	 * @return

-	 *         The array of semantic elements to be converted

-	 *

-	 * @see #getContainerElements(Object[])

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IAdaptableContentProvider

-	 */

-	private Object[] getSemanticElements(Object[] containerElements) {

-		Object[] semanticElements = new Object[containerElements.length];

-		int i = 0;

-		for (Object containerElement : containerElements) {

-			semanticElements[i++] = contentProvider.getAdaptedValue(containerElement);

-		}

-		return semanticElements;

-	}

-

-	/**

-	 * Filters the selection to return only the objects that can

-	 * be selected, according to the content provider.

-	 *

-	 * @param selection

-	 *            The input array to filter

-	 * @return

-	 *         The filtered array

-	 *

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider#isValidValue(Object)

-	 */

-	protected Object[] getElementsToMove(Object[] selection) {

-		List<Object> elementsToMove = new LinkedList<Object>();

-

-		for (Object element : selection) {

-			if (contentProvider.isValidValue(element)) {

-				elementsToMove.add(element);

-			}

-		}

-

-		notifyCommitListeners();

-		return elementsToMove.toArray();

-	}

-

-	/**

-	 * Adds elements to the list of selected elements. If the values are

-	 * unique, the specified elements won't be displayed

-	 *

-	 * @param elements

-	 */

-	private void addSelectedElements(Object[] semanticElements) {

-		if (semanticElements.length > 0) {

-			selectedElements.addAll(Arrays.asList(semanticElements));

-			refresh();

-		}

-	}

-

-	/**

-	 * Returns all the elements that are currently displayed, i.e. matching

-	 * the filter

-	 *

-	 * {@link IElementSelector#getAllElements()}

-	 *

-	 * @return all elements matching the filter

-	 */

-	@Override

-	public Object[] getAllElements() {

-		// There is no way to retrieve the filteredElements on a FList

-		// We can only retrieve the selected ones

-		// Fix : we select everything, then we return the selection

-		if (contentProvider == null) {

-			return new Object[0];

-		}

-

-		Collection<Object> visibleElements = new LinkedList<Object>();

-		for (TreeItem rootItem : treeViewer.getTree().getItems()) {

-			visibleElements.add(getElement(rootItem));

-			if (rootItem.getExpanded()) {

-				fillVisibleElements(rootItem, visibleElements);

-			}

-		}

-

-		Object[] containerElementsToMove = getElementsToMove(visibleElements.toArray());

-		Object[] semanticElementsToMove = getSemanticElements(containerElementsToMove);

-		addSelectedElements(semanticElementsToMove);

-

-		return semanticElementsToMove;

-	}

-

-	private void fillVisibleElements(TreeItem item, Collection<Object> visibleElements) {

-		for (TreeItem childItem : item.getItems()) {

-			visibleElements.add(getElement(childItem));

-			if (childItem.getExpanded()) {

-				fillVisibleElements(childItem, visibleElements);

-			}

-		}

-	}

-

-	private Object getElement(TreeItem item) {

-		return item.getData();

-	}

-

-	/**

-	 * Sets the list of selected elements. If the values are

-	 * unique, the specified elements won't be displayed

-	 *

-	 * @param elements

-	 */

-	@Override

-	public void setSelectedElements(Object[] semanticElements) {

-		selectedElements.clear();

-		selectedElements.addAll(Arrays.asList(semanticElements));

-		refresh();

-	}

-

-	@Override

-	public void newObjectCreated(Object newObject) {

-		contentProvider.addTemporaryElement(newObject);

-		refresh();

-	}

-

-	@Override

-	public void clearTemporaryElements() {

-		contentProvider.clearTemporaryElements();

-	}

-

-	/**

-	 * Refreshes this selector's {@link org.eclipse.swt.widgets.List}

-	 */

-	public void refresh() {

-		((SelectionFilteredBrowseStrategy) contentProvider.getBrowseStrategy()).refresh();

-		treeViewer.refresh();

-	}

-

-	/**

-	 * Sets this selector's label provider. The label provider is used

-	 * to display the reference values

-	 *

-	 * @param labelProvider

-	 */

-	public void setLabelProvider(ILabelProvider labelProvider) {

-		this.labelProvider = labelProvider;

-		if (treeViewer != null) {

-			treeViewer.setLabelProvider(labelProvider);

-		}

-	}

-

-	/**

-	 * Sets this selector's content provider. The content provider

-	 * is used to select the available values for this property

-	 *

-	 * @param staticContentProvider

-	 */

-	public void setContentProvider(IStaticContentProvider staticContentProvider) {

-

-		ITreeContentProvider provider = new EncapsulatedContentProvider(staticContentProvider);

-

-		TreeBrowseStrategy filteredBrowseStrategy = new SelectionFilteredBrowseStrategy(provider);

-

-		TreeBrowseStrategy revealBrowseStrategy = new ProviderBasedBrowseStrategy(provider);

-

-		this.contentProvider = new StrategyBasedContentProvider(filteredBrowseStrategy, revealBrowseStrategy);

-

-		if (treeViewer != null) {

-			treeViewer.setContentProvider(contentProvider);

-			treeViewer.setInput(""); //$NON-NLS-1$

-		}

-

-		if (contentProvider instanceof ICommitListener) {

-			commitListeners.add(contentProvider);

-		}

-	}

-

-	/**

-	 * Strategy to hide tree elements which are already selected, when the selector is defined as unique

-	 *

-	 * @author Camille Letavernier

-	 *

-	 */

-	private class SelectionFilteredBrowseStrategy extends ProviderBasedBrowseStrategy {

-

-		public SelectionFilteredBrowseStrategy(ITreeContentProvider provider) {

-			super(provider);

-		}

-

-		@Override

-		public boolean isValidValue(Object element) {

-			if (!unique) {

-				return super.isValidValue(element);

-			}

-

-			if (!super.isValidValue(element)) {

-				return false;

-			}

-

-			return !selectedElements.contains(getAdaptedValue(element));

-		}

-

-		public void refresh() {

-			if (unique) {

-				clearCache();

-			}

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void createControls(Composite parent) {

-		Composite content = new Composite(parent, SWT.NONE);

-		content.setLayout(new GridLayout(1, true));

-

-		treeViewer = new TreeViewer(content, SWT.BORDER | SWT.MULTI);

-		treeViewer.setFilters(new ViewerFilter[] { new PatternFilter() });

-

-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);

-		data.minimumHeight = 300;

-		data.minimumWidth = 300;

-		treeViewer.getTree().setLayoutData(data);

-

-		if (labelProvider != null) {

-			treeViewer.setLabelProvider(labelProvider);

-		}

-

-		if (contentProvider != null) {

-			treeViewer.setContentProvider(contentProvider);

-			treeViewer.setInput(""); //$NON-NLS-1$

-		}

-

-		if (contentProvider instanceof IGraphicalContentProvider) {

-			IGraphicalContentProvider graphicalContentProvider = contentProvider;

-

-			Composite beforeTreeComposite = new Composite(content, SWT.NONE);

-			beforeTreeComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));

-			FillLayout layout = new FillLayout();

-			layout.marginHeight = 0;

-			layout.marginWidth = 0;

-			beforeTreeComposite.setLayout(layout);

-			graphicalContentProvider.createBefore(beforeTreeComposite);

-

-			beforeTreeComposite.moveAbove(treeViewer.getTree());

-

-			Composite afterTreeComposite = new Composite(content, SWT.NONE);

-			layout = new FillLayout();

-			layout.marginHeight = 0;

-			layout.marginWidth = 0;

-			afterTreeComposite.setLayout(layout);

-			afterTreeComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));

-			graphicalContentProvider.createAfter(afterTreeComposite);

-		}

-

-		// Adds double-click support

-		treeViewer.addDoubleClickListener(new IDoubleClickListener() {

-

-			@Override

-			public void doubleClick(DoubleClickEvent event) {

-				if (!elementSelectionListeners.isEmpty()) {

-					Object[] selectedElements = getSelectedElements();

-					if (selectedElements.length > 0) {

-						notifyCommitListeners();

-						for (IElementSelectionListener listener : elementSelectionListeners) {

-							listener.addElements(selectedElements);

-						}

-					}

-				}

-			}

-

-		});

-	}

-

-	public void setUnique(boolean unique) {

-		this.unique = unique;

-	}

-

-	@Override

-	public void addElementSelectionListener(IElementSelectionListener listener) {

-		elementSelectionListeners.add(listener);

-	}

-

-	@Override

-	public void removeElementSelectionListener(IElementSelectionListener listener) {

-		elementSelectionListeners.remove(listener);

-	}

-

-	protected void notifyCommitListeners() {

-		for (ICommitListener commitListener : commitListeners) {

-			commitListener.commit(null);

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.selectors;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;
+import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IGraphicalContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.strategy.ProviderBasedBrowseStrategy;
+import org.eclipse.papyrus.infra.widgets.strategy.StrategyBasedContentProvider;
+import org.eclipse.papyrus.infra.widgets.strategy.TreeBrowseStrategy;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.TreeItem;
+import org.eclipse.ui.dialogs.PatternFilter;
+
+
+/**
+ * A Selector for Multiple Reference values, with a filter
+ *
+ * This selector is compatible with {@link org.eclipse.papyrus.infra.widgets.providers.IAdaptableContentProvider}
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class ReferenceSelector implements IElementSelector {
+
+	/**
+	 * The tree viewer
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * The content provider, returning the available reference values
+	 */
+	protected EncapsulatedContentProvider contentProvider;
+
+	/**
+	 * The content provider, returning the available reference labels
+	 */
+	protected ILabelProvider labelProvider;
+
+	/**
+	 * Indicates if the reference values should be unique
+	 */
+	protected boolean unique;
+
+	/**
+	 * Indicates if this selector should be able to return more than one value
+	 * at a time.
+	 */
+	protected boolean multiSelection;
+
+
+	protected final List<ICommitListener> commitListeners;
+
+
+	private Set<IElementSelectionListener> elementSelectionListeners = new HashSet<IElementSelectionListener>();
+
+	/**
+	 * The set of selected elements. If the selector is marked as "unique",
+	 * these elements will be filtered in the Tree.
+	 *
+	 * The Elements are in their container form
+	 */
+	protected Set<Object> selectedElements = new HashSet<Object>();
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param unique
+	 *            Indicates if the values are unique. If true, they are removed
+	 *            from the list when they are chosen
+	 */
+	public ReferenceSelector(boolean unique) {
+		this.unique = unique;
+		this.multiSelection = true;
+		commitListeners = new LinkedList<ICommitListener>();
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 * Builds a new ReferenceSelector for a single element
+	 *
+	 */
+	public ReferenceSelector() {
+		this(false);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object[] getSelectedElements() {
+		ISelection selection = treeViewer.getSelection();
+
+		if (selection instanceof IStructuredSelection) {
+			Object[] containerElementsToMove = getElementsToMove(((IStructuredSelection) selection).toArray());
+			Object[] semanticElementsToMove = getSemanticElements(containerElementsToMove);
+			addSelectedElements(semanticElementsToMove);
+			return semanticElementsToMove;
+		}
+
+		return new Object[0];
+	}
+
+	/**
+	 * This method is used for handling correctly the IAdaptableContentProvider
+	 * The objects can be in two different forms :
+	 * - The semantic element
+	 * - The container element
+	 *
+	 * This methods returns an array of semantic elements from an array of
+	 * container elements. This is useful for retrieving the semantic elements
+	 * from a viewer's selection when the viewer uses an IAdaptableContentProvider
+	 *
+	 * @param containerElements
+	 *            The array of elements wrapped in their container
+	 * @return
+	 *         The array of semantic elements to be converted
+	 *
+	 * @see #getContainerElements(Object[])
+	 * @see org.eclipse.papyrus.infra.widgets.providers.IAdaptableContentProvider
+	 */
+	private Object[] getSemanticElements(Object[] containerElements) {
+		Object[] semanticElements = new Object[containerElements.length];
+		int i = 0;
+		for (Object containerElement : containerElements) {
+			semanticElements[i++] = contentProvider.getAdaptedValue(containerElement);
+		}
+		return semanticElements;
+	}
+
+	/**
+	 * Filters the selection to return only the objects that can
+	 * be selected, according to the content provider.
+	 *
+	 * @param selection
+	 *            The input array to filter
+	 * @return
+	 *         The filtered array
+	 *
+	 * @see org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider#isValidValue(Object)
+	 */
+	protected Object[] getElementsToMove(Object[] selection) {
+		List<Object> elementsToMove = new LinkedList<Object>();
+
+		for (Object element : selection) {
+			if (contentProvider.isValidValue(element)) {
+				elementsToMove.add(element);
+			}
+		}
+
+		notifyCommitListeners();
+		return elementsToMove.toArray();
+	}
+
+	/**
+	 * Adds elements to the list of selected elements. If the values are
+	 * unique, the specified elements won't be displayed
+	 *
+	 * @param elements
+	 */
+	private void addSelectedElements(Object[] semanticElements) {
+		if (semanticElements.length > 0) {
+			selectedElements.addAll(Arrays.asList(semanticElements));
+			refresh();
+		}
+	}
+
+	/**
+	 * Returns all the elements that are currently displayed, i.e. matching
+	 * the filter
+	 *
+	 * {@link IElementSelector#getAllElements()}
+	 *
+	 * @return all elements matching the filter
+	 */
+	@Override
+	public Object[] getAllElements() {
+		// There is no way to retrieve the filteredElements on a FList
+		// We can only retrieve the selected ones
+		// Fix : we select everything, then we return the selection
+		if (contentProvider == null) {
+			return new Object[0];
+		}
+
+		Collection<Object> visibleElements = new LinkedList<Object>();
+		for (TreeItem rootItem : treeViewer.getTree().getItems()) {
+			visibleElements.add(getElement(rootItem));
+			if (rootItem.getExpanded()) {
+				fillVisibleElements(rootItem, visibleElements);
+			}
+		}
+
+		Object[] containerElementsToMove = getElementsToMove(visibleElements.toArray());
+		Object[] semanticElementsToMove = getSemanticElements(containerElementsToMove);
+		addSelectedElements(semanticElementsToMove);
+
+		return semanticElementsToMove;
+	}
+
+	private void fillVisibleElements(TreeItem item, Collection<Object> visibleElements) {
+		for (TreeItem childItem : item.getItems()) {
+			visibleElements.add(getElement(childItem));
+			if (childItem.getExpanded()) {
+				fillVisibleElements(childItem, visibleElements);
+			}
+		}
+	}
+
+	private Object getElement(TreeItem item) {
+		return item.getData();
+	}
+
+	/**
+	 * Sets the list of selected elements. If the values are
+	 * unique, the specified elements won't be displayed
+	 *
+	 * @param elements
+	 */
+	@Override
+	public void setSelectedElements(Object[] semanticElements) {
+		selectedElements.clear();
+		selectedElements.addAll(Arrays.asList(semanticElements));
+		refresh();
+	}
+
+	@Override
+	public void newObjectCreated(Object newObject) {
+		contentProvider.addTemporaryElement(newObject);
+		refresh();
+	}
+
+	@Override
+	public void clearTemporaryElements() {
+		contentProvider.clearTemporaryElements();
+	}
+
+	/**
+	 * Refreshes this selector's {@link org.eclipse.swt.widgets.List}
+	 */
+	public void refresh() {
+		((SelectionFilteredBrowseStrategy) contentProvider.getBrowseStrategy()).refresh();
+		treeViewer.refresh();
+	}
+
+	/**
+	 * Sets this selector's label provider. The label provider is used
+	 * to display the reference values
+	 *
+	 * @param labelProvider
+	 */
+	public void setLabelProvider(ILabelProvider labelProvider) {
+		this.labelProvider = labelProvider;
+		if (treeViewer != null) {
+			treeViewer.setLabelProvider(labelProvider);
+		}
+	}
+
+	/**
+	 * Sets this selector's content provider. The content provider
+	 * is used to select the available values for this property
+	 *
+	 * @param staticContentProvider
+	 */
+	public void setContentProvider(IStaticContentProvider staticContentProvider) {
+
+		ITreeContentProvider provider = new EncapsulatedContentProvider(staticContentProvider);
+
+		TreeBrowseStrategy filteredBrowseStrategy = new SelectionFilteredBrowseStrategy(provider);
+
+		TreeBrowseStrategy revealBrowseStrategy = new ProviderBasedBrowseStrategy(provider);
+
+		this.contentProvider = new StrategyBasedContentProvider(filteredBrowseStrategy, revealBrowseStrategy);
+
+		if (treeViewer != null) {
+			treeViewer.setContentProvider(contentProvider);
+			treeViewer.setInput(""); //$NON-NLS-1$
+		}
+
+		if (contentProvider instanceof ICommitListener) {
+			commitListeners.add(contentProvider);
+		}
+	}
+
+	/**
+	 * Strategy to hide tree elements which are already selected, when the selector is defined as unique
+	 *
+	 * @author Camille Letavernier
+	 *
+	 */
+	private class SelectionFilteredBrowseStrategy extends ProviderBasedBrowseStrategy {
+
+		public SelectionFilteredBrowseStrategy(ITreeContentProvider provider) {
+			super(provider);
+		}
+
+		@Override
+		public boolean isValidValue(Object element) {
+			if (!unique) {
+				return super.isValidValue(element);
+			}
+
+			if (!super.isValidValue(element)) {
+				return false;
+			}
+
+			return !selectedElements.contains(getAdaptedValue(element));
+		}
+
+		public void refresh() {
+			if (unique) {
+				clearCache();
+			}
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void createControls(Composite parent) {
+		Composite content = new Composite(parent, SWT.NONE);
+		content.setLayout(new GridLayout(1, true));
+
+		treeViewer = new TreeViewer(content, SWT.BORDER | SWT.MULTI);
+		treeViewer.setFilters(new ViewerFilter[] { new PatternFilter() });
+
+		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
+		data.minimumHeight = 300;
+		data.minimumWidth = 300;
+		treeViewer.getTree().setLayoutData(data);
+
+		if (labelProvider != null) {
+			treeViewer.setLabelProvider(labelProvider);
+		}
+
+		if (contentProvider != null) {
+			treeViewer.setContentProvider(contentProvider);
+			treeViewer.setInput(""); //$NON-NLS-1$
+		}
+
+		if (contentProvider instanceof IGraphicalContentProvider) {
+			IGraphicalContentProvider graphicalContentProvider = contentProvider;
+
+			Composite beforeTreeComposite = new Composite(content, SWT.NONE);
+			beforeTreeComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+			FillLayout layout = new FillLayout();
+			layout.marginHeight = 0;
+			layout.marginWidth = 0;
+			beforeTreeComposite.setLayout(layout);
+			graphicalContentProvider.createBefore(beforeTreeComposite);
+
+			beforeTreeComposite.moveAbove(treeViewer.getTree());
+
+			Composite afterTreeComposite = new Composite(content, SWT.NONE);
+			layout = new FillLayout();
+			layout.marginHeight = 0;
+			layout.marginWidth = 0;
+			afterTreeComposite.setLayout(layout);
+			afterTreeComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+			graphicalContentProvider.createAfter(afterTreeComposite);
+		}
+
+		// Adds double-click support
+		treeViewer.addDoubleClickListener(new IDoubleClickListener() {
+
+			@Override
+			public void doubleClick(DoubleClickEvent event) {
+				if (!elementSelectionListeners.isEmpty()) {
+					Object[] selectedElements = getSelectedElements();
+					if (selectedElements.length > 0) {
+						notifyCommitListeners();
+						for (IElementSelectionListener listener : elementSelectionListeners) {
+							listener.addElements(selectedElements);
+						}
+					}
+				}
+			}
+
+		});
+	}
+
+	public void setUnique(boolean unique) {
+		this.unique = unique;
+	}
+
+	@Override
+	public void addElementSelectionListener(IElementSelectionListener listener) {
+		elementSelectionListeners.add(listener);
+	}
+
+	@Override
+	public void removeElementSelectionListener(IElementSelectionListener listener) {
+		elementSelectionListeners.remove(listener);
+	}
+
+	protected void notifyCommitListeners() {
+		for (ICommitListener commitListener : commitListeners) {
+			commitListener.commit(null);
+		}
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/StandardSelector.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/StandardSelector.java
index 363bad4d136..5601f20141d 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/StandardSelector.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/StandardSelector.java
@@ -1,138 +1,138 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.selectors;

-

-import java.lang.reflect.Constructor;

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;

-import org.eclipse.papyrus.infra.widgets.editors.AbstractValueEditor;

-import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * Creates an element selector from an AbstractValueEditor. This class is a

- * generic implementation for element selectors.

- *

- * @author Camille Letavernier

- *

- */

-public class StandardSelector implements IElementSelector {

-

-	/**

-	 * The AbstractValueEditor class used for instantiating this selector

-	 */

-	protected Class<? extends AbstractValueEditor> editorClass;

-

-	/**

-	 * The AbstractValueEditor used by this selector

-	 */

-	protected AbstractValueEditor editor;

-

-	protected Set<IElementSelectionListener> elementSelectionListeners = new HashSet<IElementSelectionListener>();

-

-	/**

-	 * Instantiates this selector, using the specified editor class

-	 *

-	 * @param editorClass

-	 *            The AbstractValueEditor Class used to instantiate this selector

-	 */

-	public StandardSelector(Class<? extends AbstractValueEditor> editorClass) {

-		Assert.isNotNull(editorClass, "The StandardSelector editor class should not be null"); //$NON-NLS-1$

-		this.editorClass = editorClass;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object[] getSelectedElements() {

-		Object value = editor.getValue();

-		if (value == null) {

-			return new Object[] {};

-		}

-

-		return new Object[] { value };

-	}

-

-	/**

-	 * Ignored. The generic selectors can't be filtered.

-	 */

-	@Override

-	public void setSelectedElements(Object[] elements) {

-		// Ignored

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object[] getAllElements() {

-		return getSelectedElements();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * The control for this selector is obtained by instantiating the generic class with a parent

-	 * composite and a default style

-	 */

-	@Override

-	public void createControls(Composite parent) {

-		try {

-			Constructor<? extends AbstractValueEditor> construct = editorClass.getDeclaredConstructor(Composite.class, Integer.TYPE);

-			editor = construct.newInstance(parent, SWT.BORDER);

-			editor.addCommitListener(new ICommitListener() {

-

-				@Override

-				public void commit(AbstractEditor editor) {

-					if (!elementSelectionListeners.isEmpty()) {

-						Object value = StandardSelector.this.editor.getValue();

-						for (IElementSelectionListener listener : elementSelectionListeners) {

-							listener.addElements(new Object[] { value });

-						}

-					}

-				}

-

-			});

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-	}

-

-	@Override

-	public void newObjectCreated(Object newObject) {

-		// Ignored

-	}

-

-	@Override

-	public void clearTemporaryElements() {

-		// Ignored

-	}

-

-	@Override

-	public void addElementSelectionListener(IElementSelectionListener listener) {

-		elementSelectionListeners.add(listener);

-	}

-

-	@Override

-	public void removeElementSelectionListener(IElementSelectionListener listener) {

-		elementSelectionListeners.remove(listener);

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.selectors;
+
+import java.lang.reflect.Constructor;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
+import org.eclipse.papyrus.infra.widgets.editors.AbstractValueEditor;
+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * Creates an element selector from an AbstractValueEditor. This class is a
+ * generic implementation for element selectors.
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class StandardSelector implements IElementSelector {
+
+	/**
+	 * The AbstractValueEditor class used for instantiating this selector
+	 */
+	protected Class<? extends AbstractValueEditor> editorClass;
+
+	/**
+	 * The AbstractValueEditor used by this selector
+	 */
+	protected AbstractValueEditor editor;
+
+	protected Set<IElementSelectionListener> elementSelectionListeners = new HashSet<IElementSelectionListener>();
+
+	/**
+	 * Instantiates this selector, using the specified editor class
+	 *
+	 * @param editorClass
+	 *            The AbstractValueEditor Class used to instantiate this selector
+	 */
+	public StandardSelector(Class<? extends AbstractValueEditor> editorClass) {
+		Assert.isNotNull(editorClass, "The StandardSelector editor class should not be null"); //$NON-NLS-1$
+		this.editorClass = editorClass;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object[] getSelectedElements() {
+		Object value = editor.getValue();
+		if (value == null) {
+			return new Object[] {};
+		}
+
+		return new Object[] { value };
+	}
+
+	/**
+	 * Ignored. The generic selectors can't be filtered.
+	 */
+	@Override
+	public void setSelectedElements(Object[] elements) {
+		// Ignored
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object[] getAllElements() {
+		return getSelectedElements();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * The control for this selector is obtained by instantiating the generic class with a parent
+	 * composite and a default style
+	 */
+	@Override
+	public void createControls(Composite parent) {
+		try {
+			Constructor<? extends AbstractValueEditor> construct = editorClass.getDeclaredConstructor(Composite.class, Integer.TYPE);
+			editor = construct.newInstance(parent, SWT.BORDER);
+			editor.addCommitListener(new ICommitListener() {
+
+				@Override
+				public void commit(AbstractEditor editor) {
+					if (!elementSelectionListeners.isEmpty()) {
+						Object value = StandardSelector.this.editor.getValue();
+						for (IElementSelectionListener listener : elementSelectionListeners) {
+							listener.addElements(new Object[] { value });
+						}
+					}
+				}
+
+			});
+		} catch (Exception ex) {
+			Activator.log.error(ex);
+		}
+	}
+
+	@Override
+	public void newObjectCreated(Object newObject) {
+		// Ignored
+	}
+
+	@Override
+	public void clearTemporaryElements() {
+		// Ignored
+	}
+
+	@Override
+	public void addElementSelectionListener(IElementSelectionListener listener) {
+		elementSelectionListeners.add(listener);
+	}
+
+	@Override
+	public void removeElementSelectionListener(IElementSelectionListener listener) {
+		elementSelectionListeners.remove(listener);
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/StringSelector.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/StringSelector.java
index 5f81b687fb6..8df015f9b6f 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/StringSelector.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/selectors/StringSelector.java
@@ -1,155 +1,155 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.selectors;

-

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.KeyEvent;

-import org.eclipse.swt.events.KeyListener;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Text;

-

-/**

- * A selector for String values, or values that can be represented

- * as text in general.

- * Displays a field where the user can enter the new values.

- * The field can be multiline or single line

- *

- * @author Camille Letavernier

- *

- */

-public class StringSelector implements IElementSelector {

-

-	public static final String LINE_SEPARATOR = System.getProperty("line.separator");

-

-	/**

-	 * The text box used to enter a value for this selector

-	 */

-	protected Text text;

-

-	/**

-	 * Indicates if this StringSelector is multiline

-	 */

-	protected boolean multiline;

-

-	protected Set<IElementSelectionListener> elementSelectionListeners = new HashSet<IElementSelectionListener>();

-

-	/**

-	 * Constructs a single-line String Selector

-	 */

-	public StringSelector() {

-		this(false);

-	}

-

-	/**

-	 * Constructs a String Selector

-	 *

-	 * @param multiline

-	 *            True if the string values can contain more than one line

-	 */

-	public StringSelector(boolean multiline) {

-		this.multiline = multiline;

-	}

-

-	/**

-	 * Returns a single-element array containing the current text

-	 *

-	 * {@link IElementSelector#getSelectedElements()}

-	 */

-	@Override

-	public Object[] getSelectedElements() {

-		String[] result = new String[] { text.getText() };

-		text.setText(""); //$NON-NLS-1$

-		return result;

-	}

-

-	/**

-	 * Ignored

-	 */

-	@Override

-	public void setSelectedElements(Object[] elements) {

-		// Nothing

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void createControls(Composite parent) {

-		text = new Text(parent, SWT.MULTI | SWT.BORDER);

-		text.addKeyListener(new KeyListener() {

-

-			@Override

-			public void keyPressed(KeyEvent e) {

-				// Nothing

-			}

-

-			@Override

-			public void keyReleased(KeyEvent e) {

-				if ((e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) && ((e.stateMask == SWT.NONE && !multiline) || ((e.stateMask & SWT.CTRL) != 0 && multiline))) {

-					if (!elementSelectionListeners.isEmpty()) {

-						String str = (String) getSelectedElements()[0];

-						if (str.endsWith(LINE_SEPARATOR)) {

-							str = str.substring(0, str.length() - LINE_SEPARATOR.length());

-						}

-						if (!"".equals(str)) { //$NON-NLS-1$

-							for (IElementSelectionListener listener : elementSelectionListeners) {

-								listener.addElements(new Object[] { str });

-							}

-						}

-					}

-				}

-			}

-

-		});

-	}

-

-	/**

-	 * Returns the same value as getSelectedElements

-	 *

-	 * {@link IElementSelector#getAllElements()}

-	 */

-	@Override

-	public Object[] getAllElements() {

-		return getSelectedElements();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void newObjectCreated(Object newObject) {

-		// Ignored

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void clearTemporaryElements() {

-		// Ignored

-	}

-

-	@Override

-	public void addElementSelectionListener(IElementSelectionListener listener) {

-		elementSelectionListeners.add(listener);

-	}

-

-	@Override

-	public void removeElementSelectionListener(IElementSelectionListener listener) {

-		elementSelectionListeners.remove(listener);

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.selectors;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * A selector for String values, or values that can be represented
+ * as text in general.
+ * Displays a field where the user can enter the new values.
+ * The field can be multiline or single line
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class StringSelector implements IElementSelector {
+
+	public static final String LINE_SEPARATOR = System.getProperty("line.separator");
+
+	/**
+	 * The text box used to enter a value for this selector
+	 */
+	protected Text text;
+
+	/**
+	 * Indicates if this StringSelector is multiline
+	 */
+	protected boolean multiline;
+
+	protected Set<IElementSelectionListener> elementSelectionListeners = new HashSet<IElementSelectionListener>();
+
+	/**
+	 * Constructs a single-line String Selector
+	 */
+	public StringSelector() {
+		this(false);
+	}
+
+	/**
+	 * Constructs a String Selector
+	 *
+	 * @param multiline
+	 *            True if the string values can contain more than one line
+	 */
+	public StringSelector(boolean multiline) {
+		this.multiline = multiline;
+	}
+
+	/**
+	 * Returns a single-element array containing the current text
+	 *
+	 * {@link IElementSelector#getSelectedElements()}
+	 */
+	@Override
+	public Object[] getSelectedElements() {
+		String[] result = new String[] { text.getText() };
+		text.setText(""); //$NON-NLS-1$
+		return result;
+	}
+
+	/**
+	 * Ignored
+	 */
+	@Override
+	public void setSelectedElements(Object[] elements) {
+		// Nothing
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void createControls(Composite parent) {
+		text = new Text(parent, SWT.MULTI | SWT.BORDER);
+		text.addKeyListener(new KeyListener() {
+
+			@Override
+			public void keyPressed(KeyEvent e) {
+				// Nothing
+			}
+
+			@Override
+			public void keyReleased(KeyEvent e) {
+				if ((e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) && ((e.stateMask == SWT.NONE && !multiline) || ((e.stateMask & SWT.CTRL) != 0 && multiline))) {
+					if (!elementSelectionListeners.isEmpty()) {
+						String str = (String) getSelectedElements()[0];
+						if (str.endsWith(LINE_SEPARATOR)) {
+							str = str.substring(0, str.length() - LINE_SEPARATOR.length());
+						}
+						if (!"".equals(str)) { //$NON-NLS-1$
+							for (IElementSelectionListener listener : elementSelectionListeners) {
+								listener.addElements(new Object[] { str });
+							}
+						}
+					}
+				}
+			}
+
+		});
+	}
+
+	/**
+	 * Returns the same value as getSelectedElements
+	 *
+	 * {@link IElementSelector#getAllElements()}
+	 */
+	@Override
+	public Object[] getAllElements() {
+		return getSelectedElements();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void newObjectCreated(Object newObject) {
+		// Ignored
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void clearTemporaryElements() {
+		// Ignored
+	}
+
+	@Override
+	public void addElementSelectionListener(IElementSelectionListener listener) {
+		elementSelectionListeners.add(listener);
+	}
+
+	@Override
+	public void removeElementSelectionListener(IElementSelectionListener listener) {
+		elementSelectionListeners.remove(listener);
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/AbstractTreeBrowseStrategy.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/AbstractTreeBrowseStrategy.java
index 15a4c7d306a..84fc6cb48f8 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/AbstractTreeBrowseStrategy.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/AbstractTreeBrowseStrategy.java
@@ -1,34 +1,34 @@
-/*****************************************************************************

- * 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.widgets.strategy;

-

-import java.util.List;

-

-import org.eclipse.jface.viewers.Viewer;

-

-

-public abstract class AbstractTreeBrowseStrategy implements TreeBrowseStrategy {

-

-	@Override

-	public void dispose() {

-		// Nothing

-	}

-

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		// Nothing

-	}

-

-	@Override

-	abstract public void revealSemanticElement(List<?> elementsList);

-

-}

+/*****************************************************************************
+ * 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.widgets.strategy;
+
+import java.util.List;
+
+import org.eclipse.jface.viewers.Viewer;
+
+
+public abstract class AbstractTreeBrowseStrategy implements TreeBrowseStrategy {
+
+	@Override
+	public void dispose() {
+		// Nothing
+	}
+
+	@Override
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		// Nothing
+	}
+
+	@Override
+	abstract public void revealSemanticElement(List<?> elementsList);
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/IStrategyBasedContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/IStrategyBasedContentProvider.java
index 0d92635896a..672e1e85f54 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/IStrategyBasedContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/IStrategyBasedContentProvider.java
@@ -1,22 +1,22 @@
-/*****************************************************************************

- * 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.widgets.strategy;

-

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-

-

-public interface IStrategyBasedContentProvider extends IStructuredContentProvider {

-

-	public TreeBrowseStrategy getBrowseStrategy();

-

-	public TreeBrowseStrategy getRevealStrategy();

-}

+/*****************************************************************************
+ * 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.widgets.strategy;
+
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+
+
+public interface IStrategyBasedContentProvider extends IStructuredContentProvider {
+
+	public TreeBrowseStrategy getBrowseStrategy();
+
+	public TreeBrowseStrategy getRevealStrategy();
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/ProviderBasedBrowseStrategy.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/ProviderBasedBrowseStrategy.java
index a58f4c0bf68..9d2136f32c7 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/ProviderBasedBrowseStrategy.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/ProviderBasedBrowseStrategy.java
@@ -1,179 +1,179 @@
-/*****************************************************************************

- * 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.widgets.strategy;

-

-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.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.TreePath;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.tools.util.ListHelper;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider;

-

-

-public class ProviderBasedBrowseStrategy extends EncapsulatedContentProvider implements TreeBrowseStrategy {

-

-	protected ITreeContentProvider provider;

-

-	protected boolean filterElements = false;

-

-	protected final Map<Object, Boolean> cache = new HashMap<Object, Boolean>();

-

-	protected final Map<Object, Boolean> visibleChildCache = new HashMap<Object, Boolean>();

-

-	public ProviderBasedBrowseStrategy(ITreeContentProvider provider) {

-		setProvider(provider);

-	}

-

-	public ProviderBasedBrowseStrategy() {

-

-	}

-

-	public void setProvider(ITreeContentProvider provider) {

-		encapsulated = provider;

-		this.provider = provider;

-		filterElements = provider instanceof IHierarchicContentProvider;

-		clearCache();

-	}

-

-	@Override

-	public Object[] getElements() {

-		return getValidElements(super.getElements());

-	}

-

-	@Override

-	public Object[] getElements(Object inputElement) {

-		return getValidElements(super.getElements(inputElement));

-	}

-

-	/**

-	 * Filters the valid root elements, ie. the root elements containing

-	 * at least one valid child (Or being valid themselves)

-	 *

-	 * @param roots

-	 * @return

-	 */

-	protected Object[] getValidElements(Object[] roots) {

-		if (filterElements) {

-			List<Object> rootsList = ListHelper.asList(roots);

-			Iterator<?> iterator = rootsList.iterator();

-			while (iterator.hasNext()) {

-				if (!isValid(iterator.next(), new HashSet<Object>())) {

-					iterator.remove();

-				}

-			}

-			return rootsList.toArray();

-		}

-

-		return roots;

-	}

-

-	@Override

-	public Object[] getChildren(Object parent) {

-		if (provider == null) {

-			Activator.log.warn("The provider has not been initialized");

-			return new Object[0];

-		}

-

-		return getValidElements(super.getChildren(parent));

-	}

-

-	@Override

-	public boolean hasChildren(Object parent) {

-		// May be expensive

-		return getChildren(parent).length > 0;

-	}

-

-	protected boolean isValid(Object containerElement, Set<Object> visitedElements) {

-		if (!cache.containsKey(containerElement)) {

-			boolean isVisible;

-

-			if (browseElement(containerElement)) {

-				isVisible = isValidValue(containerElement) || hasOneVisibleChild(containerElement, visitedElements);

-			} else {

-				isVisible = false;

-			}

-

-			cache.put(containerElement, isVisible);

-		}

-		return cache.get(containerElement);

-	}

-

-	protected boolean browseElement(Object containerElement) {

-		return true;

-	}

-

-	protected boolean hasOneVisibleChild(Object element, Set<Object> visitedElements) {

-		if (!visibleChildCache.containsKey(element)) {

-			boolean result = false;

-			if (visitedElements.add(getAdaptedValue(element))) {

-				for (Object child : super.getChildren(element)) {

-					if (isValid(child, visitedElements)) {

-						result = true;

-						break;

-					}

-				}

-			}

-

-			visibleChildCache.put(element, result);

-		}

-		return visibleChildCache.get(element);

-	}

-

-	@Override

-	public TreePath findPath(Object semanticElement, Object[] rootElements) {

-		return TreePath.EMPTY; // TODO : Naive search

-	}

-

-	protected void clearCache() {

-		cache.clear();

-		visibleChildCache.clear();

-	}

-

-	@Override

-	public void dispose() {

-		super.dispose();

-		clearCache();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * The basic implementation is a naive tree search

-	 *

-	 * @param elementToReveal

-	 */

-	@Override

-	public void revealSemanticElement(List<?> elementsToReveal) {

-		if (viewer != null) {

-			// FIXME: TreeViewers cannot do this search when the items have not yet be expanded.

-			// We need to search on the ContentProvider and pass a TreeSelection to the viewer

-			viewer.setSelection(new StructuredSelection(elementsToReveal), true);

-		}

-	}

-

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		super.inputChanged(viewer, oldInput, newInput);

-		this.viewer = viewer;

-	}

-

-	protected Viewer viewer;

-}

+/*****************************************************************************
+ * 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.widgets.strategy;
+
+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.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreePath;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.tools.util.ListHelper;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider;
+
+
+public class ProviderBasedBrowseStrategy extends EncapsulatedContentProvider implements TreeBrowseStrategy {
+
+	protected ITreeContentProvider provider;
+
+	protected boolean filterElements = false;
+
+	protected final Map<Object, Boolean> cache = new HashMap<Object, Boolean>();
+
+	protected final Map<Object, Boolean> visibleChildCache = new HashMap<Object, Boolean>();
+
+	public ProviderBasedBrowseStrategy(ITreeContentProvider provider) {
+		setProvider(provider);
+	}
+
+	public ProviderBasedBrowseStrategy() {
+
+	}
+
+	public void setProvider(ITreeContentProvider provider) {
+		encapsulated = provider;
+		this.provider = provider;
+		filterElements = provider instanceof IHierarchicContentProvider;
+		clearCache();
+	}
+
+	@Override
+	public Object[] getElements() {
+		return getValidElements(super.getElements());
+	}
+
+	@Override
+	public Object[] getElements(Object inputElement) {
+		return getValidElements(super.getElements(inputElement));
+	}
+
+	/**
+	 * Filters the valid root elements, ie. the root elements containing
+	 * at least one valid child (Or being valid themselves)
+	 *
+	 * @param roots
+	 * @return
+	 */
+	protected Object[] getValidElements(Object[] roots) {
+		if (filterElements) {
+			List<Object> rootsList = ListHelper.asList(roots);
+			Iterator<?> iterator = rootsList.iterator();
+			while (iterator.hasNext()) {
+				if (!isValid(iterator.next(), new HashSet<Object>())) {
+					iterator.remove();
+				}
+			}
+			return rootsList.toArray();
+		}
+
+		return roots;
+	}
+
+	@Override
+	public Object[] getChildren(Object parent) {
+		if (provider == null) {
+			Activator.log.warn("The provider has not been initialized");
+			return new Object[0];
+		}
+
+		return getValidElements(super.getChildren(parent));
+	}
+
+	@Override
+	public boolean hasChildren(Object parent) {
+		// May be expensive
+		return getChildren(parent).length > 0;
+	}
+
+	protected boolean isValid(Object containerElement, Set<Object> visitedElements) {
+		if (!cache.containsKey(containerElement)) {
+			boolean isVisible;
+
+			if (browseElement(containerElement)) {
+				isVisible = isValidValue(containerElement) || hasOneVisibleChild(containerElement, visitedElements);
+			} else {
+				isVisible = false;
+			}
+
+			cache.put(containerElement, isVisible);
+		}
+		return cache.get(containerElement);
+	}
+
+	protected boolean browseElement(Object containerElement) {
+		return true;
+	}
+
+	protected boolean hasOneVisibleChild(Object element, Set<Object> visitedElements) {
+		if (!visibleChildCache.containsKey(element)) {
+			boolean result = false;
+			if (visitedElements.add(getAdaptedValue(element))) {
+				for (Object child : super.getChildren(element)) {
+					if (isValid(child, visitedElements)) {
+						result = true;
+						break;
+					}
+				}
+			}
+
+			visibleChildCache.put(element, result);
+		}
+		return visibleChildCache.get(element);
+	}
+
+	@Override
+	public TreePath findPath(Object semanticElement, Object[] rootElements) {
+		return TreePath.EMPTY; // TODO : Naive search
+	}
+
+	protected void clearCache() {
+		cache.clear();
+		visibleChildCache.clear();
+	}
+
+	@Override
+	public void dispose() {
+		super.dispose();
+		clearCache();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * The basic implementation is a naive tree search
+	 *
+	 * @param elementToReveal
+	 */
+	@Override
+	public void revealSemanticElement(List<?> elementsToReveal) {
+		if (viewer != null) {
+			// FIXME: TreeViewers cannot do this search when the items have not yet be expanded.
+			// We need to search on the ContentProvider and pass a TreeSelection to the viewer
+			viewer.setSelection(new StructuredSelection(elementsToReveal), true);
+		}
+	}
+
+	@Override
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		super.inputChanged(viewer, oldInput, newInput);
+		this.viewer = viewer;
+	}
+
+	protected Viewer viewer;
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/StrategyBasedContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/StrategyBasedContentProvider.java
index 16a8412e5a4..c32540fa59e 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/StrategyBasedContentProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/StrategyBasedContentProvider.java
@@ -1,100 +1,100 @@
-/*****************************************************************************

- * 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.widgets.strategy;

-

-import java.util.List;

-

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;

-

-public class StrategyBasedContentProvider extends EncapsulatedContentProvider {

-

-	protected TreeBrowseStrategy browseStrategy;

-

-	protected TreeBrowseStrategy revealStrategy;

-

-	protected StructuredViewer viewer;

-

-	public StrategyBasedContentProvider(TreeBrowseStrategy browseStrategy, TreeBrowseStrategy revealStrategy) {

-		setRevealStrategy(revealStrategy);

-		setBrowseStrategy(browseStrategy);

-	}

-

-	public void setBrowseStrategy(TreeBrowseStrategy strategy) {

-		if (strategy != null) {

-			browseStrategy = strategy;

-			encapsulated = browseStrategy;

-		}

-	}

-

-	public void setRevealStrategy(TreeBrowseStrategy strategy) {

-		if (strategy != null) {

-			revealStrategy = strategy;

-		}

-	}

-

-	@Override

-	public void dispose() {

-		super.dispose();

-		if (browseStrategy != null) {

-			browseStrategy.dispose();

-		}

-		if (revealStrategy != null) {

-			revealStrategy.dispose();

-		}

-	}

-

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		super.inputChanged(viewer, oldInput, newInput);

-		if (viewer instanceof StructuredViewer) {

-			this.viewer = (StructuredViewer) viewer;

-		} else {

-			this.viewer = null;

-		}

-

-		revealStrategy.inputChanged(viewer, oldInput, newInput);

-		browseStrategy.inputChanged(viewer, oldInput, newInput);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * Reveals and selects the given semantic elements

-	 */

-	@Override

-	public void revealSemanticElement(List<?> semanticElementsList) {

-		revealStrategy.revealSemanticElement(semanticElementsList);

-		// List<Object> containerElements = new LinkedList<Object>();

-		//

-		// for(Object semanticElement : semanticElementsList) {

-		// TreePath path = revealStrategy.findPath(semanticElement, getElements(viewer.getInput()));

-		// if(path.getSegmentCount() > 0) {

-		// viewer.reveal(path);

-		// containerElements.add(path.getLastSegment());

-		// }

-		// }

-		//

-		// viewer.setSelection(new StructuredSelection(containerElements));

-	}

-

-	@Override

-	public TreeBrowseStrategy getBrowseStrategy() {

-		return browseStrategy;

-	}

-

-	@Override

-	public TreeBrowseStrategy getRevealStrategy() {

-		return revealStrategy;

-	}

-}

+/*****************************************************************************
+ * 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.widgets.strategy;
+
+import java.util.List;
+
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
+
+public class StrategyBasedContentProvider extends EncapsulatedContentProvider {
+
+	protected TreeBrowseStrategy browseStrategy;
+
+	protected TreeBrowseStrategy revealStrategy;
+
+	protected StructuredViewer viewer;
+
+	public StrategyBasedContentProvider(TreeBrowseStrategy browseStrategy, TreeBrowseStrategy revealStrategy) {
+		setRevealStrategy(revealStrategy);
+		setBrowseStrategy(browseStrategy);
+	}
+
+	public void setBrowseStrategy(TreeBrowseStrategy strategy) {
+		if (strategy != null) {
+			browseStrategy = strategy;
+			encapsulated = browseStrategy;
+		}
+	}
+
+	public void setRevealStrategy(TreeBrowseStrategy strategy) {
+		if (strategy != null) {
+			revealStrategy = strategy;
+		}
+	}
+
+	@Override
+	public void dispose() {
+		super.dispose();
+		if (browseStrategy != null) {
+			browseStrategy.dispose();
+		}
+		if (revealStrategy != null) {
+			revealStrategy.dispose();
+		}
+	}
+
+	@Override
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		super.inputChanged(viewer, oldInput, newInput);
+		if (viewer instanceof StructuredViewer) {
+			this.viewer = (StructuredViewer) viewer;
+		} else {
+			this.viewer = null;
+		}
+
+		revealStrategy.inputChanged(viewer, oldInput, newInput);
+		browseStrategy.inputChanged(viewer, oldInput, newInput);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * Reveals and selects the given semantic elements
+	 */
+	@Override
+	public void revealSemanticElement(List<?> semanticElementsList) {
+		revealStrategy.revealSemanticElement(semanticElementsList);
+		// List<Object> containerElements = new LinkedList<Object>();
+		//
+		// for(Object semanticElement : semanticElementsList) {
+		// TreePath path = revealStrategy.findPath(semanticElement, getElements(viewer.getInput()));
+		// if(path.getSegmentCount() > 0) {
+		// viewer.reveal(path);
+		// containerElements.add(path.getLastSegment());
+		// }
+		// }
+		//
+		// viewer.setSelection(new StructuredSelection(containerElements));
+	}
+
+	@Override
+	public TreeBrowseStrategy getBrowseStrategy() {
+		return browseStrategy;
+	}
+
+	@Override
+	public TreeBrowseStrategy getRevealStrategy() {
+		return revealStrategy;
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/TreeBrowseStrategy.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/TreeBrowseStrategy.java
index 0d5641b54a5..5d66c6f5262 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/TreeBrowseStrategy.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/TreeBrowseStrategy.java
@@ -1,39 +1,39 @@
-/*****************************************************************************

- * 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.widgets.strategy;

-

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.viewers.TreePath;

-import org.eclipse.papyrus.infra.widgets.util.IRevealSemanticElement;

-

-

-/**

- * An interface to define a strategy for browsing a Tree

- *

- * @author Camille Letavernier

- */

-public interface TreeBrowseStrategy extends ITreeContentProvider, IRevealSemanticElement {

-

-	/**

-	 * Finds a path to the given element

-	 *

-	 * @param element

-	 *            The semanticElement to find

-	 * @parem input

-	 *        The root Elements

-	 * @return

-	 * @deprecated See {@link #revealSemanticElement(java.util.List)} instead

-	 */

-	@Deprecated

-	public TreePath findPath(Object semanticElement, Object[] roots);

-

-}

+/*****************************************************************************
+ * 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.widgets.strategy;
+
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.TreePath;
+import org.eclipse.papyrus.infra.widgets.util.IRevealSemanticElement;
+
+
+/**
+ * An interface to define a strategy for browsing a Tree
+ *
+ * @author Camille Letavernier
+ */
+public interface TreeBrowseStrategy extends ITreeContentProvider, IRevealSemanticElement {
+
+	/**
+	 * Finds a path to the given element
+	 *
+	 * @param element
+	 *            The semanticElement to find
+	 * @parem input
+	 *        The root Elements
+	 * @return
+	 * @deprecated See {@link #revealSemanticElement(java.util.List)} instead
+	 */
+	@Deprecated
+	public TreePath findPath(Object semanticElement, Object[] roots);
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/WorkspaceRevealStrategy.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/WorkspaceRevealStrategy.java
index 0f77e39e8d0..f08c5a76ddf 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/WorkspaceRevealStrategy.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/strategy/WorkspaceRevealStrategy.java
@@ -1,77 +1,77 @@
-/*****************************************************************************

- * 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.widgets.strategy;

-

-import java.util.Arrays;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.resources.IResource;

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.viewers.TreePath;

-import org.eclipse.jface.viewers.TreeSelection;

-import org.eclipse.jface.viewers.TreeViewer;

-

-/**

- * A Strategy to search for a Resource in the Workspace

- *

- * @author Camille Letavernier

- *

- */

-public class WorkspaceRevealStrategy extends ProviderBasedBrowseStrategy {

-

-	public WorkspaceRevealStrategy(ITreeContentProvider provider) {

-		super(provider);

-	}

-

-	public WorkspaceRevealStrategy() {

-		super();

-	}

-

-	@Override

-	public void revealSemanticElement(List<?> elementsToReveal) {

-		if (viewer instanceof TreeViewer) {

-			TreeViewer treeViewer = (TreeViewer) viewer;

-			TreePath[] paths = new TreePath[elementsToReveal.size()];

-			int i = 0;

-

-			List<?> roots = Arrays.asList(getElements());

-

-			for (Object elementToReveal : elementsToReveal) {

-				LinkedList<IResource> segments = new LinkedList<IResource>();

-

-				if (elementToReveal instanceof IResource) {

-					IResource currentElement = (IResource) elementToReveal;

-

-					segments.add(currentElement);

-

-					currentElement = currentElement.getParent();

-					while (currentElement != null) {

-						segments.addFirst(currentElement);

-

-						if (roots.contains(currentElement)) {

-							break; // If the tree root is not the Workspace Root, stop now

-						}

-						currentElement = currentElement.getParent();

-					}

-				}

-

-				paths[i++] = new TreePath(segments.toArray());

-			}

-

-			TreeSelection selection = new TreeSelection(paths);

-			treeViewer.setSelection(selection, true);

-		} else {

-			super.revealSemanticElement(elementsToReveal);

-		}

-	}

-}

+/*****************************************************************************
+ * 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.widgets.strategy;
+
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.TreePath;
+import org.eclipse.jface.viewers.TreeSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+
+/**
+ * A Strategy to search for a Resource in the Workspace
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class WorkspaceRevealStrategy extends ProviderBasedBrowseStrategy {
+
+	public WorkspaceRevealStrategy(ITreeContentProvider provider) {
+		super(provider);
+	}
+
+	public WorkspaceRevealStrategy() {
+		super();
+	}
+
+	@Override
+	public void revealSemanticElement(List<?> elementsToReveal) {
+		if (viewer instanceof TreeViewer) {
+			TreeViewer treeViewer = (TreeViewer) viewer;
+			TreePath[] paths = new TreePath[elementsToReveal.size()];
+			int i = 0;
+
+			List<?> roots = Arrays.asList(getElements());
+
+			for (Object elementToReveal : elementsToReveal) {
+				LinkedList<IResource> segments = new LinkedList<IResource>();
+
+				if (elementToReveal instanceof IResource) {
+					IResource currentElement = (IResource) elementToReveal;
+
+					segments.add(currentElement);
+
+					currentElement = currentElement.getParent();
+					while (currentElement != null) {
+						segments.addFirst(currentElement);
+
+						if (roots.contains(currentElement)) {
+							break; // If the tree root is not the Workspace Root, stop now
+						}
+						currentElement = currentElement.getParent();
+					}
+				}
+
+				paths[i++] = new TreePath(segments.toArray());
+			}
+
+			TreeSelection selection = new TreeSelection(paths);
+			treeViewer.setSelection(selection, true);
+		} else {
+			super.revealSemanticElement(elementsToReveal);
+		}
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/DoNothingCompletionProposal.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/DoNothingCompletionProposal.java
index b37f22846f5..b37f22846f5 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/DoNothingCompletionProposal.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/DoNothingCompletionProposal.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/FileUtil.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/FileUtil.java
index 283a44c49f6..13831478833 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/FileUtil.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/FileUtil.java
@@ -1,112 +1,112 @@
-/*****************************************************************************

- * 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.util;

-

-import java.io.File;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IWorkspaceRoot;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.papyrus.infra.widgets.editors.StringFileSelector;

-

-/**

- * A helper class for resolving files and path, either in the workspace or

- * on the File system

- *

- * @author Camille Letavernier

- * @see StringFileSelector

- */

-public class FileUtil {

-

-	/**

-	 * Returns the path to the IFile. If absolute is true, returns the path

-	 * from the FileSystem. Otherwise, returns the path from the workspace.

-	 *

-	 * @param file

-	 * @param absolute

-	 * @return

-	 */

-	public static String getPath(IFile file, boolean absolute) {

-		if (absolute) {

-			return file.getLocation().toString();

-		}

-		return file.getFullPath().toString();

-	}

-

-	/**

-	 * Returns the IFile (Workspace file) from the given location.

-	 * The location may be either absolute (From the FileSystem) or

-	 * relative to the workspace root.

-	 *

-	 * @param location

-	 * @return

-	 */

-	public static IFile getIFile(String location) {

-		// Search the file in the workspace

-		IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();

-		IPath path = new Path(location);

-		IFile currentFile = null;

-		try {

-			currentFile = workspace.getFile(path);

-		} catch (IllegalArgumentException ex) {

-			// Ignore

-		}

-

-		// Then search it on the disk

-		if (currentFile == null || !currentFile.exists()) {

-			currentFile = workspace.getFileForLocation(path);

-		}

-

-		return currentFile;

-	}

-

-	/**

-	 * Returns the Java File from the given location.

-	 * The location may be either absolute (From the FileSystem) or

-	 * relative to the workspace root.

-	 *

-	 * @param location

-	 * @return

-	 */

-	public static File getFile(String location) {

-		IFile iFile = getIFile(location);

-		if (iFile == null || !iFile.exists()) {

-			return new File(location);

-		}

-

-		return new File(iFile.getLocationURI());

-	}

-

-	/**

-	 * Returns the Java File from the given location.

-	 * The location is relative to the workspace root.

-	 *

-	 * @param location

-	 * @return

-	 */

-	public static File getWorkspaceFile(String location) {

-		IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();

-		IPath path = new Path(location);

-		IFile currentFile = null;

-		try {

-			currentFile = workspace.getFile(path);

-		} catch (IllegalArgumentException ex) {

-			Activator.log.error(ex);

-			return null;

-		}

-

-		return currentFile.getLocation().toFile();

-	}

-}

+/*****************************************************************************
+ * 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.util;
+
+import java.io.File;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.editors.StringFileSelector;
+
+/**
+ * A helper class for resolving files and path, either in the workspace or
+ * on the File system
+ *
+ * @author Camille Letavernier
+ * @see StringFileSelector
+ */
+public class FileUtil {
+
+	/**
+	 * Returns the path to the IFile. If absolute is true, returns the path
+	 * from the FileSystem. Otherwise, returns the path from the workspace.
+	 *
+	 * @param file
+	 * @param absolute
+	 * @return
+	 */
+	public static String getPath(IFile file, boolean absolute) {
+		if (absolute) {
+			return file.getLocation().toString();
+		}
+		return file.getFullPath().toString();
+	}
+
+	/**
+	 * Returns the IFile (Workspace file) from the given location.
+	 * The location may be either absolute (From the FileSystem) or
+	 * relative to the workspace root.
+	 *
+	 * @param location
+	 * @return
+	 */
+	public static IFile getIFile(String location) {
+		// Search the file in the workspace
+		IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();
+		IPath path = new Path(location);
+		IFile currentFile = null;
+		try {
+			currentFile = workspace.getFile(path);
+		} catch (IllegalArgumentException ex) {
+			// Ignore
+		}
+
+		// Then search it on the disk
+		if (currentFile == null || !currentFile.exists()) {
+			currentFile = workspace.getFileForLocation(path);
+		}
+
+		return currentFile;
+	}
+
+	/**
+	 * Returns the Java File from the given location.
+	 * The location may be either absolute (From the FileSystem) or
+	 * relative to the workspace root.
+	 *
+	 * @param location
+	 * @return
+	 */
+	public static File getFile(String location) {
+		IFile iFile = getIFile(location);
+		if (iFile == null || !iFile.exists()) {
+			return new File(location);
+		}
+
+		return new File(iFile.getLocationURI());
+	}
+
+	/**
+	 * Returns the Java File from the given location.
+	 * The location is relative to the workspace root.
+	 *
+	 * @param location
+	 * @return
+	 */
+	public static File getWorkspaceFile(String location) {
+		IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();
+		IPath path = new Path(location);
+		IFile currentFile = null;
+		try {
+			currentFile = workspace.getFile(path);
+		} catch (IllegalArgumentException ex) {
+			Activator.log.error(ex);
+			return null;
+		}
+
+		return currentFile.getLocation().toFile();
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/INameResolutionHelper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/INameResolutionHelper.java
index 727c9c6b46e..727c9c6b46e 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/INameResolutionHelper.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/INameResolutionHelper.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/IPapyrusConverter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/IPapyrusConverter.java
index 0d24d7b1d9b..0d24d7b1d9b 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/IPapyrusConverter.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/IPapyrusConverter.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/IRevealSemanticElement.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/IRevealSemanticElement.java
index b68808f4f92..9b42bdd5de5 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/IRevealSemanticElement.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/IRevealSemanticElement.java
@@ -1,34 +1,34 @@
-/*****************************************************************************

- * 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.widgets.util;

-

-import java.util.List;

-

-/**

- * this interface is used to reveal element that are given in parameter. Example

- * of the use case: the class that implements this interface can be a diagram

- * that select all editparts that are linked to the given list of semantic

- * element

- *

- */

-public interface IRevealSemanticElement {

-

-	/**

-	 * reveal all elements that represent an element in the given list.

-	 *

-	 * @param elementList

-	 *            list of semantic element that we want to reveal, <B> cannot be

-	 *            null</B>

-	 */

-	public void revealSemanticElement(List<?> elementList);

-}

+/*****************************************************************************
+ * 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.widgets.util;
+
+import java.util.List;
+
+/**
+ * this interface is used to reveal element that are given in parameter. Example
+ * of the use case: the class that implements this interface can be a diagram
+ * that select all editparts that are linked to the given list of semantic
+ * element
+ *
+ */
+public interface IRevealSemanticElement {
+
+	/**
+	 * reveal all elements that represent an element in the given list.
+	 *
+	 * @param elementList
+	 *            list of semantic element that we want to reveal, <B> cannot be
+	 *            null</B>
+	 */
+	public void revealSemanticElement(List<?> elementList);
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/ISetNameResolutionHelper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/ISetNameResolutionHelper.java
index 104bfabd7df..104bfabd7df 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/ISetNameResolutionHelper.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/ISetNameResolutionHelper.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/ISetPapyrusConverter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/ISetPapyrusConverter.java
index 4da7e5a75eb..4da7e5a75eb 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/ISetPapyrusConverter.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/ISetPapyrusConverter.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/ImageConstants.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/ImageConstants.java
index aefdf2471ed..742698a5a4d 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/ImageConstants.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/ImageConstants.java
@@ -1,40 +1,40 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.widgets.util;

-

-/**

- * @author VL222926

- *

- */

-public class ImageConstants {

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	private ImageConstants() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * the local path to get the papyrus icon

-	 */

-	public static final String PAPYRUS_ICON_PATH = "/icons/papyrus.png"; //$NON-NLS-1$

-	

-	/**

-	 * the local path to get the edit icon in 12x12

-	 */

-	public static final String EDIT_12_12_ICON_PATH = "/icons/Edit_12x12.gif";//$NON-NLS-1$

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.widgets.util;
+
+/**
+ * @author VL222926
+ *
+ */
+public class ImageConstants {
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	private ImageConstants() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * the local path to get the papyrus icon
+	 */
+	public static final String PAPYRUS_ICON_PATH = "/icons/papyrus.png"; //$NON-NLS-1$
+	
+	/**
+	 * the local path to get the edit icon in 12x12
+	 */
+	public static final String EDIT_12_12_ICON_PATH = "/icons/Edit_12x12.gif";//$NON-NLS-1$
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/ImageDescriptorManager.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/ImageDescriptorManager.java
index 31c5cfbc3e5..31c5cfbc3e5 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/ImageDescriptorManager.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/ImageDescriptorManager.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/MultiplicityConstants.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/MultiplicityConstants.java
index 69b6372375d..69b6372375d 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/MultiplicityConstants.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/MultiplicityConstants.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/NavigationTarget.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/NavigationTarget.java
index df808f898ab..4cf5461ddf0 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/NavigationTarget.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/NavigationTarget.java
@@ -1,47 +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:

- *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.util;

-

-import java.util.Collection;

-

-/**

- * This interface is used to select and reveal element that are given in parameter. Example

- * of the use case: the class that implements this interface can be a diagram

- * that select all editparts that are linked to the given list of elements.

- *

- * The element parameter can be either a semantic element (Which will likely be wrapped

- * in a graphical element such as an EditPart), or a notation element (Such as a GMF notation::View)

- */

-public interface NavigationTarget {

-

-	/**

-	 * Select and reveal the given element. Element may be either a semantic element (e.g. a uml::Class)

-	 * or a graphical element (e.g. GMF notation::View)

-	 *

-	 * @param element

-	 * @return

-	 *         True if the element has been selected, false otherwise

-	 */

-	public boolean revealElement(Object element);

-

-	/**

-	 * Select and reveal the given elements. Elements may be either semantic elements (e.g. uml::Class)

-	 * or graphical elements (e.g. GMF notation::View)

-	 *

-	 * @param elements

-	 * @return

-	 *         True if the elements have been selected, false otherwise

-	 */

-	public boolean revealElement(Collection<?> elements);

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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 (camille.letavernier@cea.fr) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.util;
+
+import java.util.Collection;
+
+/**
+ * This interface is used to select and reveal element that are given in parameter. Example
+ * of the use case: the class that implements this interface can be a diagram
+ * that select all editparts that are linked to the given list of elements.
+ *
+ * The element parameter can be either a semantic element (Which will likely be wrapped
+ * in a graphical element such as an EditPart), or a notation element (Such as a GMF notation::View)
+ */
+public interface NavigationTarget {
+
+	/**
+	 * Select and reveal the given element. Element may be either a semantic element (e.g. a uml::Class)
+	 * or a graphical element (e.g. GMF notation::View)
+	 *
+	 * @param element
+	 * @return
+	 *         True if the element has been selected, false otherwise
+	 */
+	public boolean revealElement(Object element);
+
+	/**
+	 * Select and reveal the given elements. Elements may be either semantic elements (e.g. uml::Class)
+	 * or graphical elements (e.g. GMF notation::View)
+	 *
+	 * @param elements
+	 * @return
+	 *         True if the elements have been selected, false otherwise
+	 */
+	public boolean revealElement(Collection<?> elements);
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/PopupButtonMenu.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/PopupButtonMenu.java
index 78ea06876d4..78ea06876d4 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/PopupButtonMenu.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/PopupButtonMenu.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/RevealResultCommand.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/RevealResultCommand.java
index eb020577ef4..eb020577ef4 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/RevealResultCommand.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/RevealResultCommand.java
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/RevealSemanticElementWrapper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/RevealSemanticElementWrapper.java
index 1a0fe2f2fb3..855ff9f5661 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/RevealSemanticElementWrapper.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/RevealSemanticElementWrapper.java
@@ -1,45 +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:

- *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.util;

-

-import java.util.Collection;

-import java.util.Collections;

-import java.util.LinkedList;

-

-/**

- * A wrapper to convert a IRevealSemanticElement to an INavigationTarget

- *

- * @author Camille Letavernier

- *

- */

-public class RevealSemanticElementWrapper implements NavigationTarget {

-

-	private final IRevealSemanticElement revealSemanticElement;

-

-	public RevealSemanticElementWrapper(IRevealSemanticElement revealSemanticElement) {

-		this.revealSemanticElement = revealSemanticElement;

-	}

-

-	@Override

-	public boolean revealElement(Object element) {

-		return revealElement(Collections.singletonList(element));

-	}

-

-	@Override

-	public boolean revealElement(Collection<?> elements) {

-		revealSemanticElement.revealSemanticElement(new LinkedList<Object>(elements));

-		return false;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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 (camille.letavernier@cea.fr) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.util;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+
+/**
+ * A wrapper to convert a IRevealSemanticElement to an INavigationTarget
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class RevealSemanticElementWrapper implements NavigationTarget {
+
+	private final IRevealSemanticElement revealSemanticElement;
+
+	public RevealSemanticElementWrapper(IRevealSemanticElement revealSemanticElement) {
+		this.revealSemanticElement = revealSemanticElement;
+	}
+
+	@Override
+	public boolean revealElement(Object element) {
+		return revealElement(Collections.singletonList(element));
+	}
+
+	@Override
+	public boolean revealElement(Collection<?> elements) {
+		revealSemanticElement.revealSemanticElement(new LinkedList<Object>(elements));
+		return false;
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/ValueUtils.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/ValueUtils.java
index a1d2ec0fbaa..208d533a677 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/ValueUtils.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/ValueUtils.java
@@ -1,34 +1,34 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.widgets.util;

-

-/**

- * @author VL222926

- *

- */

-public class ValueUtils {

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	private ValueUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * value used to identify feature with multiplicity to *

-	 */

-	public static final int MANY = -1;

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.widgets.util;
+
+/**
+ * @author VL222926
+ *
+ */
+public class ValueUtils {
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	private ValueUtils() {
+		// to prevent instanciation
+	}
+
+	/**
+	 * value used to identify feature with multiplicity to *
+	 */
+	public static final int MANY = -1;
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/AbstractValidator.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/AbstractValidator.java
index 49159015a6a..d21390be40d 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/AbstractValidator.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/AbstractValidator.java
@@ -1,48 +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:

- *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.validator;

-

-import org.eclipse.core.databinding.validation.IValidator;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.papyrus.infra.widgets.Activator;

-

-/**

- * An abstract implementation of the IValidator interface

- *

- * @author Camille Letavernier

- *

- */

-public abstract class AbstractValidator implements IValidator {

-

-	protected String pluginId;

-

-	public void setPluginID(String pluginId) {

-		this.pluginId = pluginId;

-	}

-

-	protected IStatus error(String message) {

-		return new Status(IStatus.ERROR, getPluginId(), message);

-	}

-

-	public String getPluginId() {

-		if (pluginId == null) {

-			return Activator.PLUGIN_ID;

-		} else {

-			return pluginId;

-		}

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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 (camille.letavernier@cea.fr) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.validator;
+
+import org.eclipse.core.databinding.validation.IValidator;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.papyrus.infra.widgets.Activator;
+
+/**
+ * An abstract implementation of the IValidator interface
+ *
+ * @author Camille Letavernier
+ *
+ */
+public abstract class AbstractValidator implements IValidator {
+
+	protected String pluginId;
+
+	public void setPluginID(String pluginId) {
+		this.pluginId = pluginId;
+	}
+
+	protected IStatus error(String message) {
+		return new Status(IStatus.ERROR, getPluginId(), message);
+	}
+
+	public String getPluginId() {
+		if (pluginId == null) {
+			return Activator.PLUGIN_ID;
+		} else {
+			return pluginId;
+		}
+	}
+
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/BooleanInputValidator.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/BooleanInputValidator.java
index fc501d7fb06..d1354a53d3d 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/BooleanInputValidator.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/BooleanInputValidator.java
@@ -1,29 +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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.validator;

-

-

-/**

- * InputValidator for boolean

- *

- * @author Vincent Lorenzo

- *

- */

-public class BooleanInputValidator extends InputValidatorWrapper {

-

-	public BooleanInputValidator() {

-		super(new BooleanValidator());

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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.widgets.validator;
+
+
+/**
+ * InputValidator for boolean
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class BooleanInputValidator extends InputValidatorWrapper {
+
+	public BooleanInputValidator() {
+		super(new BooleanValidator());
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/BooleanValidator.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/BooleanValidator.java
index 17e8f60d390..26ef894a65c 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/BooleanValidator.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/BooleanValidator.java
@@ -1,51 +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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Modification to match IValidator

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.validator;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.papyrus.infra.tools.util.BooleanHelper;

-import org.eclipse.papyrus.infra.widgets.messages.Messages;

-

-/**

- * InputValidator for boolean

- *

- * @author Vincent Lorenzo

- *

- */

-public class BooleanValidator extends AbstractValidator {

-

-

-	/**

-	 *

-	 * @param newValue

-	 * @return {@link Status#OK_STATUS} if the newValue is valid and {@link IStatus#ERROR} when newValue is

-	 *         invalid

-	 */

-	@Override

-	public IStatus validate(Object newValue) {

-		if (newValue instanceof Boolean) {

-			return Status.OK_STATUS;

-		}

-

-		if (newValue instanceof String && BooleanHelper.isBoolean((String) newValue)) {

-			return Status.OK_STATUS;

-		}

-

-		return error(Messages.BooleanInputValidator_NotABoolean);

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Modification to match IValidator
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.validator;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.papyrus.infra.tools.util.BooleanHelper;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+
+/**
+ * InputValidator for boolean
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class BooleanValidator extends AbstractValidator {
+
+
+	/**
+	 *
+	 * @param newValue
+	 * @return {@link Status#OK_STATUS} if the newValue is valid and {@link IStatus#ERROR} when newValue is
+	 *         invalid
+	 */
+	@Override
+	public IStatus validate(Object newValue) {
+		if (newValue instanceof Boolean) {
+			return Status.OK_STATUS;
+		}
+
+		if (newValue instanceof String && BooleanHelper.isBoolean((String) newValue)) {
+			return Status.OK_STATUS;
+		}
+
+		return error(Messages.BooleanInputValidator_NotABoolean);
+
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/InputValidatorWrapper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/InputValidatorWrapper.java
index b7af7553b78..0a23bbde936 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/InputValidatorWrapper.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/InputValidatorWrapper.java
@@ -1,45 +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:

- *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.validator;

-

-import org.eclipse.core.databinding.validation.IValidator;

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.jface.dialogs.IInputValidator;

-

-/**

- * A Wrapper for IValidator to IInputValidator

- *

- * @author Camille Letavernier

- */

-public class InputValidatorWrapper implements IInputValidator {

-

-	protected IValidator validator;

-

-	public InputValidatorWrapper(IValidator validator) {

-		Assert.isNotNull(validator);

-		this.validator = validator;

-	}

-

-	@Override

-	public String isValid(String newText) {

-		IStatus status = validator.validate(newText);

-		if (status.isOK()) {

-			return null;

-		}

-

-		return status.getMessage();

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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 (camille.letavernier@cea.fr) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.validator;
+
+import org.eclipse.core.databinding.validation.IValidator;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.IInputValidator;
+
+/**
+ * A Wrapper for IValidator to IInputValidator
+ *
+ * @author Camille Letavernier
+ */
+public class InputValidatorWrapper implements IInputValidator {
+
+	protected IValidator validator;
+
+	public InputValidatorWrapper(IValidator validator) {
+		Assert.isNotNull(validator);
+		this.validator = validator;
+	}
+
+	@Override
+	public String isValid(String newText) {
+		IStatus status = validator.validate(newText);
+		if (status.isOK()) {
+			return null;
+		}
+
+		return status.getMessage();
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/IntegerInputValidator.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/IntegerInputValidator.java
index 03ca5e1766f..2292a1f00a6 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/IntegerInputValidator.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/IntegerInputValidator.java
@@ -1,29 +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:

- *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.validator;

-

-

-

-/**

- * Validator for Integer

- *

- */

-public class IntegerInputValidator extends InputValidatorWrapper {

-

-

-	public IntegerInputValidator() {

-		super(new IntegerValidator());

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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 (camille.letavernier@cea.fr) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.validator;
+
+
+
+/**
+ * Validator for Integer
+ *
+ */
+public class IntegerInputValidator extends InputValidatorWrapper {
+
+
+	public IntegerInputValidator() {
+		super(new IntegerValidator());
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/IntegerValidator.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/IntegerValidator.java
index 215ca602e6a..aedb919bea9 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/IntegerValidator.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/IntegerValidator.java
@@ -1,55 +1,55 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Modification to match IValidator

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.validator;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.papyrus.infra.widgets.messages.Messages;

-

-/**

- * InputValidator for Integer

- *

- * @author Vincent Lorenzo

- *

- */

-public class IntegerValidator extends AbstractValidator {

-

-

-	/**

-	 *

-	 * @param newValue

-	 * @return {@link Status#OK_STATUS} if the newValue is valid and {@link IStatus#ERROR} when newValue is

-	 *         invalid

-	 */

-	@Override

-	public IStatus validate(Object newValue) {

-		if (newValue instanceof Integer) {

-			return Status.OK_STATUS;

-		}

-

-		if (newValue instanceof String) {

-			try {

-				Integer.parseInt((String) newValue);

-				return Status.OK_STATUS;

-			} catch (NumberFormatException ex) {

-				return error(Messages.IntegerInputValidator_NotAnIntegerMessage);

-			}

-		}

-

-		return error(Messages.IntegerInputValidator_NotAnIntegerMessage);

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms 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
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Modification to match IValidator
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.validator;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+
+/**
+ * InputValidator for Integer
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class IntegerValidator extends AbstractValidator {
+
+
+	/**
+	 *
+	 * @param newValue
+	 * @return {@link Status#OK_STATUS} if the newValue is valid and {@link IStatus#ERROR} when newValue is
+	 *         invalid
+	 */
+	@Override
+	public IStatus validate(Object newValue) {
+		if (newValue instanceof Integer) {
+			return Status.OK_STATUS;
+		}
+
+		if (newValue instanceof String) {
+			try {
+				Integer.parseInt((String) newValue);
+				return Status.OK_STATUS;
+			} catch (NumberFormatException ex) {
+				return error(Messages.IntegerInputValidator_NotAnIntegerMessage);
+			}
+		}
+
+		return error(Messages.IntegerInputValidator_NotAnIntegerMessage);
+	}
+
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/RealInputValidator.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/RealInputValidator.java
index be31d12a047..db187dfbd6d 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/RealInputValidator.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/RealInputValidator.java
@@ -1,26 +1,26 @@
-/*****************************************************************************

- * 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.validator;

-

-

-/**

- * Validator for the Real

- */

-public class RealInputValidator extends InputValidatorWrapper {

-

-	public RealInputValidator() {

-		super(new RealValidator());

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.validator;
+
+
+/**
+ * Validator for the Real
+ */
+public class RealInputValidator extends InputValidatorWrapper {
+
+	public RealInputValidator() {
+		super(new RealValidator());
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/RealValidator.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/RealValidator.java
index 711f86d8c69..eda02e90576 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/RealValidator.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/RealValidator.java
@@ -1,52 +1,52 @@
-/*****************************************************************************

- * 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Modification to match IValidator

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.validator;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.papyrus.infra.widgets.messages.Messages;

-

-/**

- * Validator for the Real

- */

-public class RealValidator extends AbstractValidator {

-

-

-	/**

-	 *

-	 * @param newValue

-	 * @return {@link Status#OK_STATUS} if the newValue is valid and {@link IStatus#ERROR} when newValue is

-	 *         invalid

-	 */

-	@Override

-	public IStatus validate(Object newValue) {

-		if (newValue instanceof Double) {

-			return Status.OK_STATUS;

-		}

-

-		if (newValue instanceof String) {

-			try {

-				Double.parseDouble((String) newValue);

-				return Status.OK_STATUS;

-			} catch (NumberFormatException ex) {

-				return error(Messages.RealInputValidator_NotaRealMessage);

-			}

-		}

-

-		return error(Messages.RealInputValidator_NotaRealMessage);

-	}

-

-

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Modification to match IValidator
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.validator;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+
+/**
+ * Validator for the Real
+ */
+public class RealValidator extends AbstractValidator {
+
+
+	/**
+	 *
+	 * @param newValue
+	 * @return {@link Status#OK_STATUS} if the newValue is valid and {@link IStatus#ERROR} when newValue is
+	 *         invalid
+	 */
+	@Override
+	public IStatus validate(Object newValue) {
+		if (newValue instanceof Double) {
+			return Status.OK_STATUS;
+		}
+
+		if (newValue instanceof String) {
+			try {
+				Double.parseDouble((String) newValue);
+				return Status.OK_STATUS;
+			} catch (NumberFormatException ex) {
+				return error(Messages.RealInputValidator_NotaRealMessage);
+			}
+		}
+
+		return error(Messages.RealInputValidator_NotaRealMessage);
+	}
+
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/UnlimitedNaturalInputValidator.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/UnlimitedNaturalInputValidator.java
index 7d2118379fe..0d25097e25e 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/UnlimitedNaturalInputValidator.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/UnlimitedNaturalInputValidator.java
@@ -1,26 +1,26 @@
-/*****************************************************************************

- * 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.validator;

-

-

-/**

- * Validator for the UnlimitedNaturalEditor. It accepts "-1", "*" and all integer >=0

- */

-public class UnlimitedNaturalInputValidator extends InputValidatorWrapper {

-

-	public UnlimitedNaturalInputValidator() {

-		super(new UnlimitedNaturalValidator());

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.validator;
+
+
+/**
+ * Validator for the UnlimitedNaturalEditor. It accepts "-1", "*" and all integer >=0
+ */
+public class UnlimitedNaturalInputValidator extends InputValidatorWrapper {
+
+	public UnlimitedNaturalInputValidator() {
+		super(new UnlimitedNaturalValidator());
+	}
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/UnlimitedNaturalValidator.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/UnlimitedNaturalValidator.java
index 80c04522b82..1b62638959f 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/UnlimitedNaturalValidator.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/validator/UnlimitedNaturalValidator.java
@@ -1,100 +1,100 @@
-/*****************************************************************************

- * 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Modification to match IValidator

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.widgets.validator;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.papyrus.infra.widgets.messages.Messages;

-

-/**

- * Validator for the UnlimitedNaturalEditor. It accepts "-1", "*" and all integer >=0

- */

-public class UnlimitedNaturalValidator extends AbstractValidator {

-

-

-	public static final String INFINITE_STAR = "*"; //$NON-NLS-1$

-

-	public static final String INFINITE_MINUS_ONE = "-1"; //$NON-NLS-1$

-

-

-	/**

-	 * @see org.eclipse.jface.dialogs.IInputValidator#isValid(java.lang.String)

-	 *

-	 * @param newText

-	 * @return <code>null</code> if the newText is valid an error message when newText is

-	 *         invalid

-	 */

-	public String isValid(String newText) {

-		if (INFINITE_STAR.equals(newText) || INFINITE_MINUS_ONE.equals(newText)) {

-			return null;

-		}

-		boolean isValid = true;

-		try {

-			Integer myUnlimitedNatural = Integer.valueOf(newText);

-			if (myUnlimitedNatural < -1) {

-				isValid = false;

-			}

-		} catch (NumberFormatException e) {

-			isValid = false;

-		}

-

-		if (!isValid) {

-			return Messages.UnlimitedNaturalInputValidator_NotAnUnlimitedNaturalMessage;

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param newValue

-	 * @return {@link Status#OK_STATUS} if the newValue is valid and {@link IStatus#ERROR} when newValue is

-	 *         invalid

-	 */

-	@Override

-	public IStatus validate(Object newValue) {

-		if (newValue instanceof Integer) {

-			int value = (Integer) newValue;

-			if (value == -1 || value >= 0) {

-				return Status.OK_STATUS;

-			}

-		}

-

-		if (newValue instanceof String) {

-			String newText = (String) newValue;

-

-			if (INFINITE_STAR.equals(newText) || INFINITE_MINUS_ONE.equals(newText)) {

-				return Status.OK_STATUS;

-			}

-

-			boolean isValid = true;

-			try {

-				Integer myUnlimitedNatural = Integer.parseInt(newText);

-				if (myUnlimitedNatural < -1) {

-					isValid = false;

-				}

-			} catch (NumberFormatException e) {

-				isValid = false;

-			}

-

-			if (isValid) {

-				return Status.OK_STATUS;

-			}

-		}

-

-		return error(Messages.UnlimitedNaturalInputValidator_NotAnUnlimitedNaturalMessage);

-	}

-

-

-}

+/*****************************************************************************
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Modification to match IValidator
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.widgets.validator;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+
+/**
+ * Validator for the UnlimitedNaturalEditor. It accepts "-1", "*" and all integer >=0
+ */
+public class UnlimitedNaturalValidator extends AbstractValidator {
+
+
+	public static final String INFINITE_STAR = "*"; //$NON-NLS-1$
+
+	public static final String INFINITE_MINUS_ONE = "-1"; //$NON-NLS-1$
+
+
+	/**
+	 * @see org.eclipse.jface.dialogs.IInputValidator#isValid(java.lang.String)
+	 *
+	 * @param newText
+	 * @return <code>null</code> if the newText is valid an error message when newText is
+	 *         invalid
+	 */
+	public String isValid(String newText) {
+		if (INFINITE_STAR.equals(newText) || INFINITE_MINUS_ONE.equals(newText)) {
+			return null;
+		}
+		boolean isValid = true;
+		try {
+			Integer myUnlimitedNatural = Integer.valueOf(newText);
+			if (myUnlimitedNatural < -1) {
+				isValid = false;
+			}
+		} catch (NumberFormatException e) {
+			isValid = false;
+		}
+
+		if (!isValid) {
+			return Messages.UnlimitedNaturalInputValidator_NotAnUnlimitedNaturalMessage;
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param newValue
+	 * @return {@link Status#OK_STATUS} if the newValue is valid and {@link IStatus#ERROR} when newValue is
+	 *         invalid
+	 */
+	@Override
+	public IStatus validate(Object newValue) {
+		if (newValue instanceof Integer) {
+			int value = (Integer) newValue;
+			if (value == -1 || value >= 0) {
+				return Status.OK_STATUS;
+			}
+		}
+
+		if (newValue instanceof String) {
+			String newText = (String) newValue;
+
+			if (INFINITE_STAR.equals(newText) || INFINITE_MINUS_ONE.equals(newText)) {
+				return Status.OK_STATUS;
+			}
+
+			boolean isValid = true;
+			try {
+				Integer myUnlimitedNatural = Integer.parseInt(newText);
+				if (myUnlimitedNatural < -1) {
+					isValid = false;
+				}
+			} catch (NumberFormatException e) {
+				isValid = false;
+			}
+
+			if (isValid) {
+				return Status.OK_STATUS;
+			}
+		}
+
+		return error(Messages.UnlimitedNaturalInputValidator_NotAnUnlimitedNaturalMessage);
+	}
+
+
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/widgets/MultipleValueEditAndSelectionWidget.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/widgets/MultipleValueEditAndSelectionWidget.java
index f4740c1ed30..7d91e2d5e21 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/widgets/MultipleValueEditAndSelectionWidget.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/widgets/MultipleValueEditAndSelectionWidget.java
@@ -1,168 +1,168 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.widgets.widgets;

-

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.papyrus.infra.widgets.messages.Messages;

-import org.eclipse.papyrus.infra.widgets.util.ImageConstants;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * @author VL222926

- *

- */

-public class MultipleValueEditAndSelectionWidget extends MultipleValueSelectionWidget {

-

-	/**

-	 * if <code>true</code> the edition button will be displayed

-	 */

-	private boolean allowEdition;

-

-

-	/**

-	 * The edit action button

-	 */

-	protected Button edit;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 */

-	public MultipleValueEditAndSelectionWidget(IElementSelector selector) {

-		super(selector);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 * @param unique

-	 */

-	public MultipleValueEditAndSelectionWidget(IElementSelector selector, boolean unique) {

-		super(selector, unique);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 * @param unique

-	 * @param ordered

-	 */

-	public MultipleValueEditAndSelectionWidget(IElementSelector selector, boolean unique, boolean ordered) {

-		super(selector, unique, ordered);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 * @param unique

-	 * @param ordered

-	 * @param upperBound

-	 */

-	public MultipleValueEditAndSelectionWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {

-		super(selector, unique, ordered, upperBound);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#init()

-	 *

-	 */

-	@Override

-	protected void init() {

-		super.init();

-		// please, keep the default value to false

-		this.allowEdition = false;

-	}

-

-	/**

-	 * @return the allowEdition

-	 */

-	public boolean isAllowEdition() {

-		return allowEdition;

-	}

-

-	/**

-	 * @param allowEdition

-	 *            the allowEdition to set

-	 */

-	public void setAllowEdition(boolean allowEdition) {

-		this.allowEdition = allowEdition;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#createRightButtonsSection(org.eclipse.swt.widgets.Composite)

-	 *

-	 * @param parent

-	 */

-	@Override

-	protected void createRightButtonsSection(Composite parent) {

-		super.createRightButtonsSection(parent);

-		if (isAllowEdition()) {

-			this.edit = new Button(rightButtonsSection, SWT.PUSH);

-			edit.setImage(Activator.getDefault().getImage(ImageConstants.EDIT_12_12_ICON_PATH)); //$NON-NLS-1$

-			edit.addSelectionListener(this);

-			edit.setToolTipText(Messages.MultipleValueEditAndSelectionWidget_EditSelectedElement);

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#updateControls()

-	 *

-	 */

-	@Override

-	public void updateControls() {

-		super.updateControls();

-		if(allowEdition){

-			updateControl(edit, this.factory!=null && this.factory.canEdit());

-		}

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#widgetSelected(org.eclipse.swt.events.SelectionEvent)

-	 *

-	 * @param e

-	 */

-	@Override

-	public void widgetSelected(SelectionEvent e) {

-		if (edit != null && e.widget == edit) {

-			edit();

-			this.selectedElementsViewer.refresh();

-		}

-		super.widgetSelected(e);

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         <code>true</code> if the selected element can be edited

-	 */

-	protected boolean canEdit() {

-		return allowEdition && this.factory.canEdit();

-	}

-

-	/**

-	 * edit the selected element

-	 */

-	protected void edit() {

-		// nothing to do here

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.widgets.widgets;
+
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.util.ImageConstants;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * @author VL222926
+ *
+ */
+public class MultipleValueEditAndSelectionWidget extends MultipleValueSelectionWidget {
+
+	/**
+	 * if <code>true</code> the edition button will be displayed
+	 */
+	private boolean allowEdition;
+
+
+	/**
+	 * The edit action button
+	 */
+	protected Button edit;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 */
+	public MultipleValueEditAndSelectionWidget(IElementSelector selector) {
+		super(selector);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 * @param unique
+	 */
+	public MultipleValueEditAndSelectionWidget(IElementSelector selector, boolean unique) {
+		super(selector, unique);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 * @param unique
+	 * @param ordered
+	 */
+	public MultipleValueEditAndSelectionWidget(IElementSelector selector, boolean unique, boolean ordered) {
+		super(selector, unique, ordered);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 * @param unique
+	 * @param ordered
+	 * @param upperBound
+	 */
+	public MultipleValueEditAndSelectionWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {
+		super(selector, unique, ordered, upperBound);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#init()
+	 *
+	 */
+	@Override
+	protected void init() {
+		super.init();
+		// please, keep the default value to false
+		this.allowEdition = false;
+	}
+
+	/**
+	 * @return the allowEdition
+	 */
+	public boolean isAllowEdition() {
+		return allowEdition;
+	}
+
+	/**
+	 * @param allowEdition
+	 *            the allowEdition to set
+	 */
+	public void setAllowEdition(boolean allowEdition) {
+		this.allowEdition = allowEdition;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#createRightButtonsSection(org.eclipse.swt.widgets.Composite)
+	 *
+	 * @param parent
+	 */
+	@Override
+	protected void createRightButtonsSection(Composite parent) {
+		super.createRightButtonsSection(parent);
+		if (isAllowEdition()) {
+			this.edit = new Button(rightButtonsSection, SWT.PUSH);
+			edit.setImage(Activator.getDefault().getImage(ImageConstants.EDIT_12_12_ICON_PATH)); //$NON-NLS-1$
+			edit.addSelectionListener(this);
+			edit.setToolTipText(Messages.MultipleValueEditAndSelectionWidget_EditSelectedElement);
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#updateControls()
+	 *
+	 */
+	@Override
+	public void updateControls() {
+		super.updateControls();
+		if(allowEdition){
+			updateControl(edit, this.factory!=null && this.factory.canEdit());
+		}
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#widgetSelected(org.eclipse.swt.events.SelectionEvent)
+	 *
+	 * @param e
+	 */
+	@Override
+	public void widgetSelected(SelectionEvent e) {
+		if (edit != null && e.widget == edit) {
+			edit();
+			this.selectedElementsViewer.refresh();
+		}
+		super.widgetSelected(e);
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         <code>true</code> if the selected element can be edited
+	 */
+	protected boolean canEdit() {
+		return allowEdition && this.factory.canEdit();
+	}
+
+	/**
+	 * edit the selected element
+	 */
+	protected void edit() {
+		// nothing to do here
+	}
+}
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/widgets/MultipleValueSelectionWidget.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/widgets/MultipleValueSelectionWidget.java
index 39e2a40da82..eecf456c52a 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/widgets/MultipleValueSelectionWidget.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/widgets/MultipleValueSelectionWidget.java
@@ -1,822 +1,822 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- * Adapted code from Camille Letavernier (CEA LIST) in MultipleValueSelectorDialog

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.widgets.widgets;

-

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashSet;

-import java.util.LinkedHashSet;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.OperationCanceledException;

-import org.eclipse.jface.viewers.DoubleClickEvent;

-import org.eclipse.jface.viewers.IContentProvider;

-import org.eclipse.jface.viewers.IDoubleClickListener;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.papyrus.infra.widgets.messages.Messages;

-import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;

-import org.eclipse.papyrus.infra.widgets.util.ValueUtils;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.layout.FillLayout;

-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.Control;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.ui.services.IDisposable;

-

-/**

- * @author VL222926

- *         Class extracted from MultipleValueSelectorDialog

- *

- */

-public class MultipleValueSelectionWidget implements ISelectionChangedListener, IDoubleClickListener, IElementSelectionListener, SelectionListener, IDisposable {

-

-	/**

-	 * The object selector

-	 */

-	protected IElementSelector selector;

-

-	/**

-	 * The SWT Composite in which the selector is drawn

-	 */

-	protected Composite selectorSection;

-

-	/**

-	 * The add/remove/addAll buttons section

-	 */

-	protected Composite buttonsSection;

-

-	/**

-	 * The up/down buttons section

-	 */

-	protected Composite rightButtonsSection;

-

-	/**

-	 * The listViewer for chosen elements

-	 */

-	protected TreeViewer selectedElementsViewer;

-

-	/**

-	 * The list for chosen elements

-	 */

-	protected Tree selectedElements;

-

-	/**

-	 * The add action button

-	 */

-	protected Button add;

-

-	/**

-	 * The create action button

-	 */

-	protected Button create;

-

-	/**

-	 * The delete action button

-	 */

-	protected Button delete;

-

-	/**

-	 * The remove action button

-	 */

-	protected Button remove;

-

-	/**

-	 * The add all action button

-	 */

-	protected Button addAll;

-

-	/**

-	 * The remove all action button

-	 */

-	protected Button removeAll;

-

-	/**

-	 * the up action button

-	 */

-	protected Button up;

-

-	/**

-	 * the down action button

-	 */

-	protected Button down;

-

-	/**

-	 * The label provider for the listViewer of chosen elements

-	 */

-	protected ILabelProvider labelProvider;

-

-	/**

-	 * The currently chosen elements

-	 */

-	protected final Collection<Object> allElements;

-

-	/**

-	 * Indicates if the values should be unique (according to Object.equals())

-	 */

-	protected boolean unique;

-

-	/**

-	 * Indicates if the list is ordered

-	 */

-	protected boolean ordered;

-

-	/**

-	 * The factory for creating new elements

-	 */

-	protected ReferenceValueFactory factory;

-

-	/**

-	 * The model element being edited (if any), to which elements are to be added or removed.

-	 */

-	protected Object contextElement;

-

-	/**

-	 * The list of newly created objects

-	 */

-	protected Set<Object> newObjects = new HashSet<Object>();

-

-

-	/**

-	 * The maximum number of values selected.

-	 */

-	protected int upperBound;

-

-	/**

-	 * the initial selection

-	 */

-	protected List<?> initialSelection;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 *            The element selector used by this dialog

-	 */

-	public MultipleValueSelectionWidget(IElementSelector selector) {

-		this(selector, false, false);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param selector

-	 *            The element selector used by this dialog

-	 * @param unique

-	 *            True if the values returned by this dialog should be unique

-	 */

-	public MultipleValueSelectionWidget(IElementSelector selector, boolean unique) {

-		this(selector, unique, false);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param selector

-	 *            The element selector used by this dialog

-	 * @param unique

-	 *            True if the values returned by this dialog should be unique

-	 */

-	public MultipleValueSelectionWidget(IElementSelector selector, boolean unique, boolean ordered) {

-		this(selector, unique, false, ValueUtils.MANY);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param selector

-	 *            The element selector used by this dialog

-	 * @param unique

-	 *            True if the values returned by this dialog should be unique

-	 * @param upperBound

-	 *            The maximum number of values selected.

-	 */

-	public MultipleValueSelectionWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {

-		Assert.isNotNull(selector, "The element selector should be defined"); //$NON-NLS-1$

-		this.selector = selector;

-		allElements = unique ? new LinkedHashSet<Object>() : new LinkedList<Object>();

-		this.unique = unique;

-		this.ordered = ordered;

-		this.upperBound = upperBound;

-		selector.addElementSelectionListener(this);

-		init();

-	}

-

-	/**

-	 * initialize the widget if required

-	 */

-	protected void init() {

-		// nothing to do

-	}

-

-	/**

-	 * Create the contents of the dialog

-	 * 

-	 * @return

-	 *         the the composite which encapsulate all the sub composite

-	 */

-	public final Composite create(Composite composite) {

-		Composite parent = createContents(composite);

-		updateControls();

-		return parent;

-	}

-

-	/**

-	 * Create the contents of the dialog

-	 * 

-	 * @return

-	 *         the the composite which encapsulate all the sub composite

-	 */

-	protected Composite createContents(Composite parent) {

-		Object parentLayout = parent.getLayout();

-		GridLayout layout = null;

-		if (parentLayout instanceof GridLayout) {

-			layout = (GridLayout) parentLayout;

-		} else {

-			parent = new Composite(parent, SWT.NONE);

-			layout = new GridLayout();

-			parent.setLayout(layout);

-		}

-

-		layout.numColumns = 2;

-		layout.makeColumnsEqualWidth = true;

-

-		Composite selectorPane = new Composite(parent, SWT.NONE);

-		selectorPane.setLayout(new GridLayout(2, false));

-		selectorPane.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-

-		Composite selectedPane = new Composite(parent, SWT.NONE);

-		selectedPane.setLayout(new GridLayout(2, false));

-		selectedPane.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-

-		createSelectorSection(selectorPane);

-		createControlsSection(selectorPane);

-		createListSection(selectedPane);

-		createRightButtonsSection(selectedPane);

-

-		allElements.clear();

-		allElements.addAll(getInitialElementSelections());

-		return parent;

-	}

-

-

-

-

-	public void setInitialSelections(List<?> selectedElements) {

-		this.initialSelection = selectedElements;

-		allElements.clear();

-		allElements.addAll(getInitialElementSelections());

-	}

-

-	/**

-	 * @return

-	 */

-	private Collection<? extends Object> getInitialElementSelections() {

-		if (this.initialSelection == null) {

-			return Collections.emptyList();

-		}

-		return this.initialSelection;

-	}

-

-	/**

-	 * Creates the selector section

-	 *

-	 * @param parent

-	 *            The composite in which the section is created

-	 */

-	private void createSelectorSection(Composite parent) {

-		selectorSection = new Composite(parent, SWT.NONE);

-		selectorSection.setLayout(new FillLayout());

-		selectorSection.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-		selector.createControls(selectorSection);

-	}

-

-	/**

-	 * Creates the main controls section (Add, remove, Add all, remove all)

-	 *

-	 * @param parent

-	 *            The composite in which the section is created

-	 */

-	private void createControlsSection(Composite parent) {

-		buttonsSection = new Composite(parent, SWT.NONE);

-		buttonsSection.setLayout(new GridLayout(1, true));

-

-		add = new Button(buttonsSection, SWT.PUSH);

-		add.setImage(Activator.getDefault().getImage("/icons/arrow_right.gif")); //$NON-NLS-1$

-		add.addSelectionListener(this);

-		add.setToolTipText(Messages.MultipleValueSelectorDialog_AddSelectedElements);

-

-		remove = new Button(buttonsSection, SWT.PUSH);

-		remove.setImage(Activator.getDefault().getImage("/icons/arrow_left.gif")); //$NON-NLS-1$

-		remove.addSelectionListener(this);

-		remove.setToolTipText(Messages.MultipleValueEditor_RemoveSelectedElements);

-

-		addAll = new Button(buttonsSection, SWT.PUSH);

-		addAll.setImage(Activator.getDefault().getImage("/icons/arrow_double.gif")); //$NON-NLS-1$

-		addAll.addSelectionListener(this);

-		addAll.setToolTipText(Messages.MultipleValueSelectorDialog_AddAllElements);

-

-		/* Disable the bouton 'addAll' if currently chosen elements is greater than the maximum number of values selected */

-		if (this.upperBound != ValueUtils.MANY && allElements.size() > this.upperBound) {

-			addAll.setEnabled(false);

-		}

-

-

-		removeAll = new Button(buttonsSection, SWT.PUSH);

-		removeAll.setImage(Activator.getDefault().getImage("/icons/arrow_left_double.gif")); //$NON-NLS-1$

-		removeAll.addSelectionListener(this);

-		removeAll.setToolTipText(Messages.MultipleValueSelectorDialog_RemoveAllElements);

-	}

-

-	/**

-	 * Creates the list displaying the currently selected elements

-	 *

-	 * @param parent

-	 *            The composite in which the section is created

-	 */

-	private void createListSection(Composite parent) {

-

-		selectedElements = new Tree(parent, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);

-		// selectedElements.addSelectionListener(this);

-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);

-		selectedElements.setLayoutData(data);

-		selectedElementsViewer = new TreeViewer(selectedElements);

-

-		selectedElementsViewer.addSelectionChangedListener(this);

-		selectedElementsViewer.addDoubleClickListener(this);

-

-		selectedElementsViewer.setContentProvider(createListSectionContentProvider());

-

-		if (labelProvider != null) {

-			selectedElementsViewer.setLabelProvider(labelProvider);

-		}

-

-		selectedElementsViewer.setInput(allElements);

-		selector.setSelectedElements(allElements.toArray());

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#createListSectionContentProvider()

-	 *

-	 * @return

-	 *         the content provider to use in the list section (right part)

-	 */

-	protected IContentProvider createListSectionContentProvider() {

-		return CollectionContentProvider.instance;

-	}

-

-	/**

-	 * Creates the up/down controls section

-	 *

-	 * @param parent

-	 *            The composite in which the section is created

-	 */

-	protected void createRightButtonsSection(Composite parent) {

-		rightButtonsSection = new Composite(parent, SWT.NONE);

-		rightButtonsSection.setLayout(new GridLayout(1, true));

-

-		up = new Button(rightButtonsSection, SWT.PUSH);

-		up.setImage(Activator.getDefault().getImage("/icons/Up_12x12.gif")); //$NON-NLS-1$

-		up.addSelectionListener(this);

-		up.setToolTipText(Messages.MultipleValueEditor_MoveSelectedElementsUp);

-

-		down = new Button(rightButtonsSection, SWT.PUSH);

-		down.setImage(Activator.getDefault().getImage("/icons/Down_12x12.gif")); //$NON-NLS-1$

-		down.addSelectionListener(this);

-		down.setToolTipText(Messages.MultipleValueEditor_MoveSelectedElementsDown);

-

-		create = new Button(rightButtonsSection, SWT.PUSH);

-		create.setImage(Activator.getDefault().getImage("/icons/Add_12x12.gif")); //$NON-NLS-1$

-		create.addSelectionListener(this);

-		create.setToolTipText(Messages.MultipleValueSelectorDialog_CreateNewElement);

-

-		delete = new Button(rightButtonsSection, SWT.PUSH);

-		delete.setImage(Activator.getDefault().getImage("/icons/Delete_12x12.gif")); //$NON-NLS-1$

-		delete.addSelectionListener(this);

-		delete.setToolTipText(Messages.MultipleValueSelectorDialog_DeleteNewElement);

-		delete.setEnabled(false);

-	}

-

-	/**

-	 * Sets the label provider used to display the selected elements

-	 *

-	 * @param labelProvider

-	 */

-	public void setLabelProvider(ILabelProvider labelProvider) {

-		this.labelProvider = labelProvider;

-	}

-

-	/**

-	 * {@inheritDoc} Handles the events on one of the control buttons

-	 *

-	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)

-	 *

-	 * @param e

-	 *            The event that occurred

-	 */

-	@Override

-	public void widgetSelected(SelectionEvent e) {

-		if (e.widget == add) {

-			addAction();

-		} else if (e.widget == remove) {

-			removeAction();

-		} else if (e.widget == addAll) {

-			addAllAction();

-		} else if (e.widget == removeAll) {

-			removeAllAction();

-		} else if (e.widget == up) {

-			upAction();

-		} else if (e.widget == down) {

-			downAction();

-		} else if (e.widget == create) {

-			createAction();

-		} else if (e.widget == delete) {

-			deleteAction();

-		}

-

-		updateControls();

-	}

-

-	/**

-	 * Sets the {@link ReferenceValueFactory} for this editor. The {@link ReferenceValueFactory} is used to create

-	 * new instances and edit existing ones.

-	 *

-	 * @param factory

-	 *            The {@link ReferenceValueFactory} to be used by this editor

-	 */

-	public void setFactory(ReferenceValueFactory factory) {

-		this.factory = factory;

-		updateControls();

-	}

-

-	/**

-	 * Handles the "Add" action

-	 */

-	protected void addAction() {

-		Object[] elements = selector.getSelectedElements();

-		addElements(elements);

-	}

-

-	/**

-	 * Handles the "Up" action

-	 */

-	protected void upAction() {

-		IStructuredSelection selection = (IStructuredSelection) selectedElementsViewer.getSelection();

-

-		// We need a list to move objects. LinkedHashSet can't do that

-		java.util.List<Object> list = new LinkedList<Object>(allElements);

-		for (Object o : selection.toArray()) {

-			int oldIndex = list.indexOf(o);

-			if (oldIndex > 0) {

-				move(list, oldIndex, oldIndex - 1);

-			}

-		}

-

-		allElements.clear();

-		allElements.addAll(list);

-

-		IStructuredSelection selectionCopy = new StructuredSelection(selection.toArray());

-		selectedElementsViewer.setSelection(selectionCopy);

-		selectedElementsViewer.refresh();

-	}

-

-	/**

-	 * Handles the "Down" action

-	 */

-	protected void downAction() {

-		IStructuredSelection selection = (IStructuredSelection) selectedElementsViewer.getSelection();

-

-		// We need a list to move objects. LinkedHashSet can't do that

-		java.util.List<Object> list = new LinkedList<Object>(allElements);

-

-		int maxIndex = list.size() - 1;

-

-		Object[] selectionArray = selection.toArray();

-		for (int i = selectionArray.length - 1; i >= 0; i--) {

-			Object o = selectionArray[i];

-			int oldIndex = list.indexOf(o);

-			if (oldIndex < maxIndex) {

-				move(list, oldIndex, oldIndex + 1);

-			}

-		}

-

-		allElements.clear();

-		allElements.addAll(list);

-

-		IStructuredSelection selectionCopy = new StructuredSelection(selection.toArray());

-		selectedElementsViewer.setSelection(selectionCopy);

-		selectedElementsViewer.refresh();

-	}

-

-	/**

-	 * Handles the "Create" action

-	 */

-	protected void createAction() {

-		if (factory == null) {

-			return;

-		}

-

-		Object newObject;

-

-		try {

-			newObject = factory.createObject(this.create, this.contextElement);

-		} catch (OperationCanceledException e) {

-			// The user cancelled and we rolled back pending model changes

-			newObject = null;

-		}

-

-		if (newObject == null) {

-			return;

-		}

-

-		newObjects.add(newObject);

-		selector.newObjectCreated(newObject);

-

-		Object[] createdObjects = new Object[] { newObject };

-		addElements(createdObjects);

-

-		selector.setSelectedElements(allElements.toArray());

-	}

-

-

-	/**

-	 * Moves an element from oldIndex to newIndex

-	 *

-	 * @param list

-	 *            The list in which to move the object

-	 * @param oldIndex

-	 * @param newIndex

-	 */

-	private void move(java.util.List<Object> list, int oldIndex, int newIndex) {

-		int size = list.size();

-

-		if (oldIndex < 0 || oldIndex >= size) {

-			throw new IndexOutOfBoundsException("oldIndex: " + oldIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-		if (newIndex < 0 || newIndex >= size) {

-			throw new IndexOutOfBoundsException("newIndex: " + newIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-		Object element = list.remove(oldIndex);

-		list.add(newIndex, element);

-	}

-

-	/**

-	 * Handles the "Remove" action

-	 */

-	protected void removeAction() {

-		if (canRemove()) {

-			IStructuredSelection selection = (IStructuredSelection) selectedElementsViewer.getSelection();

-			if (selection.isEmpty()) {

-				return;

-			}

-

-			for (Object element : selection.toArray()) {

-				allElements.remove(element);

-			}

-

-			selector.setSelectedElements(allElements.toArray());

-			selectedElementsViewer.setSelection(null);

-			selectedElementsViewer.refresh();

-		}

-	}

-

-	/**

-	 * Handles the "Delete" action

-	 */

-	protected void deleteAction() {

-		// nothing to do here

-	}

-

-	/**

-	 * Handles the "Remove all" action

-	 */

-	protected void removeAllAction() {

-		allElements.clear();

-		selector.setSelectedElements(new Object[0]);

-		selectedElementsViewer.setSelection(null);

-		selectedElementsViewer.refresh();

-	}

-

-	/**

-	 * Handles the "Add All" action

-	 */

-	protected void addAllAction() {

-		Object[] elements = selector.getAllElements();

-		addElements(elements);

-	}

-

-	/**

-	 * Adds the specified elements to the currently selected elements (For

-	 * "Add" and "Add all" actions)

-	 *

-	 * @param elements

-	 *            The elements to be added

-	 */

-	@Override

-	public void addElements(Object[] elements) {

-		if (elements != null) {

-			allElements.addAll(Arrays.asList(elements));

-			selectedElementsViewer.refresh();

-		}

-	}

-

-	public List<Object> getSelection() {

-		if (factory != null) {

-			java.util.List<Object> objectsToValidate = new LinkedList<Object>();

-			for (Object object : newObjects) {

-				if (allElements.contains(object)) {

-					objectsToValidate.add(object);

-				}

-			}

-			factory.validateObjects(objectsToValidate);

-			selector.clearTemporaryElements();

-		}

-		return new LinkedList<Object>(allElements);

-	}

-

-	@Override

-	public void widgetDefaultSelected(SelectionEvent e) {

-		// Nothing (see #doubleClick())

-	}

-

-	/**

-	 * Indicates if the selected values should be unique (According to Object.equals())

-	 *

-	 * @param unique

-	 */

-	public void setUnique(boolean unique) {

-		this.unique = unique;

-		updateControls();

-	}

-

-	/**

-	 * Indicates if the selected elements should be ordered

-	 *

-	 * @param ordered

-	 */

-	public void setOrdered(boolean ordered) {

-		this.ordered = ordered;

-		updateControls();

-	}

-

-	public void updateControls() {

-		updateControl(up, ordered && canMove(true));

-		updateControl(down, ordered && canMove(false));

-		updateControl(create, this.factory != null && this.factory.canCreateObject());

-		updateControl(add, canAdd());

-		updateControl(delete, canDelete());

-	}

-

-	/**

-	 * @return

-	 */

-	protected boolean canDelete() {

-		return true;

-	}

-

-	/**

-	 * 

-	 * @param up

-	 *            if <code>true</code> we try to move the element to the up, if <code>false</code> we try to move the element to the down

-	 * @return

-	 *         <code>true</code> if the element can be moved

-	 */

-	protected boolean canMove(boolean up) {

-		return ordered;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         <code>true</code> if we can add elements

-	 */

-	protected boolean canAdd() {

-		/* Disable the bouton 'add' if the upperBound is reached */

-		boolean canAdd = true;

-		if (this.upperBound != ValueUtils.MANY) {

-			if (allElements.size() >= this.upperBound) {

-				canAdd = false;

-			}

-		}

-		return canAdd;

-	}

-

-	protected void updateControl(Control control, boolean enabled) {

-		if (control != null) {

-			control.setEnabled(enabled);

-		}

-	}

-

-	public void setSelector(IElementSelector selector) {

-		this.selector = selector;

-	}

-

-	/**

-	 * Set the maximum number of values selected.

-	 *

-	 * @param upperBound

-	 */

-	public void setUpperBound(int upperBound) {

-		this.upperBound = upperBound;

-	}

-

-	/**

-	 * Sets the optional context of the element that is being edited, in which others will be added and removed.

-	 *

-	 * @param contextElement

-	 *            the model element that is being edited

-	 */

-	public void setContextElement(Object contextElement) {

-		this.contextElement = contextElement;

-	}

-

-	/**

-	 * Queries the optional context of the element that is being edited, in which others will be added and removed.

-	 *

-	 * @return the model element that is being edited

-	 */

-	public Object getContextElement() {

-		return contextElement;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * Handles double click event on the right-panel tree viewer {@link #selectedElementsViewer}

-	 *

-	 */

-	@Override

-	public void doubleClick(DoubleClickEvent event) {

-		removeAction();

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         <code>true</code> if the selected elements can be removed (moved from right to left)

-	 */

-	protected boolean canRemove() {

-		return true;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * Handles selection change event on the right-panel tree viewer {@link #selectedElementsViewer}

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		updateControls();

-	}

-

-	/**

-	 * @see org.eclipse.ui.services.IDisposable#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		selector.removeElementSelectionListener(this);

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the initial selection

-	 */

-	protected List<?> getInitialSelection() {

-		return this.initialSelection;

-	}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ * Adapted code from Camille Letavernier (CEA LIST) in MultipleValueSelectorDialog
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.widgets.widgets;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IContentProvider;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelectionListener;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;
+import org.eclipse.papyrus.infra.widgets.messages.Messages;
+import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;
+import org.eclipse.papyrus.infra.widgets.util.ValueUtils;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.FillLayout;
+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.Control;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.ui.services.IDisposable;
+
+/**
+ * @author VL222926
+ *         Class extracted from MultipleValueSelectorDialog
+ *
+ */
+public class MultipleValueSelectionWidget implements ISelectionChangedListener, IDoubleClickListener, IElementSelectionListener, SelectionListener, IDisposable {
+
+	/**
+	 * The object selector
+	 */
+	protected IElementSelector selector;
+
+	/**
+	 * The SWT Composite in which the selector is drawn
+	 */
+	protected Composite selectorSection;
+
+	/**
+	 * The add/remove/addAll buttons section
+	 */
+	protected Composite buttonsSection;
+
+	/**
+	 * The up/down buttons section
+	 */
+	protected Composite rightButtonsSection;
+
+	/**
+	 * The listViewer for chosen elements
+	 */
+	protected TreeViewer selectedElementsViewer;
+
+	/**
+	 * The list for chosen elements
+	 */
+	protected Tree selectedElements;
+
+	/**
+	 * The add action button
+	 */
+	protected Button add;
+
+	/**
+	 * The create action button
+	 */
+	protected Button create;
+
+	/**
+	 * The delete action button
+	 */
+	protected Button delete;
+
+	/**
+	 * The remove action button
+	 */
+	protected Button remove;
+
+	/**
+	 * The add all action button
+	 */
+	protected Button addAll;
+
+	/**
+	 * The remove all action button
+	 */
+	protected Button removeAll;
+
+	/**
+	 * the up action button
+	 */
+	protected Button up;
+
+	/**
+	 * the down action button
+	 */
+	protected Button down;
+
+	/**
+	 * The label provider for the listViewer of chosen elements
+	 */
+	protected ILabelProvider labelProvider;
+
+	/**
+	 * The currently chosen elements
+	 */
+	protected final Collection<Object> allElements;
+
+	/**
+	 * Indicates if the values should be unique (according to Object.equals())
+	 */
+	protected boolean unique;
+
+	/**
+	 * Indicates if the list is ordered
+	 */
+	protected boolean ordered;
+
+	/**
+	 * The factory for creating new elements
+	 */
+	protected ReferenceValueFactory factory;
+
+	/**
+	 * The model element being edited (if any), to which elements are to be added or removed.
+	 */
+	protected Object contextElement;
+
+	/**
+	 * The list of newly created objects
+	 */
+	protected Set<Object> newObjects = new HashSet<Object>();
+
+
+	/**
+	 * The maximum number of values selected.
+	 */
+	protected int upperBound;
+
+	/**
+	 * the initial selection
+	 */
+	protected List<?> initialSelection;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 *            The element selector used by this dialog
+	 */
+	public MultipleValueSelectionWidget(IElementSelector selector) {
+		this(selector, false, false);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param selector
+	 *            The element selector used by this dialog
+	 * @param unique
+	 *            True if the values returned by this dialog should be unique
+	 */
+	public MultipleValueSelectionWidget(IElementSelector selector, boolean unique) {
+		this(selector, unique, false);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param selector
+	 *            The element selector used by this dialog
+	 * @param unique
+	 *            True if the values returned by this dialog should be unique
+	 */
+	public MultipleValueSelectionWidget(IElementSelector selector, boolean unique, boolean ordered) {
+		this(selector, unique, false, ValueUtils.MANY);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param selector
+	 *            The element selector used by this dialog
+	 * @param unique
+	 *            True if the values returned by this dialog should be unique
+	 * @param upperBound
+	 *            The maximum number of values selected.
+	 */
+	public MultipleValueSelectionWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {
+		Assert.isNotNull(selector, "The element selector should be defined"); //$NON-NLS-1$
+		this.selector = selector;
+		allElements = unique ? new LinkedHashSet<Object>() : new LinkedList<Object>();
+		this.unique = unique;
+		this.ordered = ordered;
+		this.upperBound = upperBound;
+		selector.addElementSelectionListener(this);
+		init();
+	}
+
+	/**
+	 * initialize the widget if required
+	 */
+	protected void init() {
+		// nothing to do
+	}
+
+	/**
+	 * Create the contents of the dialog
+	 * 
+	 * @return
+	 *         the the composite which encapsulate all the sub composite
+	 */
+	public final Composite create(Composite composite) {
+		Composite parent = createContents(composite);
+		updateControls();
+		return parent;
+	}
+
+	/**
+	 * Create the contents of the dialog
+	 * 
+	 * @return
+	 *         the the composite which encapsulate all the sub composite
+	 */
+	protected Composite createContents(Composite parent) {
+		Object parentLayout = parent.getLayout();
+		GridLayout layout = null;
+		if (parentLayout instanceof GridLayout) {
+			layout = (GridLayout) parentLayout;
+		} else {
+			parent = new Composite(parent, SWT.NONE);
+			layout = new GridLayout();
+			parent.setLayout(layout);
+		}
+
+		layout.numColumns = 2;
+		layout.makeColumnsEqualWidth = true;
+
+		Composite selectorPane = new Composite(parent, SWT.NONE);
+		selectorPane.setLayout(new GridLayout(2, false));
+		selectorPane.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+		Composite selectedPane = new Composite(parent, SWT.NONE);
+		selectedPane.setLayout(new GridLayout(2, false));
+		selectedPane.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+		createSelectorSection(selectorPane);
+		createControlsSection(selectorPane);
+		createListSection(selectedPane);
+		createRightButtonsSection(selectedPane);
+
+		allElements.clear();
+		allElements.addAll(getInitialElementSelections());
+		return parent;
+	}
+
+
+
+
+	public void setInitialSelections(List<?> selectedElements) {
+		this.initialSelection = selectedElements;
+		allElements.clear();
+		allElements.addAll(getInitialElementSelections());
+	}
+
+	/**
+	 * @return
+	 */
+	private Collection<? extends Object> getInitialElementSelections() {
+		if (this.initialSelection == null) {
+			return Collections.emptyList();
+		}
+		return this.initialSelection;
+	}
+
+	/**
+	 * Creates the selector section
+	 *
+	 * @param parent
+	 *            The composite in which the section is created
+	 */
+	private void createSelectorSection(Composite parent) {
+		selectorSection = new Composite(parent, SWT.NONE);
+		selectorSection.setLayout(new FillLayout());
+		selectorSection.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		selector.createControls(selectorSection);
+	}
+
+	/**
+	 * Creates the main controls section (Add, remove, Add all, remove all)
+	 *
+	 * @param parent
+	 *            The composite in which the section is created
+	 */
+	private void createControlsSection(Composite parent) {
+		buttonsSection = new Composite(parent, SWT.NONE);
+		buttonsSection.setLayout(new GridLayout(1, true));
+
+		add = new Button(buttonsSection, SWT.PUSH);
+		add.setImage(Activator.getDefault().getImage("/icons/arrow_right.gif")); //$NON-NLS-1$
+		add.addSelectionListener(this);
+		add.setToolTipText(Messages.MultipleValueSelectorDialog_AddSelectedElements);
+
+		remove = new Button(buttonsSection, SWT.PUSH);
+		remove.setImage(Activator.getDefault().getImage("/icons/arrow_left.gif")); //$NON-NLS-1$
+		remove.addSelectionListener(this);
+		remove.setToolTipText(Messages.MultipleValueEditor_RemoveSelectedElements);
+
+		addAll = new Button(buttonsSection, SWT.PUSH);
+		addAll.setImage(Activator.getDefault().getImage("/icons/arrow_double.gif")); //$NON-NLS-1$
+		addAll.addSelectionListener(this);
+		addAll.setToolTipText(Messages.MultipleValueSelectorDialog_AddAllElements);
+
+		/* Disable the bouton 'addAll' if currently chosen elements is greater than the maximum number of values selected */
+		if (this.upperBound != ValueUtils.MANY && allElements.size() > this.upperBound) {
+			addAll.setEnabled(false);
+		}
+
+
+		removeAll = new Button(buttonsSection, SWT.PUSH);
+		removeAll.setImage(Activator.getDefault().getImage("/icons/arrow_left_double.gif")); //$NON-NLS-1$
+		removeAll.addSelectionListener(this);
+		removeAll.setToolTipText(Messages.MultipleValueSelectorDialog_RemoveAllElements);
+	}
+
+	/**
+	 * Creates the list displaying the currently selected elements
+	 *
+	 * @param parent
+	 *            The composite in which the section is created
+	 */
+	private void createListSection(Composite parent) {
+
+		selectedElements = new Tree(parent, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
+		// selectedElements.addSelectionListener(this);
+		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
+		selectedElements.setLayoutData(data);
+		selectedElementsViewer = new TreeViewer(selectedElements);
+
+		selectedElementsViewer.addSelectionChangedListener(this);
+		selectedElementsViewer.addDoubleClickListener(this);
+
+		selectedElementsViewer.setContentProvider(createListSectionContentProvider());
+
+		if (labelProvider != null) {
+			selectedElementsViewer.setLabelProvider(labelProvider);
+		}
+
+		selectedElementsViewer.setInput(allElements);
+		selector.setSelectedElements(allElements.toArray());
+	}
+
+	/**
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.wizard.pages.MultipleValueSelectionWizard#createListSectionContentProvider()
+	 *
+	 * @return
+	 *         the content provider to use in the list section (right part)
+	 */
+	protected IContentProvider createListSectionContentProvider() {
+		return CollectionContentProvider.instance;
+	}
+
+	/**
+	 * Creates the up/down controls section
+	 *
+	 * @param parent
+	 *            The composite in which the section is created
+	 */
+	protected void createRightButtonsSection(Composite parent) {
+		rightButtonsSection = new Composite(parent, SWT.NONE);
+		rightButtonsSection.setLayout(new GridLayout(1, true));
+
+		up = new Button(rightButtonsSection, SWT.PUSH);
+		up.setImage(Activator.getDefault().getImage("/icons/Up_12x12.gif")); //$NON-NLS-1$
+		up.addSelectionListener(this);
+		up.setToolTipText(Messages.MultipleValueEditor_MoveSelectedElementsUp);
+
+		down = new Button(rightButtonsSection, SWT.PUSH);
+		down.setImage(Activator.getDefault().getImage("/icons/Down_12x12.gif")); //$NON-NLS-1$
+		down.addSelectionListener(this);
+		down.setToolTipText(Messages.MultipleValueEditor_MoveSelectedElementsDown);
+
+		create = new Button(rightButtonsSection, SWT.PUSH);
+		create.setImage(Activator.getDefault().getImage("/icons/Add_12x12.gif")); //$NON-NLS-1$
+		create.addSelectionListener(this);
+		create.setToolTipText(Messages.MultipleValueSelectorDialog_CreateNewElement);
+
+		delete = new Button(rightButtonsSection, SWT.PUSH);
+		delete.setImage(Activator.getDefault().getImage("/icons/Delete_12x12.gif")); //$NON-NLS-1$
+		delete.addSelectionListener(this);
+		delete.setToolTipText(Messages.MultipleValueSelectorDialog_DeleteNewElement);
+		delete.setEnabled(false);
+	}
+
+	/**
+	 * Sets the label provider used to display the selected elements
+	 *
+	 * @param labelProvider
+	 */
+	public void setLabelProvider(ILabelProvider labelProvider) {
+		this.labelProvider = labelProvider;
+	}
+
+	/**
+	 * {@inheritDoc} Handles the events on one of the control buttons
+	 *
+	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
+	 *
+	 * @param e
+	 *            The event that occurred
+	 */
+	@Override
+	public void widgetSelected(SelectionEvent e) {
+		if (e.widget == add) {
+			addAction();
+		} else if (e.widget == remove) {
+			removeAction();
+		} else if (e.widget == addAll) {
+			addAllAction();
+		} else if (e.widget == removeAll) {
+			removeAllAction();
+		} else if (e.widget == up) {
+			upAction();
+		} else if (e.widget == down) {
+			downAction();
+		} else if (e.widget == create) {
+			createAction();
+		} else if (e.widget == delete) {
+			deleteAction();
+		}
+
+		updateControls();
+	}
+
+	/**
+	 * Sets the {@link ReferenceValueFactory} for this editor. The {@link ReferenceValueFactory} is used to create
+	 * new instances and edit existing ones.
+	 *
+	 * @param factory
+	 *            The {@link ReferenceValueFactory} to be used by this editor
+	 */
+	public void setFactory(ReferenceValueFactory factory) {
+		this.factory = factory;
+		updateControls();
+	}
+
+	/**
+	 * Handles the "Add" action
+	 */
+	protected void addAction() {
+		Object[] elements = selector.getSelectedElements();
+		addElements(elements);
+	}
+
+	/**
+	 * Handles the "Up" action
+	 */
+	protected void upAction() {
+		IStructuredSelection selection = (IStructuredSelection) selectedElementsViewer.getSelection();
+
+		// We need a list to move objects. LinkedHashSet can't do that
+		java.util.List<Object> list = new LinkedList<Object>(allElements);
+		for (Object o : selection.toArray()) {
+			int oldIndex = list.indexOf(o);
+			if (oldIndex > 0) {
+				move(list, oldIndex, oldIndex - 1);
+			}
+		}
+
+		allElements.clear();
+		allElements.addAll(list);
+
+		IStructuredSelection selectionCopy = new StructuredSelection(selection.toArray());
+		selectedElementsViewer.setSelection(selectionCopy);
+		selectedElementsViewer.refresh();
+	}
+
+	/**
+	 * Handles the "Down" action
+	 */
+	protected void downAction() {
+		IStructuredSelection selection = (IStructuredSelection) selectedElementsViewer.getSelection();
+
+		// We need a list to move objects. LinkedHashSet can't do that
+		java.util.List<Object> list = new LinkedList<Object>(allElements);
+
+		int maxIndex = list.size() - 1;
+
+		Object[] selectionArray = selection.toArray();
+		for (int i = selectionArray.length - 1; i >= 0; i--) {
+			Object o = selectionArray[i];
+			int oldIndex = list.indexOf(o);
+			if (oldIndex < maxIndex) {
+				move(list, oldIndex, oldIndex + 1);
+			}
+		}
+
+		allElements.clear();
+		allElements.addAll(list);
+
+		IStructuredSelection selectionCopy = new StructuredSelection(selection.toArray());
+		selectedElementsViewer.setSelection(selectionCopy);
+		selectedElementsViewer.refresh();
+	}
+
+	/**
+	 * Handles the "Create" action
+	 */
+	protected void createAction() {
+		if (factory == null) {
+			return;
+		}
+
+		Object newObject;
+
+		try {
+			newObject = factory.createObject(this.create, this.contextElement);
+		} catch (OperationCanceledException e) {
+			// The user cancelled and we rolled back pending model changes
+			newObject = null;
+		}
+
+		if (newObject == null) {
+			return;
+		}
+
+		newObjects.add(newObject);
+		selector.newObjectCreated(newObject);
+
+		Object[] createdObjects = new Object[] { newObject };
+		addElements(createdObjects);
+
+		selector.setSelectedElements(allElements.toArray());
+	}
+
+
+	/**
+	 * Moves an element from oldIndex to newIndex
+	 *
+	 * @param list
+	 *            The list in which to move the object
+	 * @param oldIndex
+	 * @param newIndex
+	 */
+	private void move(java.util.List<Object> list, int oldIndex, int newIndex) {
+		int size = list.size();
+
+		if (oldIndex < 0 || oldIndex >= size) {
+			throw new IndexOutOfBoundsException("oldIndex: " + oldIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (newIndex < 0 || newIndex >= size) {
+			throw new IndexOutOfBoundsException("newIndex: " + newIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		Object element = list.remove(oldIndex);
+		list.add(newIndex, element);
+	}
+
+	/**
+	 * Handles the "Remove" action
+	 */
+	protected void removeAction() {
+		if (canRemove()) {
+			IStructuredSelection selection = (IStructuredSelection) selectedElementsViewer.getSelection();
+			if (selection.isEmpty()) {
+				return;
+			}
+
+			for (Object element : selection.toArray()) {
+				allElements.remove(element);
+			}
+
+			selector.setSelectedElements(allElements.toArray());
+			selectedElementsViewer.setSelection(null);
+			selectedElementsViewer.refresh();
+		}
+	}
+
+	/**
+	 * Handles the "Delete" action
+	 */
+	protected void deleteAction() {
+		// nothing to do here
+	}
+
+	/**
+	 * Handles the "Remove all" action
+	 */
+	protected void removeAllAction() {
+		allElements.clear();
+		selector.setSelectedElements(new Object[0]);
+		selectedElementsViewer.setSelection(null);
+		selectedElementsViewer.refresh();
+	}
+
+	/**
+	 * Handles the "Add All" action
+	 */
+	protected void addAllAction() {
+		Object[] elements = selector.getAllElements();
+		addElements(elements);
+	}
+
+	/**
+	 * Adds the specified elements to the currently selected elements (For
+	 * "Add" and "Add all" actions)
+	 *
+	 * @param elements
+	 *            The elements to be added
+	 */
+	@Override
+	public void addElements(Object[] elements) {
+		if (elements != null) {
+			allElements.addAll(Arrays.asList(elements));
+			selectedElementsViewer.refresh();
+		}
+	}
+
+	public List<Object> getSelection() {
+		if (factory != null) {
+			java.util.List<Object> objectsToValidate = new LinkedList<Object>();
+			for (Object object : newObjects) {
+				if (allElements.contains(object)) {
+					objectsToValidate.add(object);
+				}
+			}
+			factory.validateObjects(objectsToValidate);
+			selector.clearTemporaryElements();
+		}
+		return new LinkedList<Object>(allElements);
+	}
+
+	@Override
+	public void widgetDefaultSelected(SelectionEvent e) {
+		// Nothing (see #doubleClick())
+	}
+
+	/**
+	 * Indicates if the selected values should be unique (According to Object.equals())
+	 *
+	 * @param unique
+	 */
+	public void setUnique(boolean unique) {
+		this.unique = unique;
+		updateControls();
+	}
+
+	/**
+	 * Indicates if the selected elements should be ordered
+	 *
+	 * @param ordered
+	 */
+	public void setOrdered(boolean ordered) {
+		this.ordered = ordered;
+		updateControls();
+	}
+
+	public void updateControls() {
+		updateControl(up, ordered && canMove(true));
+		updateControl(down, ordered && canMove(false));
+		updateControl(create, this.factory != null && this.factory.canCreateObject());
+		updateControl(add, canAdd());
+		updateControl(delete, canDelete());
+	}
+
+	/**
+	 * @return
+	 */
+	protected boolean canDelete() {
+		return true;
+	}
+
+	/**
+	 * 
+	 * @param up
+	 *            if <code>true</code> we try to move the element to the up, if <code>false</code> we try to move the element to the down
+	 * @return
+	 *         <code>true</code> if the element can be moved
+	 */
+	protected boolean canMove(boolean up) {
+		return ordered;
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         <code>true</code> if we can add elements
+	 */
+	protected boolean canAdd() {
+		/* Disable the bouton 'add' if the upperBound is reached */
+		boolean canAdd = true;
+		if (this.upperBound != ValueUtils.MANY) {
+			if (allElements.size() >= this.upperBound) {
+				canAdd = false;
+			}
+		}
+		return canAdd;
+	}
+
+	protected void updateControl(Control control, boolean enabled) {
+		if (control != null) {
+			control.setEnabled(enabled);
+		}
+	}
+
+	public void setSelector(IElementSelector selector) {
+		this.selector = selector;
+	}
+
+	/**
+	 * Set the maximum number of values selected.
+	 *
+	 * @param upperBound
+	 */
+	public void setUpperBound(int upperBound) {
+		this.upperBound = upperBound;
+	}
+
+	/**
+	 * Sets the optional context of the element that is being edited, in which others will be added and removed.
+	 *
+	 * @param contextElement
+	 *            the model element that is being edited
+	 */
+	public void setContextElement(Object contextElement) {
+		this.contextElement = contextElement;
+	}
+
+	/**
+	 * Queries the optional context of the element that is being edited, in which others will be added and removed.
+	 *
+	 * @return the model element that is being edited
+	 */
+	public Object getContextElement() {
+		return contextElement;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * Handles double click event on the right-panel tree viewer {@link #selectedElementsViewer}
+	 *
+	 */
+	@Override
+	public void doubleClick(DoubleClickEvent event) {
+		removeAction();
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         <code>true</code> if the selected elements can be removed (moved from right to left)
+	 */
+	protected boolean canRemove() {
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * Handles selection change event on the right-panel tree viewer {@link #selectedElementsViewer}
+	 */
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		updateControls();
+	}
+
+	/**
+	 * @see org.eclipse.ui.services.IDisposable#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		selector.removeElementSelectionListener(this);
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         the initial selection
+	 */
+	protected List<?> getInitialSelection() {
+		return this.initialSelection;
+	}
 }
\ No newline at end of file
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/widgets/MultipleValueSelectionWithCheckboxWidget.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/widgets/MultipleValueSelectionWithCheckboxWidget.java
index 8e4412bc497..dc5b301e481 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/widgets/MultipleValueSelectionWithCheckboxWidget.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/widgets/MultipleValueSelectionWithCheckboxWidget.java
@@ -1,168 +1,168 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- * Adapted code from Camille Letavernier (CEA LIST) in MultipleValueSelectorDialog

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.widgets.widgets;

-

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-

-

-/**

- * @author VL222926

- * 

- *

- */

-public class MultipleValueSelectionWithCheckboxWidget extends MultipleValueEditAndSelectionWidget {

-

-	/** boolean indicating if the checkbox is checked */

-	protected boolean isChecked;

-

-	/** The text to display for the checkbox */

-	protected String text;

-

-	/** the tooltip to display for the checkbox */

-	protected String tooltip;

-

-	/** indicates if the checkbox must be displayed or not */

-	protected boolean displayCheckBox = true;

-

-	protected Button checkBox;

-	/**

-	 * the checkbox listener

-	 */

-	protected SelectionListener checkboxListener;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 * @param unique

-	 * @param ordered

-	 * @param upperBound

-	 */

-	public MultipleValueSelectionWithCheckboxWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {

-		super(selector, unique, ordered, upperBound);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 * @param unique

-	 * @param ordered

-	 */

-	public MultipleValueSelectionWithCheckboxWidget(IElementSelector selector, boolean unique, boolean ordered) {

-		super(selector, unique, ordered);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 * @param unique

-	 */

-	public MultipleValueSelectionWithCheckboxWidget(IElementSelector selector, boolean unique) {

-		super(selector, unique);

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param selector

-	 */

-	public MultipleValueSelectionWithCheckboxWidget(IElementSelector selector) {

-		super(selector);

-	}

-

-	/**

-	 * @param text

-	 * @param tooltip

-	 * @param isChecked

-	 */

-	public void setCheckBoxValues(String text, String tooltip, boolean isChecked) {

-		this.text = text;

-		this.tooltip = tooltip;

-		this.isChecked = isChecked;

-	}

-

-	/**

-	 * @return

-	 *         <code>true</code> if the additional checkbox is checked

-	 */

-	public boolean isChecked() {

-		return this.isChecked;

-	}

-

-	/**

-	 * @param displayCheckBox

-	 *            <code>true</code> if the additional checkbox must be displayed

-	 */

-	public void setDisplayCheckBox(boolean displayCheckBox) {

-		this.displayCheckBox = displayCheckBox;

-	}

-

-	/**

-	 * 

-	 * @return <code>true</code> if the checkbox must be displayed

-	 */

-	public boolean isDisplayingCheckBox() {

-		return this.displayCheckBox;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#createContents(org.eclipse.swt.widgets.Composite)

-	 *

-	 * @param parent

-	 */

-	@Override

-	protected Composite createContents(Composite parent) {

-		Composite comp = super.createContents(parent);

-		if (this.displayCheckBox) {

-			this.checkBox = new Button(parent, SWT.CHECK);

-			this.checkBox.setText(this.text);

-			this.checkBox.setToolTipText(this.tooltip);

-			this.checkBox.setSelection(this.isChecked);

-			this.checkboxListener =

-					new SelectionListener() {

-

-						@Override

-						public void widgetSelected(SelectionEvent e) {

-							isChecked = MultipleValueSelectionWithCheckboxWidget.this.checkBox.getSelection();

-						}

-

-						@Override

-						public void widgetDefaultSelected(SelectionEvent e) {

-						}

-					};

-			this.checkBox.addSelectionListener(this.checkboxListener);

-		}

-		return comp;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		if (this.checkboxListener != null && this.checkBox != null) {

-			this.checkBox.removeSelectionListener(this.checkboxListener);

-		}

-		super.dispose();

-	}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ * Adapted code from Camille Letavernier (CEA LIST) in MultipleValueSelectorDialog
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.widgets.widgets;
+
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+
+
+/**
+ * @author VL222926
+ * 
+ *
+ */
+public class MultipleValueSelectionWithCheckboxWidget extends MultipleValueEditAndSelectionWidget {
+
+	/** boolean indicating if the checkbox is checked */
+	protected boolean isChecked;
+
+	/** The text to display for the checkbox */
+	protected String text;
+
+	/** the tooltip to display for the checkbox */
+	protected String tooltip;
+
+	/** indicates if the checkbox must be displayed or not */
+	protected boolean displayCheckBox = true;
+
+	protected Button checkBox;
+	/**
+	 * the checkbox listener
+	 */
+	protected SelectionListener checkboxListener;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 * @param unique
+	 * @param ordered
+	 * @param upperBound
+	 */
+	public MultipleValueSelectionWithCheckboxWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {
+		super(selector, unique, ordered, upperBound);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 * @param unique
+	 * @param ordered
+	 */
+	public MultipleValueSelectionWithCheckboxWidget(IElementSelector selector, boolean unique, boolean ordered) {
+		super(selector, unique, ordered);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 * @param unique
+	 */
+	public MultipleValueSelectionWithCheckboxWidget(IElementSelector selector, boolean unique) {
+		super(selector, unique);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param selector
+	 */
+	public MultipleValueSelectionWithCheckboxWidget(IElementSelector selector) {
+		super(selector);
+	}
+
+	/**
+	 * @param text
+	 * @param tooltip
+	 * @param isChecked
+	 */
+	public void setCheckBoxValues(String text, String tooltip, boolean isChecked) {
+		this.text = text;
+		this.tooltip = tooltip;
+		this.isChecked = isChecked;
+	}
+
+	/**
+	 * @return
+	 *         <code>true</code> if the additional checkbox is checked
+	 */
+	public boolean isChecked() {
+		return this.isChecked;
+	}
+
+	/**
+	 * @param displayCheckBox
+	 *            <code>true</code> if the additional checkbox must be displayed
+	 */
+	public void setDisplayCheckBox(boolean displayCheckBox) {
+		this.displayCheckBox = displayCheckBox;
+	}
+
+	/**
+	 * 
+	 * @return <code>true</code> if the checkbox must be displayed
+	 */
+	public boolean isDisplayingCheckBox() {
+		return this.displayCheckBox;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#createContents(org.eclipse.swt.widgets.Composite)
+	 *
+	 * @param parent
+	 */
+	@Override
+	protected Composite createContents(Composite parent) {
+		Composite comp = super.createContents(parent);
+		if (this.displayCheckBox) {
+			this.checkBox = new Button(parent, SWT.CHECK);
+			this.checkBox.setText(this.text);
+			this.checkBox.setToolTipText(this.tooltip);
+			this.checkBox.setSelection(this.isChecked);
+			this.checkboxListener =
+					new SelectionListener() {
+
+						@Override
+						public void widgetSelected(SelectionEvent e) {
+							isChecked = MultipleValueSelectionWithCheckboxWidget.this.checkBox.getSelection();
+						}
+
+						@Override
+						public void widgetDefaultSelected(SelectionEvent e) {
+						}
+					};
+			this.checkBox.addSelectionListener(this.checkboxListener);
+		}
+		return comp;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		if (this.checkboxListener != null && this.checkBox != null) {
+			this.checkBox.removeSelectionListener(this.checkboxListener);
+		}
+		super.dispose();
+	}
 }
\ No newline at end of file
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/wizard/pages/MultipleValueEditAndSelectionWizardPage.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/wizard/pages/MultipleValueEditAndSelectionWizardPage.java
index 7ea8a123be3..8815c446a53 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/wizard/pages/MultipleValueEditAndSelectionWizardPage.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/wizard/pages/MultipleValueEditAndSelectionWizardPage.java
@@ -1,263 +1,263 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.widgets.wizard.pages;

-

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

-import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;

-import org.eclipse.papyrus.infra.widgets.util.ImageConstants;

-import org.eclipse.papyrus.infra.widgets.util.ValueUtils;

-import org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Shell;

-

-/**

- * @author VL222926

- *

- */

-public class MultipleValueEditAndSelectionWizardPage extends WizardPage {

-

-	/**

-	 * the widget displayed in this dialog

-	 */

-	private MultipleValueSelectionWidget widget;

-	/**

-	 * The list of newly created objects

-	 */

-	protected Set<Object> newObjects = new HashSet<Object>();

-

-	/**

-	 * Constructor.

-	 * 

-	 * @param pageName

-	 *            the name of the wizard page

-	 * @param title

-	 *            the title of the page

-	 * @param titleImage

-	 *            the image to use in the title

-	 * @param selector

-	 *            The element selector used by this dialog

-	 */

-	public MultipleValueEditAndSelectionWizardPage(String pageName, String title, ImageDescriptor titleImage, IElementSelector selector) {

-		this(pageName, title, titleImage, selector, false, false);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 * 

-	 * @param pageName

-	 *            the name of the wizard page

-	 * @param title

-	 *            the title of the page

-	 * @param titleImage

-	 *            the image to use in the title

-	 * @param selector

-	 *            The element selector used by this dialog

-	 * @param unique

-	 *            True if the values returned by this dialog should be unique

-	 */

-	public MultipleValueEditAndSelectionWizardPage(String pageName, String title, ImageDescriptor titleImage, IElementSelector selector, boolean unique) {

-		this(pageName, title, titleImage, selector, unique, false);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 * 

-	 * @param pageName

-	 *            the name of the wizard page

-	 * @param title

-	 *            the title of the page

-	 * @param titleImage

-	 *            the image to use in the title

-	 * @param selector

-	 *            The element selector used by this dialog

-	 * @param unique

-	 *            True if the values returned by this dialog should be unique

-	 */

-	public MultipleValueEditAndSelectionWizardPage(String pageName, String title, ImageDescriptor titleImage, IElementSelector selector, boolean unique, boolean ordered) {

-		this(pageName, title, titleImage, selector, unique, false, ValueUtils.MANY);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 * 

-	 * @param pageName

-	 *            the name of the wizard page

-	 * @param title

-	 *            the title of the page

-	 * @param titleImage

-	 *            the image to use in the title

-	 * @param selector

-	 *            The element selector used by this dialog

-	 * @param unique

-	 *            True if the values returned by this dialog should be unique

-	 * @param upperBound

-	 *            The maximum number of values selected.

-	 */

-	public MultipleValueEditAndSelectionWizardPage(String pageName, String title, ImageDescriptor titleImage, IElementSelector selector, boolean unique, boolean ordered, int upperBound) {

-		super(pageName, title, titleImage);

-		this.widget = createWidget(selector, unique, ordered, upperBound);

-	}

-

-	/**

-	 * 

-	 * @param selector

-	 * @param unique

-	 * @param ordered

-	 * @param upperBound

-	 * @return

-	 */

-	protected MultipleValueSelectionWidget createWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {

-		return new MultipleValueSelectionWidget(selector, unique, ordered, upperBound);

-	}

-

-	/**

-	 * Sets the label provider used to display the selected elements

-	 *

-	 * @param labelProvider

-	 */

-	public void setLabelProvider(ILabelProvider labelProvider) {

-		this.widget.setLabelProvider(labelProvider);

-	}

-

-

-	/**

-	 * Sets the {@link ReferenceValueFactory} for this editor. The {@link ReferenceValueFactory} is used to create

-	 * new instances and edit existing ones.

-	 *

-	 * @param factory

-	 *            The {@link ReferenceValueFactory} to be used by this editor

-	 */

-	public void setFactory(ReferenceValueFactory factory) {

-		this.widget.setFactory(factory);

-	}

-

-	/**

-	 * Indicates if the selected values should be unique (According to Object.equals())

-	 *

-	 * @param unique

-	 */

-	public void setUnique(boolean unique) {

-		this.widget.setUnique(unique);

-	}

-

-	/**

-	 * Indicates if the selected elements should be ordered

-	 *

-	 * @param ordered

-	 */

-	public void setOrdered(boolean ordered) {

-		this.widget.setOrdered(ordered);

-	}

-

-	/**

-	 * 

-	 * @param selector

-	 */

-	public void setSelector(IElementSelector selector) {

-		this.widget.setSelector(selector);

-	}

-

-	/**

-	 * Set the maximum number of values selected.

-	 *

-	 * @param upperBound

-	 */

-	public void setUpperBound(int upperBound) {

-		this.widget.setUpperBound(upperBound);

-	}

-

-	/**

-	 * Sets the optional context of the element that is being edited, in which others will be added and removed.

-	 *

-	 * @param contextElement

-	 *            the model element that is being edited

-	 */

-	public void setContextElement(Object contextElement) {

-		this.widget.setContextElement(contextElement);

-	}

-

-	/**

-	 * Queries the optional context of the element that is being edited, in which others will be added and removed.

-	 *

-	 * @return the model element that is being edited

-	 */

-	public Object getContextElement() {

-		return this.widget.getContextElement();

-	}

-

-

-	/**

-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)

-	 *

-	 * @param arg0

-	 */

-	@Override

-	public void createControl(Composite arg0) {

-		Control ctrl = this.widget.create(arg0);

-		getShell().pack();

-		this.widget.updateControls();

-		setControl(ctrl);

-	}

-

-	/**

-	 * @param arrayList

-	 */

-	public void setInitialElementSelections(List<Object> arrayList) {

-		this.widget.setInitialSelections(arrayList);

-	}

-

-	/**

-	 * @see org.eclipse.jface.dialogs.DialogPage#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		this.widget.dispose();

-		super.dispose();

-	}

-

-	/**

-	 * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean)

-	 *

-	 * @param visible

-	 */

-	@Override

-	public void setVisible(boolean visible) {

-		super.setVisible(visible);

-		getControl().setVisible(visible);

-		this.widget.updateControls();

-		getShell().pack();

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the wrapped widget

-	 */

-	protected MultipleValueSelectionWidget getWidget() {

-		return this.widget;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.widgets.wizard.pages;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
+import org.eclipse.papyrus.infra.widgets.editors.IElementSelector;
+import org.eclipse.papyrus.infra.widgets.util.ImageConstants;
+import org.eclipse.papyrus.infra.widgets.util.ValueUtils;
+import org.eclipse.papyrus.infra.widgets.widgets.MultipleValueSelectionWidget;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * @author VL222926
+ *
+ */
+public class MultipleValueEditAndSelectionWizardPage extends WizardPage {
+
+	/**
+	 * the widget displayed in this dialog
+	 */
+	private MultipleValueSelectionWidget widget;
+	/**
+	 * The list of newly created objects
+	 */
+	protected Set<Object> newObjects = new HashSet<Object>();
+
+	/**
+	 * Constructor.
+	 * 
+	 * @param pageName
+	 *            the name of the wizard page
+	 * @param title
+	 *            the title of the page
+	 * @param titleImage
+	 *            the image to use in the title
+	 * @param selector
+	 *            The element selector used by this dialog
+	 */
+	public MultipleValueEditAndSelectionWizardPage(String pageName, String title, ImageDescriptor titleImage, IElementSelector selector) {
+		this(pageName, title, titleImage, selector, false, false);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 * 
+	 * @param pageName
+	 *            the name of the wizard page
+	 * @param title
+	 *            the title of the page
+	 * @param titleImage
+	 *            the image to use in the title
+	 * @param selector
+	 *            The element selector used by this dialog
+	 * @param unique
+	 *            True if the values returned by this dialog should be unique
+	 */
+	public MultipleValueEditAndSelectionWizardPage(String pageName, String title, ImageDescriptor titleImage, IElementSelector selector, boolean unique) {
+		this(pageName, title, titleImage, selector, unique, false);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 * 
+	 * @param pageName
+	 *            the name of the wizard page
+	 * @param title
+	 *            the title of the page
+	 * @param titleImage
+	 *            the image to use in the title
+	 * @param selector
+	 *            The element selector used by this dialog
+	 * @param unique
+	 *            True if the values returned by this dialog should be unique
+	 */
+	public MultipleValueEditAndSelectionWizardPage(String pageName, String title, ImageDescriptor titleImage, IElementSelector selector, boolean unique, boolean ordered) {
+		this(pageName, title, titleImage, selector, unique, false, ValueUtils.MANY);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 * 
+	 * @param pageName
+	 *            the name of the wizard page
+	 * @param title
+	 *            the title of the page
+	 * @param titleImage
+	 *            the image to use in the title
+	 * @param selector
+	 *            The element selector used by this dialog
+	 * @param unique
+	 *            True if the values returned by this dialog should be unique
+	 * @param upperBound
+	 *            The maximum number of values selected.
+	 */
+	public MultipleValueEditAndSelectionWizardPage(String pageName, String title, ImageDescriptor titleImage, IElementSelector selector, boolean unique, boolean ordered, int upperBound) {
+		super(pageName, title, titleImage);
+		this.widget = createWidget(selector, unique, ordered, upperBound);
+	}
+
+	/**
+	 * 
+	 * @param selector
+	 * @param unique
+	 * @param ordered
+	 * @param upperBound
+	 * @return
+	 */
+	protected MultipleValueSelectionWidget createWidget(IElementSelector selector, boolean unique, boolean ordered, int upperBound) {
+		return new MultipleValueSelectionWidget(selector, unique, ordered, upperBound);
+	}
+
+	/**
+	 * Sets the label provider used to display the selected elements
+	 *
+	 * @param labelProvider
+	 */
+	public void setLabelProvider(ILabelProvider labelProvider) {
+		this.widget.setLabelProvider(labelProvider);
+	}
+
+
+	/**
+	 * Sets the {@link ReferenceValueFactory} for this editor. The {@link ReferenceValueFactory} is used to create
+	 * new instances and edit existing ones.
+	 *
+	 * @param factory
+	 *            The {@link ReferenceValueFactory} to be used by this editor
+	 */
+	public void setFactory(ReferenceValueFactory factory) {
+		this.widget.setFactory(factory);
+	}
+
+	/**
+	 * Indicates if the selected values should be unique (According to Object.equals())
+	 *
+	 * @param unique
+	 */
+	public void setUnique(boolean unique) {
+		this.widget.setUnique(unique);
+	}
+
+	/**
+	 * Indicates if the selected elements should be ordered
+	 *
+	 * @param ordered
+	 */
+	public void setOrdered(boolean ordered) {
+		this.widget.setOrdered(ordered);
+	}
+
+	/**
+	 * 
+	 * @param selector
+	 */
+	public void setSelector(IElementSelector selector) {
+		this.widget.setSelector(selector);
+	}
+
+	/**
+	 * Set the maximum number of values selected.
+	 *
+	 * @param upperBound
+	 */
+	public void setUpperBound(int upperBound) {
+		this.widget.setUpperBound(upperBound);
+	}
+
+	/**
+	 * Sets the optional context of the element that is being edited, in which others will be added and removed.
+	 *
+	 * @param contextElement
+	 *            the model element that is being edited
+	 */
+	public void setContextElement(Object contextElement) {
+		this.widget.setContextElement(contextElement);
+	}
+
+	/**
+	 * Queries the optional context of the element that is being edited, in which others will be added and removed.
+	 *
+	 * @return the model element that is being edited
+	 */
+	public Object getContextElement() {
+		return this.widget.getContextElement();
+	}
+
+
+	/**
+	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+	 *
+	 * @param arg0
+	 */
+	@Override
+	public void createControl(Composite arg0) {
+		Control ctrl = this.widget.create(arg0);
+		getShell().pack();
+		this.widget.updateControls();
+		setControl(ctrl);
+	}
+
+	/**
+	 * @param arrayList
+	 */
+	public void setInitialElementSelections(List<Object> arrayList) {
+		this.widget.setInitialSelections(arrayList);
+	}
+
+	/**
+	 * @see org.eclipse.jface.dialogs.DialogPage#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		this.widget.dispose();
+		super.dispose();
+	}
+
+	/**
+	 * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean)
+	 *
+	 * @param visible
+	 */
+	@Override
+	public void setVisible(boolean visible) {
+		super.setVisible(visible);
+		getControl().setVisible(visible);
+		this.widget.updateControls();
+		getShell().pack();
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         the wrapped widget
+	 */
+	protected MultipleValueSelectionWidget getWidget() {
+		return this.widget;
+	}
+}
diff --git a/plugins/infra/ui/pom.xml b/plugins/infra/ui/pom.xml
new file mode 100644
index 00000000000..589c9e1afcd
--- /dev/null
+++ b/plugins/infra/ui/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.infra-ui</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+	<name>Papyrus Infra UI</name>
+	<description>The principal common User Interface components of Papyrus, including the core Editor APIs.</description>
+
+	<modules>
+		<module>org.eclipse.papyrus.infra.ui</module>
+		<module>org.eclipse.papyrus.infra.ui.resources</module>
+		<module>org.eclipse.papyrus.infra.onefile.ui</module>
+		<module>org.eclipse.papyrus.infra.widgets</module>
+		<module>org.eclipse.papyrus.infra.widgets.toolbox</module>
+	</modules>
+</project>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/pom.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/pom.xml
index 1c10ebb0336..0ba83e183a4 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/pom.xml
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.edit/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-viewpoints</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.viewpoints.configuration.edit</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/pom.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/pom.xml
index 84304050eca..e53ae656a9c 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/pom.xml
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.editor/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-viewpoints</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.viewpoints.configuration.editor</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/pom.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/pom.xml
index fc398b603d7..8775a5daf6f 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/pom.xml
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-viewpoints</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.viewpoints.configuration</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/pom.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/pom.xml
index 3b0f860ecff..977f321ad94 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/pom.xml
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010.edit/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-viewpoints</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.viewpoints.iso42010.edit</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/pom.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/pom.xml
index 19879885ec0..4e9ce3e102f 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/pom.xml
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-viewpoints</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.viewpoints.iso42010</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml
index 6ec02db0a13..70f43a54400 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-viewpoints</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.viewpoints.policy</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/pom.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/pom.xml
index 88c3b202ab9..0bbc6d0b729 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/pom.xml
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-viewpoints</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.viewpoints.preferences</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/viewpoints/pom.xml b/plugins/infra/viewpoints/pom.xml
new file mode 100644
index 00000000000..899afc26ee1
--- /dev/null
+++ b/plugins/infra/viewpoints/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.infra-viewpoints</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+	<name>Papyrus Infra Viewpoints</name>
+	<description>Plug-ins providing an model of the ISO42010 standard and its application to Papyrus for role-based viewpoints customizing the UI experience.</description>
+
+	<modules>
+		<module>org.eclipse.papyrus.infra.viewpoints.configuration</module>
+		<module>org.eclipse.papyrus.infra.viewpoints.configuration.edit</module>
+		<module>org.eclipse.papyrus.infra.viewpoints.configuration.editor</module>
+		<module>org.eclipse.papyrus.infra.viewpoints.iso42010</module>
+		<module>org.eclipse.papyrus.infra.viewpoints.iso42010.edit</module>
+		<module>org.eclipse.papyrus.infra.viewpoints.policy</module>
+		<module>org.eclipse.papyrus.infra.viewpoints.preferences</module>
+	</modules>
+</project>
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/.classpath b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4759947300a..00000000000
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-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

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/about.html b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index 62a08f4494d..00000000000
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

-org.eclipse.jdt.core.compiler.compliance=1.8

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.8

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=false

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

-org.eclipse.jdt.core.formatter.comment.line_length=260

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=260

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=false

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/about.html b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/.classpath b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.classpath
index 240e23bfdc0..240e23bfdc0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/.classpath
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.classpath
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/.project b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.project
index 0175da62ef3..0175da62ef3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/.project
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.project
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.settings/org.eclipse.jdt.core.prefs
index 0de02b374f2..0de02b374f2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/META-INF/MANIFEST.MF b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/META-INF/MANIFEST.MF
index 74806535dcf..6e50c15d0ca 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.emf.edit;visibility:=reexport,

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.provider,

- org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider,

- org.eclipse.papyrus.infra.extendedtypes.provider

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.provider.ExtendedTypesEditPlugin$Implementation

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.extendedtypes.edit;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0";visibility:=reexport,
+ org.eclipse.emf.edit;visibility:=reexport,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"
+Export-Package: org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.provider,
+ org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider,
+ org.eclipse.papyrus.infra.extendedtypes.provider
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.provider.ExtendedTypesEditPlugin$Implementation
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.extendedtypes.edit;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/about.html b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/about.html
new file mode 100644
index 00000000000..d35d5aed64c
--- /dev/null
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/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.extendedtypes.edit/build.properties b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/build.properties
index 9c53427d507..9c53427d507 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/build.properties
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/build.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateActionConfiguration_preValidationQueryConfiguration_ModiscoQueryConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateActionConfiguration_preValidationQueryConfiguration_ModiscoQueryConfiguration.gif
index d75e4636bcb..d75e4636bcb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateActionConfiguration_preValidationQueryConfiguration_ModiscoQueryConfiguration.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateActionConfiguration_preValidationQueryConfiguration_ModiscoQueryConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateAspectSemanticTypeConfiguration_adviceConfiguration_AspectSemanticTypeAdviceConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateAspectSemanticTypeConfiguration_adviceConfiguration_AspectSemanticTypeAdviceConfiguration.gif
index 48054300c70..48054300c70 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateAspectSemanticTypeConfiguration_adviceConfiguration_AspectSemanticTypeAdviceConfiguration.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateAspectSemanticTypeConfiguration_adviceConfiguration_AspectSemanticTypeAdviceConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateAspectViewTypeConfiguration_adviceConfiguration_AspectViewTypeAdviceConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateAspectViewTypeConfiguration_adviceConfiguration_AspectViewTypeAdviceConfiguration.gif
index 8640819ef61..8640819ef61 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateAspectViewTypeConfiguration_adviceConfiguration_AspectViewTypeAdviceConfiguration.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateAspectViewTypeConfiguration_adviceConfiguration_AspectViewTypeAdviceConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateConfigurationElement_iconEntry_IconEntry.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateConfigurationElement_iconEntry_IconEntry.gif
index f33bed84b34..f33bed84b34 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateConfigurationElement_iconEntry_IconEntry.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateConfigurationElement_iconEntry_IconEntry.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateExtendedElementTypeSet_elementType_AspectSemanticTypeConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateExtendedElementTypeSet_elementType_AspectSemanticTypeConfiguration.gif
index dea9e2d9379..dea9e2d9379 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateExtendedElementTypeSet_elementType_AspectSemanticTypeConfiguration.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateExtendedElementTypeSet_elementType_AspectSemanticTypeConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateExtendedElementTypeSet_elementType_AspectViewTypeConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateExtendedElementTypeSet_elementType_AspectViewTypeConfiguration.gif
index 1f765e12d39..1f765e12d39 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateExtendedElementTypeSet_elementType_AspectViewTypeConfiguration.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateExtendedElementTypeSet_elementType_AspectViewTypeConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateExtendedElementTypeSet_elementType_InvariantSemanticTypeConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateExtendedElementTypeSet_elementType_InvariantSemanticTypeConfiguration.gif
index ddad704eaf3..ddad704eaf3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateExtendedElementTypeSet_elementType_InvariantSemanticTypeConfiguration.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateExtendedElementTypeSet_elementType_InvariantSemanticTypeConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantContainerConfiguration_permissions_HierarchyPermission.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantContainerConfiguration_permissions_HierarchyPermission.gif
index 86ec735a156..86ec735a156 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantContainerConfiguration_permissions_HierarchyPermission.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantContainerConfiguration_permissions_HierarchyPermission.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantHierarchyConfiguration_permissions_HierarchyPermission.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantHierarchyConfiguration_permissions_HierarchyPermission.gif
index 7afe9dc1af9..7afe9dc1af9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantHierarchyConfiguration_permissions_HierarchyPermission.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantHierarchyConfiguration_permissions_HierarchyPermission.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantConfiguration_InvariantHierarchyConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantConfiguration_InvariantHierarchyConfiguration.gif
index 5fcdce8997b..5fcdce8997b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantConfiguration_InvariantHierarchyConfiguration.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantConfiguration_InvariantHierarchyConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_AndRule.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_AndRule.gif
index 285bf7f552c..285bf7f552c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_AndRule.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_AndRule.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_OrRule.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_OrRule.gif
index 412157824c8..412157824c8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_OrRule.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_OrRule.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AndRule.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AndRule.gif
index 33a997a1606..33a997a1606 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AndRule.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AndRule.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectSemanticTypeAdviceConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectSemanticTypeAdviceConfiguration.gif
index c414fe9f728..c414fe9f728 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectSemanticTypeAdviceConfiguration.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectSemanticTypeAdviceConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectSemanticTypeConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectSemanticTypeConfiguration.gif
index 89ad5da38ab..89ad5da38ab 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectSemanticTypeConfiguration.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectSemanticTypeConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectViewTypeAdviceConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectViewTypeAdviceConfiguration.gif
index 8a5c70cbd74..8a5c70cbd74 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectViewTypeAdviceConfiguration.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectViewTypeAdviceConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectViewTypeConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectViewTypeConfiguration.gif
index 7b7c428c715..7b7c428c715 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectViewTypeConfiguration.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectViewTypeConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/ElementTypeConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/ElementTypeConfiguration.gif
index 94c953e013b..94c953e013b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/ElementTypeConfiguration.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/ElementTypeConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/ExtendedElementTypeSet.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/ExtendedElementTypeSet.gif
index e4bc22dd17e..e4bc22dd17e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/ExtendedElementTypeSet.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/ExtendedElementTypeSet.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/HierarchyPermission.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/HierarchyPermission.gif
index c4a8af41844..c4a8af41844 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/HierarchyPermission.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/HierarchyPermission.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/IconEntry.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/IconEntry.gif
index caf2804510d..caf2804510d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/IconEntry.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/IconEntry.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantConfiguration.gif
index ef56c140853..ef56c140853 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantConfiguration.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantContainerConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantContainerConfiguration.gif
index 134551bff7e..134551bff7e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantContainerConfiguration.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantContainerConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantHierarchyConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantHierarchyConfiguration.gif
index 420eee17752..420eee17752 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantHierarchyConfiguration.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantHierarchyConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantSemanticTypeConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantSemanticTypeConfiguration.gif
index ef56c140853..ef56c140853 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantSemanticTypeConfiguration.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantSemanticTypeConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/OrRule.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/OrRule.gif
index 48e3cf22687..48e3cf22687 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/OrRule.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/OrRule.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/plugin.properties b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/plugin.properties
index 7f6dd5b031a..7f6dd5b031a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/plugin.properties
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/plugin.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/plugin.xml b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/plugin.xml
index d3502964191..d3502964191 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/plugin.xml
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/plugin.xml
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/pom.xml b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/pom.xml
index d2e1a9f69cc..23558b55db6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/pom.xml
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-xtypes</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.extendedtypes.edit</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/HierarchyPermissionItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/HierarchyPermissionItemProvider.java
index 6b0243aae12..6d9f8826f4b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/HierarchyPermissionItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/HierarchyPermissionItemProvider.java
@@ -1,224 +1,224 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.invariantcontainerconfiguration.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.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission;

-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class HierarchyPermissionItemProvider

-		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 HierarchyPermissionItemProvider(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);

-

-			addChildTypePropertyDescriptor(object);

-			addIsPermittedPropertyDescriptor(object);

-			addIsStrictPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Child Type feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addChildTypePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_HierarchyPermission_childType_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_HierarchyPermission_childType_feature", "_UI_HierarchyPermission_type"),

-						InvariantContainerConfigurationPackage.Literals.HIERARCHY_PERMISSION__CHILD_TYPE,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Is Permitted feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addIsPermittedPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_HierarchyPermission_isPermitted_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_HierarchyPermission_isPermitted_feature", "_UI_HierarchyPermission_type"),

-						InvariantContainerConfigurationPackage.Literals.HIERARCHY_PERMISSION__IS_PERMITTED,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Is Strict feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addIsStrictPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_HierarchyPermission_isStrict_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_HierarchyPermission_isStrict_feature", "_UI_HierarchyPermission_type"),

-						InvariantContainerConfigurationPackage.Literals.HIERARCHY_PERMISSION__IS_STRICT,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This returns HierarchyPermission.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/HierarchyPermission"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((HierarchyPermission) object).getChildType();

-		return label == null || label.length() == 0 ?

-				getString("_UI_HierarchyPermission_type") :

-				getString("_UI_HierarchyPermission_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(HierarchyPermission.class)) {

-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE:

-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED:

-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT:

-			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 InvariantContainerConfigurationEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantcontainerconfiguration.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.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission;
+import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class HierarchyPermissionItemProvider
+		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 HierarchyPermissionItemProvider(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);
+
+			addChildTypePropertyDescriptor(object);
+			addIsPermittedPropertyDescriptor(object);
+			addIsStrictPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Child Type feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addChildTypePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+				(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_HierarchyPermission_childType_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_HierarchyPermission_childType_feature", "_UI_HierarchyPermission_type"),
+						InvariantContainerConfigurationPackage.Literals.HIERARCHY_PERMISSION__CHILD_TYPE,
+						true,
+						false,
+						false,
+						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+						null,
+						null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Is Permitted feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addIsPermittedPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+				(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_HierarchyPermission_isPermitted_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_HierarchyPermission_isPermitted_feature", "_UI_HierarchyPermission_type"),
+						InvariantContainerConfigurationPackage.Literals.HIERARCHY_PERMISSION__IS_PERMITTED,
+						true,
+						false,
+						false,
+						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+						null,
+						null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Is Strict feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addIsStrictPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+				(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_HierarchyPermission_isStrict_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_HierarchyPermission_isStrict_feature", "_UI_HierarchyPermission_type"),
+						InvariantContainerConfigurationPackage.Literals.HIERARCHY_PERMISSION__IS_STRICT,
+						true,
+						false,
+						false,
+						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+						null,
+						null));
+	}
+
+	/**
+	 * This returns HierarchyPermission.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/HierarchyPermission"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((HierarchyPermission) object).getChildType();
+		return label == null || label.length() == 0 ?
+				getString("_UI_HierarchyPermission_type") :
+				getString("_UI_HierarchyPermission_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(HierarchyPermission.class)) {
+		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE:
+		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED:
+		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT:
+			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 InvariantContainerConfigurationEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/InvariantContainerConfigurationEditPlugin.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/InvariantContainerConfigurationEditPlugin.java
index 841ec6425b5..8a8ea3fb28b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/InvariantContainerConfigurationEditPlugin.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/InvariantContainerConfigurationEditPlugin.java
@@ -1,111 +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.infra.extendedtypes.invariantcontainerconfiguration.provider;

-

-import org.eclipse.emf.common.EMFPlugin;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider.InvariantSemanticTypeConfigurationEditPlugin;

-import org.eclipse.papyrus.infra.extendedtypes.provider.ExtendedTypesEditPlugin;

-

-/**

- * This is the central singleton for the InvariantContainerConfiguration edit plugin.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public final class InvariantContainerConfigurationEditPlugin extends EMFPlugin {

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final InvariantContainerConfigurationEditPlugin INSTANCE = new InvariantContainerConfigurationEditPlugin();

-

-	/**

-	 * 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 InvariantContainerConfigurationEditPlugin() {

-		super(new ResourceLocator[] {

-				EcoreEditPlugin.INSTANCE,

-				ExtendedTypesEditPlugin.INSTANCE,

-				InvariantSemanticTypeConfigurationEditPlugin.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;

-		}

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantcontainerconfiguration.provider;
+
+import org.eclipse.emf.common.EMFPlugin;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider.InvariantSemanticTypeConfigurationEditPlugin;
+import org.eclipse.papyrus.infra.extendedtypes.provider.ExtendedTypesEditPlugin;
+
+/**
+ * This is the central singleton for the InvariantContainerConfiguration edit plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public final class InvariantContainerConfigurationEditPlugin extends EMFPlugin {
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static final InvariantContainerConfigurationEditPlugin INSTANCE = new InvariantContainerConfigurationEditPlugin();
+
+	/**
+	 * 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 InvariantContainerConfigurationEditPlugin() {
+		super(new ResourceLocator[] {
+				EcoreEditPlugin.INSTANCE,
+				ExtendedTypesEditPlugin.INSTANCE,
+				InvariantSemanticTypeConfigurationEditPlugin.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/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/InvariantContainerConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/InvariantContainerConfigurationItemProvider.java
index 44fd1abc0da..88b0f705682 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/InvariantContainerConfigurationItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/InvariantContainerConfigurationItemProvider.java
@@ -1,183 +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.infra.extendedtypes.invariantcontainerconfiguration.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.ViewerNotification;

-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationFactory;

-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider.InvariantRuleConfigurationItemProvider;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class InvariantContainerConfigurationItemProvider

-		extends InvariantRuleConfigurationItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantContainerConfigurationItemProvider(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(InvariantContainerConfigurationPackage.Literals.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS);

-		}

-		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 InvariantContainerConfiguration.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/InvariantContainerConfiguration"));

-	}

-

-	/**

-	 * 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_InvariantContainerConfiguration_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(InvariantContainerConfiguration.class)) {

-		case InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS:

-			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

-				(InvariantContainerConfigurationPackage.Literals.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS,

-						InvariantContainerConfigurationFactory.eINSTANCE.createHierarchyPermission()));

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return InvariantContainerConfigurationEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantcontainerconfiguration.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.ViewerNotification;
+import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationFactory;
+import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider.InvariantRuleConfigurationItemProvider;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class InvariantContainerConfigurationItemProvider
+		extends InvariantRuleConfigurationItemProvider
+		implements
+		IEditingDomainItemProvider,
+		IStructuredItemContentProvider,
+		ITreeItemContentProvider,
+		IItemLabelProvider,
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public InvariantContainerConfigurationItemProvider(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(InvariantContainerConfigurationPackage.Literals.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS);
+		}
+		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 InvariantContainerConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/InvariantContainerConfiguration"));
+	}
+
+	/**
+	 * 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_InvariantContainerConfiguration_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(InvariantContainerConfiguration.class)) {
+		case InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS:
+			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
+				(InvariantContainerConfigurationPackage.Literals.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS,
+						InvariantContainerConfigurationFactory.eINSTANCE.createHierarchyPermission()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return InvariantContainerConfigurationEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/InvariantContainerConfigurationItemProviderAdapterFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/InvariantContainerConfigurationItemProviderAdapterFactory.java
index 80fe2d19ac7..0c606b43a41 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/InvariantContainerConfigurationItemProviderAdapterFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/InvariantContainerConfigurationItemProviderAdapterFactory.java
@@ -1,253 +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.infra.extendedtypes.invariantcontainerconfiguration.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.infra.extendedtypes.invariantcontainerconfiguration.util.InvariantContainerConfigurationAdapterFactory;

-

-/**

- * 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 InvariantContainerConfigurationItemProviderAdapterFactory extends InvariantContainerConfigurationAdapterFactory 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 InvariantContainerConfigurationItemProviderAdapterFactory() {

-		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.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected InvariantContainerConfigurationItemProvider invariantContainerConfigurationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createInvariantContainerConfigurationAdapter() {

-		if (invariantContainerConfigurationItemProvider == null) {

-			invariantContainerConfigurationItemProvider = new InvariantContainerConfigurationItemProvider(this);

-		}

-

-		return invariantContainerConfigurationItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected HierarchyPermissionItemProvider hierarchyPermissionItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createHierarchyPermissionAdapter() {

-		if (hierarchyPermissionItemProvider == null) {

-			hierarchyPermissionItemProvider = new HierarchyPermissionItemProvider(this);

-		}

-

-		return hierarchyPermissionItemProvider;

-	}

-

-	/**

-	 * 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 (invariantContainerConfigurationItemProvider != null) {

-			invariantContainerConfigurationItemProvider.dispose();

-		}

-		if (hierarchyPermissionItemProvider != null) {

-			hierarchyPermissionItemProvider.dispose();

-		}

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantcontainerconfiguration.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.infra.extendedtypes.invariantcontainerconfiguration.util.InvariantContainerConfigurationAdapterFactory;
+
+/**
+ * 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 InvariantContainerConfigurationItemProviderAdapterFactory extends InvariantContainerConfigurationAdapterFactory 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 InvariantContainerConfigurationItemProviderAdapterFactory() {
+		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.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected InvariantContainerConfigurationItemProvider invariantContainerConfigurationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Adapter createInvariantContainerConfigurationAdapter() {
+		if (invariantContainerConfigurationItemProvider == null) {
+			invariantContainerConfigurationItemProvider = new InvariantContainerConfigurationItemProvider(this);
+		}
+
+		return invariantContainerConfigurationItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected HierarchyPermissionItemProvider hierarchyPermissionItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Adapter createHierarchyPermissionAdapter() {
+		if (hierarchyPermissionItemProvider == null) {
+			hierarchyPermissionItemProvider = new HierarchyPermissionItemProvider(this);
+		}
+
+		return hierarchyPermissionItemProvider;
+	}
+
+	/**
+	 * 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 (invariantContainerConfigurationItemProvider != null) {
+			invariantContainerConfigurationItemProvider.dispose();
+		}
+		if (hierarchyPermissionItemProvider != null) {
+			hierarchyPermissionItemProvider.dispose();
+		}
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/AndRuleItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/AndRuleItemProvider.java
index d1456e4f521..019bd8f0cd0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/AndRuleItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/AndRuleItemProvider.java
@@ -1,122 +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.infra.extendedtypes.invariantsemantictypeconfiguration.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;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class AndRuleItemProvider

-		extends ComposedRuleConfigurationItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public AndRuleItemProvider(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 AndRule.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AndRule"));

-	}

-

-	/**

-	 * 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_AndRule_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);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.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;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class AndRuleItemProvider
+		extends ComposedRuleConfigurationItemProvider
+		implements
+		IEditingDomainItemProvider,
+		IStructuredItemContentProvider,
+		ITreeItemContentProvider,
+		IItemLabelProvider,
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public AndRuleItemProvider(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 AndRule.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AndRule"));
+	}
+
+	/**
+	 * 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_AndRule_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);
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/ComposedRuleConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/ComposedRuleConfigurationItemProvider.java
index 9ff884dffae..7458d1fd97b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/ComposedRuleConfigurationItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/ComposedRuleConfigurationItemProvider.java
@@ -1,136 +1,136 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.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.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ComposedRuleConfigurationItemProvider

-		extends InvariantRuleConfigurationItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ComposedRuleConfigurationItemProvider(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);

-

-			addComposedRulesPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Composed Rules feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addComposedRulesPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ComposedRuleConfiguration_composedRules_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ComposedRuleConfiguration_composedRules_feature", "_UI_ComposedRuleConfiguration_type"),

-						InvariantSemanticTypeConfigurationPackage.Literals.COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES,

-						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) {

-		return getString("_UI_ComposedRuleConfiguration_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);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.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.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ComposedRuleConfigurationItemProvider
+		extends InvariantRuleConfigurationItemProvider
+		implements
+		IEditingDomainItemProvider,
+		IStructuredItemContentProvider,
+		ITreeItemContentProvider,
+		IItemLabelProvider,
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ComposedRuleConfigurationItemProvider(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);
+
+			addComposedRulesPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Composed Rules feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addComposedRulesPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+				(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_ComposedRuleConfiguration_composedRules_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_ComposedRuleConfiguration_composedRules_feature", "_UI_ComposedRuleConfiguration_type"),
+						InvariantSemanticTypeConfigurationPackage.Literals.COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES,
+						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) {
+		return getString("_UI_ComposedRuleConfiguration_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);
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantRuleConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantRuleConfigurationItemProvider.java
index 059f573a5cf..3426aba9852 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantRuleConfigurationItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantRuleConfigurationItemProvider.java
@@ -1,124 +1,124 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.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.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;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class InvariantRuleConfigurationItemProvider

-		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 InvariantRuleConfigurationItemProvider(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) {

-		return getString("_UI_InvariantRuleConfiguration_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 InvariantSemanticTypeConfigurationEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.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.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;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class InvariantRuleConfigurationItemProvider
+		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 InvariantRuleConfigurationItemProvider(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) {
+		return getString("_UI_InvariantRuleConfiguration_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 InvariantSemanticTypeConfigurationEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantSemanticTypeConfigurationEditPlugin.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantSemanticTypeConfigurationEditPlugin.java
index b724f5f1c4d..6f67da530a3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantSemanticTypeConfigurationEditPlugin.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantSemanticTypeConfigurationEditPlugin.java
@@ -1,109 +1,109 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.provider;

-

-import org.eclipse.emf.common.EMFPlugin;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

-import org.eclipse.papyrus.infra.extendedtypes.provider.ExtendedTypesEditPlugin;

-

-/**

- * This is the central singleton for the InvariantSemanticTypeConfiguration edit plugin.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public final class InvariantSemanticTypeConfigurationEditPlugin extends EMFPlugin {

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final InvariantSemanticTypeConfigurationEditPlugin INSTANCE = new InvariantSemanticTypeConfigurationEditPlugin();

-

-	/**

-	 * 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 InvariantSemanticTypeConfigurationEditPlugin() {

-		super(new ResourceLocator[] {

-				EcoreEditPlugin.INSTANCE,

-				ExtendedTypesEditPlugin.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;

-		}

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.provider;
+
+import org.eclipse.emf.common.EMFPlugin;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
+import org.eclipse.papyrus.infra.extendedtypes.provider.ExtendedTypesEditPlugin;
+
+/**
+ * This is the central singleton for the InvariantSemanticTypeConfiguration edit plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public final class InvariantSemanticTypeConfigurationEditPlugin extends EMFPlugin {
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static final InvariantSemanticTypeConfigurationEditPlugin INSTANCE = new InvariantSemanticTypeConfigurationEditPlugin();
+
+	/**
+	 * 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 InvariantSemanticTypeConfigurationEditPlugin() {
+		super(new ResourceLocator[] {
+				EcoreEditPlugin.INSTANCE,
+				ExtendedTypesEditPlugin.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/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantSemanticTypeConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantSemanticTypeConfigurationItemProvider.java
index 8f016bd3f68..7e6a08eb62f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantSemanticTypeConfigurationItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantSemanticTypeConfigurationItemProvider.java
@@ -1,191 +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.extendedtypes.invariantsemantictypeconfiguration.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.ViewerNotification;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationFactory;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;

-import org.eclipse.papyrus.infra.extendedtypes.provider.SemanticTypeConfigurationItemProvider;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class InvariantSemanticTypeConfigurationItemProvider

-		extends SemanticTypeConfigurationItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantSemanticTypeConfigurationItemProvider(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(InvariantSemanticTypeConfigurationPackage.Literals.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION);

-		}

-		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 InvariantSemanticTypeConfiguration.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/InvariantSemanticTypeConfiguration"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((InvariantSemanticTypeConfiguration) object).getName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_InvariantSemanticTypeConfiguration_type") :

-				getString("_UI_InvariantSemanticTypeConfiguration_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(InvariantSemanticTypeConfiguration.class)) {

-		case InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:

-			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

-				(InvariantSemanticTypeConfigurationPackage.Literals.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION,

-						InvariantSemanticTypeConfigurationFactory.eINSTANCE.createAndRule()));

-

-		newChildDescriptors.add

-				(createChildParameter

-				(InvariantSemanticTypeConfigurationPackage.Literals.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION,

-						InvariantSemanticTypeConfigurationFactory.eINSTANCE.createOrRule()));

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return InvariantSemanticTypeConfigurationEditPlugin.INSTANCE;

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.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.ViewerNotification;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationFactory;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
+import org.eclipse.papyrus.infra.extendedtypes.provider.SemanticTypeConfigurationItemProvider;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class InvariantSemanticTypeConfigurationItemProvider
+		extends SemanticTypeConfigurationItemProvider
+		implements
+		IEditingDomainItemProvider,
+		IStructuredItemContentProvider,
+		ITreeItemContentProvider,
+		IItemLabelProvider,
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public InvariantSemanticTypeConfigurationItemProvider(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(InvariantSemanticTypeConfigurationPackage.Literals.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION);
+		}
+		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 InvariantSemanticTypeConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/InvariantSemanticTypeConfiguration"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((InvariantSemanticTypeConfiguration) object).getName();
+		return label == null || label.length() == 0 ?
+				getString("_UI_InvariantSemanticTypeConfiguration_type") :
+				getString("_UI_InvariantSemanticTypeConfiguration_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(InvariantSemanticTypeConfiguration.class)) {
+		case InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:
+			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
+				(InvariantSemanticTypeConfigurationPackage.Literals.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION,
+						InvariantSemanticTypeConfigurationFactory.eINSTANCE.createAndRule()));
+
+		newChildDescriptors.add
+				(createChildParameter
+				(InvariantSemanticTypeConfigurationPackage.Literals.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION,
+						InvariantSemanticTypeConfigurationFactory.eINSTANCE.createOrRule()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return InvariantSemanticTypeConfigurationEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantSemanticTypeConfigurationItemProviderAdapterFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantSemanticTypeConfigurationItemProviderAdapterFactory.java
index 8d911ce7465..726f8df40a4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantSemanticTypeConfigurationItemProviderAdapterFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantSemanticTypeConfigurationItemProviderAdapterFactory.java
@@ -1,388 +1,388 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

-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.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.command.CommandParameter;

-import org.eclipse.emf.edit.domain.EditingDomain;

-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.IChildCreationExtender;

-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.infra.extendedtypes.ExtendedElementTypeSet;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationFactory;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.util.InvariantSemanticTypeConfigurationAdapterFactory;

-import org.eclipse.papyrus.infra.extendedtypes.util.ExtendedtypesSwitch;

-

-/**

- * 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 InvariantSemanticTypeConfigurationItemProviderAdapterFactory extends InvariantSemanticTypeConfigurationAdapterFactory 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 InvariantSemanticTypeConfigurationItemProviderAdapterFactory() {

-		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.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected InvariantSemanticTypeConfigurationItemProvider invariantSemanticTypeConfigurationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createInvariantSemanticTypeConfigurationAdapter() {

-		if (invariantSemanticTypeConfigurationItemProvider == null) {

-			invariantSemanticTypeConfigurationItemProvider = new InvariantSemanticTypeConfigurationItemProvider(this);

-		}

-

-		return invariantSemanticTypeConfigurationItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected AndRuleItemProvider andRuleItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createAndRuleAdapter() {

-		if (andRuleItemProvider == null) {

-			andRuleItemProvider = new AndRuleItemProvider(this);

-		}

-

-		return andRuleItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected OrRuleItemProvider orRuleItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createOrRuleAdapter() {

-		if (orRuleItemProvider == null) {

-			orRuleItemProvider = new OrRuleItemProvider(this);

-		}

-

-		return orRuleItemProvider;

-	}

-

-	/**

-	 * 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 (invariantSemanticTypeConfigurationItemProvider != null) {

-			invariantSemanticTypeConfigurationItemProvider.dispose();

-		}

-		if (andRuleItemProvider != null) {

-			andRuleItemProvider.dispose();

-		}

-		if (orRuleItemProvider != null) {

-			orRuleItemProvider.dispose();

-		}

-	}

-

-	/**

-	 * A child creation extender for the {@link ExtendedtypesPackage}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static class ExtendedtypesChildCreationExtender implements IChildCreationExtender {

-		/**

-		 * The switch for creating child descriptors specific to each extended class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected static class CreationSwitch extends ExtendedtypesSwitch<Object> {

-			/**

-			 * The child descriptors being populated.

-			 * <!-- begin-user-doc -->

-			 * <!-- end-user-doc -->

-			 *

-			 * @generated

-			 */

-			protected List<Object> newChildDescriptors;

-

-			/**

-			 * The domain in which to create the children.

-			 * <!-- begin-user-doc -->

-			 * <!-- end-user-doc -->

-			 *

-			 * @generated

-			 */

-			protected EditingDomain editingDomain;

-

-			/**

-			 * Creates the a switch for populating child descriptors in the given domain.

-			 * <!-- begin-user-doc -->

-			 * <!-- end-user-doc -->

-			 *

-			 * @generated

-			 */

-			CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain) {

-				this.newChildDescriptors = newChildDescriptors;

-				this.editingDomain = editingDomain;

-			}

-

-			/**

-			 * <!-- begin-user-doc -->

-			 * <!-- end-user-doc -->

-			 *

-			 * @generated

-			 */

-			@Override

-			public Object caseExtendedElementTypeSet(ExtendedElementTypeSet object) {

-				newChildDescriptors.add

-						(createChildParameter

-						(ExtendedtypesPackage.eINSTANCE.getExtendedElementTypeSet_ElementType(),

-								InvariantSemanticTypeConfigurationFactory.eINSTANCE.createInvariantSemanticTypeConfiguration()));

-

-				return null;

-			}

-

-			/**

-			 * <!-- begin-user-doc -->

-			 * <!-- end-user-doc -->

-			 *

-			 * @generated

-			 */

-			protected CommandParameter createChildParameter(Object feature, Object child) {

-				return new CommandParameter(null, feature, child);

-			}

-

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain) {

-			ArrayList<Object> result = new ArrayList<Object>();

-			new CreationSwitch(result, editingDomain).doSwitch((EObject) object);

-			return result;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public ResourceLocator getResourceLocator() {

-			return InvariantSemanticTypeConfigurationEditPlugin.INSTANCE;

-		}

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+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.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.CommandParameter;
+import org.eclipse.emf.edit.domain.EditingDomain;
+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.IChildCreationExtender;
+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.infra.extendedtypes.ExtendedElementTypeSet;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationFactory;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.util.InvariantSemanticTypeConfigurationAdapterFactory;
+import org.eclipse.papyrus.infra.extendedtypes.util.ExtendedtypesSwitch;
+
+/**
+ * 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 InvariantSemanticTypeConfigurationItemProviderAdapterFactory extends InvariantSemanticTypeConfigurationAdapterFactory 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 InvariantSemanticTypeConfigurationItemProviderAdapterFactory() {
+		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.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected InvariantSemanticTypeConfigurationItemProvider invariantSemanticTypeConfigurationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Adapter createInvariantSemanticTypeConfigurationAdapter() {
+		if (invariantSemanticTypeConfigurationItemProvider == null) {
+			invariantSemanticTypeConfigurationItemProvider = new InvariantSemanticTypeConfigurationItemProvider(this);
+		}
+
+		return invariantSemanticTypeConfigurationItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected AndRuleItemProvider andRuleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Adapter createAndRuleAdapter() {
+		if (andRuleItemProvider == null) {
+			andRuleItemProvider = new AndRuleItemProvider(this);
+		}
+
+		return andRuleItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected OrRuleItemProvider orRuleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Adapter createOrRuleAdapter() {
+		if (orRuleItemProvider == null) {
+			orRuleItemProvider = new OrRuleItemProvider(this);
+		}
+
+		return orRuleItemProvider;
+	}
+
+	/**
+	 * 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 (invariantSemanticTypeConfigurationItemProvider != null) {
+			invariantSemanticTypeConfigurationItemProvider.dispose();
+		}
+		if (andRuleItemProvider != null) {
+			andRuleItemProvider.dispose();
+		}
+		if (orRuleItemProvider != null) {
+			orRuleItemProvider.dispose();
+		}
+	}
+
+	/**
+	 * A child creation extender for the {@link ExtendedtypesPackage}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static class ExtendedtypesChildCreationExtender implements IChildCreationExtender {
+		/**
+		 * The switch for creating child descriptors specific to each extended class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		protected static class CreationSwitch extends ExtendedtypesSwitch<Object> {
+			/**
+			 * The child descriptors being populated.
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 *
+			 * @generated
+			 */
+			protected List<Object> newChildDescriptors;
+
+			/**
+			 * The domain in which to create the children.
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 *
+			 * @generated
+			 */
+			protected EditingDomain editingDomain;
+
+			/**
+			 * Creates the a switch for populating child descriptors in the given domain.
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 *
+			 * @generated
+			 */
+			CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain) {
+				this.newChildDescriptors = newChildDescriptors;
+				this.editingDomain = editingDomain;
+			}
+
+			/**
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 *
+			 * @generated
+			 */
+			@Override
+			public Object caseExtendedElementTypeSet(ExtendedElementTypeSet object) {
+				newChildDescriptors.add
+						(createChildParameter
+						(ExtendedtypesPackage.eINSTANCE.getExtendedElementTypeSet_ElementType(),
+								InvariantSemanticTypeConfigurationFactory.eINSTANCE.createInvariantSemanticTypeConfiguration()));
+
+				return null;
+			}
+
+			/**
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 *
+			 * @generated
+			 */
+			protected CommandParameter createChildParameter(Object feature, Object child) {
+				return new CommandParameter(null, feature, child);
+			}
+
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
+			ArrayList<Object> result = new ArrayList<Object>();
+			new CreationSwitch(result, editingDomain).doSwitch((EObject) object);
+			return result;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		public ResourceLocator getResourceLocator() {
+			return InvariantSemanticTypeConfigurationEditPlugin.INSTANCE;
+		}
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/OrRuleItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/OrRuleItemProvider.java
index 203efb77a7a..ff9d0f567f7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/OrRuleItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/OrRuleItemProvider.java
@@ -1,122 +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.infra.extendedtypes.invariantsemantictypeconfiguration.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;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class OrRuleItemProvider

-		extends ComposedRuleConfigurationItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public OrRuleItemProvider(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 OrRule.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/OrRule"));

-	}

-

-	/**

-	 * 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_OrRule_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);

-	}

-

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.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;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class OrRuleItemProvider
+		extends ComposedRuleConfigurationItemProvider
+		implements
+		IEditingDomainItemProvider,
+		IStructuredItemContentProvider,
+		ITreeItemContentProvider,
+		IItemLabelProvider,
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public OrRuleItemProvider(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 OrRule.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/OrRule"));
+	}
+
+	/**
+	 * 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_OrRule_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);
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ActionConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ActionConfigurationItemProvider.java
index f9e3186468f..e76723e842a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ActionConfigurationItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ActionConfigurationItemProvider.java
@@ -1,103 +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.extendedtypes.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.infra.extendedtypes.ActionConfiguration;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ActionConfigurationItemProvider extends ConfigurationElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ActionConfigurationItemProvider(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 = ((ActionConfiguration) object).getName();

-		return label == null || label.length() == 0 ? getString("_UI_ActionConfiguration_type") : //$NON-NLS-1$

-				getString("_UI_ActionConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * 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);

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.infra.extendedtypes.ActionConfiguration;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ActionConfigurationItemProvider extends ConfigurationElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ActionConfigurationItemProvider(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 = ((ActionConfiguration) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_ActionConfiguration_type") : //$NON-NLS-1$
+				getString("_UI_ActionConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * 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/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/AspectSemanticTypeConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/AspectSemanticTypeConfigurationItemProvider.java
index 4451edb3432..8a151e4ddca 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/AspectSemanticTypeConfigurationItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/AspectSemanticTypeConfigurationItemProvider.java
@@ -1,153 +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.infra.extendedtypes.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.infra.extendedtypes.AspectSemanticTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class AspectSemanticTypeConfigurationItemProvider extends SemanticTypeConfigurationItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public AspectSemanticTypeConfigurationItemProvider(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(ExtendedtypesPackage.eINSTANCE.getAspectSemanticTypeConfiguration_ActionConfiguration());

-		}

-		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 AspectSemanticTypeConfiguration.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AspectSemanticTypeConfiguration")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((AspectSemanticTypeConfiguration) object).getName();

-		return label == null || label.length() == 0 ? getString("_UI_AspectSemanticTypeConfiguration_type") : //$NON-NLS-1$

-				getString("_UI_AspectSemanticTypeConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * 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(AspectSemanticTypeConfiguration.class)) {

-		case ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION:

-			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);

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.infra.extendedtypes.AspectSemanticTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class AspectSemanticTypeConfigurationItemProvider extends SemanticTypeConfigurationItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public AspectSemanticTypeConfigurationItemProvider(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(ExtendedtypesPackage.eINSTANCE.getAspectSemanticTypeConfiguration_ActionConfiguration());
+		}
+		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 AspectSemanticTypeConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AspectSemanticTypeConfiguration")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((AspectSemanticTypeConfiguration) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_AspectSemanticTypeConfiguration_type") : //$NON-NLS-1$
+				getString("_UI_AspectSemanticTypeConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * 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(AspectSemanticTypeConfiguration.class)) {
+		case ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
+			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);
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/AspectViewTypeConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/AspectViewTypeConfigurationItemProvider.java
index d4f85179d3e..ffa9be45482 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/AspectViewTypeConfigurationItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/AspectViewTypeConfigurationItemProvider.java
@@ -1,153 +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.infra.extendedtypes.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.infra.extendedtypes.AspectViewTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class AspectViewTypeConfigurationItemProvider extends ViewTypeConfigurationItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public AspectViewTypeConfigurationItemProvider(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(ExtendedtypesPackage.eINSTANCE.getAspectViewTypeConfiguration_ActionConfiguration());

-		}

-		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 AspectViewTypeConfiguration.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AspectViewTypeConfiguration")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((AspectViewTypeConfiguration) object).getName();

-		return label == null || label.length() == 0 ? getString("_UI_AspectViewTypeConfiguration_type") : //$NON-NLS-1$

-				getString("_UI_AspectViewTypeConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * 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(AspectViewTypeConfiguration.class)) {

-		case ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION:

-			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);

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.infra.extendedtypes.AspectViewTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class AspectViewTypeConfigurationItemProvider extends ViewTypeConfigurationItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public AspectViewTypeConfigurationItemProvider(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(ExtendedtypesPackage.eINSTANCE.getAspectViewTypeConfiguration_ActionConfiguration());
+		}
+		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 AspectViewTypeConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AspectViewTypeConfiguration")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((AspectViewTypeConfiguration) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_AspectViewTypeConfiguration_type") : //$NON-NLS-1$
+				getString("_UI_AspectViewTypeConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * 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(AspectViewTypeConfiguration.class)) {
+		case ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
+			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);
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ConfigurationElementItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ConfigurationElementItemProvider.java
index 2f30db32950..dc4b11a0753 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ConfigurationElementItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ConfigurationElementItemProvider.java
@@ -1,206 +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.infra.extendedtypes.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.infra.extendedtypes.ConfigurationElement;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ConfigurationElementItemProvider 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 ConfigurationElementItemProvider(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);

-			addDescriptionPropertyDescriptor(object);

-			addIdentifierPropertyDescriptor(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_ConfigurationElement_name_feature"), //$NON-NLS-1$

-				getString("_UI_PropertyDescriptor_description", "_UI_ConfigurationElement_name_feature", "_UI_ConfigurationElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				ExtendedtypesPackage.eINSTANCE.getConfigurationElement_Name(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Description feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addDescriptionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ConfigurationElement_description_feature"), //$NON-NLS-1$

-				getString("_UI_PropertyDescriptor_description", "_UI_ConfigurationElement_description_feature", "_UI_ConfigurationElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				ExtendedtypesPackage.eINSTANCE.getConfigurationElement_Description(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Identifier feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addIdentifierPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ConfigurationElement_identifier_feature"), //$NON-NLS-1$

-				getString("_UI_PropertyDescriptor_description", "_UI_ConfigurationElement_identifier_feature", "_UI_ConfigurationElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				ExtendedtypesPackage.eINSTANCE.getConfigurationElement_Identifier(), 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(ExtendedtypesPackage.eINSTANCE.getConfigurationElement_IconEntry());

-		}

-		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 the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((ConfigurationElement) object).getName();

-		return label == null || label.length() == 0 ? getString("_UI_ConfigurationElement_type") : //$NON-NLS-1$

-				getString("_UI_ConfigurationElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * 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(ConfigurationElement.class)) {

-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__NAME:

-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__DESCRIPTION:

-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__IDENTIFIER:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY:

-			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(ExtendedtypesPackage.eINSTANCE.getConfigurationElement_IconEntry(), ExtendedtypesFactory.eINSTANCE.createIconEntry()));

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return ExtendedTypesEditPlugin.INSTANCE;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.infra.extendedtypes.ConfigurationElement;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ConfigurationElementItemProvider 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 ConfigurationElementItemProvider(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);
+			addDescriptionPropertyDescriptor(object);
+			addIdentifierPropertyDescriptor(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_ConfigurationElement_name_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ConfigurationElement_name_feature", "_UI_ConfigurationElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ExtendedtypesPackage.eINSTANCE.getConfigurationElement_Name(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Description feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addDescriptionPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ConfigurationElement_description_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ConfigurationElement_description_feature", "_UI_ConfigurationElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ExtendedtypesPackage.eINSTANCE.getConfigurationElement_Description(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Identifier feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addIdentifierPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ConfigurationElement_identifier_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ConfigurationElement_identifier_feature", "_UI_ConfigurationElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ExtendedtypesPackage.eINSTANCE.getConfigurationElement_Identifier(), 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(ExtendedtypesPackage.eINSTANCE.getConfigurationElement_IconEntry());
+		}
+		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 the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((ConfigurationElement) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_ConfigurationElement_type") : //$NON-NLS-1$
+				getString("_UI_ConfigurationElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * 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(ConfigurationElement.class)) {
+		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__NAME:
+		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
+		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__IDENTIFIER:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY:
+			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(ExtendedtypesPackage.eINSTANCE.getConfigurationElement_IconEntry(), ExtendedtypesFactory.eINSTANCE.createIconEntry()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return ExtendedTypesEditPlugin.INSTANCE;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ElementTypeAdviceConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ElementTypeAdviceConfigurationItemProvider.java
index 92f499d6ecf..31dc7db18bd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ElementTypeAdviceConfigurationItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ElementTypeAdviceConfigurationItemProvider.java
@@ -1,103 +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.extendedtypes.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.infra.extendedtypes.ElementTypeAdviceConfiguration;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ElementTypeAdviceConfigurationItemProvider extends ConfigurationElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ElementTypeAdviceConfigurationItemProvider(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 = ((ElementTypeAdviceConfiguration) object).getName();

-		return label == null || label.length() == 0 ? getString("_UI_ElementTypeAdviceConfiguration_type") : //$NON-NLS-1$

-				getString("_UI_ElementTypeAdviceConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * 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);

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.infra.extendedtypes.ElementTypeAdviceConfiguration;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ElementTypeAdviceConfigurationItemProvider extends ConfigurationElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ElementTypeAdviceConfigurationItemProvider(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 = ((ElementTypeAdviceConfiguration) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_ElementTypeAdviceConfiguration_type") : //$NON-NLS-1$
+				getString("_UI_ElementTypeAdviceConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * 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/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ElementTypeConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ElementTypeConfigurationItemProvider.java
index f66a25c078d..db0aa0390a1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ElementTypeConfigurationItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ElementTypeConfigurationItemProvider.java
@@ -1,202 +1,202 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.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.infra.extendedtypes.ElementTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ElementTypeConfigurationItemProvider extends ConfigurationElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ElementTypeConfigurationItemProvider(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);

-			addHintPropertyDescriptor(object);

-			addKindNamePropertyDescriptor(object);

-			addSpecializedTypesIDPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Hint feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addHintPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ElementTypeConfiguration_hint_feature"), //$NON-NLS-1$

-				getString("_UI_PropertyDescriptor_description", "_UI_ElementTypeConfiguration_hint_feature", "_UI_ElementTypeConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				ExtendedtypesPackage.eINSTANCE.getElementTypeConfiguration_Hint(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Kind Name feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addKindNamePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ElementTypeConfiguration_kindName_feature"), //$NON-NLS-1$

-				getString("_UI_PropertyDescriptor_description", "_UI_ElementTypeConfiguration_kindName_feature", "_UI_ElementTypeConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				ExtendedtypesPackage.eINSTANCE.getElementTypeConfiguration_KindName(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Specialized Types ID feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addSpecializedTypesIDPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ElementTypeConfiguration_specializedTypesID_feature"), //$NON-NLS-1$

-				getString("_UI_PropertyDescriptor_description", "_UI_ElementTypeConfiguration_specializedTypesID_feature", "_UI_ElementTypeConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				ExtendedtypesPackage.eINSTANCE.getElementTypeConfiguration_SpecializedTypesID(), 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(ExtendedtypesPackage.eINSTANCE.getElementTypeConfiguration_MatcherConfiguration());

-		}

-		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 ElementTypeConfiguration.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ElementTypeConfiguration")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((ElementTypeConfiguration) object).getName();

-		return label == null || label.length() == 0 ? getString("_UI_ElementTypeConfiguration_type") : //$NON-NLS-1$

-				getString("_UI_ElementTypeConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * 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(ElementTypeConfiguration.class)) {

-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__HINT:

-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__KIND_NAME:

-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:

-			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);

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.infra.extendedtypes.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ElementTypeConfigurationItemProvider extends ConfigurationElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ElementTypeConfigurationItemProvider(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);
+			addHintPropertyDescriptor(object);
+			addKindNamePropertyDescriptor(object);
+			addSpecializedTypesIDPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Hint feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addHintPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ElementTypeConfiguration_hint_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ElementTypeConfiguration_hint_feature", "_UI_ElementTypeConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ExtendedtypesPackage.eINSTANCE.getElementTypeConfiguration_Hint(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Kind Name feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addKindNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ElementTypeConfiguration_kindName_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ElementTypeConfiguration_kindName_feature", "_UI_ElementTypeConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ExtendedtypesPackage.eINSTANCE.getElementTypeConfiguration_KindName(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Specialized Types ID feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addSpecializedTypesIDPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ElementTypeConfiguration_specializedTypesID_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ElementTypeConfiguration_specializedTypesID_feature", "_UI_ElementTypeConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ExtendedtypesPackage.eINSTANCE.getElementTypeConfiguration_SpecializedTypesID(), 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(ExtendedtypesPackage.eINSTANCE.getElementTypeConfiguration_MatcherConfiguration());
+		}
+		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 ElementTypeConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ElementTypeConfiguration")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((ElementTypeConfiguration) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_ElementTypeConfiguration_type") : //$NON-NLS-1$
+				getString("_UI_ElementTypeConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * 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(ElementTypeConfiguration.class)) {
+		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
+		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__KIND_NAME:
+		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
+			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);
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ExtendedElementTypeSetItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ExtendedElementTypeSetItemProvider.java
index fe4a678c678..acc93cecf58 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ExtendedElementTypeSetItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ExtendedElementTypeSetItemProvider.java
@@ -1,175 +1,175 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.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.infra.extendedtypes.ExtendedElementTypeSet;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ExtendedElementTypeSetItemProvider extends ConfigurationElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ExtendedElementTypeSetItemProvider(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);

-			addExtensiblePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Extensible feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addExtensiblePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ExtendedElementTypeSet_extensible_feature"), //$NON-NLS-1$

-				getString("_UI_PropertyDescriptor_description", "_UI_ExtendedElementTypeSet_extensible_feature", "_UI_ExtendedElementTypeSet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				ExtendedtypesPackage.eINSTANCE.getExtendedElementTypeSet_Extensible(), 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(ExtendedtypesPackage.eINSTANCE.getExtendedElementTypeSet_ElementType());

-		}

-		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 ExtendedElementTypeSet.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ExtendedElementTypeSet")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((ExtendedElementTypeSet) object).getName();

-		return label == null || label.length() == 0 ? getString("_UI_ExtendedElementTypeSet_type") : //$NON-NLS-1$

-				getString("_UI_ExtendedElementTypeSet_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * 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(ExtendedElementTypeSet.class)) {

-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE:

-			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(ExtendedtypesPackage.eINSTANCE.getExtendedElementTypeSet_ElementType(), ExtendedtypesFactory.eINSTANCE.createAspectSemanticTypeConfiguration()));

-		newChildDescriptors.add(createChildParameter(ExtendedtypesPackage.eINSTANCE.getExtendedElementTypeSet_ElementType(), ExtendedtypesFactory.eINSTANCE.createAspectViewTypeConfiguration()));

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.infra.extendedtypes.ExtendedElementTypeSet;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ExtendedElementTypeSetItemProvider extends ConfigurationElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ExtendedElementTypeSetItemProvider(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);
+			addExtensiblePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Extensible feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addExtensiblePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ExtendedElementTypeSet_extensible_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ExtendedElementTypeSet_extensible_feature", "_UI_ExtendedElementTypeSet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ExtendedtypesPackage.eINSTANCE.getExtendedElementTypeSet_Extensible(), 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(ExtendedtypesPackage.eINSTANCE.getExtendedElementTypeSet_ElementType());
+		}
+		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 ExtendedElementTypeSet.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ExtendedElementTypeSet")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((ExtendedElementTypeSet) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_ExtendedElementTypeSet_type") : //$NON-NLS-1$
+				getString("_UI_ExtendedElementTypeSet_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * 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(ExtendedElementTypeSet.class)) {
+		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE:
+			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(ExtendedtypesPackage.eINSTANCE.getExtendedElementTypeSet_ElementType(), ExtendedtypesFactory.eINSTANCE.createAspectSemanticTypeConfiguration()));
+		newChildDescriptors.add(createChildParameter(ExtendedtypesPackage.eINSTANCE.getExtendedElementTypeSet_ElementType(), ExtendedtypesFactory.eINSTANCE.createAspectViewTypeConfiguration()));
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ExtendedTypesEditPlugin.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ExtendedTypesEditPlugin.java
index f525eab8116..3b999d88819 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ExtendedTypesEditPlugin.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ExtendedTypesEditPlugin.java
@@ -1,105 +1,105 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.provider;

-

-import org.eclipse.emf.common.EMFPlugin;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

-

-/**

- * This is the central singleton for the ExtendedTypes edit plugin.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public final class ExtendedTypesEditPlugin extends EMFPlugin {

-

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final ExtendedTypesEditPlugin INSTANCE = new ExtendedTypesEditPlugin();

-

-	/**

-	 * 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 ExtendedTypesEditPlugin() {

-		super(new ResourceLocator[] { EcoreEditPlugin.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;

-		}

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.provider;
+
+import org.eclipse.emf.common.EMFPlugin;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
+
+/**
+ * This is the central singleton for the ExtendedTypes edit plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public final class ExtendedTypesEditPlugin extends EMFPlugin {
+
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static final ExtendedTypesEditPlugin INSTANCE = new ExtendedTypesEditPlugin();
+
+	/**
+	 * 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 ExtendedTypesEditPlugin() {
+		super(new ResourceLocator[] { EcoreEditPlugin.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/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ExtendedtypesItemProviderAdapterFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ExtendedtypesItemProviderAdapterFactory.java
index 8e7c6ca0f6d..1ff4931f090 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ExtendedtypesItemProviderAdapterFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ExtendedtypesItemProviderAdapterFactory.java
@@ -1,303 +1,303 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.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.infra.extendedtypes.util.ExtendedtypesAdapterFactory;

-

-/**

- * 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 ExtendedtypesItemProviderAdapterFactory extends ExtendedtypesAdapterFactory 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 ExtendedtypesItemProviderAdapterFactory() {

-		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.infra.extendedtypes.ExtendedElementTypeSet} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ExtendedElementTypeSetItemProvider extendedElementTypeSetItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createExtendedElementTypeSetAdapter() {

-		if (extendedElementTypeSetItemProvider == null) {

-			extendedElementTypeSetItemProvider = new ExtendedElementTypeSetItemProvider(this);

-		}

-		return extendedElementTypeSetItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.extendedtypes.IconEntry} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IconEntryItemProvider iconEntryItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.IconEntry}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createIconEntryAdapter() {

-		if (iconEntryItemProvider == null) {

-			iconEntryItemProvider = new IconEntryItemProvider(this);

-		}

-		return iconEntryItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected AspectSemanticTypeConfigurationItemProvider aspectSemanticTypeConfigurationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createAspectSemanticTypeConfigurationAdapter() {

-		if (aspectSemanticTypeConfigurationItemProvider == null) {

-			aspectSemanticTypeConfigurationItemProvider = new AspectSemanticTypeConfigurationItemProvider(this);

-		}

-		return aspectSemanticTypeConfigurationItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected AspectViewTypeConfigurationItemProvider aspectViewTypeConfigurationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createAspectViewTypeConfigurationAdapter() {

-		if (aspectViewTypeConfigurationItemProvider == null) {

-			aspectViewTypeConfigurationItemProvider = new AspectViewTypeConfigurationItemProvider(this);

-		}

-		return aspectViewTypeConfigurationItemProvider;

-	}

-

-	/**

-	 * 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 (extendedElementTypeSetItemProvider != null) {

-			extendedElementTypeSetItemProvider.dispose();

-		}

-		if (iconEntryItemProvider != null) {

-			iconEntryItemProvider.dispose();

-		}

-		if (aspectSemanticTypeConfigurationItemProvider != null) {

-			aspectSemanticTypeConfigurationItemProvider.dispose();

-		}

-		if (aspectViewTypeConfigurationItemProvider != null) {

-			aspectViewTypeConfigurationItemProvider.dispose();

-		}

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.infra.extendedtypes.util.ExtendedtypesAdapterFactory;
+
+/**
+ * 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 ExtendedtypesItemProviderAdapterFactory extends ExtendedtypesAdapterFactory 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 ExtendedtypesItemProviderAdapterFactory() {
+		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.infra.extendedtypes.ExtendedElementTypeSet} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ExtendedElementTypeSetItemProvider extendedElementTypeSetItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Adapter createExtendedElementTypeSetAdapter() {
+		if (extendedElementTypeSetItemProvider == null) {
+			extendedElementTypeSetItemProvider = new ExtendedElementTypeSetItemProvider(this);
+		}
+		return extendedElementTypeSetItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.extendedtypes.IconEntry} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected IconEntryItemProvider iconEntryItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.IconEntry}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Adapter createIconEntryAdapter() {
+		if (iconEntryItemProvider == null) {
+			iconEntryItemProvider = new IconEntryItemProvider(this);
+		}
+		return iconEntryItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected AspectSemanticTypeConfigurationItemProvider aspectSemanticTypeConfigurationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Adapter createAspectSemanticTypeConfigurationAdapter() {
+		if (aspectSemanticTypeConfigurationItemProvider == null) {
+			aspectSemanticTypeConfigurationItemProvider = new AspectSemanticTypeConfigurationItemProvider(this);
+		}
+		return aspectSemanticTypeConfigurationItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected AspectViewTypeConfigurationItemProvider aspectViewTypeConfigurationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Adapter createAspectViewTypeConfigurationAdapter() {
+		if (aspectViewTypeConfigurationItemProvider == null) {
+			aspectViewTypeConfigurationItemProvider = new AspectViewTypeConfigurationItemProvider(this);
+		}
+		return aspectViewTypeConfigurationItemProvider;
+	}
+
+	/**
+	 * 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 (extendedElementTypeSetItemProvider != null) {
+			extendedElementTypeSetItemProvider.dispose();
+		}
+		if (iconEntryItemProvider != null) {
+			iconEntryItemProvider.dispose();
+		}
+		if (aspectSemanticTypeConfigurationItemProvider != null) {
+			aspectSemanticTypeConfigurationItemProvider.dispose();
+		}
+		if (aspectViewTypeConfigurationItemProvider != null) {
+			aspectViewTypeConfigurationItemProvider.dispose();
+		}
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/IconEntryItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/IconEntryItemProvider.java
index 74485b98a4c..211c7369652 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/IconEntryItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/IconEntryItemProvider.java
@@ -1,167 +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.infra.extendedtypes.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.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.infra.extendedtypes.IconEntry;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.IconEntry} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class IconEntryItemProvider 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 IconEntryItemProvider(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);

-			addIconPathPropertyDescriptor(object);

-			addBundleIdPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Icon Path feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addIconPathPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_IconEntry_iconPath_feature"), //$NON-NLS-1$

-				getString("_UI_PropertyDescriptor_description", "_UI_IconEntry_iconPath_feature", "_UI_IconEntry_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				ExtendedtypesPackage.eINSTANCE.getIconEntry_IconPath(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Bundle Id feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBundleIdPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_IconEntry_bundleId_feature"), //$NON-NLS-1$

-				getString("_UI_PropertyDescriptor_description", "_UI_IconEntry_bundleId_feature", "_UI_IconEntry_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				ExtendedtypesPackage.eINSTANCE.getIconEntry_BundleId(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));

-	}

-

-	/**

-	 * This returns IconEntry.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/IconEntry")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((IconEntry) object).getIconPath();

-		return label == null || label.length() == 0 ? getString("_UI_IconEntry_type") : //$NON-NLS-1$

-				getString("_UI_IconEntry_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * 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(IconEntry.class)) {

-		case ExtendedtypesPackage.ICON_ENTRY__ICON_PATH:

-		case ExtendedtypesPackage.ICON_ENTRY__BUNDLE_ID:

-			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 ExtendedTypesEditPlugin.INSTANCE;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.IconEntry;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.IconEntry} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class IconEntryItemProvider 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 IconEntryItemProvider(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);
+			addIconPathPropertyDescriptor(object);
+			addBundleIdPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Icon Path feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addIconPathPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_IconEntry_iconPath_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_IconEntry_iconPath_feature", "_UI_IconEntry_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ExtendedtypesPackage.eINSTANCE.getIconEntry_IconPath(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Bundle Id feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addBundleIdPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_IconEntry_bundleId_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_IconEntry_bundleId_feature", "_UI_IconEntry_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ExtendedtypesPackage.eINSTANCE.getIconEntry_BundleId(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+	}
+
+	/**
+	 * This returns IconEntry.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/IconEntry")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((IconEntry) object).getIconPath();
+		return label == null || label.length() == 0 ? getString("_UI_IconEntry_type") : //$NON-NLS-1$
+				getString("_UI_IconEntry_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * 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(IconEntry.class)) {
+		case ExtendedtypesPackage.ICON_ENTRY__ICON_PATH:
+		case ExtendedtypesPackage.ICON_ENTRY__BUNDLE_ID:
+			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 ExtendedTypesEditPlugin.INSTANCE;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/MatcherConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/MatcherConfigurationItemProvider.java
index 42e2b7356eb..ea340c5cf84 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/MatcherConfigurationItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/MatcherConfigurationItemProvider.java
@@ -1,114 +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.extendedtypes.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.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;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class MatcherConfigurationItemProvider 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 MatcherConfigurationItemProvider(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) {

-		return getString("_UI_MatcherConfiguration_type"); //$NON-NLS-1$

-	}

-

-	/**

-	 * 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 ExtendedTypesEditPlugin.INSTANCE;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.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;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class MatcherConfigurationItemProvider 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 MatcherConfigurationItemProvider(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) {
+		return getString("_UI_MatcherConfiguration_type"); //$NON-NLS-1$
+	}
+
+	/**
+	 * 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 ExtendedTypesEditPlugin.INSTANCE;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/SemanticActionConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/SemanticActionConfigurationItemProvider.java
index 51e058639dc..ae37f4bdb8e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/SemanticActionConfigurationItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/SemanticActionConfigurationItemProvider.java
@@ -1,103 +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.extendedtypes.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.infra.extendedtypes.SemanticActionConfiguration;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class SemanticActionConfigurationItemProvider extends ActionConfigurationItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SemanticActionConfigurationItemProvider(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 = ((SemanticActionConfiguration) object).getName();

-		return label == null || label.length() == 0 ? getString("_UI_SemanticActionConfiguration_type") : //$NON-NLS-1$

-				getString("_UI_SemanticActionConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * 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);

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.infra.extendedtypes.SemanticActionConfiguration;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class SemanticActionConfigurationItemProvider extends ActionConfigurationItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public SemanticActionConfigurationItemProvider(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 = ((SemanticActionConfiguration) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_SemanticActionConfiguration_type") : //$NON-NLS-1$
+				getString("_UI_SemanticActionConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * 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/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/SemanticTypeConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/SemanticTypeConfigurationItemProvider.java
index 7a2dbced2a0..60498edc643 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/SemanticTypeConfigurationItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/SemanticTypeConfigurationItemProvider.java
@@ -1,103 +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.extendedtypes.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.infra.extendedtypes.SemanticTypeConfiguration;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class SemanticTypeConfigurationItemProvider extends ElementTypeConfigurationItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SemanticTypeConfigurationItemProvider(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 = ((SemanticTypeConfiguration) object).getName();

-		return label == null || label.length() == 0 ? getString("_UI_SemanticTypeConfiguration_type") : //$NON-NLS-1$

-				getString("_UI_SemanticTypeConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * 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);

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.infra.extendedtypes.SemanticTypeConfiguration;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class SemanticTypeConfigurationItemProvider extends ElementTypeConfigurationItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public SemanticTypeConfigurationItemProvider(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 = ((SemanticTypeConfiguration) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_SemanticTypeConfiguration_type") : //$NON-NLS-1$
+				getString("_UI_SemanticTypeConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * 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/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ViewActionConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ViewActionConfigurationItemProvider.java
index 2115d909f37..17b50010d24 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ViewActionConfigurationItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ViewActionConfigurationItemProvider.java
@@ -1,103 +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.extendedtypes.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.infra.extendedtypes.ViewActionConfiguration;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ViewActionConfigurationItemProvider extends ActionConfigurationItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ViewActionConfigurationItemProvider(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 = ((ViewActionConfiguration) object).getName();

-		return label == null || label.length() == 0 ? getString("_UI_ViewActionConfiguration_type") : //$NON-NLS-1$

-				getString("_UI_ViewActionConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * 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);

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.infra.extendedtypes.ViewActionConfiguration;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ViewActionConfigurationItemProvider extends ActionConfigurationItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ViewActionConfigurationItemProvider(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 = ((ViewActionConfiguration) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_ViewActionConfiguration_type") : //$NON-NLS-1$
+				getString("_UI_ViewActionConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * 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/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ViewTypeConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ViewTypeConfigurationItemProvider.java
index 0c620cb9e4e..d5c139cba22 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ViewTypeConfigurationItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ViewTypeConfigurationItemProvider.java
@@ -1,126 +1,126 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.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.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ViewTypeConfigurationItemProvider extends ElementTypeConfigurationItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

-

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ViewTypeConfigurationItemProvider(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);

-			addSpecializedDiagramTypeIDPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Specialized Diagram Type ID feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addSpecializedDiagramTypeIDPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewTypeConfiguration_specializedDiagramTypeID_feature"), //$NON-NLS-1$

-				getString("_UI_PropertyDescriptor_description", "_UI_ViewTypeConfiguration_specializedDiagramTypeID_feature", "_UI_ViewTypeConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				ExtendedtypesPackage.eINSTANCE.getViewTypeConfiguration_SpecializedDiagramTypeID(), true, false, false, ItemPropertyDescriptor.GENERIC_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 = ((ViewTypeConfiguration) object).getName();

-		return label == null || label.length() == 0 ? getString("_UI_ViewTypeConfiguration_type") : //$NON-NLS-1$

-				getString("_UI_ViewTypeConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * 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(ViewTypeConfiguration.class)) {

-		case ExtendedtypesPackage.VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID:

-			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);

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ViewTypeConfigurationItemProvider extends ElementTypeConfigurationItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ViewTypeConfigurationItemProvider(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);
+			addSpecializedDiagramTypeIDPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Specialized Diagram Type ID feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addSpecializedDiagramTypeIDPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewTypeConfiguration_specializedDiagramTypeID_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ViewTypeConfiguration_specializedDiagramTypeID_feature", "_UI_ViewTypeConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ExtendedtypesPackage.eINSTANCE.getViewTypeConfiguration_SpecializedDiagramTypeID(), true, false, false, ItemPropertyDescriptor.GENERIC_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 = ((ViewTypeConfiguration) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_ViewTypeConfiguration_type") : //$NON-NLS-1$
+				getString("_UI_ViewTypeConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * 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(ViewTypeConfiguration.class)) {
+		case ExtendedtypesPackage.VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID:
+			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/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/CustomInvariantSemanticTypeConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/CustomInvariantSemanticTypeConfigurationItemProvider.java
index f4c8e765c23..f4c8e765c23 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/CustomInvariantSemanticTypeConfigurationItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/CustomInvariantSemanticTypeConfigurationItemProvider.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/CustomInvariantSemanticTypeConfigurationItemProviderAdapterFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/CustomInvariantSemanticTypeConfigurationItemProviderAdapterFactory.java
index 8099a659611..8099a659611 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/CustomInvariantSemanticTypeConfigurationItemProviderAdapterFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/CustomInvariantSemanticTypeConfigurationItemProviderAdapterFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/provider/CustomAspectSemanticTypeConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/provider/CustomAspectSemanticTypeConfigurationItemProvider.java
index 61018d32dfc..61018d32dfc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/provider/CustomAspectSemanticTypeConfigurationItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/provider/CustomAspectSemanticTypeConfigurationItemProvider.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/provider/CustomExtendedElementTypeSetItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/provider/CustomExtendedElementTypeSetItemProvider.java
index eada8b7d3fe..eada8b7d3fe 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/provider/CustomExtendedElementTypeSetItemProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/provider/CustomExtendedElementTypeSetItemProvider.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/provider/CustomExtendedtypesItemProviderAdapterFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/provider/CustomExtendedtypesItemProviderAdapterFactory.java
index 16652b06833..16652b06833 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/provider/CustomExtendedtypesItemProviderAdapterFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/provider/CustomExtendedtypesItemProviderAdapterFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/.classpath b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.classpath
index 240e23bfdc0..240e23bfdc0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/.classpath
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.classpath
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/.project b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.project
index a389db7f315..a389db7f315 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/.project
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.project
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..c585cc455ae
--- /dev/null
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+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
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/META-INF/MANIFEST.MF b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/META-INF/MANIFEST.MF
index d0dd6d2a7e0..aab5cb673f9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.infra.extendedtypes.edit;bundle-version="1.2.0";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

-Export-Package: org.eclipse.papyrus.infra.extendedtypes.presentation

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.presentation.ExtendedTypesEditorPlugin$Implementation

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.extendedtypes.editor;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources;visibility:=reexport,
+ org.eclipse.papyrus.infra.extendedtypes.edit;bundle-version="1.2.0";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
+Export-Package: org.eclipse.papyrus.infra.extendedtypes.presentation
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.presentation.ExtendedTypesEditorPlugin$Implementation
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.extendedtypes.editor;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/about.html b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/about.html
index 77ef6958f99..d194d3dce4d 100755
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/about.html
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/about.html
@@ -1,28 +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>March, 2014</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>

+<!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>March, 2014</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.extendedtypes.editor/build.properties b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/build.properties
index ed6ddf0dd30..ed6ddf0dd30 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/build.properties
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/build.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/AspectSemanticModelFile.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/AspectSemanticModelFile.gif
index cc04daea0fe..cc04daea0fe 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/AspectSemanticModelFile.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/AspectSemanticModelFile.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/ExtendedtypesModelFile.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/ExtendedtypesModelFile.gif
index 66b71ecf1b9..66b71ecf1b9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/ExtendedtypesModelFile.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/ExtendedtypesModelFile.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/InvariantHierarchyConfigurationModelFile.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/InvariantHierarchyConfigurationModelFile.gif
index 97061e34e9b..97061e34e9b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/InvariantHierarchyConfigurationModelFile.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/InvariantHierarchyConfigurationModelFile.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/InvariantSemanticTypeConfigurationModelFile.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/InvariantSemanticTypeConfigurationModelFile.gif
index b7c1ce53490..b7c1ce53490 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/InvariantSemanticTypeConfigurationModelFile.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/InvariantSemanticTypeConfigurationModelFile.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewAspectSemantic.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewAspectSemantic.gif
index 7238879695e..7238879695e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewAspectSemantic.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewAspectSemantic.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewExtendedtypes.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewExtendedtypes.gif
index 35743ceb88a..35743ceb88a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewExtendedtypes.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewExtendedtypes.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewInvariantHierarchyConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewInvariantHierarchyConfiguration.gif
index 9c44c4935ea..9c44c4935ea 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewInvariantHierarchyConfiguration.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewInvariantHierarchyConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewInvariantSemanticTypeConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewInvariantSemanticTypeConfiguration.gif
index 84d170d6289..84d170d6289 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewInvariantSemanticTypeConfiguration.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewInvariantSemanticTypeConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/plugin.properties b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/plugin.properties
index 7aedafb665b..220cf347ea6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/plugin.properties
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/plugin.properties
@@ -68,25 +68,25 @@ _UI_AspectSemanticModelWizard_description = Create a new AspectSemantic model
 
_UI_AspectSemanticEditor_label = AspectSemantic Model Editor
 
_UI_AspectSemanticEditorFilenameDefaultBase = My
 _UI_AspectSemanticEditorFilenameExtensions = aspectsemantic
-

+
 _UI_InvariantSemanticTypeConfigurationEditor_menu = &InvariantSemanticTypeConfiguration Editor
 
_UI_InvariantSemanticTypeConfigurationModelWizard_label = InvariantSemanticTypeConfiguration Model
 _UI_InvariantSemanticTypeConfigurationModelWizard_description = Create a new InvariantSemanticTypeConfiguration model
 
_UI_InvariantSemanticTypeConfigurationEditor_label = InvariantSemanticTypeConfiguration Model Editor
 
_UI_InvariantSemanticTypeConfigurationEditorFilenameDefaultBase = My
 _UI_InvariantSemanticTypeConfigurationEditorFilenameExtensions = invariantsemantictypeconfiguration
-

+
 _UI_InvariantHierarchyConfigurationEditor_menu = &InvariantHierarchyConfiguration Editor
 
_UI_InvariantHierarchyConfigurationModelWizard_label = InvariantHierarchyConfiguration Model
 _UI_InvariantHierarchyConfigurationModelWizard_description = Create a new InvariantHierarchyConfiguration model
 
_UI_InvariantHierarchyConfigurationEditor_label = InvariantHierarchyConfiguration Model Editor
 
_UI_InvariantHierarchyConfigurationEditorFilenameDefaultBase = My
 _UI_InvariantHierarchyConfigurationEditorFilenameExtensions = invarianthierarchyconfiguration
-

+
 _UI_InvarianthierarchyconfigurationEditor_menu = &Invarianthierarchyconfiguration Editor
 
_UI_InvarianthierarchyconfigurationModelWizard_label = Invarianthierarchyconfiguration Model
 _UI_InvarianthierarchyconfigurationModelWizard_description = Create a new Invarianthierarchyconfiguration model
 
_UI_InvarianthierarchyconfigurationEditor_label = Invarianthierarchyconfiguration Model Editor
 
_UI_InvarianthierarchyconfigurationEditorFilenameDefaultBase = My
 _UI_InvarianthierarchyconfigurationEditorFilenameExtensions = invarianthierarchyconfiguration
-

+
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/plugin.xml b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/plugin.xml
index a8c24eff582..a8c24eff582 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/plugin.xml
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/plugin.xml
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedTypesEditorPlugin.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedTypesEditorPlugin.java
index 08e33577691..118060c7cd4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedTypesEditorPlugin.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedTypesEditorPlugin.java
@@ -1,106 +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.extendedtypes.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;

-

-/**

- * This is the central singleton for the ExtendedTypes editor plugin.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public final class ExtendedTypesEditorPlugin extends EMFPlugin {

-

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final ExtendedTypesEditorPlugin INSTANCE = new ExtendedTypesEditorPlugin();

-

-	/**

-	 * 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 ExtendedTypesEditorPlugin() {

-		super(new ResourceLocator[] { EcoreEditPlugin.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;

-		}

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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;
+
+/**
+ * This is the central singleton for the ExtendedTypes editor plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public final class ExtendedTypesEditorPlugin extends EMFPlugin {
+
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static final ExtendedTypesEditorPlugin INSTANCE = new ExtendedTypesEditorPlugin();
+
+	/**
+	 * 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 ExtendedTypesEditorPlugin() {
+		super(new ResourceLocator[] { EcoreEditPlugin.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/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedtypesActionBarContributor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedtypesActionBarContributor.java
index 04858878fb2..50c9b0ba882 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedtypesActionBarContributor.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedtypesActionBarContributor.java
@@ -1,535 +1,535 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.Map;

-import java.util.StringTokenizer;

-

-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 Extendedtypes model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ExtendedtypesActionBarContributor 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(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-	{

-

-		@Override

-		public void run() {

-			try {

-				getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-			} catch (PartInitException exception) {

-				ExtendedTypesEditorPlugin.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(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-	{

-

-		@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 will contain a map of {@link org.eclipse.emf.edit.ui.action.CreateChildAction}s, keyed by sub-menu text.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Map<String, Collection<IAction>> createChildSubmenuActions;

-

-	/**

-	 * 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 will contain a map of {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction}s, keyed by submenu text.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Map<String, Collection<IAction>> createSiblingSubmenuActions;

-

-	/**

-	 * 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 ExtendedtypesActionBarContributor() {

-		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("extendedtypes-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("extendedtypes-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * 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(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesEditor_menu"), "org.eclipse.papyrus.infra.extendedtypesMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-		// 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, createChildSubmenuActions);

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingSubmenuActions);

-			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);

-		createChildSubmenuActions = extractSubmenuActions(createChildActions);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-		createSiblingSubmenuActions = extractSubmenuActions(createSiblingActions);

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildSubmenuActions, null);

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingSubmenuActions, 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 extracts those actions in the <code>submenuActions</code> collection whose text is qualified and returns

-	 * a map of these actions, keyed by submenu text.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Map<String, Collection<IAction>> extractSubmenuActions(Collection<IAction> createActions) {

-		Map<String, Collection<IAction>> createSubmenuActions = new LinkedHashMap<String, Collection<IAction>>();

-		if (createActions != null) {

-			for (Iterator<IAction> actions = createActions.iterator(); actions.hasNext();) {

-				IAction action = actions.next();

-				StringTokenizer st = new StringTokenizer(action.getText(), "|"); //$NON-NLS-1$

-				if (st.countTokens() == 2) {

-					String text = st.nextToken().trim();

-					Collection<IAction> submenuActions = createSubmenuActions.get(text);

-					if (submenuActions == null) {

-						createSubmenuActions.put(text, submenuActions = new ArrayList<IAction>());

-					}

-					action.setText(st.nextToken().trim());

-					submenuActions.add(action);

-					actions.remove();

-				}

-			}

-		}

-		return createSubmenuActions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.MenuManager}s containing {@link org.eclipse.jface.action.ActionContributionItem}s based on the {@link org.eclipse.jface.action.IAction}s

-	 * contained in the <code>submenuActions</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, Map<String, Collection<IAction>> submenuActions, String contributionID) {

-		if (submenuActions != null) {

-			for (Map.Entry<String, Collection<IAction>> entry : submenuActions.entrySet()) {

-				MenuManager submenuManager = new MenuManager(entry.getKey());

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, submenuManager);

-				} else {

-					manager.add(submenuManager);

-				}

-				populateManager(submenuManager, entry.getValue(), null);

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.MenuManager}s and their {@link org.eclipse.jface.action.ActionContributionItem}s based on the {@link org.eclipse.jface.action.IAction}s

-	 * contained in the <code>submenuActions</code> map.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Map<String, Collection<IAction>> submenuActions) {

-		if (submenuActions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				IContributionItem contributionItem = items[i];

-				if (contributionItem instanceof MenuManager) {

-					MenuManager submenuManager = (MenuManager) contributionItem;

-					if (submenuActions.containsKey(submenuManager.getMenuText())) {

-						depopulateManager(submenuManager, submenuActions.get(contributionItem));

-						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(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildSubmenuActions, null);

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-		submenuManager = new MenuManager(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingSubmenuActions, null);

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * 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")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-		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;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+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 Extendedtypes model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ExtendedtypesActionBarContributor 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(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+	{
+
+		@Override
+		public void run() {
+			try {
+				getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+			} catch (PartInitException exception) {
+				ExtendedTypesEditorPlugin.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(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+	{
+
+		@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 will contain a map of {@link org.eclipse.emf.edit.ui.action.CreateChildAction}s, keyed by sub-menu text.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected Map<String, Collection<IAction>> createChildSubmenuActions;
+
+	/**
+	 * 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 will contain a map of {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction}s, keyed by submenu text.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected Map<String, Collection<IAction>> createSiblingSubmenuActions;
+
+	/**
+	 * 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 ExtendedtypesActionBarContributor() {
+		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("extendedtypes-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("extendedtypes-additions")); //$NON-NLS-1$
+	}
+
+	/**
+	 * 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(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesEditor_menu"), "org.eclipse.papyrus.infra.extendedtypesMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+		// 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, createChildSubmenuActions);
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingSubmenuActions);
+			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);
+		createChildSubmenuActions = extractSubmenuActions(createChildActions);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+		createSiblingSubmenuActions = extractSubmenuActions(createSiblingActions);
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildSubmenuActions, null);
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingSubmenuActions, 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 extracts those actions in the <code>submenuActions</code> collection whose text is qualified and returns
+	 * a map of these actions, keyed by submenu text.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected Map<String, Collection<IAction>> extractSubmenuActions(Collection<IAction> createActions) {
+		Map<String, Collection<IAction>> createSubmenuActions = new LinkedHashMap<String, Collection<IAction>>();
+		if (createActions != null) {
+			for (Iterator<IAction> actions = createActions.iterator(); actions.hasNext();) {
+				IAction action = actions.next();
+				StringTokenizer st = new StringTokenizer(action.getText(), "|"); //$NON-NLS-1$
+				if (st.countTokens() == 2) {
+					String text = st.nextToken().trim();
+					Collection<IAction> submenuActions = createSubmenuActions.get(text);
+					if (submenuActions == null) {
+						createSubmenuActions.put(text, submenuActions = new ArrayList<IAction>());
+					}
+					action.setText(st.nextToken().trim());
+					submenuActions.add(action);
+					actions.remove();
+				}
+			}
+		}
+		return createSubmenuActions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.MenuManager}s containing {@link org.eclipse.jface.action.ActionContributionItem}s based on the {@link org.eclipse.jface.action.IAction}s
+	 * contained in the <code>submenuActions</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, Map<String, Collection<IAction>> submenuActions, String contributionID) {
+		if (submenuActions != null) {
+			for (Map.Entry<String, Collection<IAction>> entry : submenuActions.entrySet()) {
+				MenuManager submenuManager = new MenuManager(entry.getKey());
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, submenuManager);
+				} else {
+					manager.add(submenuManager);
+				}
+				populateManager(submenuManager, entry.getValue(), null);
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.MenuManager}s and their {@link org.eclipse.jface.action.ActionContributionItem}s based on the {@link org.eclipse.jface.action.IAction}s
+	 * contained in the <code>submenuActions</code> map.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Map<String, Collection<IAction>> submenuActions) {
+		if (submenuActions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				IContributionItem contributionItem = items[i];
+				if (contributionItem instanceof MenuManager) {
+					MenuManager submenuManager = (MenuManager) contributionItem;
+					if (submenuActions.containsKey(submenuManager.getMenuText())) {
+						depopulateManager(submenuManager, submenuActions.get(contributionItem));
+						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(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createChildSubmenuActions, null);
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+		submenuManager = new MenuManager(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		populateManager(submenuManager, createSiblingSubmenuActions, null);
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+	}
+
+	/**
+	 * 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")); //$NON-NLS-1$ //$NON-NLS-2$
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
+		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+		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/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedtypesEditor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedtypesEditor.java
index 9b416c163ca..0fd5c56cde9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedtypesEditor.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedtypesEditor.java
@@ -1,1761 +1,1761 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.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.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.provider.EcoreItemProviderAdapterFactory;

-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.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.papyrus.infra.extendedtypes.provider.ExtendedtypesItemProviderAdapterFactory;

-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.actions.WorkspaceModifyOperation;

-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;

-

-/**

- * This is an example of a Extendedtypes model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ExtendedtypesEditor 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(ExtendedtypesEditor.this);

-					setCurrentViewer(contentOutlineViewer);

-				}

-			} else if (p instanceof PropertySheet) {

-				if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {

-					getActionBarContributor().setActiveEditor(ExtendedtypesEditor.this);

-					handleActivate();

-				}

-			} else if (p == ExtendedtypesEditor.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(ExtendedtypesEditor.this, false);

-							}

-						}

-					});

-				}

-				if (!visitor.getChangedResources().isEmpty()) {

-					getSite().getShell().getDisplay().asyncExec(new Runnable() {

-

-						public void run() {

-							changedResources.addAll(visitor.getChangedResources());

-							if (getSite().getPage().getActiveEditor() == ExtendedtypesEditor.this) {

-								handleActivate();

-							}

-						}

-					});

-				}

-			} catch (CoreException exception) {

-				ExtendedTypesEditorPlugin.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(ExtendedtypesEditor.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.infra.extendedtypes.editor", //$NON-NLS-1$

-					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) {

-					ExtendedTypesEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				markerHelper.deleteMarkers(editingDomain.getResourceSet());

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					try {

-						markerHelper.createMarkers(diagnostic);

-					} catch (CoreException exception) {

-						ExtendedTypesEditorPlugin.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"), //$NON-NLS-1$

-				getString("_WARN_FileConflict")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This creates a model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ExtendedtypesEditor() {

-		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 ExtendedtypesItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		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"); //$NON-NLS-1$

-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

-		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.infra.extendedtypes.editor", //$NON-NLS-1$

-					0, getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					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.infra.extendedtypes.editor", //$NON-NLS-1$

-					0, getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					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(), ExtendedtypesEditor.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")); //$NON-NLS-1$

-			}

-			// Create a page for the parent tree view.

-			//

-			{

-				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ExtendedtypesEditor.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")); //$NON-NLS-1$

-			}

-			// This is the page for the list viewer

-			//

-			{

-				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ExtendedtypesEditor.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")); //$NON-NLS-1$

-			}

-			// This is the page for the tree viewer

-			//

-			{

-				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ExtendedtypesEditor.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")); //$NON-NLS-1$

-			}

-			// This is the page for the table viewer.

-			//

-			{

-				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ExtendedtypesEditor.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")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				tableViewer.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

-				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$

-			}

-			// This is the page for the table tree viewer.

-			//

-			{

-				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ExtendedtypesEditor.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")); //$NON-NLS-1$

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-				treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$

-			}

-			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, ""); //$NON-NLS-1$

-			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")); //$NON-NLS-1$

-			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) {

-				ExtendedtypesEditor.this.setSelectionToViewer(selection);

-				ExtendedtypesEditor.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.

-			//

-			ExtendedTypesEditorPlugin.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")); //$NON-NLS-1$

-					break;

-				}

-				case 1: {

-					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

-					break;

-				}

-				default: {

-					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

-					break;

-				}

-				}

-			} else {

-				statusLineManager.setMessage(""); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * 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 ExtendedTypesEditorPlugin.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 ExtendedTypesEditorPlugin.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;

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.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.provider.EcoreItemProviderAdapterFactory;
+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.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.papyrus.infra.extendedtypes.provider.ExtendedtypesItemProviderAdapterFactory;
+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.actions.WorkspaceModifyOperation;
+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;
+
+/**
+ * This is an example of a Extendedtypes model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ExtendedtypesEditor 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(ExtendedtypesEditor.this);
+					setCurrentViewer(contentOutlineViewer);
+				}
+			} else if (p instanceof PropertySheet) {
+				if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {
+					getActionBarContributor().setActiveEditor(ExtendedtypesEditor.this);
+					handleActivate();
+				}
+			} else if (p == ExtendedtypesEditor.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(ExtendedtypesEditor.this, false);
+							}
+						}
+					});
+				}
+				if (!visitor.getChangedResources().isEmpty()) {
+					getSite().getShell().getDisplay().asyncExec(new Runnable() {
+
+						public void run() {
+							changedResources.addAll(visitor.getChangedResources());
+							if (getSite().getPage().getActiveEditor() == ExtendedtypesEditor.this) {
+								handleActivate();
+							}
+						}
+					});
+				}
+			} catch (CoreException exception) {
+				ExtendedTypesEditorPlugin.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(ExtendedtypesEditor.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.infra.extendedtypes.editor", //$NON-NLS-1$
+					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) {
+					ExtendedTypesEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				markerHelper.deleteMarkers(editingDomain.getResourceSet());
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					try {
+						markerHelper.createMarkers(diagnostic);
+					} catch (CoreException exception) {
+						ExtendedTypesEditorPlugin.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"), //$NON-NLS-1$
+				getString("_WARN_FileConflict")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This creates a model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ExtendedtypesEditor() {
+		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 ExtendedtypesItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+		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"); //$NON-NLS-1$
+		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+		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.infra.extendedtypes.editor", //$NON-NLS-1$
+					0, getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					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.infra.extendedtypes.editor", //$NON-NLS-1$
+					0, getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+					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(), ExtendedtypesEditor.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")); //$NON-NLS-1$
+			}
+			// Create a page for the parent tree view.
+			//
+			{
+				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ExtendedtypesEditor.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")); //$NON-NLS-1$
+			}
+			// This is the page for the list viewer
+			//
+			{
+				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ExtendedtypesEditor.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")); //$NON-NLS-1$
+			}
+			// This is the page for the tree viewer
+			//
+			{
+				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ExtendedtypesEditor.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")); //$NON-NLS-1$
+			}
+			// This is the page for the table viewer.
+			//
+			{
+				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ExtendedtypesEditor.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")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				tableViewer.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$
+				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
+			}
+			// This is the page for the table tree viewer.
+			//
+			{
+				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ExtendedtypesEditor.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")); //$NON-NLS-1$
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+				treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
+			}
+			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, ""); //$NON-NLS-1$
+			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")); //$NON-NLS-1$
+			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) {
+				ExtendedtypesEditor.this.setSelectionToViewer(selection);
+				ExtendedtypesEditor.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.
+			//
+			ExtendedTypesEditorPlugin.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")); //$NON-NLS-1$
+					break;
+				}
+				case 1: {
+					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
+					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$
+					break;
+				}
+				default: {
+					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$
+					break;
+				}
+				}
+			} else {
+				statusLineManager.setMessage(""); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * 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 ExtendedTypesEditorPlugin.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 ExtendedTypesEditorPlugin.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/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedtypesModelWizard.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedtypesModelWizard.java
index 3d39a8f6452..763e5d46218 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedtypesModelWizard.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedtypesModelWizard.java
@@ -1,612 +1,612 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.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.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.core.runtime.Path;

-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.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.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.infra.extendedtypes.provider.ExtendedTypesEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-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.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-/**

- * This is a simple wizard for creating a new model file.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ExtendedtypesModelWizard 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(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS = ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ExtendedtypesPackage extendedtypesPackage = ExtendedtypesPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ExtendedtypesFactory extendedtypesFactory = extendedtypesPackage.getExtendedtypesFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ExtendedtypesModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ExtendedtypesModelWizardInitialObjectCreationPage 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(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ExtendedTypesEditorPlugin.INSTANCE.getImage("full/wizban/NewExtendedtypes"))); //$NON-NLS-1$

-	}

-

-	/**

-	 * 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 : extendedtypesPackage.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) extendedtypesPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = extendedtypesFactory.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) {

-						ExtendedTypesEditorPlugin.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(), ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

-				return false;

-			}

-			return true;

-		} catch (Exception exception) {

-			ExtendedTypesEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public class ExtendedtypesModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public ExtendedtypesModelWizardNewFileCreationPage(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"; //$NON-NLS-1$ //$NON-NLS-2$

-					setErrorMessage(ExtendedTypesEditorPlugin.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 ExtendedtypesModelWizardInitialObjectCreationPage 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 ExtendedtypesModelWizardInitialObjectCreationPage(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(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$

-				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(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$

-				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 ExtendedTypesEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$

-			} catch (MissingResourceException mre) {

-				ExtendedTypesEditorPlugin.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(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) //$NON-NLS-1$

-				{

-					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 ExtendedtypesModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$

-		newFileCreationPage.setTitle(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesModelWizard_label")); //$NON-NLS-1$

-		newFileCreationPage.setDescription(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesModelWizard_description")); //$NON-NLS-1$

-		newFileCreationPage.setFileName(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$

-		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 = ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesEditorFilenameDefaultBase"); //$NON-NLS-1$

-					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new ExtendedtypesModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$

-		initialObjectCreationPage.setTitle(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesModelWizard_label")); //$NON-NLS-1$

-		initialObjectCreationPage.setDescription(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-}

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.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.core.runtime.Path;
+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.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.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.provider.ExtendedTypesEditPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+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.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+
+/**
+ * This is a simple wizard for creating a new model file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ExtendedtypesModelWizard 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(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS = ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ExtendedtypesPackage extendedtypesPackage = ExtendedtypesPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ExtendedtypesFactory extendedtypesFactory = extendedtypesPackage.getExtendedtypesFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ExtendedtypesModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ExtendedtypesModelWizardInitialObjectCreationPage 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(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ExtendedTypesEditorPlugin.INSTANCE.getImage("full/wizban/NewExtendedtypes"))); //$NON-NLS-1$
+	}
+
+	/**
+	 * 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 : extendedtypesPackage.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) extendedtypesPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = extendedtypesFactory.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) {
+						ExtendedTypesEditorPlugin.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(), ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
+				return false;
+			}
+			return true;
+		} catch (Exception exception) {
+			ExtendedTypesEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public class ExtendedtypesModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		public ExtendedtypesModelWizardNewFileCreationPage(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"; //$NON-NLS-1$ //$NON-NLS-2$
+					setErrorMessage(ExtendedTypesEditorPlugin.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 ExtendedtypesModelWizardInitialObjectCreationPage 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 ExtendedtypesModelWizardInitialObjectCreationPage(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(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
+				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(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
+				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 ExtendedTypesEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$
+			} catch (MissingResourceException mre) {
+				ExtendedTypesEditorPlugin.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(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) //$NON-NLS-1$
+				{
+					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 ExtendedtypesModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		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 = ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesEditorFilenameDefaultBase"); //$NON-NLS-1$
+					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
+					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new ExtendedtypesModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage.setDescription(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.getModelFile();
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/src/org/eclipse/papyrus/infra/extendedtypes/presentation/CustomExtendedtypesEditor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src/org/eclipse/papyrus/infra/extendedtypes/presentation/CustomExtendedtypesEditor.java
index 8ab30ef8241..8ab30ef8241 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.editor/src/org/eclipse/papyrus/infra/extendedtypes/presentation/CustomExtendedtypesEditor.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src/org/eclipse/papyrus/infra/extendedtypes/presentation/CustomExtendedtypesEditor.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/.classpath b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.classpath
index 0c22b5d7e6d..0c22b5d7e6d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/.classpath
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.classpath
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/.project b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.project
index 4f76a49a8c6..f485136d322 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/.project
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.extendedtypes.emf</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>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.extendedtypes.emf</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/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF
index f961a4abb56..3e47b54c845 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF
@@ -1,31 +1,31 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",

- org.eclipse.emf.ecore;bundle-version="2.7.0",

- org.eclipse.emf.ecore.xmi;bundle-version="2.6.0",

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",

- org.eclipse.emf.edit,

- org.eclipse.emf.ecore.edit,

- org.eclipse.uml2.uml.edit,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.core.databinding;bundle-version="1.4.1",

- org.eclipse.papyrus.infra.properties;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.infra.extendedtypes.emf,

- org.eclipse.papyrus.infra.extendedtypes.emf.converter,

- org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration,

- org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl,

- org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.util,

- org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration,

- org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl,

- org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.util

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.emf.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.extendedtypes.emf;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.emf.ecore;bundle-version="2.7.0",
+ org.eclipse.emf.ecore.xmi;bundle-version="2.6.0",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
+ org.eclipse.emf.edit,
+ org.eclipse.emf.ecore.edit,
+ org.eclipse.uml2.uml.edit,
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
+ org.eclipse.core.databinding;bundle-version="1.4.1",
+ org.eclipse.papyrus.infra.properties;bundle-version="1.2.0"
+Export-Package: org.eclipse.papyrus.infra.extendedtypes.emf,
+ org.eclipse.papyrus.infra.extendedtypes.emf.converter,
+ org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration,
+ org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl,
+ org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.util,
+ org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration,
+ org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl,
+ org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.util
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.emf.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.extendedtypes.emf;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/about.html b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/about.html
new file mode 100644
index 00000000000..d35d5aed64c
--- /dev/null
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/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.extendedtypes.emf/build.properties b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/build.properties
index 41808c4d7e5..85562d1f154 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/build.properties
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/build.properties
@@ -1,15 +1,15 @@
-#

-#Mon Sep 12 09:29:52 CEST 2011

-output..=bin/

-bin.includes = .,\

-               model/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html,\

-               icons/

-jars.compile.order=.

-src.includes = about.html

-source.. = src/,\

-           src-gen/

-bin..=bin/

+#
+#Mon Sep 12 09:29:52 CEST 2011
+output..=bin/
+bin.includes = .,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html,\
+               icons/
+jars.compile.order=.
+src.includes = about.html
+source.. = src/,\
+           src-gen/
+bin..=bin/
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/Values.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/Values.gif
index f1f019535ea..f1f019535ea 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/Values.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/Values.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Duration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Duration.gif
index dac4138ca01..dac4138ca01 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Duration.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Duration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_DurationInterval.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_DurationInterval.gif
index 755e4ca7a46..755e4ca7a46 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_DurationInterval.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_DurationInterval.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Expression.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Expression.gif
index 8ce82e3f6c7..8ce82e3f6c7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Expression.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Expression.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_InstanceValue.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_InstanceValue.gif
index fe708946d58..fe708946d58 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_InstanceValue.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_InstanceValue.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Interval.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Interval.gif
index 4aaad5a4cd7..4aaad5a4cd7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Interval.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Interval.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralBoolean.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralBoolean.gif
index 44afafd55da..44afafd55da 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralBoolean.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralBoolean.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralInteger.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralInteger.gif
index f93c92d061a..f93c92d061a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralInteger.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralInteger.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralNull.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralNull.gif
index 5ef9a94e8da..5ef9a94e8da 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralNull.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralNull.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralReal.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralReal.gif
index bbf242da6a9..bbf242da6a9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralReal.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralReal.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralString.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralString.gif
index f08356ef9bb..f08356ef9bb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralString.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralString.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralUnlimitedNatural.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralUnlimitedNatural.gif
index 37dad615792..37dad615792 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralUnlimitedNatural.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralUnlimitedNatural.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_OpaqueExpression.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_OpaqueExpression.gif
index 8ce82e3f6c7..8ce82e3f6c7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_OpaqueExpression.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_OpaqueExpression.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_StringExpression.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_StringExpression.gif
index 4aaad5a4cd7..4aaad5a4cd7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_StringExpression.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_StringExpression.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_TimeExpression.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_TimeExpression.gif
index 33e07420851..33e07420851 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_TimeExpression.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_TimeExpression.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_TimeInterval.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_TimeInterval.gif
index e180c4cf7ca..e180c4cf7ca 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_TimeInterval.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_TimeInterval.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateFeatureToSet_value_ConstantValue.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateFeatureToSet_value_ConstantValue.gif
index 03366e35d0f..03366e35d0f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateFeatureToSet_value_ConstantValue.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateFeatureToSet_value_ConstantValue.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateFeatureToSet_value_ListValue.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateFeatureToSet_value_ListValue.gif
index 8997497557c..8997497557c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateFeatureToSet_value_ListValue.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateFeatureToSet_value_ListValue.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateFeatureToSet_value_QueryExecutionValue.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateFeatureToSet_value_QueryExecutionValue.gif
index c048169804a..c048169804a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateFeatureToSet_value_QueryExecutionValue.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateFeatureToSet_value_QueryExecutionValue.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateSetValuesActionConfiguration_featuresToSet_FeatureToSet.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateSetValuesActionConfiguration_featuresToSet_FeatureToSet.gif
index bf19516c7a4..bf19516c7a4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateSetValuesActionConfiguration_featuresToSet_FeatureToSet.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateSetValuesActionConfiguration_featuresToSet_FeatureToSet.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/ConstantValue.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/ConstantValue.gif
index e4bc22dd17e..e4bc22dd17e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/ConstantValue.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/ConstantValue.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/DynamicValue.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/DynamicValue.gif
index ed874747401..ed874747401 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/DynamicValue.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/DynamicValue.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/FeatureToSet.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/FeatureToSet.gif
index 5a9bc7514fa..5a9bc7514fa 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/FeatureToSet.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/FeatureToSet.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/ListValue.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/ListValue.gif
index c3370c7ddd5..c3370c7ddd5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/ListValue.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/ListValue.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/QueryExecutionValue.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/QueryExecutionValue.gif
index ed874747401..ed874747401 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/QueryExecutionValue.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/QueryExecutionValue.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/SetValuesActionConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/SetValuesActionConfiguration.gif
index 7b7c428c715..7b7c428c715 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/SetValuesActionConfiguration.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/SetValuesActionConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/RuntimeValuesEditionActionConfiguration.ecore b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/RuntimeValuesEditionActionConfiguration.ecore
index 7e75b0d9567..db788f9a6a9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/RuntimeValuesEditionActionConfiguration.ecore
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/RuntimeValuesEditionActionConfiguration.ecore
@@ -1,13 +1,13 @@
-<?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="runtimevalueseditionactionconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/runtimevalueseditionaction/1.0"

-    nsPrefix="runtimevalueseditionactionconfiguration">

-  <eClassifiers xsi:type="ecore:EClass" name="RuntimeValuesEditionActionConfiguration"

-      eSuperTypes="../../org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore#//SemanticActionConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="viewsToDisplay" upperBound="-1"

-        eType="#//ViewToDisplay" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ViewToDisplay">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="view" lowerBound="1" eType="ecore:EClass ../../org.eclipse.papyrus.infra.properties/Model/Properties.ecore#//contexts/View"/>

-  </eClassifiers>

-</ecore:EPackage>

+<?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="runtimevalueseditionactionconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/runtimevalueseditionaction/1.0"
+    nsPrefix="runtimevalueseditionactionconfiguration">
+  <eClassifiers xsi:type="ecore:EClass" name="RuntimeValuesEditionActionConfiguration"
+      eSuperTypes="../../org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore#//SemanticActionConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="viewsToDisplay" upperBound="-1"
+        eType="#//ViewToDisplay" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ViewToDisplay">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="view" lowerBound="1" eType="ecore:EClass ../../org.eclipse.papyrus.infra.properties/Model/Properties.ecore#//contexts/View"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/RuntimeValuesEditionActionConfiguration.ecorediag b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/RuntimeValuesEditionActionConfiguration.ecorediag
index 1feb4311cfa..906dd582bd7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/RuntimeValuesEditionActionConfiguration.ecorediag
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/RuntimeValuesEditionActionConfiguration.ecorediag
@@ -1,107 +1,107 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram 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" xmi:id="_6iPDYJM8EeOW09nMQ1MuzQ" type="EcoreTools" name="RuntimeValuesEditionActionConfiguration.ecorediag" measurementUnit="Pixel">

-  <children xmi:type="notation:Node" xmi:id="_6igJIJM8EeOW09nMQ1MuzQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_6ilBoJM8EeOW09nMQ1MuzQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_6ilosJM8EeOW09nMQ1MuzQ" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_6ilosZM8EeOW09nMQ1MuzQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_6ilospM8EeOW09nMQ1MuzQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6ilos5M8EeOW09nMQ1MuzQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_6imPwJM8EeOW09nMQ1MuzQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_6imPwZM8EeOW09nMQ1MuzQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_6imPwpM8EeOW09nMQ1MuzQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6imPw5M8EeOW09nMQ1MuzQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_6igJIZM8EeOW09nMQ1MuzQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="RuntimeValuesEditionActionConfiguration.ecore#//RuntimeValuesEditionActionConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6igJIpM8EeOW09nMQ1MuzQ" x="130" y="200" height="148"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_6iqhMJM8EeOW09nMQ1MuzQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_6irIQJM8EeOW09nMQ1MuzQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_6irIQZM8EeOW09nMQ1MuzQ" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_6irIQpM8EeOW09nMQ1MuzQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_6irIQ5M8EeOW09nMQ1MuzQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6irIRJM8EeOW09nMQ1MuzQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_6irIRZM8EeOW09nMQ1MuzQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_6irIRpM8EeOW09nMQ1MuzQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_6irIR5M8EeOW09nMQ1MuzQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6irISJM8EeOW09nMQ1MuzQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_6iqhMZM8EeOW09nMQ1MuzQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="RuntimeValuesEditionActionConfiguration.ecore#//ViewToDisplay"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6iqhMpM8EeOW09nMQ1MuzQ" x="570" y="200" width="138" height="148"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_A7S3MJM9EeOW09nMQ1MuzQ" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A7rRsJM9EeOW09nMQ1MuzQ" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_A7rRsZM9EeOW09nMQ1MuzQ" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_A7TeQJM9EeOW09nMQ1MuzQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_A7UFUJM9EeOW09nMQ1MuzQ" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_A7UFUZM9EeOW09nMQ1MuzQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_A7UFUpM9EeOW09nMQ1MuzQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_A7UFU5M9EeOW09nMQ1MuzQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_A7UFVJM9EeOW09nMQ1MuzQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_A7UFVZM9EeOW09nMQ1MuzQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_A7UFVpM9EeOW09nMQ1MuzQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_A7UFV5M9EeOW09nMQ1MuzQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_A7S3MZM9EeOW09nMQ1MuzQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12560536" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore#//SemanticActionConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7S3MpM9EeOW09nMQ1MuzQ" x="145" y="60" width="228"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_OAiPIJM9EeOW09nMQ1MuzQ" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OBIsEJM9EeOW09nMQ1MuzQ" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OBIsEZM9EeOW09nMQ1MuzQ" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_OAkEUJM9EeOW09nMQ1MuzQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_OAkrYJM9EeOW09nMQ1MuzQ" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_OAkrYZM9EeOW09nMQ1MuzQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_OAkrYpM9EeOW09nMQ1MuzQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_OAkrY5M9EeOW09nMQ1MuzQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_OAlScJM9EeOW09nMQ1MuzQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_OAlScZM9EeOW09nMQ1MuzQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_OAlScpM9EeOW09nMQ1MuzQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_OAlSc5M9EeOW09nMQ1MuzQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_OAi2MJM9EeOW09nMQ1MuzQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12560536" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.papyrus.infra.properties/Model/Properties.ecore#//contexts/View"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OAi2MZM9EeOW09nMQ1MuzQ" x="860" y="225"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_6iPqcJM8EeOW09nMQ1MuzQ"/>

-  <element xmi:type="ecore:EPackage" href="RuntimeValuesEditionActionConfiguration.ecore#/"/>

-  <edges xmi:type="notation:Edge" xmi:id="_6i0SMJM8EeOW09nMQ1MuzQ" type="3002" source="_6igJIJM8EeOW09nMQ1MuzQ" target="_6iqhMJM8EeOW09nMQ1MuzQ">

-    <children xmi:type="notation:Node" xmi:id="_6i2HYJM8EeOW09nMQ1MuzQ" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6i2HYZM8EeOW09nMQ1MuzQ" x="-24" y="-12"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_6i2ucJM8EeOW09nMQ1MuzQ" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6i2ucZM8EeOW09nMQ1MuzQ" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_6i0SMZM8EeOW09nMQ1MuzQ" routing="Rectilinear" closestDistance="true" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_6i0SMpM8EeOW09nMQ1MuzQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="RuntimeValuesEditionActionConfiguration.ecore#//RuntimeValuesEditionActionConfiguration/viewsToDisplay"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6i0SM5M8EeOW09nMQ1MuzQ" points="[9, -25, -198, -27]$[189, -25, -18, -27]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6koQEJM8EeOW09nMQ1MuzQ" id="(0.9656488549618321,0.5878378378378378)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6koQEZM8EeOW09nMQ1MuzQ" id="(0.1792452830188679,0.6013513513513513)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_A7dPQJM9EeOW09nMQ1MuzQ" type="3003" source="_6igJIJM8EeOW09nMQ1MuzQ" target="_A7S3MJM9EeOW09nMQ1MuzQ">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_A7dPQZM9EeOW09nMQ1MuzQ" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_A7dPQpM9EeOW09nMQ1MuzQ" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_A7dPQ5M9EeOW09nMQ1MuzQ" points="[0, -73, -3, 111]$[0, -155, -3, 29]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_OBBXUJM9EeOW09nMQ1MuzQ" type="3002" source="_6iqhMJM8EeOW09nMQ1MuzQ" target="_OAiPIJM9EeOW09nMQ1MuzQ">

-    <children xmi:type="notation:Node" xmi:id="_OBB-YJM9EeOW09nMQ1MuzQ" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_OBB-YZM9EeOW09nMQ1MuzQ" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_OBB-YpM9EeOW09nMQ1MuzQ" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_OBB-Y5M9EeOW09nMQ1MuzQ" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_OBBXUZM9EeOW09nMQ1MuzQ" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_OBBXUpM9EeOW09nMQ1MuzQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="RuntimeValuesEditionActionConfiguration.ecore#//ViewToDisplay/view"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OBBXU5M9EeOW09nMQ1MuzQ" points="[-68, -30, 571, 244]$[-638, -274, 1, 0]"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram 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" xmi:id="_6iPDYJM8EeOW09nMQ1MuzQ" type="EcoreTools" name="RuntimeValuesEditionActionConfiguration.ecorediag" measurementUnit="Pixel">
+  <children xmi:type="notation:Node" xmi:id="_6igJIJM8EeOW09nMQ1MuzQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_6ilBoJM8EeOW09nMQ1MuzQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_6ilosJM8EeOW09nMQ1MuzQ" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_6ilosZM8EeOW09nMQ1MuzQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6ilospM8EeOW09nMQ1MuzQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6ilos5M8EeOW09nMQ1MuzQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_6imPwJM8EeOW09nMQ1MuzQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_6imPwZM8EeOW09nMQ1MuzQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6imPwpM8EeOW09nMQ1MuzQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6imPw5M8EeOW09nMQ1MuzQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_6igJIZM8EeOW09nMQ1MuzQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="RuntimeValuesEditionActionConfiguration.ecore#//RuntimeValuesEditionActionConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6igJIpM8EeOW09nMQ1MuzQ" x="130" y="200" height="148"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_6iqhMJM8EeOW09nMQ1MuzQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_6irIQJM8EeOW09nMQ1MuzQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_6irIQZM8EeOW09nMQ1MuzQ" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_6irIQpM8EeOW09nMQ1MuzQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6irIQ5M8EeOW09nMQ1MuzQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6irIRJM8EeOW09nMQ1MuzQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_6irIRZM8EeOW09nMQ1MuzQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_6irIRpM8EeOW09nMQ1MuzQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6irIR5M8EeOW09nMQ1MuzQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6irISJM8EeOW09nMQ1MuzQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_6iqhMZM8EeOW09nMQ1MuzQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="RuntimeValuesEditionActionConfiguration.ecore#//ViewToDisplay"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6iqhMpM8EeOW09nMQ1MuzQ" x="570" y="200" width="138" height="148"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_A7S3MJM9EeOW09nMQ1MuzQ" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A7rRsJM9EeOW09nMQ1MuzQ" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_A7rRsZM9EeOW09nMQ1MuzQ" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_A7TeQJM9EeOW09nMQ1MuzQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_A7UFUJM9EeOW09nMQ1MuzQ" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_A7UFUZM9EeOW09nMQ1MuzQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_A7UFUpM9EeOW09nMQ1MuzQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_A7UFU5M9EeOW09nMQ1MuzQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_A7UFVJM9EeOW09nMQ1MuzQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_A7UFVZM9EeOW09nMQ1MuzQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_A7UFVpM9EeOW09nMQ1MuzQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_A7UFV5M9EeOW09nMQ1MuzQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_A7S3MZM9EeOW09nMQ1MuzQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12560536" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore#//SemanticActionConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7S3MpM9EeOW09nMQ1MuzQ" x="145" y="60" width="228"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_OAiPIJM9EeOW09nMQ1MuzQ" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OBIsEJM9EeOW09nMQ1MuzQ" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OBIsEZM9EeOW09nMQ1MuzQ" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_OAkEUJM9EeOW09nMQ1MuzQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_OAkrYJM9EeOW09nMQ1MuzQ" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_OAkrYZM9EeOW09nMQ1MuzQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_OAkrYpM9EeOW09nMQ1MuzQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_OAkrY5M9EeOW09nMQ1MuzQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_OAlScJM9EeOW09nMQ1MuzQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_OAlScZM9EeOW09nMQ1MuzQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_OAlScpM9EeOW09nMQ1MuzQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_OAlSc5M9EeOW09nMQ1MuzQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_OAi2MJM9EeOW09nMQ1MuzQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12560536" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.papyrus.infra.properties/Model/Properties.ecore#//contexts/View"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OAi2MZM9EeOW09nMQ1MuzQ" x="860" y="225"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_6iPqcJM8EeOW09nMQ1MuzQ"/>
+  <element xmi:type="ecore:EPackage" href="RuntimeValuesEditionActionConfiguration.ecore#/"/>
+  <edges xmi:type="notation:Edge" xmi:id="_6i0SMJM8EeOW09nMQ1MuzQ" type="3002" source="_6igJIJM8EeOW09nMQ1MuzQ" target="_6iqhMJM8EeOW09nMQ1MuzQ">
+    <children xmi:type="notation:Node" xmi:id="_6i2HYJM8EeOW09nMQ1MuzQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_6i2HYZM8EeOW09nMQ1MuzQ" x="-24" y="-12"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_6i2ucJM8EeOW09nMQ1MuzQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_6i2ucZM8EeOW09nMQ1MuzQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_6i0SMZM8EeOW09nMQ1MuzQ" routing="Rectilinear" closestDistance="true" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_6i0SMpM8EeOW09nMQ1MuzQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="RuntimeValuesEditionActionConfiguration.ecore#//RuntimeValuesEditionActionConfiguration/viewsToDisplay"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6i0SM5M8EeOW09nMQ1MuzQ" points="[9, -25, -198, -27]$[189, -25, -18, -27]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6koQEJM8EeOW09nMQ1MuzQ" id="(0.9656488549618321,0.5878378378378378)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6koQEZM8EeOW09nMQ1MuzQ" id="(0.1792452830188679,0.6013513513513513)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_A7dPQJM9EeOW09nMQ1MuzQ" type="3003" source="_6igJIJM8EeOW09nMQ1MuzQ" target="_A7S3MJM9EeOW09nMQ1MuzQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_A7dPQZM9EeOW09nMQ1MuzQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_A7dPQpM9EeOW09nMQ1MuzQ" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_A7dPQ5M9EeOW09nMQ1MuzQ" points="[0, -73, -3, 111]$[0, -155, -3, 29]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_OBBXUJM9EeOW09nMQ1MuzQ" type="3002" source="_6iqhMJM8EeOW09nMQ1MuzQ" target="_OAiPIJM9EeOW09nMQ1MuzQ">
+    <children xmi:type="notation:Node" xmi:id="_OBB-YJM9EeOW09nMQ1MuzQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_OBB-YZM9EeOW09nMQ1MuzQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_OBB-YpM9EeOW09nMQ1MuzQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_OBB-Y5M9EeOW09nMQ1MuzQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_OBBXUZM9EeOW09nMQ1MuzQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_OBBXUpM9EeOW09nMQ1MuzQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="RuntimeValuesEditionActionConfiguration.ecore#//ViewToDisplay/view"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OBBXU5M9EeOW09nMQ1MuzQ" points="[-68, -30, 571, 244]$[-638, -274, 1, 0]"/>
+  </edges>
+</notation:Diagram>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/RuntimeValuesEditionActionConfiguration.genmodel b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/RuntimeValuesEditionActionConfiguration.genmodel
index b7d5282f942..b6582c59703 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/RuntimeValuesEditionActionConfiguration.genmodel
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/RuntimeValuesEditionActionConfiguration.genmodel
@@ -1,19 +1,19 @@
-<?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.infra.extendedtypes.emf/src-gen"

-    editDirectory="/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen" editorDirectory="/org.eclipse.papyrus.infra.extendedtypes.emf.editor/src-gen"

-    modelPluginID="org.eclipse.papyrus.infra.extendedtypes.emf" modelName="RuntimeValuesEditionActionConfiguration"

-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.emf.importer.ecore"

-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel#//extendedtypes platform:/plugin/org.eclipse.papyrus.infra.properties/Model/Properties.genmodel#//properties"

-    operationReflection="true" importOrganizing="true">

-  <foreignModel>RuntimeValuesEditionActionConfiguration.ecore</foreignModel>

-  <genPackages prefix="RuntimeValuesEditionActionConfiguration" disposableProviderFactory="true" resource="XML"  basePackage="org.eclipse.papyrus.infra.extendedtypes.emf"

-      ecorePackage="RuntimeValuesEditionActionConfiguration.ecore#/">

-    <genClasses ecoreClass="RuntimeValuesEditionActionConfiguration.ecore#//RuntimeValuesEditionActionConfiguration">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuntimeValuesEditionActionConfiguration.ecore#//RuntimeValuesEditionActionConfiguration/viewsToDisplay"/>

-    </genClasses>

-    <genClasses ecoreClass="RuntimeValuesEditionActionConfiguration.ecore#//ViewToDisplay">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference RuntimeValuesEditionActionConfiguration.ecore#//ViewToDisplay/view"/>

-    </genClasses>

-  </genPackages>

-</genmodel:GenModel>

+<?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.infra.extendedtypes.emf/src-gen"
+    editDirectory="/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen" editorDirectory="/org.eclipse.papyrus.infra.extendedtypes.emf.editor/src-gen"
+    modelPluginID="org.eclipse.papyrus.infra.extendedtypes.emf" modelName="RuntimeValuesEditionActionConfiguration"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.emf.importer.ecore"
+    complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel#//extendedtypes platform:/plugin/org.eclipse.papyrus.infra.properties/Model/Properties.genmodel#//properties"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>RuntimeValuesEditionActionConfiguration.ecore</foreignModel>
+  <genPackages prefix="RuntimeValuesEditionActionConfiguration" disposableProviderFactory="true" resource="XML"  basePackage="org.eclipse.papyrus.infra.extendedtypes.emf"
+      ecorePackage="RuntimeValuesEditionActionConfiguration.ecore#/">
+    <genClasses ecoreClass="RuntimeValuesEditionActionConfiguration.ecore#//RuntimeValuesEditionActionConfiguration">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuntimeValuesEditionActionConfiguration.ecore#//RuntimeValuesEditionActionConfiguration/viewsToDisplay"/>
+    </genClasses>
+    <genClasses ecoreClass="RuntimeValuesEditionActionConfiguration.ecore#//ViewToDisplay">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference RuntimeValuesEditionActionConfiguration.ecore#//ViewToDisplay/view"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/SetValuesActionConfiguration.ecore b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/SetValuesActionConfiguration.ecore
index 5c42dea3afe..6bab0eeabb8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/SetValuesActionConfiguration.ecore
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/SetValuesActionConfiguration.ecore
@@ -1,26 +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="setvaluesactionconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0"

-    nsPrefix="setvaluesactionconfiguration">

-  <eClassifiers xsi:type="ecore:EClass" name="SetValuesActionConfiguration" eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore#//SemanticActionConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="featuresToSet" upperBound="-1"

-        eType="#//FeatureToSet" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="FeatureToSet">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="featureName" lowerBound="1"

-        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="#//FeatureValue"

-        containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="FeatureValue" abstract="true"/>

-  <eClassifiers xsi:type="ecore:EClass" name="DynamicValue" abstract="true" eSuperTypes="#//FeatureValue"/>

-  <eClassifiers xsi:type="ecore:EClass" name="ConstantValue" eSuperTypes="#//FeatureValue">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="valueInstance" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ValueSpecification"

-        containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ListValue" eSuperTypes="#//FeatureValue">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"

-        eType="#//FeatureValue" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="QueryExecutionValue" eSuperTypes="#//DynamicValue"/>

-</ecore:EPackage>

+<?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="setvaluesactionconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0"
+    nsPrefix="setvaluesactionconfiguration">
+  <eClassifiers xsi:type="ecore:EClass" name="SetValuesActionConfiguration" eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore#//SemanticActionConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="featuresToSet" upperBound="-1"
+        eType="#//FeatureToSet" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FeatureToSet">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="featureName" lowerBound="1"
+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="#//FeatureValue"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FeatureValue" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="DynamicValue" abstract="true" eSuperTypes="#//FeatureValue"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ConstantValue" eSuperTypes="#//FeatureValue">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="valueInstance" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ValueSpecification"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ListValue" eSuperTypes="#//FeatureValue">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"
+        eType="#//FeatureValue" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="QueryExecutionValue" eSuperTypes="#//DynamicValue"/>
+</ecore:EPackage>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/SetValuesActionConfiguration.ecorediag b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/SetValuesActionConfiguration.ecorediag
index 9c51a194c39..34ae16642b8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/SetValuesActionConfiguration.ecorediag
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/SetValuesActionConfiguration.ecorediag
@@ -1,253 +1,253 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram 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" xmi:id="_ay7h0FSgEeC-0syXieMmHA" type="EcoreTools" name="SetValuesActionConfiguration" measurementUnit="Pixel">

-  <children xmi:type="notation:Node" xmi:id="_omszsFSgEeC-0syXieMmHA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_omszs1SgEeC-0syXieMmHA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_omsztFSgEeC-0syXieMmHA" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_omsztVSgEeC-0syXieMmHA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_omsztlSgEeC-0syXieMmHA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_omszt1SgEeC-0syXieMmHA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_omszuFSgEeC-0syXieMmHA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_omszuVSgEeC-0syXieMmHA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_omszulSgEeC-0syXieMmHA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_omszu1SgEeC-0syXieMmHA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_omszsVSgEeC-0syXieMmHA" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="SetValuesActionConfiguration.ecore#//SetValuesActionConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_omszslSgEeC-0syXieMmHA" x="50" y="310" width="306" height="87"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_m7JwcVVnEeCZTbk4eXVjvg" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_m7ThcFVnEeCZTbk4eXVjvg" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_m7ThcVVnEeCZTbk4eXVjvg" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_rSjOgFVnEeCZTbk4eXVjvg" type="2001">

-        <element xmi:type="ecore:EAttribute" href="SetValuesActionConfiguration.ecore#//FeatureToSet/featureName"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rSjOgVVnEeCZTbk4eXVjvg"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_m7ThclVnEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_m7Thc1VnEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_m7ThdFVnEeCZTbk4eXVjvg"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_m7ThdVVnEeCZTbk4eXVjvg" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_m7ThdlVnEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_m7Thd1VnEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_m7TheFVnEeCZTbk4eXVjvg"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_m7JwclVnEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="SetValuesActionConfiguration.ecore#//FeatureToSet"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m7Jwc1VnEeCZTbk4eXVjvg" x="480" y="310" width="198" height="83"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_FCIyIFVoEeCZTbk4eXVjvg" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_FCIyI1VoEeCZTbk4eXVjvg" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_FCIyJFVoEeCZTbk4eXVjvg" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_FCIyJVVoEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_FCIyJlVoEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_FCIyJ1VoEeCZTbk4eXVjvg"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_FCIyKFVoEeCZTbk4eXVjvg" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_FCIyKVVoEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_FCIyKlVoEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_FCIyK1VoEeCZTbk4eXVjvg"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_FCIyIVVoEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="SetValuesActionConfiguration.ecore#//FeatureValue"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FCIyIlVoEeCZTbk4eXVjvg" x="810" y="310" width="188" height="83"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_ataLwFVoEeCZTbk4eXVjvg" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_ataLw1VoEeCZTbk4eXVjvg" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_ataLxFVoEeCZTbk4eXVjvg" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ataLxVVoEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ataLxlVoEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ataLx1VoEeCZTbk4eXVjvg"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ataLyFVoEeCZTbk4eXVjvg" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ataLyVVoEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ataLylVoEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ataLy1VoEeCZTbk4eXVjvg"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ataLwVVoEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="SetValuesActionConfiguration.ecore#//DynamicValue"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ataLwlVoEeCZTbk4eXVjvg" x="110" y="495" width="183" height="58"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_d-nd0FVoEeCZTbk4eXVjvg" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_d-nd01VoEeCZTbk4eXVjvg" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_d-nd1FVoEeCZTbk4eXVjvg" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_d-nd1VVoEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_d-nd1lVoEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_d-nd11VoEeCZTbk4eXVjvg"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_d-xO0FVoEeCZTbk4eXVjvg" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_d-xO0VVoEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_d-xO0lVoEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_d-xO01VoEeCZTbk4eXVjvg"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_d-nd0VVoEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="SetValuesActionConfiguration.ecore#//ConstantValue"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d-nd0lVoEeCZTbk4eXVjvg" x="480" y="495" width="153" height="58"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_j3TvgFVoEeCZTbk4eXVjvg" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_j3Tvg1VoEeCZTbk4eXVjvg" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_j3TvhFVoEeCZTbk4eXVjvg" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_j3TvhVVoEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_j3TvhlVoEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_j3Tvh1VoEeCZTbk4eXVjvg"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_j3TviFVoEeCZTbk4eXVjvg" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_j3TviVVoEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_j3TvilVoEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_j3Tvi1VoEeCZTbk4eXVjvg"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_j3TvgVVoEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="SetValuesActionConfiguration.ecore#//ListValue"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j3TvglVoEeCZTbk4eXVjvg" x="875" y="495" width="143" height="58"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_nJRPgFVoEeCZTbk4eXVjvg" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_nJRPg1VoEeCZTbk4eXVjvg" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_nJRPhFVoEeCZTbk4eXVjvg" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_nJRPhVVoEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_nJRPhlVoEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_nJRPh1VoEeCZTbk4eXVjvg"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_nJRPiFVoEeCZTbk4eXVjvg" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_nJRPiVVoEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_nJRPilVoEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_nJRPi1VoEeCZTbk4eXVjvg"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_nJRPgVVoEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="SetValuesActionConfiguration.ecore#//QueryExecutionValue"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nJRPglVoEeCZTbk4eXVjvg" x="110" y="640" width="173" height="58"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_CjJ_gFVuEeCZTbk4eXVjvg" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CjJ_jFVuEeCZTbk4eXVjvg" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CjJ_jVVuEeCZTbk4eXVjvg" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_CjJ_g1VuEeCZTbk4eXVjvg" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_CjJ_hFVuEeCZTbk4eXVjvg" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_CjJ_hVVuEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_CjJ_hlVuEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_CjJ_h1VuEeCZTbk4eXVjvg"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_CjJ_iFVuEeCZTbk4eXVjvg" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_CjJ_iVVuEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_CjJ_ilVuEeCZTbk4eXVjvg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_CjJ_i1VuEeCZTbk4eXVjvg"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_CjJ_gVVuEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="12560536" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ValueSpecification"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CjJ_glVuEeCZTbk4eXVjvg" x="360" y="610" width="293" height="218"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_bdSXoIK0EeOjkMhtoir5vQ" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bi86wIK0EeOjkMhtoir5vQ" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bi86wYK0EeOjkMhtoir5vQ" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_bdTlwIK0EeOjkMhtoir5vQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_bdUz4IK0EeOjkMhtoir5vQ" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_bdUz4YK0EeOjkMhtoir5vQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_bdUz4oK0EeOjkMhtoir5vQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_bdUz44K0EeOjkMhtoir5vQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_bdVa8IK0EeOjkMhtoir5vQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_bdVa8YK0EeOjkMhtoir5vQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_bdVa8oK0EeOjkMhtoir5vQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_bdVa84K0EeOjkMhtoir5vQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_bdSXoYK0EeOjkMhtoir5vQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12560536" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore#//SemanticActionConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bdSXooK0EeOjkMhtoir5vQ" x="110" y="125"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_ay7h0VSgEeC-0syXieMmHA"/>

-  <element xmi:type="ecore:EPackage" href="SetValuesActionConfiguration.ecore#/"/>

-  <edges xmi:type="notation:Edge" xmi:id="_xbMAsFVnEeCZTbk4eXVjvg" type="3002" source="_omszsFSgEeC-0syXieMmHA" target="_m7JwcVVnEeCZTbk4eXVjvg">

-    <children xmi:type="notation:Node" xmi:id="_xbMAtFVnEeCZTbk4eXVjvg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_xbMAtVVnEeCZTbk4eXVjvg" x="-25" y="-9"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_xbMAtlVnEeCZTbk4eXVjvg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_xbMAt1VnEeCZTbk4eXVjvg" y="11"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xbMAsVVnEeCZTbk4eXVjvg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_xbMAslVnEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="SetValuesActionConfiguration.ecore#//SetValuesActionConfiguration/featuresToSet"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xbMAs1VnEeCZTbk4eXVjvg" points="[52, 0, -233, 2]$[286, 29, 1, 31]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xbVKoFVnEeCZTbk4eXVjvg" id="(0.8300653594771242,0.5632183908045977)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xbVKoVVnEeCZTbk4eXVjvg" id="(0.2,0.5921052631578947)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_S2gg8FVoEeCZTbk4eXVjvg" type="3002" source="_m7JwcVVnEeCZTbk4eXVjvg" target="_FCIyIFVoEeCZTbk4eXVjvg">

-    <children xmi:type="notation:Node" xmi:id="_S2gg9FVoEeCZTbk4eXVjvg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_S2gg9VVoEeCZTbk4eXVjvg" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_S2gg9lVoEeCZTbk4eXVjvg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_S2gg91VoEeCZTbk4eXVjvg" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_S2gg8VVoEeCZTbk4eXVjvg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_S2gg8lVoEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="SetValuesActionConfiguration.ecore#//FeatureToSet/value"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_S2gg81VoEeCZTbk4eXVjvg" points="[20, 9, -141, 1]$[162, -26, 1, -34]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_S2gg-FVoEeCZTbk4eXVjvg" id="(0.898989898989899,0.3253012048192771)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_S2gg-VVoEeCZTbk4eXVjvg" id="(0.12234042553191489,0.42168674698795183)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_dE8q4FVoEeCZTbk4eXVjvg" type="3003" source="_ataLwFVoEeCZTbk4eXVjvg" target="_FCIyIFVoEeCZTbk4eXVjvg">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_dE8q4VVoEeCZTbk4eXVjvg" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_dE8q4lVoEeCZTbk4eXVjvg"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dE8q41VoEeCZTbk4eXVjvg" points="[-16, -8, -727, 120]$[-16, -53, -727, 75]$[694, -53, -17, 75]$[694, -112, -17, 16]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dE8q5FVoEeCZTbk4eXVjvg" id="(0.5628415300546448,0.15517241379310345)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dE8q5VVoEeCZTbk4eXVjvg" id="(0.6063829787234043,0.8072289156626506)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_f3BJ4FVoEeCZTbk4eXVjvg" type="3003" source="_d-nd0FVoEeCZTbk4eXVjvg" target="_FCIyIFVoEeCZTbk4eXVjvg">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_f3BJ4VVoEeCZTbk4eXVjvg" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_f3BJ4lVoEeCZTbk4eXVjvg"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f3BJ41VoEeCZTbk4eXVjvg" points="[0, 0, -323, 104]$[0, -45, -323, 59]$[325, -45, 2, 59]$[325, -104, 2, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f3KT0FVoEeCZTbk4eXVjvg" id="(0.6666666666666666,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f3KT0VVoEeCZTbk4eXVjvg" id="(0.5,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_l4DfQFVoEeCZTbk4eXVjvg" type="3003" source="_j3TvgFVoEeCZTbk4eXVjvg" target="_FCIyIFVoEeCZTbk4eXVjvg">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_l4DfQVVoEeCZTbk4eXVjvg" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_l4DfQlVoEeCZTbk4eXVjvg"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l4DfQ1VoEeCZTbk4eXVjvg" points="[12, -4, 72, 123]$[12, -49, 72, 78]$[-53, -49, 7, 78]$[-53, -108, 7, 19]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l4DfRFVoEeCZTbk4eXVjvg" id="(0.5244755244755245,0.08620689655172414)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l4DfRVVoEeCZTbk4eXVjvg" id="(0.5053191489361702,0.7710843373493976)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_wuI4AFVoEeCZTbk4eXVjvg" type="3003" source="_nJRPgFVoEeCZTbk4eXVjvg" target="_ataLwFVoEeCZTbk4eXVjvg">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_wuI4AVVoEeCZTbk4eXVjvg" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_wuI4AlVoEeCZTbk4eXVjvg"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wuI4A1VoEeCZTbk4eXVjvg" points="[-28, 0, 13, 102]$[-28, -89, 13, 13]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wuI4BFVoEeCZTbk4eXVjvg" id="(0.6647398843930635,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fYiPwIK1EeOjkMhtoir5vQ" id="(0.3989071038251366,0.7758620689655172)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_2veIUFVoEeCZTbk4eXVjvg" type="3002" source="_j3TvgFVoEeCZTbk4eXVjvg" target="_FCIyIFVoEeCZTbk4eXVjvg">

-    <children xmi:type="notation:Node" xmi:id="_2veIVFVoEeCZTbk4eXVjvg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_2veIVVVoEeCZTbk4eXVjvg" x="10" y="-12"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_2veIVlVoEeCZTbk4eXVjvg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_2veIV1VoEeCZTbk4eXVjvg" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_2veIUVVoEeCZTbk4eXVjvg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_2veIUlVoEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="SetValuesActionConfiguration.ecore#//ListValue/values"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2veIU1VoEeCZTbk4eXVjvg" points="[24, 0, 43, 161]$[60, 0, 79, 161]$[60, -161, 79, 0]$[4, -161, 23, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2vn5UFVoEeCZTbk4eXVjvg" id="(0.8321678321678322,0.39655172413793105)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2vn5UVVoEeCZTbk4eXVjvg" id="(0.8776595744680851,0.5783132530120482)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ClZbMFVuEeCZTbk4eXVjvg" type="3002" source="_d-nd0FVoEeCZTbk4eXVjvg" target="_CjJ_gFVuEeCZTbk4eXVjvg">

-    <children xmi:type="notation:Node" xmi:id="_ClZbNFVuEeCZTbk4eXVjvg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ClZbNVVuEeCZTbk4eXVjvg" x="-8" y="-46"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ClZbNlVuEeCZTbk4eXVjvg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ClZbN1VuEeCZTbk4eXVjvg" x="-3" y="17"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ClZbMVVuEeCZTbk4eXVjvg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ClZbMlVuEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="SetValuesActionConfiguration.ecore#//ConstantValue/valueInstance"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ClZbM1VuEeCZTbk4eXVjvg" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Cm4o8FVuEeCZTbk4eXVjvg" id="(0.3333333333333333,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Cm4o8VVuEeCZTbk4eXVjvg" id="(0.6245733788395904,0.03164556962025317)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_gIqhoIK0EeOjkMhtoir5vQ" type="3003" source="_omszsFSgEeC-0syXieMmHA" target="_bdSXoIK0EeOjkMhtoir5vQ">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_gIrIsIK0EeOjkMhtoir5vQ" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_gIrIsYK0EeOjkMhtoir5vQ" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gIrIsoK0EeOjkMhtoir5vQ" points="[-2, -42, -2, 156]$[-2, -169, -2, 29]"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram 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" xmi:id="_ay7h0FSgEeC-0syXieMmHA" type="EcoreTools" name="SetValuesActionConfiguration" measurementUnit="Pixel">
+  <children xmi:type="notation:Node" xmi:id="_omszsFSgEeC-0syXieMmHA" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_omszs1SgEeC-0syXieMmHA" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_omsztFSgEeC-0syXieMmHA" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_omsztVSgEeC-0syXieMmHA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_omsztlSgEeC-0syXieMmHA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_omszt1SgEeC-0syXieMmHA"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_omszuFSgEeC-0syXieMmHA" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_omszuVSgEeC-0syXieMmHA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_omszulSgEeC-0syXieMmHA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_omszu1SgEeC-0syXieMmHA"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_omszsVSgEeC-0syXieMmHA" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="SetValuesActionConfiguration.ecore#//SetValuesActionConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_omszslSgEeC-0syXieMmHA" x="50" y="310" width="306" height="87"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_m7JwcVVnEeCZTbk4eXVjvg" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_m7ThcFVnEeCZTbk4eXVjvg" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_m7ThcVVnEeCZTbk4eXVjvg" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_rSjOgFVnEeCZTbk4eXVjvg" type="2001">
+        <element xmi:type="ecore:EAttribute" href="SetValuesActionConfiguration.ecore#//FeatureToSet/featureName"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rSjOgVVnEeCZTbk4eXVjvg"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_m7ThclVnEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_m7Thc1VnEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_m7ThdFVnEeCZTbk4eXVjvg"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_m7ThdVVnEeCZTbk4eXVjvg" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_m7ThdlVnEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_m7Thd1VnEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_m7TheFVnEeCZTbk4eXVjvg"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_m7JwclVnEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="SetValuesActionConfiguration.ecore#//FeatureToSet"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m7Jwc1VnEeCZTbk4eXVjvg" x="480" y="310" width="198" height="83"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_FCIyIFVoEeCZTbk4eXVjvg" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_FCIyI1VoEeCZTbk4eXVjvg" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_FCIyJFVoEeCZTbk4eXVjvg" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_FCIyJVVoEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_FCIyJlVoEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_FCIyJ1VoEeCZTbk4eXVjvg"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_FCIyKFVoEeCZTbk4eXVjvg" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_FCIyKVVoEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_FCIyKlVoEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_FCIyK1VoEeCZTbk4eXVjvg"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_FCIyIVVoEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="SetValuesActionConfiguration.ecore#//FeatureValue"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FCIyIlVoEeCZTbk4eXVjvg" x="810" y="310" width="188" height="83"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_ataLwFVoEeCZTbk4eXVjvg" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_ataLw1VoEeCZTbk4eXVjvg" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_ataLxFVoEeCZTbk4eXVjvg" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_ataLxVVoEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_ataLxlVoEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_ataLx1VoEeCZTbk4eXVjvg"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_ataLyFVoEeCZTbk4eXVjvg" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_ataLyVVoEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_ataLylVoEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_ataLy1VoEeCZTbk4eXVjvg"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_ataLwVVoEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="SetValuesActionConfiguration.ecore#//DynamicValue"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ataLwlVoEeCZTbk4eXVjvg" x="110" y="495" width="183" height="58"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_d-nd0FVoEeCZTbk4eXVjvg" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_d-nd01VoEeCZTbk4eXVjvg" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_d-nd1FVoEeCZTbk4eXVjvg" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_d-nd1VVoEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_d-nd1lVoEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_d-nd11VoEeCZTbk4eXVjvg"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_d-xO0FVoEeCZTbk4eXVjvg" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_d-xO0VVoEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_d-xO0lVoEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_d-xO01VoEeCZTbk4eXVjvg"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_d-nd0VVoEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="SetValuesActionConfiguration.ecore#//ConstantValue"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d-nd0lVoEeCZTbk4eXVjvg" x="480" y="495" width="153" height="58"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_j3TvgFVoEeCZTbk4eXVjvg" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_j3Tvg1VoEeCZTbk4eXVjvg" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_j3TvhFVoEeCZTbk4eXVjvg" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_j3TvhVVoEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_j3TvhlVoEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_j3Tvh1VoEeCZTbk4eXVjvg"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_j3TviFVoEeCZTbk4eXVjvg" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_j3TviVVoEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_j3TvilVoEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_j3Tvi1VoEeCZTbk4eXVjvg"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_j3TvgVVoEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="SetValuesActionConfiguration.ecore#//ListValue"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j3TvglVoEeCZTbk4eXVjvg" x="875" y="495" width="143" height="58"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_nJRPgFVoEeCZTbk4eXVjvg" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_nJRPg1VoEeCZTbk4eXVjvg" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_nJRPhFVoEeCZTbk4eXVjvg" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_nJRPhVVoEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_nJRPhlVoEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_nJRPh1VoEeCZTbk4eXVjvg"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_nJRPiFVoEeCZTbk4eXVjvg" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_nJRPiVVoEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_nJRPilVoEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_nJRPi1VoEeCZTbk4eXVjvg"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_nJRPgVVoEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="SetValuesActionConfiguration.ecore#//QueryExecutionValue"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nJRPglVoEeCZTbk4eXVjvg" x="110" y="640" width="173" height="58"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_CjJ_gFVuEeCZTbk4eXVjvg" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CjJ_jFVuEeCZTbk4eXVjvg" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CjJ_jVVuEeCZTbk4eXVjvg" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_CjJ_g1VuEeCZTbk4eXVjvg" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_CjJ_hFVuEeCZTbk4eXVjvg" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_CjJ_hVVuEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_CjJ_hlVuEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_CjJ_h1VuEeCZTbk4eXVjvg"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_CjJ_iFVuEeCZTbk4eXVjvg" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_CjJ_iVVuEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_CjJ_ilVuEeCZTbk4eXVjvg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_CjJ_i1VuEeCZTbk4eXVjvg"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_CjJ_gVVuEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="12560536" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ValueSpecification"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CjJ_glVuEeCZTbk4eXVjvg" x="360" y="610" width="293" height="218"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_bdSXoIK0EeOjkMhtoir5vQ" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bi86wIK0EeOjkMhtoir5vQ" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bi86wYK0EeOjkMhtoir5vQ" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_bdTlwIK0EeOjkMhtoir5vQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_bdUz4IK0EeOjkMhtoir5vQ" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_bdUz4YK0EeOjkMhtoir5vQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_bdUz4oK0EeOjkMhtoir5vQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_bdUz44K0EeOjkMhtoir5vQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_bdVa8IK0EeOjkMhtoir5vQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_bdVa8YK0EeOjkMhtoir5vQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_bdVa8oK0EeOjkMhtoir5vQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_bdVa84K0EeOjkMhtoir5vQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_bdSXoYK0EeOjkMhtoir5vQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12560536" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore#//SemanticActionConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bdSXooK0EeOjkMhtoir5vQ" x="110" y="125"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_ay7h0VSgEeC-0syXieMmHA"/>
+  <element xmi:type="ecore:EPackage" href="SetValuesActionConfiguration.ecore#/"/>
+  <edges xmi:type="notation:Edge" xmi:id="_xbMAsFVnEeCZTbk4eXVjvg" type="3002" source="_omszsFSgEeC-0syXieMmHA" target="_m7JwcVVnEeCZTbk4eXVjvg">
+    <children xmi:type="notation:Node" xmi:id="_xbMAtFVnEeCZTbk4eXVjvg" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_xbMAtVVnEeCZTbk4eXVjvg" x="-25" y="-9"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_xbMAtlVnEeCZTbk4eXVjvg" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_xbMAt1VnEeCZTbk4eXVjvg" y="11"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xbMAsVVnEeCZTbk4eXVjvg" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_xbMAslVnEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="SetValuesActionConfiguration.ecore#//SetValuesActionConfiguration/featuresToSet"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xbMAs1VnEeCZTbk4eXVjvg" points="[52, 0, -233, 2]$[286, 29, 1, 31]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xbVKoFVnEeCZTbk4eXVjvg" id="(0.8300653594771242,0.5632183908045977)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xbVKoVVnEeCZTbk4eXVjvg" id="(0.2,0.5921052631578947)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_S2gg8FVoEeCZTbk4eXVjvg" type="3002" source="_m7JwcVVnEeCZTbk4eXVjvg" target="_FCIyIFVoEeCZTbk4eXVjvg">
+    <children xmi:type="notation:Node" xmi:id="_S2gg9FVoEeCZTbk4eXVjvg" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_S2gg9VVoEeCZTbk4eXVjvg" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_S2gg9lVoEeCZTbk4eXVjvg" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_S2gg91VoEeCZTbk4eXVjvg" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_S2gg8VVoEeCZTbk4eXVjvg" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_S2gg8lVoEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="SetValuesActionConfiguration.ecore#//FeatureToSet/value"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_S2gg81VoEeCZTbk4eXVjvg" points="[20, 9, -141, 1]$[162, -26, 1, -34]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_S2gg-FVoEeCZTbk4eXVjvg" id="(0.898989898989899,0.3253012048192771)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_S2gg-VVoEeCZTbk4eXVjvg" id="(0.12234042553191489,0.42168674698795183)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_dE8q4FVoEeCZTbk4eXVjvg" type="3003" source="_ataLwFVoEeCZTbk4eXVjvg" target="_FCIyIFVoEeCZTbk4eXVjvg">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_dE8q4VVoEeCZTbk4eXVjvg" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_dE8q4lVoEeCZTbk4eXVjvg"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dE8q41VoEeCZTbk4eXVjvg" points="[-16, -8, -727, 120]$[-16, -53, -727, 75]$[694, -53, -17, 75]$[694, -112, -17, 16]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dE8q5FVoEeCZTbk4eXVjvg" id="(0.5628415300546448,0.15517241379310345)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dE8q5VVoEeCZTbk4eXVjvg" id="(0.6063829787234043,0.8072289156626506)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_f3BJ4FVoEeCZTbk4eXVjvg" type="3003" source="_d-nd0FVoEeCZTbk4eXVjvg" target="_FCIyIFVoEeCZTbk4eXVjvg">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_f3BJ4VVoEeCZTbk4eXVjvg" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_f3BJ4lVoEeCZTbk4eXVjvg"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f3BJ41VoEeCZTbk4eXVjvg" points="[0, 0, -323, 104]$[0, -45, -323, 59]$[325, -45, 2, 59]$[325, -104, 2, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f3KT0FVoEeCZTbk4eXVjvg" id="(0.6666666666666666,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f3KT0VVoEeCZTbk4eXVjvg" id="(0.5,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_l4DfQFVoEeCZTbk4eXVjvg" type="3003" source="_j3TvgFVoEeCZTbk4eXVjvg" target="_FCIyIFVoEeCZTbk4eXVjvg">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_l4DfQVVoEeCZTbk4eXVjvg" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_l4DfQlVoEeCZTbk4eXVjvg"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l4DfQ1VoEeCZTbk4eXVjvg" points="[12, -4, 72, 123]$[12, -49, 72, 78]$[-53, -49, 7, 78]$[-53, -108, 7, 19]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l4DfRFVoEeCZTbk4eXVjvg" id="(0.5244755244755245,0.08620689655172414)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l4DfRVVoEeCZTbk4eXVjvg" id="(0.5053191489361702,0.7710843373493976)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_wuI4AFVoEeCZTbk4eXVjvg" type="3003" source="_nJRPgFVoEeCZTbk4eXVjvg" target="_ataLwFVoEeCZTbk4eXVjvg">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_wuI4AVVoEeCZTbk4eXVjvg" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_wuI4AlVoEeCZTbk4eXVjvg"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wuI4A1VoEeCZTbk4eXVjvg" points="[-28, 0, 13, 102]$[-28, -89, 13, 13]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wuI4BFVoEeCZTbk4eXVjvg" id="(0.6647398843930635,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fYiPwIK1EeOjkMhtoir5vQ" id="(0.3989071038251366,0.7758620689655172)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_2veIUFVoEeCZTbk4eXVjvg" type="3002" source="_j3TvgFVoEeCZTbk4eXVjvg" target="_FCIyIFVoEeCZTbk4eXVjvg">
+    <children xmi:type="notation:Node" xmi:id="_2veIVFVoEeCZTbk4eXVjvg" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_2veIVVVoEeCZTbk4eXVjvg" x="10" y="-12"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_2veIVlVoEeCZTbk4eXVjvg" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_2veIV1VoEeCZTbk4eXVjvg" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_2veIUVVoEeCZTbk4eXVjvg" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_2veIUlVoEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="SetValuesActionConfiguration.ecore#//ListValue/values"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2veIU1VoEeCZTbk4eXVjvg" points="[24, 0, 43, 161]$[60, 0, 79, 161]$[60, -161, 79, 0]$[4, -161, 23, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2vn5UFVoEeCZTbk4eXVjvg" id="(0.8321678321678322,0.39655172413793105)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2vn5UVVoEeCZTbk4eXVjvg" id="(0.8776595744680851,0.5783132530120482)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_ClZbMFVuEeCZTbk4eXVjvg" type="3002" source="_d-nd0FVoEeCZTbk4eXVjvg" target="_CjJ_gFVuEeCZTbk4eXVjvg">
+    <children xmi:type="notation:Node" xmi:id="_ClZbNFVuEeCZTbk4eXVjvg" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_ClZbNVVuEeCZTbk4eXVjvg" x="-8" y="-46"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_ClZbNlVuEeCZTbk4eXVjvg" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_ClZbN1VuEeCZTbk4eXVjvg" x="-3" y="17"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ClZbMVVuEeCZTbk4eXVjvg" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_ClZbMlVuEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="SetValuesActionConfiguration.ecore#//ConstantValue/valueInstance"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ClZbM1VuEeCZTbk4eXVjvg" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Cm4o8FVuEeCZTbk4eXVjvg" id="(0.3333333333333333,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Cm4o8VVuEeCZTbk4eXVjvg" id="(0.6245733788395904,0.03164556962025317)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_gIqhoIK0EeOjkMhtoir5vQ" type="3003" source="_omszsFSgEeC-0syXieMmHA" target="_bdSXoIK0EeOjkMhtoir5vQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_gIrIsIK0EeOjkMhtoir5vQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_gIrIsYK0EeOjkMhtoir5vQ" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gIrIsoK0EeOjkMhtoir5vQ" points="[-2, -42, -2, 156]$[-2, -169, -2, 29]"/>
+  </edges>
+</notation:Diagram>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/SetValuesActionConfiguration.genmodel b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/SetValuesActionConfiguration.genmodel
index a8786580aa0..ce8adb4ffcd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/model/SetValuesActionConfiguration.genmodel
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/SetValuesActionConfiguration.genmodel
@@ -1,29 +1,29 @@
-<?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.infra.extendedtypes.emf/src-gen"

-    editDirectory="/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen" editorDirectory="/org.eclipse.papyrus.infra.extendedtypes.emf.editor/src-gen"

-    modelPluginID="org.eclipse.papyrus.infra.extendedtypes.emf" modelName="SetValuesActionConfiguration"

-    editPluginClass="org.eclipse.papyrus.infra.extendedtypes.emf.Activator" testsDirectory="/org.eclipse.papyrus.infra.extendedtypes.emf.tests/src-gen"

-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"

-    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel#//extendedtypes platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types">

-  <foreignModel>SetValuesActionConfiguration.ecore</foreignModel>

-  <genPackages prefix="SetValuesActionConfiguration" basePackage="org.eclipse.papyrus.infra.extendedtypes.emf"

-      resource="XML" disposableProviderFactory="true" ecorePackage="SetValuesActionConfiguration.ecore#/">

-    <genClasses ecoreClass="SetValuesActionConfiguration.ecore#//SetValuesActionConfiguration">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesActionConfiguration.ecore#//SetValuesActionConfiguration/featuresToSet"/>

-    </genClasses>

-    <genClasses ecoreClass="SetValuesActionConfiguration.ecore#//FeatureToSet">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SetValuesActionConfiguration.ecore#//FeatureToSet/featureName"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesActionConfiguration.ecore#//FeatureToSet/value"/>

-    </genClasses>

-    <genClasses image="false" ecoreClass="SetValuesActionConfiguration.ecore#//FeatureValue"/>

-    <genClasses ecoreClass="SetValuesActionConfiguration.ecore#//DynamicValue"/>

-    <genClasses ecoreClass="SetValuesActionConfiguration.ecore#//ConstantValue">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesActionConfiguration.ecore#//ConstantValue/valueInstance"/>

-    </genClasses>

-    <genClasses ecoreClass="SetValuesActionConfiguration.ecore#//ListValue">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesActionConfiguration.ecore#//ListValue/values"/>

-    </genClasses>

-    <genClasses ecoreClass="SetValuesActionConfiguration.ecore#//QueryExecutionValue"/>

-  </genPackages>

-</genmodel:GenModel>

+<?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.infra.extendedtypes.emf/src-gen"
+    editDirectory="/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen" editorDirectory="/org.eclipse.papyrus.infra.extendedtypes.emf.editor/src-gen"
+    modelPluginID="org.eclipse.papyrus.infra.extendedtypes.emf" modelName="SetValuesActionConfiguration"
+    editPluginClass="org.eclipse.papyrus.infra.extendedtypes.emf.Activator" testsDirectory="/org.eclipse.papyrus.infra.extendedtypes.emf.tests/src-gen"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
+    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel#//extendedtypes platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types">
+  <foreignModel>SetValuesActionConfiguration.ecore</foreignModel>
+  <genPackages prefix="SetValuesActionConfiguration" basePackage="org.eclipse.papyrus.infra.extendedtypes.emf"
+      resource="XML" disposableProviderFactory="true" ecorePackage="SetValuesActionConfiguration.ecore#/">
+    <genClasses ecoreClass="SetValuesActionConfiguration.ecore#//SetValuesActionConfiguration">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesActionConfiguration.ecore#//SetValuesActionConfiguration/featuresToSet"/>
+    </genClasses>
+    <genClasses ecoreClass="SetValuesActionConfiguration.ecore#//FeatureToSet">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SetValuesActionConfiguration.ecore#//FeatureToSet/featureName"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesActionConfiguration.ecore#//FeatureToSet/value"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="SetValuesActionConfiguration.ecore#//FeatureValue"/>
+    <genClasses ecoreClass="SetValuesActionConfiguration.ecore#//DynamicValue"/>
+    <genClasses ecoreClass="SetValuesActionConfiguration.ecore#//ConstantValue">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesActionConfiguration.ecore#//ConstantValue/valueInstance"/>
+    </genClasses>
+    <genClasses ecoreClass="SetValuesActionConfiguration.ecore#//ListValue">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesActionConfiguration.ecore#//ListValue/values"/>
+    </genClasses>
+    <genClasses ecoreClass="SetValuesActionConfiguration.ecore#//QueryExecutionValue"/>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.properties b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.properties
index 06b91d0e8d1..3f1f4430b9f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.properties
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.properties
@@ -1,32 +1,32 @@
-

-# <copyright>

-# </copyright>

-#

-# $Id$

-

-pluginName = EMF ExtendedTypes Model

-providerName = Eclipse Modeling Project

-_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_SetValuesActionConfiguration_type = Set Values Action Configuration

-_UI_FeatureToSet_type = Feature To Set

-_UI_FeatureValue_type = Feature Value

-_UI_DynamicValue_type = Dynamic Value

-_UI_ConstantValue_type = Constant Value

-_UI_ListValue_type = List Value

-_UI_QueryExecutionValue_type = Query Execution Value

-_UI_Unknown_type = Object

-
_UI_Unknown_datatype= Value

-
_UI_SetValuesActionConfiguration_featuresToSet_feature = Features To Set

-_UI_FeatureToSet_featureName_feature = Feature Name

-_UI_FeatureToSet_value_feature = Value

-_UI_FeatureToSet_atRuntime_feature = At Runtime

-_UI_ConstantValue_valueInstance_feature = Value Instance

-_UI_ListValue_values_feature = Values

-_UI_Unknown_feature = Unspecified

-


+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+pluginName = EMF ExtendedTypes Model
+providerName = Eclipse Modeling Project
+_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_SetValuesActionConfiguration_type = Set Values Action Configuration
+_UI_FeatureToSet_type = Feature To Set
+_UI_FeatureValue_type = Feature Value
+_UI_DynamicValue_type = Dynamic Value
+_UI_ConstantValue_type = Constant Value
+_UI_ListValue_type = List Value
+_UI_QueryExecutionValue_type = Query Execution Value
+_UI_Unknown_type = Object
+
_UI_Unknown_datatype= Value
+
_UI_SetValuesActionConfiguration_featuresToSet_feature = Features To Set
+_UI_FeatureToSet_featureName_feature = Feature Name
+_UI_FeatureToSet_value_feature = Value
+_UI_FeatureToSet_atRuntime_feature = At Runtime
+_UI_ConstantValue_valueInstance_feature = Value Instance
+_UI_ListValue_values_feature = Values
+_UI_Unknown_feature = Unspecified
+
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.xml b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.xml
index 54992418010..1b469fcf126 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.xml
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<plugin>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated SetValuesActionConfiguration -->

-      <package

-            uri="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0"

-            class="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage"

-            genModel="model/SetValuesActionConfiguration.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.extension_parser">

-      <!-- @generated SetValuesActionConfiguration -->

-      <parser

-            type="setvaluesactionconfiguration"

-            class="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.util.SetValuesActionConfigurationResourceFactoryImpl"/>

-   </extension>

-

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated RuntimeValuesEditionActionConfiguration -->

-      <package

-            uri="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/runtimevalueseditionaction/1.0"

-            class="org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage"

-            genModel="model/RuntimeValuesEditionActionConfiguration.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.extension_parser">

-      <!-- @generated RuntimeValuesEditionActionConfiguration -->

-      <parser

-            type="runtimevalueseditionactionconfiguration"

-            class="org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.util.RuntimeValuesEditionActionConfigurationResourceFactoryImpl"/>

-   </extension>

-

-   <extension

-         point="org.eclipse.papyrus.infra.extendedtypes.aspectActionConfiguration">

-      <aspectAction

-            configurationClass="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration"

-            configurationModelCreation="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationModelCreation"

-            creationElementValidator="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionCreationElementValidator"

-            editHelperAdvice="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionEditHelperAdvice">

-      </aspectAction>

-   </extension>

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<plugin>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated SetValuesActionConfiguration -->
+      <package
+            uri="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0"
+            class="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage"
+            genModel="model/SetValuesActionConfiguration.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.extension_parser">
+      <!-- @generated SetValuesActionConfiguration -->
+      <parser
+            type="setvaluesactionconfiguration"
+            class="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.util.SetValuesActionConfigurationResourceFactoryImpl"/>
+   </extension>
+
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated RuntimeValuesEditionActionConfiguration -->
+      <package
+            uri="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/runtimevalueseditionaction/1.0"
+            class="org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage"
+            genModel="model/RuntimeValuesEditionActionConfiguration.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.extension_parser">
+      <!-- @generated RuntimeValuesEditionActionConfiguration -->
+      <parser
+            type="runtimevalueseditionactionconfiguration"
+            class="org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.util.RuntimeValuesEditionActionConfigurationResourceFactoryImpl"/>
+   </extension>
+
+   <extension
+         point="org.eclipse.papyrus.infra.extendedtypes.aspectActionConfiguration">
+      <aspectAction
+            configurationClass="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration"
+            configurationModelCreation="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationModelCreation"
+            creationElementValidator="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionCreationElementValidator"
+            editHelperAdvice="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionEditHelperAdvice">
+      </aspectAction>
+   </extension>
+</plugin>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/pom.xml b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/pom.xml
index 6e47c222eba..1c6334dd6c2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/pom.xml
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-xtypes</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.extendedtypes.emf</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/RuntimeValuesEditionActionConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/RuntimeValuesEditionActionConfiguration.java
index 83bc6fdaadb..0da2d94be63 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/RuntimeValuesEditionActionConfiguration.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/RuntimeValuesEditionActionConfiguration.java
@@ -1,41 +1,41 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Runtime Values Edition Action Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration#getViewsToDisplay <em>Views To Display</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage#getRuntimeValuesEditionActionConfiguration()

- * @model

- * @generated

- */

-public interface RuntimeValuesEditionActionConfiguration extends SemanticActionConfiguration {

-	/**

-	 * Returns the value of the '<em><b>Views To Display</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Views To Display</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>Views To Display</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage#getRuntimeValuesEditionActionConfiguration_ViewsToDisplay()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<ViewToDisplay> getViewsToDisplay();

-

-} // RuntimeValuesEditionActionConfiguration

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Runtime Values Edition Action Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration#getViewsToDisplay <em>Views To Display</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage#getRuntimeValuesEditionActionConfiguration()
+ * @model
+ * @generated
+ */
+public interface RuntimeValuesEditionActionConfiguration extends SemanticActionConfiguration {
+	/**
+	 * Returns the value of the '<em><b>Views To Display</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Views To Display</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>Views To Display</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage#getRuntimeValuesEditionActionConfiguration_ViewsToDisplay()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<ViewToDisplay> getViewsToDisplay();
+
+} // RuntimeValuesEditionActionConfiguration
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/RuntimeValuesEditionActionConfigurationFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/RuntimeValuesEditionActionConfigurationFactory.java
index 2fe9955e88d..87f332c481d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/RuntimeValuesEditionActionConfigurationFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/RuntimeValuesEditionActionConfigurationFactory.java
@@ -1,56 +1,56 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration;

-

-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.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage

- * @generated

- */

-public interface RuntimeValuesEditionActionConfigurationFactory extends EFactory {

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	RuntimeValuesEditionActionConfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Runtime Values Edition Action Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Runtime Values Edition Action Configuration</em>'.

-	 * @generated

-	 */

-	RuntimeValuesEditionActionConfiguration createRuntimeValuesEditionActionConfiguration();

-

-	/**

-	 * Returns a new object of class '<em>View To Display</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>View To Display</em>'.

-	 * @generated

-	 */

-	ViewToDisplay createViewToDisplay();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	RuntimeValuesEditionActionConfigurationPackage getRuntimeValuesEditionActionConfigurationPackage();

-

-} // RuntimeValuesEditionActionConfigurationFactory

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration;
+
+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.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage
+ * @generated
+ */
+public interface RuntimeValuesEditionActionConfigurationFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	RuntimeValuesEditionActionConfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Runtime Values Edition Action Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Runtime Values Edition Action Configuration</em>'.
+	 * @generated
+	 */
+	RuntimeValuesEditionActionConfiguration createRuntimeValuesEditionActionConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>View To Display</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>View To Display</em>'.
+	 * @generated
+	 */
+	ViewToDisplay createViewToDisplay();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	RuntimeValuesEditionActionConfigurationPackage getRuntimeValuesEditionActionConfigurationPackage();
+
+} // RuntimeValuesEditionActionConfigurationFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/RuntimeValuesEditionActionConfigurationPackage.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/RuntimeValuesEditionActionConfigurationPackage.java
index 39e1bb1599b..000d647b887 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/RuntimeValuesEditionActionConfigurationPackage.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/RuntimeValuesEditionActionConfigurationPackage.java
@@ -1,290 +1,290 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-

-/**

- * <!-- 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.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationFactory

- * @model kind="package"

- * @generated

- */

-public interface RuntimeValuesEditionActionConfigurationPackage extends EPackage {

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "runtimevalueseditionactionconfiguration";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/extendedtypes/emf/runtimevalueseditionaction/1.0";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "runtimevalueseditionactionconfiguration";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	RuntimeValuesEditionActionConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationImpl <em>Runtime Values Edition Action Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationPackageImpl#getRuntimeValuesEditionActionConfiguration()

-	 * @generated

-	 */

-	int RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION = 0;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__NAME = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__DESCRIPTION = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__IDENTIFIER = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__IDENTIFIER;

-

-	/**

-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__ICON_ENTRY = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__ICON_ENTRY;

-

-	/**

-	 * The feature id for the '<em><b>Views To Display</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Runtime Values Edition Action Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION_FEATURE_COUNT = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.ViewToDisplayImpl <em>View To Display</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.ViewToDisplayImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationPackageImpl#getViewToDisplay()

-	 * @generated

-	 */

-	int VIEW_TO_DISPLAY = 1;

-

-	/**

-	 * The feature id for the '<em><b>View</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_TO_DISPLAY__VIEW = 0;

-

-	/**

-	 * The number of structural features of the '<em>View To Display</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_TO_DISPLAY_FEATURE_COUNT = 1;

-

-	/**

-	 * The number of operations of the '<em>View To Display</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_TO_DISPLAY_OPERATION_COUNT = 0;

-

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration <em>Runtime Values Edition Action Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Runtime Values Edition Action Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration

-	 * @generated

-	 */

-	EClass getRuntimeValuesEditionActionConfiguration();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration#getViewsToDisplay <em>Views To Display</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Views To Display</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration#getViewsToDisplay()

-	 * @see #getRuntimeValuesEditionActionConfiguration()

-	 * @generated

-	 */

-	EReference getRuntimeValuesEditionActionConfiguration_ViewsToDisplay();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay <em>View To Display</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>View To Display</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay

-	 * @generated

-	 */

-	EClass getViewToDisplay();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay#getView <em>View</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>View</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay#getView()

-	 * @see #getViewToDisplay()

-	 * @generated

-	 */

-	EReference getViewToDisplay_View();

-

-	/**

-	 * 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

-	 */

-	RuntimeValuesEditionActionConfigurationFactory getRuntimeValuesEditionActionConfigurationFactory();

-

-	/**

-	 * <!-- 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.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationImpl <em>Runtime Values Edition Action Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationPackageImpl#getRuntimeValuesEditionActionConfiguration()

-		 * @generated

-		 */

-		EClass RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION = eINSTANCE.getRuntimeValuesEditionActionConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Views To Display</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY = eINSTANCE.getRuntimeValuesEditionActionConfiguration_ViewsToDisplay();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.ViewToDisplayImpl <em>View To Display</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.ViewToDisplayImpl

-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationPackageImpl#getViewToDisplay()

-		 * @generated

-		 */

-		EClass VIEW_TO_DISPLAY = eINSTANCE.getViewToDisplay();

-

-		/**

-		 * The meta object literal for the '<em><b>View</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference VIEW_TO_DISPLAY__VIEW = eINSTANCE.getViewToDisplay_View();

-

-	}

-

-} // RuntimeValuesEditionActionConfigurationPackage

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+
+/**
+ * <!-- 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.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface RuntimeValuesEditionActionConfigurationPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNAME = "runtimevalueseditionactionconfiguration";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/infra/extendedtypes/emf/runtimevalueseditionaction/1.0";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_PREFIX = "runtimevalueseditionactionconfiguration";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	RuntimeValuesEditionActionConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationImpl <em>Runtime Values Edition Action Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationPackageImpl#getRuntimeValuesEditionActionConfiguration()
+	 * @generated
+	 */
+	int RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__NAME = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__DESCRIPTION = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__IDENTIFIER = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__IDENTIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__ICON_ENTRY = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__ICON_ENTRY;
+
+	/**
+	 * The feature id for the '<em><b>Views To Display</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Runtime Values Edition Action Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION_FEATURE_COUNT = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.ViewToDisplayImpl <em>View To Display</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.ViewToDisplayImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationPackageImpl#getViewToDisplay()
+	 * @generated
+	 */
+	int VIEW_TO_DISPLAY = 1;
+
+	/**
+	 * The feature id for the '<em><b>View</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VIEW_TO_DISPLAY__VIEW = 0;
+
+	/**
+	 * The number of structural features of the '<em>View To Display</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VIEW_TO_DISPLAY_FEATURE_COUNT = 1;
+
+	/**
+	 * The number of operations of the '<em>View To Display</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VIEW_TO_DISPLAY_OPERATION_COUNT = 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration <em>Runtime Values Edition Action Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Runtime Values Edition Action Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration
+	 * @generated
+	 */
+	EClass getRuntimeValuesEditionActionConfiguration();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration#getViewsToDisplay <em>Views To Display</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference list '<em>Views To Display</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration#getViewsToDisplay()
+	 * @see #getRuntimeValuesEditionActionConfiguration()
+	 * @generated
+	 */
+	EReference getRuntimeValuesEditionActionConfiguration_ViewsToDisplay();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay <em>View To Display</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>View To Display</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay
+	 * @generated
+	 */
+	EClass getViewToDisplay();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay#getView <em>View</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the reference '<em>View</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay#getView()
+	 * @see #getViewToDisplay()
+	 * @generated
+	 */
+	EReference getViewToDisplay_View();
+
+	/**
+	 * 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
+	 */
+	RuntimeValuesEditionActionConfigurationFactory getRuntimeValuesEditionActionConfigurationFactory();
+
+	/**
+	 * <!-- 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.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationImpl <em>Runtime Values Edition Action Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationPackageImpl#getRuntimeValuesEditionActionConfiguration()
+		 * @generated
+		 */
+		EClass RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION = eINSTANCE.getRuntimeValuesEditionActionConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Views To Display</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY = eINSTANCE.getRuntimeValuesEditionActionConfiguration_ViewsToDisplay();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.ViewToDisplayImpl <em>View To Display</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.ViewToDisplayImpl
+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationPackageImpl#getViewToDisplay()
+		 * @generated
+		 */
+		EClass VIEW_TO_DISPLAY = eINSTANCE.getViewToDisplay();
+
+		/**
+		 * The meta object literal for the '<em><b>View</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference VIEW_TO_DISPLAY__VIEW = eINSTANCE.getViewToDisplay_View();
+
+	}
+
+} // RuntimeValuesEditionActionConfigurationPackage
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/ViewToDisplay.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/ViewToDisplay.java
index 2dd1b76a252..c7e2650e595 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/ViewToDisplay.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/ViewToDisplay.java
@@ -1,53 +1,53 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.properties.contexts.View;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>View To Display</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay#getView <em>View</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage#getViewToDisplay()

- * @model

- * @generated

- */

-public interface ViewToDisplay extends EObject {

-	/**

-	 * Returns the value of the '<em><b>View</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>View</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>View</em>' reference.

-	 * @see #setView(View)

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage#getViewToDisplay_View()

-	 * @model required="true"

-	 * @generated

-	 */

-	View getView();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay#getView <em>View</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>View</em>' reference.

-	 * @see #getView()

-	 * @generated

-	 */

-	void setView(View value);

-

-} // ViewToDisplay

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>View To Display</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay#getView <em>View</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage#getViewToDisplay()
+ * @model
+ * @generated
+ */
+public interface ViewToDisplay extends EObject {
+	/**
+	 * Returns the value of the '<em><b>View</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>View</em>' reference isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>View</em>' reference.
+	 * @see #setView(View)
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage#getViewToDisplay_View()
+	 * @model required="true"
+	 * @generated
+	 */
+	View getView();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay#getView <em>View</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>View</em>' reference.
+	 * @see #getView()
+	 * @generated
+	 */
+	void setView(View value);
+
+} // ViewToDisplay
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/RuntimeValuesEditionActionConfigurationFactoryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/RuntimeValuesEditionActionConfigurationFactoryImpl.java
index 8b0a2f397af..140e53abb7d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/RuntimeValuesEditionActionConfigurationFactoryImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/RuntimeValuesEditionActionConfigurationFactoryImpl.java
@@ -1,118 +1,118 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.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.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationFactory;

-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage;

-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class RuntimeValuesEditionActionConfigurationFactoryImpl extends EFactoryImpl implements RuntimeValuesEditionActionConfigurationFactory {

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static RuntimeValuesEditionActionConfigurationFactory init() {

-		try {

-			RuntimeValuesEditionActionConfigurationFactory theRuntimeValuesEditionActionConfigurationFactory = (RuntimeValuesEditionActionConfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(RuntimeValuesEditionActionConfigurationPackage.eNS_URI);

-			if (theRuntimeValuesEditionActionConfigurationFactory != null) {

-				return theRuntimeValuesEditionActionConfigurationFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new RuntimeValuesEditionActionConfigurationFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public RuntimeValuesEditionActionConfigurationFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION:

-			return createRuntimeValuesEditionActionConfiguration();

-		case RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY:

-			return createViewToDisplay();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public RuntimeValuesEditionActionConfiguration createRuntimeValuesEditionActionConfiguration() {

-		RuntimeValuesEditionActionConfigurationImpl runtimeValuesEditionActionConfiguration = new RuntimeValuesEditionActionConfigurationImpl();

-		return runtimeValuesEditionActionConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ViewToDisplay createViewToDisplay() {

-		ViewToDisplayImpl viewToDisplay = new ViewToDisplayImpl();

-		return viewToDisplay;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public RuntimeValuesEditionActionConfigurationPackage getRuntimeValuesEditionActionConfigurationPackage() {

-		return (RuntimeValuesEditionActionConfigurationPackage) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static RuntimeValuesEditionActionConfigurationPackage getPackage() {

-		return RuntimeValuesEditionActionConfigurationPackage.eINSTANCE;

-	}

-

-} // RuntimeValuesEditionActionConfigurationFactoryImpl

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.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.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationFactory;
+import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage;
+import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class RuntimeValuesEditionActionConfigurationFactoryImpl extends EFactoryImpl implements RuntimeValuesEditionActionConfigurationFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static RuntimeValuesEditionActionConfigurationFactory init() {
+		try {
+			RuntimeValuesEditionActionConfigurationFactory theRuntimeValuesEditionActionConfigurationFactory = (RuntimeValuesEditionActionConfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(RuntimeValuesEditionActionConfigurationPackage.eNS_URI);
+			if (theRuntimeValuesEditionActionConfigurationFactory != null) {
+				return theRuntimeValuesEditionActionConfigurationFactory;
+			}
+		} catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new RuntimeValuesEditionActionConfigurationFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public RuntimeValuesEditionActionConfigurationFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+		case RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION:
+			return createRuntimeValuesEditionActionConfiguration();
+		case RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY:
+			return createViewToDisplay();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public RuntimeValuesEditionActionConfiguration createRuntimeValuesEditionActionConfiguration() {
+		RuntimeValuesEditionActionConfigurationImpl runtimeValuesEditionActionConfiguration = new RuntimeValuesEditionActionConfigurationImpl();
+		return runtimeValuesEditionActionConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public ViewToDisplay createViewToDisplay() {
+		ViewToDisplayImpl viewToDisplay = new ViewToDisplayImpl();
+		return viewToDisplay;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public RuntimeValuesEditionActionConfigurationPackage getRuntimeValuesEditionActionConfigurationPackage() {
+		return (RuntimeValuesEditionActionConfigurationPackage) getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static RuntimeValuesEditionActionConfigurationPackage getPackage() {
+		return RuntimeValuesEditionActionConfigurationPackage.eINSTANCE;
+	}
+
+} // RuntimeValuesEditionActionConfigurationFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/RuntimeValuesEditionActionConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/RuntimeValuesEditionActionConfigurationImpl.java
index 2569c3efe05..5572aaec7b5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/RuntimeValuesEditionActionConfigurationImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/RuntimeValuesEditionActionConfigurationImpl.java
@@ -1,157 +1,157 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.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.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage;

-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay;

-import org.eclipse.papyrus.infra.extendedtypes.impl.SemanticActionConfigurationImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Runtime Values Edition Action Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationImpl#getViewsToDisplay <em>Views To Display</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class RuntimeValuesEditionActionConfigurationImpl extends SemanticActionConfigurationImpl implements RuntimeValuesEditionActionConfiguration {

-	/**

-	 * The cached value of the '{@link #getViewsToDisplay() <em>Views To Display</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getViewsToDisplay()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ViewToDisplay> viewsToDisplay;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected RuntimeValuesEditionActionConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return RuntimeValuesEditionActionConfigurationPackage.Literals.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<ViewToDisplay> getViewsToDisplay() {

-		if (viewsToDisplay == null) {

-			viewsToDisplay = new EObjectContainmentEList<ViewToDisplay>(ViewToDisplay.class, this, RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY);

-		}

-		return viewsToDisplay;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY:

-			return ((InternalEList<?>) getViewsToDisplay()).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 RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY:

-			return getViewsToDisplay();

-		}

-		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 RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY:

-			getViewsToDisplay().clear();

-			getViewsToDisplay().addAll((Collection<? extends ViewToDisplay>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY:

-			getViewsToDisplay().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY:

-			return viewsToDisplay != null && !viewsToDisplay.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // RuntimeValuesEditionActionConfigurationImpl

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.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.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage;
+import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay;
+import org.eclipse.papyrus.infra.extendedtypes.impl.SemanticActionConfigurationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Runtime Values Edition Action Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationImpl#getViewsToDisplay <em>Views To Display</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class RuntimeValuesEditionActionConfigurationImpl extends SemanticActionConfigurationImpl implements RuntimeValuesEditionActionConfiguration {
+	/**
+	 * The cached value of the '{@link #getViewsToDisplay() <em>Views To Display</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getViewsToDisplay()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ViewToDisplay> viewsToDisplay;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected RuntimeValuesEditionActionConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return RuntimeValuesEditionActionConfigurationPackage.Literals.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<ViewToDisplay> getViewsToDisplay() {
+		if (viewsToDisplay == null) {
+			viewsToDisplay = new EObjectContainmentEList<ViewToDisplay>(ViewToDisplay.class, this, RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY);
+		}
+		return viewsToDisplay;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY:
+			return ((InternalEList<?>) getViewsToDisplay()).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 RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY:
+			return getViewsToDisplay();
+		}
+		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 RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY:
+			getViewsToDisplay().clear();
+			getViewsToDisplay().addAll((Collection<? extends ViewToDisplay>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY:
+			getViewsToDisplay().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY:
+			return viewsToDisplay != null && !viewsToDisplay.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} // RuntimeValuesEditionActionConfigurationImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/RuntimeValuesEditionActionConfigurationPackageImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/RuntimeValuesEditionActionConfigurationPackageImpl.java
index daa5465326d..614e0a694d0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/RuntimeValuesEditionActionConfigurationPackageImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/RuntimeValuesEditionActionConfigurationPackageImpl.java
@@ -1,244 +1,244 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.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.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationFactory;

-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage;

-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay;

-import org.eclipse.papyrus.infra.properties.contexts.ContextsPackage;

-import org.eclipse.papyrus.infra.properties.environment.EnvironmentPackage;

-import org.eclipse.papyrus.infra.properties.ui.UiPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class RuntimeValuesEditionActionConfigurationPackageImpl extends EPackageImpl implements RuntimeValuesEditionActionConfigurationPackage {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass runtimeValuesEditionActionConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass viewToDisplayEClass = 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.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private RuntimeValuesEditionActionConfigurationPackageImpl() {

-		super(eNS_URI, RuntimeValuesEditionActionConfigurationFactory.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 RuntimeValuesEditionActionConfigurationPackage#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 RuntimeValuesEditionActionConfigurationPackage init() {

-		if (isInited) {

-			return (RuntimeValuesEditionActionConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(RuntimeValuesEditionActionConfigurationPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		RuntimeValuesEditionActionConfigurationPackageImpl theRuntimeValuesEditionActionConfigurationPackage = (RuntimeValuesEditionActionConfigurationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RuntimeValuesEditionActionConfigurationPackageImpl ? EPackage.Registry.INSTANCE

-				.get(eNS_URI) : new RuntimeValuesEditionActionConfigurationPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		ExtendedtypesPackage.eINSTANCE.eClass();

-		EnvironmentPackage.eINSTANCE.eClass();

-		ContextsPackage.eINSTANCE.eClass();

-		UiPackage.eINSTANCE.eClass();

-

-		// Create package meta-data objects

-		theRuntimeValuesEditionActionConfigurationPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theRuntimeValuesEditionActionConfigurationPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theRuntimeValuesEditionActionConfigurationPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(RuntimeValuesEditionActionConfigurationPackage.eNS_URI, theRuntimeValuesEditionActionConfigurationPackage);

-		return theRuntimeValuesEditionActionConfigurationPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getRuntimeValuesEditionActionConfiguration() {

-		return runtimeValuesEditionActionConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getRuntimeValuesEditionActionConfiguration_ViewsToDisplay() {

-		return (EReference) runtimeValuesEditionActionConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getViewToDisplay() {

-		return viewToDisplayEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getViewToDisplay_View() {

-		return (EReference) viewToDisplayEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public RuntimeValuesEditionActionConfigurationFactory getRuntimeValuesEditionActionConfigurationFactory() {

-		return (RuntimeValuesEditionActionConfigurationFactory) 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

-		runtimeValuesEditionActionConfigurationEClass = createEClass(RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION);

-		createEReference(runtimeValuesEditionActionConfigurationEClass, RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY);

-

-		viewToDisplayEClass = createEClass(VIEW_TO_DISPLAY);

-		createEReference(viewToDisplayEClass, VIEW_TO_DISPLAY__VIEW);

-	}

-

-	/**

-	 * <!-- 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

-		ExtendedtypesPackage theExtendedtypesPackage = (ExtendedtypesPackage) EPackage.Registry.INSTANCE.getEPackage(ExtendedtypesPackage.eNS_URI);

-		ContextsPackage theContextsPackage = (ContextsPackage) EPackage.Registry.INSTANCE.getEPackage(ContextsPackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		runtimeValuesEditionActionConfigurationEClass.getESuperTypes().add(theExtendedtypesPackage.getSemanticActionConfiguration());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(runtimeValuesEditionActionConfigurationEClass, RuntimeValuesEditionActionConfiguration.class, "RuntimeValuesEditionActionConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getRuntimeValuesEditionActionConfiguration_ViewsToDisplay(), this.getViewToDisplay(), null, "viewsToDisplay", null, 0, -1, RuntimeValuesEditionActionConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,

-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(viewToDisplayEClass, ViewToDisplay.class, "ViewToDisplay", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getViewToDisplay_View(), theContextsPackage.getView(), null, "view", null, 1, 1, ViewToDisplay.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);

-	}

-

-} // RuntimeValuesEditionActionConfigurationPackageImpl

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.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.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationFactory;
+import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage;
+import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay;
+import org.eclipse.papyrus.infra.properties.contexts.ContextsPackage;
+import org.eclipse.papyrus.infra.properties.environment.EnvironmentPackage;
+import org.eclipse.papyrus.infra.properties.ui.UiPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class RuntimeValuesEditionActionConfigurationPackageImpl extends EPackageImpl implements RuntimeValuesEditionActionConfigurationPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass runtimeValuesEditionActionConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass viewToDisplayEClass = 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.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private RuntimeValuesEditionActionConfigurationPackageImpl() {
+		super(eNS_URI, RuntimeValuesEditionActionConfigurationFactory.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 RuntimeValuesEditionActionConfigurationPackage#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 RuntimeValuesEditionActionConfigurationPackage init() {
+		if (isInited) {
+			return (RuntimeValuesEditionActionConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(RuntimeValuesEditionActionConfigurationPackage.eNS_URI);
+		}
+
+		// Obtain or create and register package
+		RuntimeValuesEditionActionConfigurationPackageImpl theRuntimeValuesEditionActionConfigurationPackage = (RuntimeValuesEditionActionConfigurationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RuntimeValuesEditionActionConfigurationPackageImpl ? EPackage.Registry.INSTANCE
+				.get(eNS_URI) : new RuntimeValuesEditionActionConfigurationPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		ExtendedtypesPackage.eINSTANCE.eClass();
+		EnvironmentPackage.eINSTANCE.eClass();
+		ContextsPackage.eINSTANCE.eClass();
+		UiPackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theRuntimeValuesEditionActionConfigurationPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theRuntimeValuesEditionActionConfigurationPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theRuntimeValuesEditionActionConfigurationPackage.freeze();
+
+
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(RuntimeValuesEditionActionConfigurationPackage.eNS_URI, theRuntimeValuesEditionActionConfigurationPackage);
+		return theRuntimeValuesEditionActionConfigurationPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EClass getRuntimeValuesEditionActionConfiguration() {
+		return runtimeValuesEditionActionConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EReference getRuntimeValuesEditionActionConfiguration_ViewsToDisplay() {
+		return (EReference) runtimeValuesEditionActionConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EClass getViewToDisplay() {
+		return viewToDisplayEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EReference getViewToDisplay_View() {
+		return (EReference) viewToDisplayEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public RuntimeValuesEditionActionConfigurationFactory getRuntimeValuesEditionActionConfigurationFactory() {
+		return (RuntimeValuesEditionActionConfigurationFactory) 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
+		runtimeValuesEditionActionConfigurationEClass = createEClass(RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION);
+		createEReference(runtimeValuesEditionActionConfigurationEClass, RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY);
+
+		viewToDisplayEClass = createEClass(VIEW_TO_DISPLAY);
+		createEReference(viewToDisplayEClass, VIEW_TO_DISPLAY__VIEW);
+	}
+
+	/**
+	 * <!-- 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
+		ExtendedtypesPackage theExtendedtypesPackage = (ExtendedtypesPackage) EPackage.Registry.INSTANCE.getEPackage(ExtendedtypesPackage.eNS_URI);
+		ContextsPackage theContextsPackage = (ContextsPackage) EPackage.Registry.INSTANCE.getEPackage(ContextsPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		runtimeValuesEditionActionConfigurationEClass.getESuperTypes().add(theExtendedtypesPackage.getSemanticActionConfiguration());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(runtimeValuesEditionActionConfigurationEClass, RuntimeValuesEditionActionConfiguration.class, "RuntimeValuesEditionActionConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getRuntimeValuesEditionActionConfiguration_ViewsToDisplay(), this.getViewToDisplay(), null, "viewsToDisplay", null, 0, -1, RuntimeValuesEditionActionConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(viewToDisplayEClass, ViewToDisplay.class, "ViewToDisplay", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getViewToDisplay_View(), theContextsPackage.getView(), null, "view", null, 1, 1, ViewToDisplay.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);
+	}
+
+} // RuntimeValuesEditionActionConfigurationPackageImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/ViewToDisplayImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/ViewToDisplayImpl.java
index 9823e117eb3..b2c172b7087 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/ViewToDisplayImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/ViewToDisplayImpl.java
@@ -1,170 +1,170 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.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.MinimalEObjectImpl;

-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage;

-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay;

-import org.eclipse.papyrus.infra.properties.contexts.View;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>View To Display</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.ViewToDisplayImpl#getView <em>View</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ViewToDisplayImpl extends MinimalEObjectImpl.Container implements ViewToDisplay {

-	/**

-	 * The cached value of the '{@link #getView() <em>View</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getView()

-	 * @generated

-	 * @ordered

-	 */

-	protected View view;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ViewToDisplayImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return RuntimeValuesEditionActionConfigurationPackage.Literals.VIEW_TO_DISPLAY;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public View getView() {

-		if (view != null && view.eIsProxy()) {

-			InternalEObject oldView = (InternalEObject) view;

-			view = (View) eResolveProxy(oldView);

-			if (view != oldView) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY__VIEW, oldView, view));

-				}

-			}

-		}

-		return view;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public View basicGetView() {

-		return view;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setView(View newView) {

-		View oldView = view;

-		view = newView;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY__VIEW, oldView, view));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY__VIEW:

-			if (resolve) {

-				return getView();

-			}

-			return basicGetView();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY__VIEW:

-			setView((View) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY__VIEW:

-			setView((View) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY__VIEW:

-			return view != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // ViewToDisplayImpl

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.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.MinimalEObjectImpl;
+import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage;
+import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>View To Display</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.ViewToDisplayImpl#getView <em>View</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ViewToDisplayImpl extends MinimalEObjectImpl.Container implements ViewToDisplay {
+	/**
+	 * The cached value of the '{@link #getView() <em>View</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getView()
+	 * @generated
+	 * @ordered
+	 */
+	protected View view;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ViewToDisplayImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return RuntimeValuesEditionActionConfigurationPackage.Literals.VIEW_TO_DISPLAY;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public View getView() {
+		if (view != null && view.eIsProxy()) {
+			InternalEObject oldView = (InternalEObject) view;
+			view = (View) eResolveProxy(oldView);
+			if (view != oldView) {
+				if (eNotificationRequired()) {
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY__VIEW, oldView, view));
+				}
+			}
+		}
+		return view;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public View basicGetView() {
+		return view;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setView(View newView) {
+		View oldView = view;
+		view = newView;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY__VIEW, oldView, view));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY__VIEW:
+			if (resolve) {
+				return getView();
+			}
+			return basicGetView();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY__VIEW:
+			setView((View) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY__VIEW:
+			setView((View) null);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY__VIEW:
+			return view != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} // ViewToDisplayImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationAdapterFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationAdapterFactory.java
index eb22a28ad22..4ab571e6f8c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationAdapterFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationAdapterFactory.java
@@ -1,212 +1,212 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.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.extendedtypes.ActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage;

-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay;

-

-/**

- * <!-- 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.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage

- * @generated

- */

-public class RuntimeValuesEditionActionConfigurationAdapterFactory extends AdapterFactoryImpl {

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static RuntimeValuesEditionActionConfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public RuntimeValuesEditionActionConfigurationAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = RuntimeValuesEditionActionConfigurationPackage.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 RuntimeValuesEditionActionConfigurationSwitch<Adapter> modelSwitch =

-			new RuntimeValuesEditionActionConfigurationSwitch<Adapter>() {

-				@Override

-				public Adapter caseRuntimeValuesEditionActionConfiguration(RuntimeValuesEditionActionConfiguration object) {

-					return createRuntimeValuesEditionActionConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter caseViewToDisplay(ViewToDisplay object) {

-					return createViewToDisplayAdapter();

-				}

-

-				@Override

-				public Adapter caseConfigurationElement(ConfigurationElement object) {

-					return createConfigurationElementAdapter();

-				}

-

-				@Override

-				public Adapter caseActionConfiguration(ActionConfiguration object) {

-					return createActionConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter caseSemanticActionConfiguration(SemanticActionConfiguration object) {

-					return createSemanticActionConfigurationAdapter();

-				}

-

-				@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.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration <em>Runtime Values Edition Action Configuration</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.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration

-	 * @generated

-	 */

-	public Adapter createRuntimeValuesEditionActionConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay <em>View To Display</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.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay

-	 * @generated

-	 */

-	public Adapter createViewToDisplayAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement <em>Configuration 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.infra.extendedtypes.ConfigurationElement

-	 * @generated

-	 */

-	public Adapter createConfigurationElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration <em>Action Configuration</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.extendedtypes.ActionConfiguration

-	 * @generated

-	 */

-	public Adapter createActionConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration <em>Semantic Action Configuration</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.extendedtypes.SemanticActionConfiguration

-	 * @generated

-	 */

-	public Adapter createSemanticActionConfigurationAdapter() {

-		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;

-	}

-

-} // RuntimeValuesEditionActionConfigurationAdapterFactory

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.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.extendedtypes.ActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;
+import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage;
+import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay;
+
+/**
+ * <!-- 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.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage
+ * @generated
+ */
+public class RuntimeValuesEditionActionConfigurationAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static RuntimeValuesEditionActionConfigurationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public RuntimeValuesEditionActionConfigurationAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = RuntimeValuesEditionActionConfigurationPackage.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 RuntimeValuesEditionActionConfigurationSwitch<Adapter> modelSwitch =
+			new RuntimeValuesEditionActionConfigurationSwitch<Adapter>() {
+				@Override
+				public Adapter caseRuntimeValuesEditionActionConfiguration(RuntimeValuesEditionActionConfiguration object) {
+					return createRuntimeValuesEditionActionConfigurationAdapter();
+				}
+
+				@Override
+				public Adapter caseViewToDisplay(ViewToDisplay object) {
+					return createViewToDisplayAdapter();
+				}
+
+				@Override
+				public Adapter caseConfigurationElement(ConfigurationElement object) {
+					return createConfigurationElementAdapter();
+				}
+
+				@Override
+				public Adapter caseActionConfiguration(ActionConfiguration object) {
+					return createActionConfigurationAdapter();
+				}
+
+				@Override
+				public Adapter caseSemanticActionConfiguration(SemanticActionConfiguration object) {
+					return createSemanticActionConfigurationAdapter();
+				}
+
+				@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.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration <em>Runtime Values Edition Action Configuration</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.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration
+	 * @generated
+	 */
+	public Adapter createRuntimeValuesEditionActionConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay <em>View To Display</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.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay
+	 * @generated
+	 */
+	public Adapter createViewToDisplayAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement <em>Configuration 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.infra.extendedtypes.ConfigurationElement
+	 * @generated
+	 */
+	public Adapter createConfigurationElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration <em>Action Configuration</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.extendedtypes.ActionConfiguration
+	 * @generated
+	 */
+	public Adapter createActionConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration <em>Semantic Action Configuration</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.extendedtypes.SemanticActionConfiguration
+	 * @generated
+	 */
+	public Adapter createSemanticActionConfigurationAdapter() {
+		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;
+	}
+
+} // RuntimeValuesEditionActionConfigurationAdapterFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationResourceFactoryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationResourceFactoryImpl.java
index fa811dcc1e6..b2260ef2955 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationResourceFactoryImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationResourceFactoryImpl.java
@@ -1,42 +1,42 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.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.extendedtypes.emf.runtimevalueseditionactionconfiguration.util.RuntimeValuesEditionActionConfigurationResourceImpl

- * @generated

- */

-public class RuntimeValuesEditionActionConfigurationResourceFactoryImpl extends ResourceFactoryImpl {

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public RuntimeValuesEditionActionConfigurationResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		Resource result = new RuntimeValuesEditionActionConfigurationResourceImpl(uri);

-		return result;

-	}

-

-} // RuntimeValuesEditionActionConfigurationResourceFactoryImpl

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.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.extendedtypes.emf.runtimevalueseditionactionconfiguration.util.RuntimeValuesEditionActionConfigurationResourceImpl
+ * @generated
+ */
+public class RuntimeValuesEditionActionConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
+	/**
+	 * Creates an instance of the resource factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public RuntimeValuesEditionActionConfigurationResourceFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Resource createResource(URI uri) {
+		Resource result = new RuntimeValuesEditionActionConfigurationResourceImpl(uri);
+		return result;
+	}
+
+} // RuntimeValuesEditionActionConfigurationResourceFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationResourceImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationResourceImpl.java
index 1c36130b3c0..55076a59919 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationResourceImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationResourceImpl.java
@@ -1,30 +1,30 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.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.extendedtypes.emf.runtimevalueseditionactionconfiguration.util.RuntimeValuesEditionActionConfigurationResourceFactoryImpl

- * @generated

- */

-public class RuntimeValuesEditionActionConfigurationResourceImpl extends XMLResourceImpl {

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public RuntimeValuesEditionActionConfigurationResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} // RuntimeValuesEditionActionConfigurationResourceImpl

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.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.extendedtypes.emf.runtimevalueseditionactionconfiguration.util.RuntimeValuesEditionActionConfigurationResourceFactoryImpl
+ * @generated
+ */
+public class RuntimeValuesEditionActionConfigurationResourceImpl extends XMLResourceImpl {
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param uri
+	 *            the URI of the new resource.
+	 * @generated
+	 */
+	public RuntimeValuesEditionActionConfigurationResourceImpl(URI uri) {
+		super(uri);
+	}
+
+} // RuntimeValuesEditionActionConfigurationResourceImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationSwitch.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationSwitch.java
index 4f99bce0455..79382851ef3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationSwitch.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationSwitch.java
@@ -1,209 +1,209 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.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.extendedtypes.ActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage;

-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay;

-

-/**

- * <!-- 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.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage

- * @generated

- */

-public class RuntimeValuesEditionActionConfigurationSwitch<T> extends Switch<T> {

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static RuntimeValuesEditionActionConfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public RuntimeValuesEditionActionConfigurationSwitch() {

-		if (modelPackage == null) {

-			modelPackage = RuntimeValuesEditionActionConfigurationPackage.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 RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION: {

-			RuntimeValuesEditionActionConfiguration runtimeValuesEditionActionConfiguration = (RuntimeValuesEditionActionConfiguration) theEObject;

-			T result = caseRuntimeValuesEditionActionConfiguration(runtimeValuesEditionActionConfiguration);

-			if (result == null) {

-				result = caseSemanticActionConfiguration(runtimeValuesEditionActionConfiguration);

-			}

-			if (result == null) {

-				result = caseActionConfiguration(runtimeValuesEditionActionConfiguration);

-			}

-			if (result == null) {

-				result = caseConfigurationElement(runtimeValuesEditionActionConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY: {

-			ViewToDisplay viewToDisplay = (ViewToDisplay) theEObject;

-			T result = caseViewToDisplay(viewToDisplay);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Runtime Values Edition Action Configuration</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>Runtime Values Edition Action Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseRuntimeValuesEditionActionConfiguration(RuntimeValuesEditionActionConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>View To Display</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>View To Display</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseViewToDisplay(ViewToDisplay object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Configuration 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>Configuration Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseConfigurationElement(ConfigurationElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Action Configuration</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>Action Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseActionConfiguration(ActionConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Semantic Action Configuration</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>Semantic Action Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseSemanticActionConfiguration(SemanticActionConfiguration 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;

-	}

-

-} // RuntimeValuesEditionActionConfigurationSwitch

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.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.extendedtypes.ActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;
+import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage;
+import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay;
+
+/**
+ * <!-- 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.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage
+ * @generated
+ */
+public class RuntimeValuesEditionActionConfigurationSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static RuntimeValuesEditionActionConfigurationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public RuntimeValuesEditionActionConfigurationSwitch() {
+		if (modelPackage == null) {
+			modelPackage = RuntimeValuesEditionActionConfigurationPackage.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 RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION: {
+			RuntimeValuesEditionActionConfiguration runtimeValuesEditionActionConfiguration = (RuntimeValuesEditionActionConfiguration) theEObject;
+			T result = caseRuntimeValuesEditionActionConfiguration(runtimeValuesEditionActionConfiguration);
+			if (result == null) {
+				result = caseSemanticActionConfiguration(runtimeValuesEditionActionConfiguration);
+			}
+			if (result == null) {
+				result = caseActionConfiguration(runtimeValuesEditionActionConfiguration);
+			}
+			if (result == null) {
+				result = caseConfigurationElement(runtimeValuesEditionActionConfiguration);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY: {
+			ViewToDisplay viewToDisplay = (ViewToDisplay) theEObject;
+			T result = caseViewToDisplay(viewToDisplay);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Runtime Values Edition Action Configuration</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>Runtime Values Edition Action Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseRuntimeValuesEditionActionConfiguration(RuntimeValuesEditionActionConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>View To Display</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>View To Display</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseViewToDisplay(ViewToDisplay object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Configuration 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>Configuration Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseConfigurationElement(ConfigurationElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Action Configuration</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>Action Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseActionConfiguration(ActionConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Semantic Action Configuration</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>Semantic Action Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSemanticActionConfiguration(SemanticActionConfiguration 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;
+	}
+
+} // RuntimeValuesEditionActionConfigurationSwitch
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationXMLProcessor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationXMLProcessor.java
index b7ae8fc49a2..f0d43a78965 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationXMLProcessor.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationXMLProcessor.java
@@ -1,50 +1,50 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.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.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class RuntimeValuesEditionActionConfigurationXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public RuntimeValuesEditionActionConfigurationXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		RuntimeValuesEditionActionConfigurationPackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the RuntimeValuesEditionActionConfigurationResourceFactoryImpl 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 RuntimeValuesEditionActionConfigurationResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new RuntimeValuesEditionActionConfigurationResourceFactoryImpl());

-		}

-		return registrations;

-	}

-

-} // RuntimeValuesEditionActionConfigurationXMLProcessor

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.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.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage;
+
+/**
+ * This class contains helper methods to serialize and deserialize XML documents
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class RuntimeValuesEditionActionConfigurationXMLProcessor extends XMLProcessor {
+
+	/**
+	 * Public constructor to instantiate the helper.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public RuntimeValuesEditionActionConfigurationXMLProcessor() {
+		super((EPackage.Registry.INSTANCE));
+		RuntimeValuesEditionActionConfigurationPackage.eINSTANCE.eClass();
+	}
+
+	/**
+	 * Register for "*" and "xml" file extensions the RuntimeValuesEditionActionConfigurationResourceFactoryImpl 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 RuntimeValuesEditionActionConfigurationResourceFactoryImpl());
+			registrations.put(STAR_EXTENSION, new RuntimeValuesEditionActionConfigurationResourceFactoryImpl());
+		}
+		return registrations;
+	}
+
+} // RuntimeValuesEditionActionConfigurationXMLProcessor
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/ConstantValue.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/ConstantValue.java
index cb491610a15..3eae9ed6516 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/ConstantValue.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/ConstantValue.java
@@ -1,52 +1,52 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;

-

-import org.eclipse.uml2.uml.ValueSpecification;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Constant Value</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getConstantValue()

- * @model

- * @generated

- */

-public interface ConstantValue extends FeatureValue {

-	/**

-	 * Returns the value of the '<em><b>Value Instance</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value Instance</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>Value Instance</em>' containment reference.

-	 * @see #setValueInstance(ValueSpecification)

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getConstantValue_ValueInstance()

-	 * @model containment="true"

-	 * @generated

-	 */

-	ValueSpecification getValueInstance();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value Instance</em>' containment reference.

-	 * @see #getValueInstance()

-	 * @generated

-	 */

-	void setValueInstance(ValueSpecification value);

-

-} // ConstantValue

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
+
+import org.eclipse.uml2.uml.ValueSpecification;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Constant Value</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getConstantValue()
+ * @model
+ * @generated
+ */
+public interface ConstantValue extends FeatureValue {
+	/**
+	 * Returns the value of the '<em><b>Value Instance</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Value Instance</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>Value Instance</em>' containment reference.
+	 * @see #setValueInstance(ValueSpecification)
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getConstantValue_ValueInstance()
+	 * @model containment="true"
+	 * @generated
+	 */
+	ValueSpecification getValueInstance();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Value Instance</em>' containment reference.
+	 * @see #getValueInstance()
+	 * @generated
+	 */
+	void setValueInstance(ValueSpecification value);
+
+} // ConstantValue
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/DynamicValue.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/DynamicValue.java
index 6df8d4728c0..0b214bd98ea 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/DynamicValue.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/DynamicValue.java
@@ -1,17 +1,17 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Dynamic Value</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getDynamicValue()

- * @model abstract="true"

- * @generated

- */

-public interface DynamicValue extends FeatureValue {

-} // DynamicValue

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dynamic Value</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getDynamicValue()
+ * @model abstract="true"
+ * @generated
+ */
+public interface DynamicValue extends FeatureValue {
+} // DynamicValue
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/FeatureToSet.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/FeatureToSet.java
index dd45a009595..e4d6bf069bd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/FeatureToSet.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/FeatureToSet.java
@@ -1,81 +1,81 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Feature To Set</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getFeatureToSet()

- * @model

- * @generated

- */

-public interface FeatureToSet extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Feature Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Feature 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>Feature Name</em>' attribute.

-	 * @see #setFeatureName(String)

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getFeatureToSet_FeatureName()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getFeatureName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Feature Name</em>' attribute.

-	 * @see #getFeatureName()

-	 * @generated

-	 */

-	void setFeatureName(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</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>Value</em>' containment reference.

-	 * @see #setValue(FeatureValue)

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getFeatureToSet_Value()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	FeatureValue getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getValue <em>Value</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' containment reference.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(FeatureValue value);

-

-} // FeatureToSet

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Feature To Set</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getFeatureToSet()
+ * @model
+ * @generated
+ */
+public interface FeatureToSet extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Feature Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Feature 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>Feature Name</em>' attribute.
+	 * @see #setFeatureName(String)
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getFeatureToSet_FeatureName()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getFeatureName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Feature Name</em>' attribute.
+	 * @see #getFeatureName()
+	 * @generated
+	 */
+	void setFeatureName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Value</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Value</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>Value</em>' containment reference.
+	 * @see #setValue(FeatureValue)
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getFeatureToSet_Value()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	FeatureValue getValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getValue <em>Value</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Value</em>' containment reference.
+	 * @see #getValue()
+	 * @generated
+	 */
+	void setValue(FeatureValue value);
+
+} // FeatureToSet
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/FeatureValue.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/FeatureValue.java
index 1d240e3e18b..470daf74016 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/FeatureValue.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/FeatureValue.java
@@ -1,18 +1,18 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Feature Value</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getFeatureValue()

- * @model abstract="true"

- * @generated

- */

-public interface FeatureValue extends EObject {

-} // FeatureValue

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Feature Value</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getFeatureValue()
+ * @model abstract="true"
+ * @generated
+ */
+public interface FeatureValue extends EObject {
+} // FeatureValue
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/ListValue.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/ListValue.java
index c659c174e68..afde34caab7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/ListValue.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/ListValue.java
@@ -1,40 +1,40 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>List Value</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue#getValues <em>Values</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getListValue()

- * @model

- * @generated

- */

-public interface ListValue extends FeatureValue {

-	/**

-	 * Returns the value of the '<em><b>Values</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Values</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>Values</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getListValue_Values()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<FeatureValue> getValues();

-

-} // ListValue

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>List Value</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue#getValues <em>Values</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getListValue()
+ * @model
+ * @generated
+ */
+public interface ListValue extends FeatureValue {
+	/**
+	 * Returns the value of the '<em><b>Values</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Values</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>Values</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getListValue_Values()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<FeatureValue> getValues();
+
+} // ListValue
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/QueryExecutionValue.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/QueryExecutionValue.java
index 7e7f316158c..8c08807fedc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/QueryExecutionValue.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/QueryExecutionValue.java
@@ -1,17 +1,17 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Query Execution Value</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getQueryExecutionValue()

- * @model

- * @generated

- */

-public interface QueryExecutionValue extends DynamicValue {

-} // QueryExecutionValue

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Query Execution Value</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getQueryExecutionValue()
+ * @model
+ * @generated
+ */
+public interface QueryExecutionValue extends DynamicValue {
+} // QueryExecutionValue
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfiguration.java
index 2a1cfec7522..a10168d5315 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfiguration.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfiguration.java
@@ -1,41 +1,41 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Set Values Action Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration#getFeaturesToSet <em>Features To Set</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getSetValuesActionConfiguration()

- * @model

- * @generated

- */

-public interface SetValuesActionConfiguration extends SemanticActionConfiguration {

-	/**

-	 * Returns the value of the '<em><b>Features To Set</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Features To Set</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>Features To Set</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getSetValuesActionConfiguration_FeaturesToSet()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<FeatureToSet> getFeaturesToSet();

-

-} // SetValuesActionConfiguration

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Set Values Action Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration#getFeaturesToSet <em>Features To Set</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getSetValuesActionConfiguration()
+ * @model
+ * @generated
+ */
+public interface SetValuesActionConfiguration extends SemanticActionConfiguration {
+	/**
+	 * Returns the value of the '<em><b>Features To Set</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Features To Set</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>Features To Set</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getSetValuesActionConfiguration_FeaturesToSet()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<FeatureToSet> getFeaturesToSet();
+
+} // SetValuesActionConfiguration
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfigurationFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfigurationFactory.java
index cb4548a2610..86808d9bc0c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfigurationFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfigurationFactory.java
@@ -1,86 +1,86 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;

-

-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.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage

- * @generated

- */

-public interface SetValuesActionConfigurationFactory extends EFactory {

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	SetValuesActionConfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Set Values Action Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Set Values Action Configuration</em>'.

-	 * @generated

-	 */

-	SetValuesActionConfiguration createSetValuesActionConfiguration();

-

-	/**

-	 * Returns a new object of class '<em>Feature To Set</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Feature To Set</em>'.

-	 * @generated

-	 */

-	FeatureToSet createFeatureToSet();

-

-	/**

-	 * Returns a new object of class '<em>Constant Value</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Constant Value</em>'.

-	 * @generated

-	 */

-	ConstantValue createConstantValue();

-

-	/**

-	 * Returns a new object of class '<em>List Value</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>List Value</em>'.

-	 * @generated

-	 */

-	ListValue createListValue();

-

-	/**

-	 * Returns a new object of class '<em>Query Execution Value</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Query Execution Value</em>'.

-	 * @generated

-	 */

-	QueryExecutionValue createQueryExecutionValue();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	SetValuesActionConfigurationPackage getSetValuesActionConfigurationPackage();

-

-} // SetValuesActionConfigurationFactory

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
+
+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.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage
+ * @generated
+ */
+public interface SetValuesActionConfigurationFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	SetValuesActionConfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Set Values Action Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Set Values Action Configuration</em>'.
+	 * @generated
+	 */
+	SetValuesActionConfiguration createSetValuesActionConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>Feature To Set</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Feature To Set</em>'.
+	 * @generated
+	 */
+	FeatureToSet createFeatureToSet();
+
+	/**
+	 * Returns a new object of class '<em>Constant Value</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Constant Value</em>'.
+	 * @generated
+	 */
+	ConstantValue createConstantValue();
+
+	/**
+	 * Returns a new object of class '<em>List Value</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>List Value</em>'.
+	 * @generated
+	 */
+	ListValue createListValue();
+
+	/**
+	 * Returns a new object of class '<em>Query Execution Value</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Query Execution Value</em>'.
+	 * @generated
+	 */
+	QueryExecutionValue createQueryExecutionValue();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	SetValuesActionConfigurationPackage getSetValuesActionConfigurationPackage();
+
+} // SetValuesActionConfigurationFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfigurationPackage.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfigurationPackage.java
index b733b20186e..e1df80f5eea 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfigurationPackage.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfigurationPackage.java
@@ -1,587 +1,587 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;

-

-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.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-

-/**

- * <!-- 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 enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationFactory

- * @model kind="package"

- * @generated

- */

-public interface SetValuesActionConfigurationPackage extends EPackage {

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "setvaluesactionconfiguration";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "setvaluesactionconfiguration";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	SetValuesActionConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationImpl <em>Set Values Action Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getSetValuesActionConfiguration()

-	 * @generated

-	 */

-	int SET_VALUES_ACTION_CONFIGURATION = 0;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SET_VALUES_ACTION_CONFIGURATION__NAME = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SET_VALUES_ACTION_CONFIGURATION__DESCRIPTION = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SET_VALUES_ACTION_CONFIGURATION__IDENTIFIER = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__IDENTIFIER;

-

-	/**

-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SET_VALUES_ACTION_CONFIGURATION__ICON_ENTRY = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__ICON_ENTRY;

-

-	/**

-	 * The feature id for the '<em><b>Features To Set</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Set Values Action Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SET_VALUES_ACTION_CONFIGURATION_FEATURE_COUNT = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureToSetImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getFeatureToSet()

-	 * @generated

-	 */

-	int FEATURE_TO_SET = 1;

-

-	/**

-	 * The feature id for the '<em><b>Feature Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TO_SET__FEATURE_NAME = 0;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TO_SET__VALUE = 1;

-

-	/**

-	 * The number of structural features of the '<em>Feature To Set</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TO_SET_FEATURE_COUNT = 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureValueImpl <em>Feature Value</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureValueImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getFeatureValue()

-	 * @generated

-	 */

-	int FEATURE_VALUE = 2;

-

-	/**

-	 * The number of structural features of the '<em>Feature Value</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_VALUE_FEATURE_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.DynamicValueImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getDynamicValue()

-	 * @generated

-	 */

-	int DYNAMIC_VALUE = 3;

-

-	/**

-	 * The number of structural features of the '<em>Dynamic Value</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DYNAMIC_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ConstantValueImpl <em>Constant Value</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ConstantValueImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getConstantValue()

-	 * @generated

-	 */

-	int CONSTANT_VALUE = 4;

-

-	/**

-	 * The feature id for the '<em><b>Value Instance</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONSTANT_VALUE__VALUE_INSTANCE = FEATURE_VALUE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Constant Value</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONSTANT_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ListValueImpl <em>List Value</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ListValueImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getListValue()

-	 * @generated

-	 */

-	int LIST_VALUE = 5;

-

-	/**

-	 * The feature id for the '<em><b>Values</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int LIST_VALUE__VALUES = FEATURE_VALUE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>List Value</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int LIST_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.QueryExecutionValueImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getQueryExecutionValue()

-	 * @generated

-	 */

-	int QUERY_EXECUTION_VALUE = 6;

-

-	/**

-	 * The number of structural features of the '<em>Query Execution Value</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int QUERY_EXECUTION_VALUE_FEATURE_COUNT = DYNAMIC_VALUE_FEATURE_COUNT + 0;

-

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration <em>Set Values Action Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Set Values Action Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration

-	 * @generated

-	 */

-	EClass getSetValuesActionConfiguration();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration#getFeaturesToSet <em>Features To Set</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Features To Set</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration#getFeaturesToSet()

-	 * @see #getSetValuesActionConfiguration()

-	 * @generated

-	 */

-	EReference getSetValuesActionConfiguration_FeaturesToSet();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet <em>Feature To Set</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Feature To Set</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet

-	 * @generated

-	 */

-	EClass getFeatureToSet();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Feature Name</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getFeatureName()

-	 * @see #getFeatureToSet()

-	 * @generated

-	 */

-	EAttribute getFeatureToSet_FeatureName();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getValue <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Value</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getValue()

-	 * @see #getFeatureToSet()

-	 * @generated

-	 */

-	EReference getFeatureToSet_Value();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue <em>Feature Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Feature Value</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue

-	 * @generated

-	 */

-	EClass getFeatureValue();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue <em>Dynamic Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Dynamic Value</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue

-	 * @generated

-	 */

-	EClass getDynamicValue();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue <em>Constant Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Constant Value</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue

-	 * @generated

-	 */

-	EClass getConstantValue();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Value Instance</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue#getValueInstance()

-	 * @see #getConstantValue()

-	 * @generated

-	 */

-	EReference getConstantValue_ValueInstance();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue <em>List Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>List Value</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue

-	 * @generated

-	 */

-	EClass getListValue();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue#getValues <em>Values</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Values</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue#getValues()

-	 * @see #getListValue()

-	 * @generated

-	 */

-	EReference getListValue_Values();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue <em>Query Execution Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Query Execution Value</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue

-	 * @generated

-	 */

-	EClass getQueryExecutionValue();

-

-	/**

-	 * 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

-	 */

-	SetValuesActionConfigurationFactory getSetValuesActionConfigurationFactory();

-

-	/**

-	 * <!-- 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 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.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationImpl <em>Set Values Action Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getSetValuesActionConfiguration()

-		 * @generated

-		 */

-		EClass SET_VALUES_ACTION_CONFIGURATION = eINSTANCE.getSetValuesActionConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Features To Set</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET = eINSTANCE.getSetValuesActionConfiguration_FeaturesToSet();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureToSetImpl

-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getFeatureToSet()

-		 * @generated

-		 */

-		EClass FEATURE_TO_SET = eINSTANCE.getFeatureToSet();

-

-		/**

-		 * The meta object literal for the '<em><b>Feature Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute FEATURE_TO_SET__FEATURE_NAME = eINSTANCE.getFeatureToSet_FeatureName();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference FEATURE_TO_SET__VALUE = eINSTANCE.getFeatureToSet_Value();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureValueImpl <em>Feature Value</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureValueImpl

-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getFeatureValue()

-		 * @generated

-		 */

-		EClass FEATURE_VALUE = eINSTANCE.getFeatureValue();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.DynamicValueImpl

-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getDynamicValue()

-		 * @generated

-		 */

-		EClass DYNAMIC_VALUE = eINSTANCE.getDynamicValue();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ConstantValueImpl <em>Constant Value</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ConstantValueImpl

-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getConstantValue()

-		 * @generated

-		 */

-		EClass CONSTANT_VALUE = eINSTANCE.getConstantValue();

-

-		/**

-		 * The meta object literal for the '<em><b>Value Instance</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CONSTANT_VALUE__VALUE_INSTANCE = eINSTANCE.getConstantValue_ValueInstance();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ListValueImpl <em>List Value</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ListValueImpl

-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getListValue()

-		 * @generated

-		 */

-		EClass LIST_VALUE = eINSTANCE.getListValue();

-

-		/**

-		 * The meta object literal for the '<em><b>Values</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference LIST_VALUE__VALUES = eINSTANCE.getListValue_Values();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.QueryExecutionValueImpl

-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getQueryExecutionValue()

-		 * @generated

-		 */

-		EClass QUERY_EXECUTION_VALUE = eINSTANCE.getQueryExecutionValue();

-

-	}

-

-} // SetValuesActionConfigurationPackage

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
+
+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.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+
+/**
+ * <!-- 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 enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface SetValuesActionConfigurationPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNAME = "setvaluesactionconfiguration";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_PREFIX = "setvaluesactionconfiguration";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	SetValuesActionConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationImpl <em>Set Values Action Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getSetValuesActionConfiguration()
+	 * @generated
+	 */
+	int SET_VALUES_ACTION_CONFIGURATION = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SET_VALUES_ACTION_CONFIGURATION__NAME = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SET_VALUES_ACTION_CONFIGURATION__DESCRIPTION = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SET_VALUES_ACTION_CONFIGURATION__IDENTIFIER = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__IDENTIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SET_VALUES_ACTION_CONFIGURATION__ICON_ENTRY = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__ICON_ENTRY;
+
+	/**
+	 * The feature id for the '<em><b>Features To Set</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Set Values Action Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SET_VALUES_ACTION_CONFIGURATION_FEATURE_COUNT = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureToSetImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getFeatureToSet()
+	 * @generated
+	 */
+	int FEATURE_TO_SET = 1;
+
+	/**
+	 * The feature id for the '<em><b>Feature Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TO_SET__FEATURE_NAME = 0;
+
+	/**
+	 * The feature id for the '<em><b>Value</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TO_SET__VALUE = 1;
+
+	/**
+	 * The number of structural features of the '<em>Feature To Set</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_TO_SET_FEATURE_COUNT = 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureValueImpl <em>Feature Value</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureValueImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getFeatureValue()
+	 * @generated
+	 */
+	int FEATURE_VALUE = 2;
+
+	/**
+	 * The number of structural features of the '<em>Feature Value</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_VALUE_FEATURE_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.DynamicValueImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getDynamicValue()
+	 * @generated
+	 */
+	int DYNAMIC_VALUE = 3;
+
+	/**
+	 * The number of structural features of the '<em>Dynamic Value</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int DYNAMIC_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ConstantValueImpl <em>Constant Value</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ConstantValueImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getConstantValue()
+	 * @generated
+	 */
+	int CONSTANT_VALUE = 4;
+
+	/**
+	 * The feature id for the '<em><b>Value Instance</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANT_VALUE__VALUE_INSTANCE = FEATURE_VALUE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Constant Value</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANT_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ListValueImpl <em>List Value</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ListValueImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getListValue()
+	 * @generated
+	 */
+	int LIST_VALUE = 5;
+
+	/**
+	 * The feature id for the '<em><b>Values</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int LIST_VALUE__VALUES = FEATURE_VALUE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>List Value</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int LIST_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.QueryExecutionValueImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getQueryExecutionValue()
+	 * @generated
+	 */
+	int QUERY_EXECUTION_VALUE = 6;
+
+	/**
+	 * The number of structural features of the '<em>Query Execution Value</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int QUERY_EXECUTION_VALUE_FEATURE_COUNT = DYNAMIC_VALUE_FEATURE_COUNT + 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration <em>Set Values Action Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Set Values Action Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration
+	 * @generated
+	 */
+	EClass getSetValuesActionConfiguration();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration#getFeaturesToSet <em>Features To Set</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference list '<em>Features To Set</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration#getFeaturesToSet()
+	 * @see #getSetValuesActionConfiguration()
+	 * @generated
+	 */
+	EReference getSetValuesActionConfiguration_FeaturesToSet();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet <em>Feature To Set</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Feature To Set</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet
+	 * @generated
+	 */
+	EClass getFeatureToSet();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Feature Name</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getFeatureName()
+	 * @see #getFeatureToSet()
+	 * @generated
+	 */
+	EAttribute getFeatureToSet_FeatureName();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getValue <em>Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference '<em>Value</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getValue()
+	 * @see #getFeatureToSet()
+	 * @generated
+	 */
+	EReference getFeatureToSet_Value();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue <em>Feature Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Feature Value</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue
+	 * @generated
+	 */
+	EClass getFeatureValue();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue <em>Dynamic Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Dynamic Value</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue
+	 * @generated
+	 */
+	EClass getDynamicValue();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue <em>Constant Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Constant Value</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue
+	 * @generated
+	 */
+	EClass getConstantValue();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference '<em>Value Instance</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue#getValueInstance()
+	 * @see #getConstantValue()
+	 * @generated
+	 */
+	EReference getConstantValue_ValueInstance();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue <em>List Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>List Value</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue
+	 * @generated
+	 */
+	EClass getListValue();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue#getValues <em>Values</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference list '<em>Values</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue#getValues()
+	 * @see #getListValue()
+	 * @generated
+	 */
+	EReference getListValue_Values();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue <em>Query Execution Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Query Execution Value</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue
+	 * @generated
+	 */
+	EClass getQueryExecutionValue();
+
+	/**
+	 * 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
+	 */
+	SetValuesActionConfigurationFactory getSetValuesActionConfigurationFactory();
+
+	/**
+	 * <!-- 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 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.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationImpl <em>Set Values Action Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getSetValuesActionConfiguration()
+		 * @generated
+		 */
+		EClass SET_VALUES_ACTION_CONFIGURATION = eINSTANCE.getSetValuesActionConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Features To Set</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET = eINSTANCE.getSetValuesActionConfiguration_FeaturesToSet();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureToSetImpl
+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getFeatureToSet()
+		 * @generated
+		 */
+		EClass FEATURE_TO_SET = eINSTANCE.getFeatureToSet();
+
+		/**
+		 * The meta object literal for the '<em><b>Feature Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute FEATURE_TO_SET__FEATURE_NAME = eINSTANCE.getFeatureToSet_FeatureName();
+
+		/**
+		 * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference FEATURE_TO_SET__VALUE = eINSTANCE.getFeatureToSet_Value();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureValueImpl <em>Feature Value</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureValueImpl
+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getFeatureValue()
+		 * @generated
+		 */
+		EClass FEATURE_VALUE = eINSTANCE.getFeatureValue();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.DynamicValueImpl
+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getDynamicValue()
+		 * @generated
+		 */
+		EClass DYNAMIC_VALUE = eINSTANCE.getDynamicValue();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ConstantValueImpl <em>Constant Value</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ConstantValueImpl
+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getConstantValue()
+		 * @generated
+		 */
+		EClass CONSTANT_VALUE = eINSTANCE.getConstantValue();
+
+		/**
+		 * The meta object literal for the '<em><b>Value Instance</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference CONSTANT_VALUE__VALUE_INSTANCE = eINSTANCE.getConstantValue_ValueInstance();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ListValueImpl <em>List Value</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ListValueImpl
+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getListValue()
+		 * @generated
+		 */
+		EClass LIST_VALUE = eINSTANCE.getListValue();
+
+		/**
+		 * The meta object literal for the '<em><b>Values</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference LIST_VALUE__VALUES = eINSTANCE.getListValue_Values();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.QueryExecutionValueImpl
+		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getQueryExecutionValue()
+		 * @generated
+		 */
+		EClass QUERY_EXECUTION_VALUE = eINSTANCE.getQueryExecutionValue();
+
+	}
+
+} // SetValuesActionConfigurationPackage
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/ConstantValueImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/ConstantValueImpl.java
index 33caaaff9ad..bacbaf0464f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/ConstantValueImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/ConstantValueImpl.java
@@ -1,194 +1,194 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;

-import org.eclipse.uml2.uml.ValueSpecification;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Constant Value</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ConstantValueImpl#getValueInstance <em>Value Instance</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ConstantValueImpl extends FeatureValueImpl implements ConstantValue {

-	/**

-	 * The cached value of the '{@link #getValueInstance() <em>Value Instance</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValueInstance()

-	 * @generated

-	 * @ordered

-	 */

-	protected ValueSpecification valueInstance;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConstantValueImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return SetValuesActionConfigurationPackage.Literals.CONSTANT_VALUE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ValueSpecification getValueInstance() {

-		return valueInstance;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetValueInstance(ValueSpecification newValueInstance, NotificationChain msgs) {

-		ValueSpecification oldValueInstance = valueInstance;

-		valueInstance = newValueInstance;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, oldValueInstance, newValueInstance);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setValueInstance(ValueSpecification newValueInstance) {

-		if (newValueInstance != valueInstance) {

-			NotificationChain msgs = null;

-			if (valueInstance != null) {

-				msgs = ((InternalEObject) valueInstance).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, null, msgs);

-			}

-			if (newValueInstance != null) {

-				msgs = ((InternalEObject) newValueInstance).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, null, msgs);

-			}

-			msgs = basicSetValueInstance(newValueInstance, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, newValueInstance, newValueInstance));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:

-			return basicSetValueInstance(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 SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:

-			return getValueInstance();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:

-			setValueInstance((ValueSpecification) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:

-			setValueInstance((ValueSpecification) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:

-			return valueInstance != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // ConstantValueImpl

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
+import org.eclipse.uml2.uml.ValueSpecification;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Constant Value</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ConstantValueImpl#getValueInstance <em>Value Instance</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ConstantValueImpl extends FeatureValueImpl implements ConstantValue {
+	/**
+	 * The cached value of the '{@link #getValueInstance() <em>Value Instance</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getValueInstance()
+	 * @generated
+	 * @ordered
+	 */
+	protected ValueSpecification valueInstance;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ConstantValueImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SetValuesActionConfigurationPackage.Literals.CONSTANT_VALUE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public ValueSpecification getValueInstance() {
+		return valueInstance;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetValueInstance(ValueSpecification newValueInstance, NotificationChain msgs) {
+		ValueSpecification oldValueInstance = valueInstance;
+		valueInstance = newValueInstance;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, oldValueInstance, newValueInstance);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setValueInstance(ValueSpecification newValueInstance) {
+		if (newValueInstance != valueInstance) {
+			NotificationChain msgs = null;
+			if (valueInstance != null) {
+				msgs = ((InternalEObject) valueInstance).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, null, msgs);
+			}
+			if (newValueInstance != null) {
+				msgs = ((InternalEObject) newValueInstance).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, null, msgs);
+			}
+			msgs = basicSetValueInstance(newValueInstance, msgs);
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		}
+		else if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, newValueInstance, newValueInstance));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
+			return basicSetValueInstance(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 SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
+			return getValueInstance();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
+			setValueInstance((ValueSpecification) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
+			setValueInstance((ValueSpecification) null);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
+			return valueInstance != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} // ConstantValueImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/DynamicValueImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/DynamicValueImpl.java
index d746a5c4767..e881efc0926 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/DynamicValueImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/DynamicValueImpl.java
@@ -1,40 +1,40 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Dynamic Value</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public abstract class DynamicValueImpl extends FeatureValueImpl implements DynamicValue {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected DynamicValueImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return SetValuesActionConfigurationPackage.Literals.DYNAMIC_VALUE;

-	}

-

-} // DynamicValueImpl

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dynamic Value</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class DynamicValueImpl extends FeatureValueImpl implements DynamicValue {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected DynamicValueImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SetValuesActionConfigurationPackage.Literals.DYNAMIC_VALUE;
+	}
+
+} // DynamicValueImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/FeatureToSetImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/FeatureToSetImpl.java
index c5798bd87ff..bdc368de2ba 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/FeatureToSetImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/FeatureToSetImpl.java
@@ -1,273 +1,273 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.impl.EObjectImpl;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Feature To Set</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureToSetImpl#getFeatureName <em>Feature Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureToSetImpl#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {

-	/**

-	 * The default value of the '{@link #getFeatureName() <em>Feature Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getFeatureName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String FEATURE_NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getFeatureName() <em>Feature Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getFeatureName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String featureName = FEATURE_NAME_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected FeatureValue value;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FeatureToSetImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return SetValuesActionConfigurationPackage.Literals.FEATURE_TO_SET;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getFeatureName() {

-		return featureName;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setFeatureName(String newFeatureName) {

-		String oldFeatureName = featureName;

-		featureName = newFeatureName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, SetValuesActionConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME, oldFeatureName, featureName));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public FeatureValue getValue() {

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetValue(FeatureValue newValue, NotificationChain msgs) {

-		FeatureValue oldValue = value;

-		value = newValue;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE, oldValue, newValue);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setValue(FeatureValue newValue) {

-		if (newValue != value) {

-			NotificationChain msgs = null;

-			if (value != null) {

-				msgs = ((InternalEObject) value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE, null, msgs);

-			}

-			if (newValue != null) {

-				msgs = ((InternalEObject) newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE, null, msgs);

-			}

-			msgs = basicSetValue(newValue, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE, newValue, newValue));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE:

-			return basicSetValue(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 SetValuesActionConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:

-			return getFeatureName();

-		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE:

-			return getValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:

-			setFeatureName((String) newValue);

-			return;

-		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE:

-			setValue((FeatureValue) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:

-			setFeatureName(FEATURE_NAME_EDEFAULT);

-			return;

-		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE:

-			setValue((FeatureValue) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:

-			return FEATURE_NAME_EDEFAULT == null ? featureName != null : !FEATURE_NAME_EDEFAULT.equals(featureName);

-		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE:

-			return value != 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(" (featureName: ");

-		result.append(featureName);

-		result.append(')');

-		return result.toString();

-	}

-

-} // FeatureToSetImpl

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.impl.EObjectImpl;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Feature To Set</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureToSetImpl#getFeatureName <em>Feature Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureToSetImpl#getValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {
+	/**
+	 * The default value of the '{@link #getFeatureName() <em>Feature Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getFeatureName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FEATURE_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getFeatureName() <em>Feature Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getFeatureName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String featureName = FEATURE_NAME_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected FeatureValue value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected FeatureToSetImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SetValuesActionConfigurationPackage.Literals.FEATURE_TO_SET;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getFeatureName() {
+		return featureName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setFeatureName(String newFeatureName) {
+		String oldFeatureName = featureName;
+		featureName = newFeatureName;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, SetValuesActionConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME, oldFeatureName, featureName));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public FeatureValue getValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetValue(FeatureValue newValue, NotificationChain msgs) {
+		FeatureValue oldValue = value;
+		value = newValue;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE, oldValue, newValue);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setValue(FeatureValue newValue) {
+		if (newValue != value) {
+			NotificationChain msgs = null;
+			if (value != null) {
+				msgs = ((InternalEObject) value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE, null, msgs);
+			}
+			if (newValue != null) {
+				msgs = ((InternalEObject) newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE, null, msgs);
+			}
+			msgs = basicSetValue(newValue, msgs);
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		}
+		else if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE, newValue, newValue));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE:
+			return basicSetValue(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 SetValuesActionConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:
+			return getFeatureName();
+		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE:
+			return getValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:
+			setFeatureName((String) newValue);
+			return;
+		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE:
+			setValue((FeatureValue) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:
+			setFeatureName(FEATURE_NAME_EDEFAULT);
+			return;
+		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE:
+			setValue((FeatureValue) null);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:
+			return FEATURE_NAME_EDEFAULT == null ? featureName != null : !FEATURE_NAME_EDEFAULT.equals(featureName);
+		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE:
+			return value != 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(" (featureName: ");
+		result.append(featureName);
+		result.append(')');
+		return result.toString();
+	}
+
+} // FeatureToSetImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/FeatureValueImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/FeatureValueImpl.java
index 68c7e296179..10d08ef5cc4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/FeatureValueImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/FeatureValueImpl.java
@@ -1,41 +1,41 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.EObjectImpl;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Feature Value</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public abstract class FeatureValueImpl extends EObjectImpl implements FeatureValue {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FeatureValueImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return SetValuesActionConfigurationPackage.Literals.FEATURE_VALUE;

-	}

-

-} // FeatureValueImpl

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Feature Value</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class FeatureValueImpl extends EObjectImpl implements FeatureValue {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected FeatureValueImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SetValuesActionConfigurationPackage.Literals.FEATURE_VALUE;
+	}
+
+} // FeatureValueImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/ListValueImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/ListValueImpl.java
index 4ea9be25d27..eeddf921da0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/ListValueImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/ListValueImpl.java
@@ -1,156 +1,156 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>List Value</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ListValueImpl#getValues <em>Values</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ListValueImpl extends FeatureValueImpl implements ListValue {

-	/**

-	 * The cached value of the '{@link #getValues() <em>Values</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValues()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<FeatureValue> values;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ListValueImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return SetValuesActionConfigurationPackage.Literals.LIST_VALUE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<FeatureValue> getValues() {

-		if (values == null) {

-			values = new EObjectContainmentEList<FeatureValue>(FeatureValue.class, this, SetValuesActionConfigurationPackage.LIST_VALUE__VALUES);

-		}

-		return values;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case SetValuesActionConfigurationPackage.LIST_VALUE__VALUES:

-			return ((InternalEList<?>) getValues()).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 SetValuesActionConfigurationPackage.LIST_VALUE__VALUES:

-			return getValues();

-		}

-		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 SetValuesActionConfigurationPackage.LIST_VALUE__VALUES:

-			getValues().clear();

-			getValues().addAll((Collection<? extends FeatureValue>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case SetValuesActionConfigurationPackage.LIST_VALUE__VALUES:

-			getValues().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case SetValuesActionConfigurationPackage.LIST_VALUE__VALUES:

-			return values != null && !values.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // ListValueImpl

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>List Value</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ListValueImpl#getValues <em>Values</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ListValueImpl extends FeatureValueImpl implements ListValue {
+	/**
+	 * The cached value of the '{@link #getValues() <em>Values</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getValues()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<FeatureValue> values;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ListValueImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SetValuesActionConfigurationPackage.Literals.LIST_VALUE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<FeatureValue> getValues() {
+		if (values == null) {
+			values = new EObjectContainmentEList<FeatureValue>(FeatureValue.class, this, SetValuesActionConfigurationPackage.LIST_VALUE__VALUES);
+		}
+		return values;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case SetValuesActionConfigurationPackage.LIST_VALUE__VALUES:
+			return ((InternalEList<?>) getValues()).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 SetValuesActionConfigurationPackage.LIST_VALUE__VALUES:
+			return getValues();
+		}
+		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 SetValuesActionConfigurationPackage.LIST_VALUE__VALUES:
+			getValues().clear();
+			getValues().addAll((Collection<? extends FeatureValue>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case SetValuesActionConfigurationPackage.LIST_VALUE__VALUES:
+			getValues().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case SetValuesActionConfigurationPackage.LIST_VALUE__VALUES:
+			return values != null && !values.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} // ListValueImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/QueryExecutionValueImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/QueryExecutionValueImpl.java
index 08acd8b0e6b..c1c15ed7dd8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/QueryExecutionValueImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/QueryExecutionValueImpl.java
@@ -1,40 +1,40 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Query Execution Value</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class QueryExecutionValueImpl extends DynamicValueImpl implements QueryExecutionValue {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected QueryExecutionValueImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return SetValuesActionConfigurationPackage.Literals.QUERY_EXECUTION_VALUE;

-	}

-

-} // QueryExecutionValueImpl

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Query Execution Value</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class QueryExecutionValueImpl extends DynamicValueImpl implements QueryExecutionValue {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected QueryExecutionValueImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SetValuesActionConfigurationPackage.Literals.QUERY_EXECUTION_VALUE;
+	}
+
+} // QueryExecutionValueImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/SetValuesActionConfigurationFactoryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/SetValuesActionConfigurationFactoryImpl.java
index 94b4636fbc9..8af9e56ec0e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/SetValuesActionConfigurationFactoryImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/SetValuesActionConfigurationFactoryImpl.java
@@ -1,163 +1,163 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationFactory;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class SetValuesActionConfigurationFactoryImpl extends EFactoryImpl implements SetValuesActionConfigurationFactory {

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static SetValuesActionConfigurationFactory init() {

-		try {

-			SetValuesActionConfigurationFactory theSetValuesActionConfigurationFactory = (SetValuesActionConfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(SetValuesActionConfigurationPackage.eNS_URI);

-			if (theSetValuesActionConfigurationFactory != null) {

-				return theSetValuesActionConfigurationFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new SetValuesActionConfigurationFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SetValuesActionConfigurationFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION:

-			return createSetValuesActionConfiguration();

-		case SetValuesActionConfigurationPackage.FEATURE_TO_SET:

-			return createFeatureToSet();

-		case SetValuesActionConfigurationPackage.CONSTANT_VALUE:

-			return createConstantValue();

-		case SetValuesActionConfigurationPackage.LIST_VALUE:

-			return createListValue();

-		case SetValuesActionConfigurationPackage.QUERY_EXECUTION_VALUE:

-			return createQueryExecutionValue();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public SetValuesActionConfiguration createSetValuesActionConfiguration() {

-		SetValuesActionConfigurationImpl setValuesActionConfiguration = new SetValuesActionConfigurationImpl();

-		return setValuesActionConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public FeatureToSet createFeatureToSet() {

-		FeatureToSetImpl featureToSet = new FeatureToSetImpl();

-		return featureToSet;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ConstantValue createConstantValue() {

-		ConstantValueImpl constantValue = new ConstantValueImpl();

-		return constantValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ListValue createListValue() {

-		ListValueImpl listValue = new ListValueImpl();

-		return listValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public QueryExecutionValue createQueryExecutionValue() {

-		QueryExecutionValueImpl queryExecutionValue = new QueryExecutionValueImpl();

-		return queryExecutionValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public SetValuesActionConfigurationPackage getSetValuesActionConfigurationPackage() {

-		return (SetValuesActionConfigurationPackage) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static SetValuesActionConfigurationPackage getPackage() {

-		return SetValuesActionConfigurationPackage.eINSTANCE;

-	}

-

-} // SetValuesActionConfigurationFactoryImpl

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationFactory;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class SetValuesActionConfigurationFactoryImpl extends EFactoryImpl implements SetValuesActionConfigurationFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static SetValuesActionConfigurationFactory init() {
+		try {
+			SetValuesActionConfigurationFactory theSetValuesActionConfigurationFactory = (SetValuesActionConfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(SetValuesActionConfigurationPackage.eNS_URI);
+			if (theSetValuesActionConfigurationFactory != null) {
+				return theSetValuesActionConfigurationFactory;
+			}
+		} catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new SetValuesActionConfigurationFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public SetValuesActionConfigurationFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+		case SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION:
+			return createSetValuesActionConfiguration();
+		case SetValuesActionConfigurationPackage.FEATURE_TO_SET:
+			return createFeatureToSet();
+		case SetValuesActionConfigurationPackage.CONSTANT_VALUE:
+			return createConstantValue();
+		case SetValuesActionConfigurationPackage.LIST_VALUE:
+			return createListValue();
+		case SetValuesActionConfigurationPackage.QUERY_EXECUTION_VALUE:
+			return createQueryExecutionValue();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public SetValuesActionConfiguration createSetValuesActionConfiguration() {
+		SetValuesActionConfigurationImpl setValuesActionConfiguration = new SetValuesActionConfigurationImpl();
+		return setValuesActionConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public FeatureToSet createFeatureToSet() {
+		FeatureToSetImpl featureToSet = new FeatureToSetImpl();
+		return featureToSet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public ConstantValue createConstantValue() {
+		ConstantValueImpl constantValue = new ConstantValueImpl();
+		return constantValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public ListValue createListValue() {
+		ListValueImpl listValue = new ListValueImpl();
+		return listValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public QueryExecutionValue createQueryExecutionValue() {
+		QueryExecutionValueImpl queryExecutionValue = new QueryExecutionValueImpl();
+		return queryExecutionValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public SetValuesActionConfigurationPackage getSetValuesActionConfigurationPackage() {
+		return (SetValuesActionConfigurationPackage) getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static SetValuesActionConfigurationPackage getPackage() {
+		return SetValuesActionConfigurationPackage.eINSTANCE;
+	}
+
+} // SetValuesActionConfigurationFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/SetValuesActionConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/SetValuesActionConfigurationImpl.java
index e4b8da16173..08808fd9f1a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/SetValuesActionConfigurationImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/SetValuesActionConfigurationImpl.java
@@ -1,157 +1,157 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;

-import org.eclipse.papyrus.infra.extendedtypes.impl.SemanticActionConfigurationImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Set Values Action Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationImpl#getFeaturesToSet <em>Features To Set</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class SetValuesActionConfigurationImpl extends SemanticActionConfigurationImpl implements SetValuesActionConfiguration {

-	/**

-	 * The cached value of the '{@link #getFeaturesToSet() <em>Features To Set</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getFeaturesToSet()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<FeatureToSet> featuresToSet;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected SetValuesActionConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return SetValuesActionConfigurationPackage.Literals.SET_VALUES_ACTION_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<FeatureToSet> getFeaturesToSet() {

-		if (featuresToSet == null) {

-			featuresToSet = new EObjectContainmentEList<FeatureToSet>(FeatureToSet.class, this, SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET);

-		}

-		return featuresToSet;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET:

-			return ((InternalEList<?>) getFeaturesToSet()).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 SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET:

-			return getFeaturesToSet();

-		}

-		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 SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET:

-			getFeaturesToSet().clear();

-			getFeaturesToSet().addAll((Collection<? extends FeatureToSet>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET:

-			getFeaturesToSet().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET:

-			return featuresToSet != null && !featuresToSet.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // SetValuesActionConfigurationImpl

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
+import org.eclipse.papyrus.infra.extendedtypes.impl.SemanticActionConfigurationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Set Values Action Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationImpl#getFeaturesToSet <em>Features To Set</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class SetValuesActionConfigurationImpl extends SemanticActionConfigurationImpl implements SetValuesActionConfiguration {
+	/**
+	 * The cached value of the '{@link #getFeaturesToSet() <em>Features To Set</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getFeaturesToSet()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<FeatureToSet> featuresToSet;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected SetValuesActionConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SetValuesActionConfigurationPackage.Literals.SET_VALUES_ACTION_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EList<FeatureToSet> getFeaturesToSet() {
+		if (featuresToSet == null) {
+			featuresToSet = new EObjectContainmentEList<FeatureToSet>(FeatureToSet.class, this, SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET);
+		}
+		return featuresToSet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET:
+			return ((InternalEList<?>) getFeaturesToSet()).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 SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET:
+			return getFeaturesToSet();
+		}
+		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 SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET:
+			getFeaturesToSet().clear();
+			getFeaturesToSet().addAll((Collection<? extends FeatureToSet>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET:
+			getFeaturesToSet().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET:
+			return featuresToSet != null && !featuresToSet.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} // SetValuesActionConfigurationImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/SetValuesActionConfigurationPackageImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/SetValuesActionConfigurationPackageImpl.java
index a774d7156bb..5fb3e088df9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/SetValuesActionConfigurationPackageImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/SetValuesActionConfigurationPackageImpl.java
@@ -1,407 +1,407 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationFactory;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class SetValuesActionConfigurationPackageImpl extends EPackageImpl implements SetValuesActionConfigurationPackage {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass setValuesActionConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass featureToSetEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass featureValueEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass dynamicValueEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass constantValueEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass listValueEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass queryExecutionValueEClass = 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.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private SetValuesActionConfigurationPackageImpl() {

-		super(eNS_URI, SetValuesActionConfigurationFactory.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 SetValuesActionConfigurationPackage#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 SetValuesActionConfigurationPackage init() {

-		if (isInited) {

-			return (SetValuesActionConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(SetValuesActionConfigurationPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		SetValuesActionConfigurationPackageImpl theSetValuesActionConfigurationPackage = (SetValuesActionConfigurationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SetValuesActionConfigurationPackageImpl ? EPackage.Registry.INSTANCE

-				.get(eNS_URI) : new SetValuesActionConfigurationPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		ExtendedtypesPackage.eINSTANCE.eClass();

-		UMLPackage.eINSTANCE.eClass();

-

-		// Create package meta-data objects

-		theSetValuesActionConfigurationPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theSetValuesActionConfigurationPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theSetValuesActionConfigurationPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(SetValuesActionConfigurationPackage.eNS_URI, theSetValuesActionConfigurationPackage);

-		return theSetValuesActionConfigurationPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getSetValuesActionConfiguration() {

-		return setValuesActionConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getSetValuesActionConfiguration_FeaturesToSet() {

-		return (EReference) setValuesActionConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getFeatureToSet() {

-		return featureToSetEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getFeatureToSet_FeatureName() {

-		return (EAttribute) featureToSetEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getFeatureToSet_Value() {

-		return (EReference) featureToSetEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getFeatureValue() {

-		return featureValueEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getDynamicValue() {

-		return dynamicValueEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getConstantValue() {

-		return constantValueEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getConstantValue_ValueInstance() {

-		return (EReference) constantValueEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getListValue() {

-		return listValueEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getListValue_Values() {

-		return (EReference) listValueEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getQueryExecutionValue() {

-		return queryExecutionValueEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public SetValuesActionConfigurationFactory getSetValuesActionConfigurationFactory() {

-		return (SetValuesActionConfigurationFactory) 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

-		setValuesActionConfigurationEClass = createEClass(SET_VALUES_ACTION_CONFIGURATION);

-		createEReference(setValuesActionConfigurationEClass, SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET);

-

-		featureToSetEClass = createEClass(FEATURE_TO_SET);

-		createEAttribute(featureToSetEClass, FEATURE_TO_SET__FEATURE_NAME);

-		createEReference(featureToSetEClass, FEATURE_TO_SET__VALUE);

-

-		featureValueEClass = createEClass(FEATURE_VALUE);

-

-		dynamicValueEClass = createEClass(DYNAMIC_VALUE);

-

-		constantValueEClass = createEClass(CONSTANT_VALUE);

-		createEReference(constantValueEClass, CONSTANT_VALUE__VALUE_INSTANCE);

-

-		listValueEClass = createEClass(LIST_VALUE);

-		createEReference(listValueEClass, LIST_VALUE__VALUES);

-

-		queryExecutionValueEClass = createEClass(QUERY_EXECUTION_VALUE);

-	}

-

-	/**

-	 * <!-- 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

-		ExtendedtypesPackage theExtendedtypesPackage = (ExtendedtypesPackage) EPackage.Registry.INSTANCE.getEPackage(ExtendedtypesPackage.eNS_URI);

-		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

-		UMLPackage theUMLPackage = (UMLPackage) EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		setValuesActionConfigurationEClass.getESuperTypes().add(theExtendedtypesPackage.getSemanticActionConfiguration());

-		dynamicValueEClass.getESuperTypes().add(this.getFeatureValue());

-		constantValueEClass.getESuperTypes().add(this.getFeatureValue());

-		listValueEClass.getESuperTypes().add(this.getFeatureValue());

-		queryExecutionValueEClass.getESuperTypes().add(this.getDynamicValue());

-

-		// Initialize classes and features; add operations and parameters

-		initEClass(setValuesActionConfigurationEClass, SetValuesActionConfiguration.class, "SetValuesActionConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getSetValuesActionConfiguration_FeaturesToSet(), this.getFeatureToSet(), null, "featuresToSet", null, 0, -1, SetValuesActionConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(featureToSetEClass, FeatureToSet.class, "FeatureToSet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getFeatureToSet_FeatureName(), theEcorePackage.getEString(), "featureName", null, 1, 1, FeatureToSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getFeatureToSet_Value(), this.getFeatureValue(), null, "value", null, 1, 1, FeatureToSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(featureValueEClass, FeatureValue.class, "FeatureValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(dynamicValueEClass, DynamicValue.class, "DynamicValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(constantValueEClass, ConstantValue.class, "ConstantValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getConstantValue_ValueInstance(), theUMLPackage.getValueSpecification(), null, "valueInstance", null, 0, 1, ConstantValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

-				!IS_DERIVED, IS_ORDERED);

-

-		initEClass(listValueEClass, ListValue.class, "ListValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getListValue_Values(), this.getFeatureValue(), null, "values", null, 0, -1, ListValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(queryExecutionValueEClass, QueryExecutionValue.class, "QueryExecutionValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		// Create resource

-		createResource(eNS_URI);

-	}

-

-} // SetValuesActionConfigurationPackageImpl

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationFactory;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class SetValuesActionConfigurationPackageImpl extends EPackageImpl implements SetValuesActionConfigurationPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass setValuesActionConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass featureToSetEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass featureValueEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass dynamicValueEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass constantValueEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass listValueEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass queryExecutionValueEClass = 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.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private SetValuesActionConfigurationPackageImpl() {
+		super(eNS_URI, SetValuesActionConfigurationFactory.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 SetValuesActionConfigurationPackage#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 SetValuesActionConfigurationPackage init() {
+		if (isInited) {
+			return (SetValuesActionConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(SetValuesActionConfigurationPackage.eNS_URI);
+		}
+
+		// Obtain or create and register package
+		SetValuesActionConfigurationPackageImpl theSetValuesActionConfigurationPackage = (SetValuesActionConfigurationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SetValuesActionConfigurationPackageImpl ? EPackage.Registry.INSTANCE
+				.get(eNS_URI) : new SetValuesActionConfigurationPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		ExtendedtypesPackage.eINSTANCE.eClass();
+		UMLPackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theSetValuesActionConfigurationPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theSetValuesActionConfigurationPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theSetValuesActionConfigurationPackage.freeze();
+
+
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(SetValuesActionConfigurationPackage.eNS_URI, theSetValuesActionConfigurationPackage);
+		return theSetValuesActionConfigurationPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EClass getSetValuesActionConfiguration() {
+		return setValuesActionConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EReference getSetValuesActionConfiguration_FeaturesToSet() {
+		return (EReference) setValuesActionConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EClass getFeatureToSet() {
+		return featureToSetEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFeatureToSet_FeatureName() {
+		return (EAttribute) featureToSetEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EReference getFeatureToSet_Value() {
+		return (EReference) featureToSetEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EClass getFeatureValue() {
+		return featureValueEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EClass getDynamicValue() {
+		return dynamicValueEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EClass getConstantValue() {
+		return constantValueEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EReference getConstantValue_ValueInstance() {
+		return (EReference) constantValueEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EClass getListValue() {
+		return listValueEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EReference getListValue_Values() {
+		return (EReference) listValueEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EClass getQueryExecutionValue() {
+		return queryExecutionValueEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public SetValuesActionConfigurationFactory getSetValuesActionConfigurationFactory() {
+		return (SetValuesActionConfigurationFactory) 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
+		setValuesActionConfigurationEClass = createEClass(SET_VALUES_ACTION_CONFIGURATION);
+		createEReference(setValuesActionConfigurationEClass, SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET);
+
+		featureToSetEClass = createEClass(FEATURE_TO_SET);
+		createEAttribute(featureToSetEClass, FEATURE_TO_SET__FEATURE_NAME);
+		createEReference(featureToSetEClass, FEATURE_TO_SET__VALUE);
+
+		featureValueEClass = createEClass(FEATURE_VALUE);
+
+		dynamicValueEClass = createEClass(DYNAMIC_VALUE);
+
+		constantValueEClass = createEClass(CONSTANT_VALUE);
+		createEReference(constantValueEClass, CONSTANT_VALUE__VALUE_INSTANCE);
+
+		listValueEClass = createEClass(LIST_VALUE);
+		createEReference(listValueEClass, LIST_VALUE__VALUES);
+
+		queryExecutionValueEClass = createEClass(QUERY_EXECUTION_VALUE);
+	}
+
+	/**
+	 * <!-- 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
+		ExtendedtypesPackage theExtendedtypesPackage = (ExtendedtypesPackage) EPackage.Registry.INSTANCE.getEPackage(ExtendedtypesPackage.eNS_URI);
+		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+		UMLPackage theUMLPackage = (UMLPackage) EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		setValuesActionConfigurationEClass.getESuperTypes().add(theExtendedtypesPackage.getSemanticActionConfiguration());
+		dynamicValueEClass.getESuperTypes().add(this.getFeatureValue());
+		constantValueEClass.getESuperTypes().add(this.getFeatureValue());
+		listValueEClass.getESuperTypes().add(this.getFeatureValue());
+		queryExecutionValueEClass.getESuperTypes().add(this.getDynamicValue());
+
+		// Initialize classes and features; add operations and parameters
+		initEClass(setValuesActionConfigurationEClass, SetValuesActionConfiguration.class, "SetValuesActionConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getSetValuesActionConfiguration_FeaturesToSet(), this.getFeatureToSet(), null, "featuresToSet", null, 0, -1, SetValuesActionConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(featureToSetEClass, FeatureToSet.class, "FeatureToSet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getFeatureToSet_FeatureName(), theEcorePackage.getEString(), "featureName", null, 1, 1, FeatureToSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getFeatureToSet_Value(), this.getFeatureValue(), null, "value", null, 1, 1, FeatureToSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(featureValueEClass, FeatureValue.class, "FeatureValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(dynamicValueEClass, DynamicValue.class, "DynamicValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(constantValueEClass, ConstantValue.class, "ConstantValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getConstantValue_ValueInstance(), theUMLPackage.getValueSpecification(), null, "valueInstance", null, 0, 1, ConstantValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+
+		initEClass(listValueEClass, ListValue.class, "ListValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getListValue_Values(), this.getFeatureValue(), null, "values", null, 0, -1, ListValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(queryExecutionValueEClass, QueryExecutionValue.class, "QueryExecutionValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} // SetValuesActionConfigurationPackageImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationAdapterFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationAdapterFactory.java
index a44ede4350f..6c6072ae37a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationAdapterFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationAdapterFactory.java
@@ -1,317 +1,317 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.extendedtypes.ActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;

-

-/**

- * <!-- 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.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage

- * @generated

- */

-public class SetValuesActionConfigurationAdapterFactory extends AdapterFactoryImpl {

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static SetValuesActionConfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SetValuesActionConfigurationAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = SetValuesActionConfigurationPackage.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 SetValuesActionConfigurationSwitch<Adapter> modelSwitch =

-			new SetValuesActionConfigurationSwitch<Adapter>() {

-				@Override

-				public Adapter caseSetValuesActionConfiguration(SetValuesActionConfiguration object) {

-					return createSetValuesActionConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter caseFeatureToSet(FeatureToSet object) {

-					return createFeatureToSetAdapter();

-				}

-

-				@Override

-				public Adapter caseFeatureValue(FeatureValue object) {

-					return createFeatureValueAdapter();

-				}

-

-				@Override

-				public Adapter caseDynamicValue(DynamicValue object) {

-					return createDynamicValueAdapter();

-				}

-

-				@Override

-				public Adapter caseConstantValue(ConstantValue object) {

-					return createConstantValueAdapter();

-				}

-

-				@Override

-				public Adapter caseListValue(ListValue object) {

-					return createListValueAdapter();

-				}

-

-				@Override

-				public Adapter caseQueryExecutionValue(QueryExecutionValue object) {

-					return createQueryExecutionValueAdapter();

-				}

-

-				@Override

-				public Adapter caseConfigurationElement(ConfigurationElement object) {

-					return createConfigurationElementAdapter();

-				}

-

-				@Override

-				public Adapter caseActionConfiguration(ActionConfiguration object) {

-					return createActionConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter caseSemanticActionConfiguration(SemanticActionConfiguration object) {

-					return createSemanticActionConfigurationAdapter();

-				}

-

-				@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.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration <em>Set Values Action Configuration</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.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration

-	 * @generated

-	 */

-	public Adapter createSetValuesActionConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet <em>Feature To Set</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.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet

-	 * @generated

-	 */

-	public Adapter createFeatureToSetAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue <em>Feature Value</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.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue

-	 * @generated

-	 */

-	public Adapter createFeatureValueAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue <em>Dynamic Value</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.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue

-	 * @generated

-	 */

-	public Adapter createDynamicValueAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue <em>Constant Value</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.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue

-	 * @generated

-	 */

-	public Adapter createConstantValueAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue <em>List Value</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.extendedtypes.emf.setvaluesactionconfiguration.ListValue

-	 * @generated

-	 */

-	public Adapter createListValueAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue <em>Query Execution Value</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.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue

-	 * @generated

-	 */

-	public Adapter createQueryExecutionValueAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement <em>Configuration 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.infra.extendedtypes.ConfigurationElement

-	 * @generated

-	 */

-	public Adapter createConfigurationElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration <em>Action Configuration</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.extendedtypes.ActionConfiguration

-	 * @generated

-	 */

-	public Adapter createActionConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration <em>Semantic Action Configuration</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.extendedtypes.SemanticActionConfiguration

-	 * @generated

-	 */

-	public Adapter createSemanticActionConfigurationAdapter() {

-		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;

-	}

-

-} // SetValuesActionConfigurationAdapterFactory

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.extendedtypes.ActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;
+import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
+
+/**
+ * <!-- 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.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage
+ * @generated
+ */
+public class SetValuesActionConfigurationAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static SetValuesActionConfigurationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public SetValuesActionConfigurationAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = SetValuesActionConfigurationPackage.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 SetValuesActionConfigurationSwitch<Adapter> modelSwitch =
+			new SetValuesActionConfigurationSwitch<Adapter>() {
+				@Override
+				public Adapter caseSetValuesActionConfiguration(SetValuesActionConfiguration object) {
+					return createSetValuesActionConfigurationAdapter();
+				}
+
+				@Override
+				public Adapter caseFeatureToSet(FeatureToSet object) {
+					return createFeatureToSetAdapter();
+				}
+
+				@Override
+				public Adapter caseFeatureValue(FeatureValue object) {
+					return createFeatureValueAdapter();
+				}
+
+				@Override
+				public Adapter caseDynamicValue(DynamicValue object) {
+					return createDynamicValueAdapter();
+				}
+
+				@Override
+				public Adapter caseConstantValue(ConstantValue object) {
+					return createConstantValueAdapter();
+				}
+
+				@Override
+				public Adapter caseListValue(ListValue object) {
+					return createListValueAdapter();
+				}
+
+				@Override
+				public Adapter caseQueryExecutionValue(QueryExecutionValue object) {
+					return createQueryExecutionValueAdapter();
+				}
+
+				@Override
+				public Adapter caseConfigurationElement(ConfigurationElement object) {
+					return createConfigurationElementAdapter();
+				}
+
+				@Override
+				public Adapter caseActionConfiguration(ActionConfiguration object) {
+					return createActionConfigurationAdapter();
+				}
+
+				@Override
+				public Adapter caseSemanticActionConfiguration(SemanticActionConfiguration object) {
+					return createSemanticActionConfigurationAdapter();
+				}
+
+				@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.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration <em>Set Values Action Configuration</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.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration
+	 * @generated
+	 */
+	public Adapter createSetValuesActionConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet <em>Feature To Set</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.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet
+	 * @generated
+	 */
+	public Adapter createFeatureToSetAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue <em>Feature Value</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.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue
+	 * @generated
+	 */
+	public Adapter createFeatureValueAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue <em>Dynamic Value</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.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue
+	 * @generated
+	 */
+	public Adapter createDynamicValueAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue <em>Constant Value</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.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue
+	 * @generated
+	 */
+	public Adapter createConstantValueAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue <em>List Value</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.extendedtypes.emf.setvaluesactionconfiguration.ListValue
+	 * @generated
+	 */
+	public Adapter createListValueAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue <em>Query Execution Value</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.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue
+	 * @generated
+	 */
+	public Adapter createQueryExecutionValueAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement <em>Configuration 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.infra.extendedtypes.ConfigurationElement
+	 * @generated
+	 */
+	public Adapter createConfigurationElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration <em>Action Configuration</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.extendedtypes.ActionConfiguration
+	 * @generated
+	 */
+	public Adapter createActionConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration <em>Semantic Action Configuration</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.extendedtypes.SemanticActionConfiguration
+	 * @generated
+	 */
+	public Adapter createSemanticActionConfigurationAdapter() {
+		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;
+	}
+
+} // SetValuesActionConfigurationAdapterFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationResourceFactoryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationResourceFactoryImpl.java
index 2107877bb91..d082cb6fce6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationResourceFactoryImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationResourceFactoryImpl.java
@@ -1,52 +1,52 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.infra.extendedtypes.emf.setvaluesactionconfiguration.util.SetValuesActionConfigurationResourceImpl

- * @generated

- */

-public class SetValuesActionConfigurationResourceFactoryImpl extends ResourceFactoryImpl {

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SetValuesActionConfigurationResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		XMLResource result = new SetValuesActionConfigurationResourceImpl(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;

-	}

-

-} // SetValuesActionConfigurationResourceFactoryImpl

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.infra.extendedtypes.emf.setvaluesactionconfiguration.util.SetValuesActionConfigurationResourceImpl
+ * @generated
+ */
+public class SetValuesActionConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
+	/**
+	 * Creates an instance of the resource factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public SetValuesActionConfigurationResourceFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Resource createResource(URI uri) {
+		XMLResource result = new SetValuesActionConfigurationResourceImpl(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;
+	}
+
+} // SetValuesActionConfigurationResourceFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationResourceImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationResourceImpl.java
index 27964e354d7..2727090f2c2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationResourceImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationResourceImpl.java
@@ -1,30 +1,30 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.extendedtypes.emf.setvaluesactionconfiguration.util.SetValuesActionConfigurationResourceFactoryImpl

- * @generated

- */

-public class SetValuesActionConfigurationResourceImpl extends XMLResourceImpl {

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public SetValuesActionConfigurationResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} // SetValuesActionConfigurationResourceImpl

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.extendedtypes.emf.setvaluesactionconfiguration.util.SetValuesActionConfigurationResourceFactoryImpl
+ * @generated
+ */
+public class SetValuesActionConfigurationResourceImpl extends XMLResourceImpl {
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param uri
+	 *            the URI of the new resource.
+	 * @generated
+	 */
+	public SetValuesActionConfigurationResourceImpl(URI uri) {
+		super(uri);
+	}
+
+} // SetValuesActionConfigurationResourceImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationSwitch.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationSwitch.java
index 7cd36ae5552..dec3090a9ab 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationSwitch.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationSwitch.java
@@ -1,354 +1,354 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.extendedtypes.ActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;

-

-/**

- * <!-- 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.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage

- * @generated

- */

-public class SetValuesActionConfigurationSwitch<T> extends Switch<T> {

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static SetValuesActionConfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SetValuesActionConfigurationSwitch() {

-		if (modelPackage == null) {

-			modelPackage = SetValuesActionConfigurationPackage.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 SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION: {

-			SetValuesActionConfiguration setValuesActionConfiguration = (SetValuesActionConfiguration) theEObject;

-			T result = caseSetValuesActionConfiguration(setValuesActionConfiguration);

-			if (result == null) {

-				result = caseSemanticActionConfiguration(setValuesActionConfiguration);

-			}

-			if (result == null) {

-				result = caseActionConfiguration(setValuesActionConfiguration);

-			}

-			if (result == null) {

-				result = caseConfigurationElement(setValuesActionConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case SetValuesActionConfigurationPackage.FEATURE_TO_SET: {

-			FeatureToSet featureToSet = (FeatureToSet) theEObject;

-			T result = caseFeatureToSet(featureToSet);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case SetValuesActionConfigurationPackage.FEATURE_VALUE: {

-			FeatureValue featureValue = (FeatureValue) theEObject;

-			T result = caseFeatureValue(featureValue);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case SetValuesActionConfigurationPackage.DYNAMIC_VALUE: {

-			DynamicValue dynamicValue = (DynamicValue) theEObject;

-			T result = caseDynamicValue(dynamicValue);

-			if (result == null) {

-				result = caseFeatureValue(dynamicValue);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case SetValuesActionConfigurationPackage.CONSTANT_VALUE: {

-			ConstantValue constantValue = (ConstantValue) theEObject;

-			T result = caseConstantValue(constantValue);

-			if (result == null) {

-				result = caseFeatureValue(constantValue);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case SetValuesActionConfigurationPackage.LIST_VALUE: {

-			ListValue listValue = (ListValue) theEObject;

-			T result = caseListValue(listValue);

-			if (result == null) {

-				result = caseFeatureValue(listValue);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case SetValuesActionConfigurationPackage.QUERY_EXECUTION_VALUE: {

-			QueryExecutionValue queryExecutionValue = (QueryExecutionValue) theEObject;

-			T result = caseQueryExecutionValue(queryExecutionValue);

-			if (result == null) {

-				result = caseDynamicValue(queryExecutionValue);

-			}

-			if (result == null) {

-				result = caseFeatureValue(queryExecutionValue);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Set Values Action Configuration</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>Set Values Action Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseSetValuesActionConfiguration(SetValuesActionConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Feature To Set</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>Feature To Set</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFeatureToSet(FeatureToSet object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Feature Value</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>Feature Value</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFeatureValue(FeatureValue object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Dynamic Value</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>Dynamic Value</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseDynamicValue(DynamicValue object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Constant Value</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>Constant Value</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseConstantValue(ConstantValue object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>List Value</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>List Value</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseListValue(ListValue object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Query Execution Value</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>Query Execution Value</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseQueryExecutionValue(QueryExecutionValue object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Configuration 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>Configuration Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseConfigurationElement(ConfigurationElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Action Configuration</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>Action Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseActionConfiguration(ActionConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Semantic Action Configuration</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>Semantic Action Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseSemanticActionConfiguration(SemanticActionConfiguration 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;

-	}

-

-} // SetValuesActionConfigurationSwitch

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.extendedtypes.ActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;
+import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
+
+/**
+ * <!-- 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.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage
+ * @generated
+ */
+public class SetValuesActionConfigurationSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static SetValuesActionConfigurationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public SetValuesActionConfigurationSwitch() {
+		if (modelPackage == null) {
+			modelPackage = SetValuesActionConfigurationPackage.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 SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION: {
+			SetValuesActionConfiguration setValuesActionConfiguration = (SetValuesActionConfiguration) theEObject;
+			T result = caseSetValuesActionConfiguration(setValuesActionConfiguration);
+			if (result == null) {
+				result = caseSemanticActionConfiguration(setValuesActionConfiguration);
+			}
+			if (result == null) {
+				result = caseActionConfiguration(setValuesActionConfiguration);
+			}
+			if (result == null) {
+				result = caseConfigurationElement(setValuesActionConfiguration);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case SetValuesActionConfigurationPackage.FEATURE_TO_SET: {
+			FeatureToSet featureToSet = (FeatureToSet) theEObject;
+			T result = caseFeatureToSet(featureToSet);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case SetValuesActionConfigurationPackage.FEATURE_VALUE: {
+			FeatureValue featureValue = (FeatureValue) theEObject;
+			T result = caseFeatureValue(featureValue);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case SetValuesActionConfigurationPackage.DYNAMIC_VALUE: {
+			DynamicValue dynamicValue = (DynamicValue) theEObject;
+			T result = caseDynamicValue(dynamicValue);
+			if (result == null) {
+				result = caseFeatureValue(dynamicValue);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case SetValuesActionConfigurationPackage.CONSTANT_VALUE: {
+			ConstantValue constantValue = (ConstantValue) theEObject;
+			T result = caseConstantValue(constantValue);
+			if (result == null) {
+				result = caseFeatureValue(constantValue);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case SetValuesActionConfigurationPackage.LIST_VALUE: {
+			ListValue listValue = (ListValue) theEObject;
+			T result = caseListValue(listValue);
+			if (result == null) {
+				result = caseFeatureValue(listValue);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case SetValuesActionConfigurationPackage.QUERY_EXECUTION_VALUE: {
+			QueryExecutionValue queryExecutionValue = (QueryExecutionValue) theEObject;
+			T result = caseQueryExecutionValue(queryExecutionValue);
+			if (result == null) {
+				result = caseDynamicValue(queryExecutionValue);
+			}
+			if (result == null) {
+				result = caseFeatureValue(queryExecutionValue);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Set Values Action Configuration</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>Set Values Action Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSetValuesActionConfiguration(SetValuesActionConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Feature To Set</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>Feature To Set</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFeatureToSet(FeatureToSet object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Feature Value</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>Feature Value</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFeatureValue(FeatureValue object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dynamic Value</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>Dynamic Value</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDynamicValue(DynamicValue object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Constant Value</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>Constant Value</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseConstantValue(ConstantValue object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>List Value</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>List Value</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseListValue(ListValue object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Query Execution Value</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>Query Execution Value</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseQueryExecutionValue(QueryExecutionValue object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Configuration 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>Configuration Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseConfigurationElement(ConfigurationElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Action Configuration</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>Action Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseActionConfiguration(ActionConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Semantic Action Configuration</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>Semantic Action Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSemanticActionConfiguration(SemanticActionConfiguration 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;
+	}
+
+} // SetValuesActionConfigurationSwitch
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationXMLProcessor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationXMLProcessor.java
index 07498c83975..bc84fb6726a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationXMLProcessor.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationXMLProcessor.java
@@ -1,50 +1,50 @@
-/**

- */

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class SetValuesActionConfigurationXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SetValuesActionConfigurationXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		SetValuesActionConfigurationPackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the SetValuesActionConfigurationResourceFactoryImpl 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 SetValuesActionConfigurationResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new SetValuesActionConfigurationResourceFactoryImpl());

-		}

-		return registrations;

-	}

-

-} // SetValuesActionConfigurationXMLProcessor

+/**
+ */
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.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.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
+
+/**
+ * This class contains helper methods to serialize and deserialize XML documents
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class SetValuesActionConfigurationXMLProcessor extends XMLProcessor {
+
+	/**
+	 * Public constructor to instantiate the helper.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public SetValuesActionConfigurationXMLProcessor() {
+		super((EPackage.Registry.INSTANCE));
+		SetValuesActionConfigurationPackage.eINSTANCE.eClass();
+	}
+
+	/**
+	 * Register for "*" and "xml" file extensions the SetValuesActionConfigurationResourceFactoryImpl 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 SetValuesActionConfigurationResourceFactoryImpl());
+			registrations.put(STAR_EXTENSION, new SetValuesActionConfigurationResourceFactoryImpl());
+		}
+		return registrations;
+	}
+
+} // SetValuesActionConfigurationXMLProcessor
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/Activator.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/Activator.java
index f0e88f6b739..7732e762f08 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/Activator.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/Activator.java
@@ -1,73 +1,73 @@
-/*****************************************************************************

- * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *  

- /*****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes.emf;

-

-import org.eclipse.core.runtime.Plugin;

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends Plugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.extendedtypes.emf"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/** Logging helper */

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		log = null;

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *  
+ /*****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.emf;
+
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends Plugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.extendedtypes.emf"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/** Logging helper */
+	public static LogHelper log;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		log = null;
+		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.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ConverterNotfoundException.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ConverterNotfoundException.java
index 09ccf5237bc..09ccf5237bc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ConverterNotfoundException.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ConverterNotfoundException.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ConverterRegistry.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ConverterRegistry.java
index bdca51a8a42..bdca51a8a42 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ConverterRegistry.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ConverterRegistry.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ObjectToBooleanConverter.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ObjectToBooleanConverter.java
index 50bf410e853..50bf410e853 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ObjectToBooleanConverter.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ObjectToBooleanConverter.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ObjectToIntegerConverter.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ObjectToIntegerConverter.java
index e10febbdd80..e10febbdd80 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ObjectToIntegerConverter.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ObjectToIntegerConverter.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToBooleanConverter.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToBooleanConverter.java
index c50b45f486f..c50b45f486f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToBooleanConverter.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToBooleanConverter.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToEENumConverter.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToEENumConverter.java
index d569df6f7b8..62cf5cec095 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToEENumConverter.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToEENumConverter.java
@@ -1,71 +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:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes.emf.converter;

-

-import org.eclipse.core.databinding.conversion.Converter;

-import org.eclipse.core.databinding.conversion.IConverter;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.uml2.uml.EnumerationLiteral;

-import org.eclipse.uml2.uml.InstanceSpecification;

-import org.eclipse.uml2.uml.InstanceValue;

-import org.eclipse.uml2.uml.ValueSpecification;

-import org.eclipse.uml2.uml.VisibilityKind;

-

-

-/**

- * @author RS211865

- */

-public class ValueSpecificationToEENumConverter extends Converter implements IConverter {

-

-	/**

-	 * @param fromType

-	 * @param toType

-	 */

-	public ValueSpecificationToEENumConverter() {

-		super(ValueSpecification.class, EEnum.class);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object convert(Object fromObject) {

-		if (fromObject instanceof InstanceValue) {

-			InstanceSpecification instanceSpecification = ((InstanceValue) fromObject).getInstance();

-			if (instanceSpecification instanceof EnumerationLiteral) {

-

-				System.err.println(VisibilityKind.PRIVATE_LITERAL);

-				Class<?> eclass = ((EnumerationLiteral) instanceSpecification).getEnumeration().eClass().getInstanceClass();

-				System.err.println(eclass.getEnumConstants());

-				System.err.println(eclass);

-

-

-

-

-

-				// final EEnumLiteral literal = eenum.getEEnumLiteral(umlLiteral.getName());

-				// if(literal != null) {

-				// return literal.getInstance();

-				// }

-				// return null;

-				//

-				System.err.println(instanceSpecification);

-

-

-				// return ((EnumerationLiteral)instanceSpecification).;

-			}

-		}

-

-		return fromObject;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.emf.converter;
+
+import org.eclipse.core.databinding.conversion.Converter;
+import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.uml2.uml.EnumerationLiteral;
+import org.eclipse.uml2.uml.InstanceSpecification;
+import org.eclipse.uml2.uml.InstanceValue;
+import org.eclipse.uml2.uml.ValueSpecification;
+import org.eclipse.uml2.uml.VisibilityKind;
+
+
+/**
+ * @author RS211865
+ */
+public class ValueSpecificationToEENumConverter extends Converter implements IConverter {
+
+	/**
+	 * @param fromType
+	 * @param toType
+	 */
+	public ValueSpecificationToEENumConverter() {
+		super(ValueSpecification.class, EEnum.class);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object convert(Object fromObject) {
+		if (fromObject instanceof InstanceValue) {
+			InstanceSpecification instanceSpecification = ((InstanceValue) fromObject).getInstance();
+			if (instanceSpecification instanceof EnumerationLiteral) {
+
+				System.err.println(VisibilityKind.PRIVATE_LITERAL);
+				Class<?> eclass = ((EnumerationLiteral) instanceSpecification).getEnumeration().eClass().getInstanceClass();
+				System.err.println(eclass.getEnumConstants());
+				System.err.println(eclass);
+
+
+
+
+
+				// final EEnumLiteral literal = eenum.getEEnumLiteral(umlLiteral.getName());
+				// if(literal != null) {
+				// return literal.getInstance();
+				// }
+				// return null;
+				//
+				System.err.println(instanceSpecification);
+
+
+				// return ((EnumerationLiteral)instanceSpecification).;
+			}
+		}
+
+		return fromObject;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToEnumerationConverter.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToEnumerationConverter.java
index e7bbeef7d31..1fd78d84420 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToEnumerationConverter.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToEnumerationConverter.java
@@ -1,51 +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:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes.emf.converter;

-

-import org.eclipse.core.databinding.conversion.Converter;

-import org.eclipse.core.databinding.conversion.IConverter;

-import org.eclipse.uml2.uml.Enumeration;

-import org.eclipse.uml2.uml.EnumerationLiteral;

-import org.eclipse.uml2.uml.InstanceSpecification;

-import org.eclipse.uml2.uml.InstanceValue;

-import org.eclipse.uml2.uml.ValueSpecification;

-

-

-/**

- * Converter for enumeration values

- */

-public class ValueSpecificationToEnumerationConverter extends Converter implements IConverter {

-

-	/**

-	 * @param fromType

-	 * @param toType

-	 */

-	public ValueSpecificationToEnumerationConverter() {

-		super(ValueSpecification.class, Enumeration.class);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Object convert(Object fromObject) {

-		if (fromObject instanceof InstanceValue) {

-			InstanceSpecification instanceSpecification = ((InstanceValue) fromObject).getInstance();

-			if (instanceSpecification instanceof EnumerationLiteral) {

-				return (instanceSpecification);

-			}

-		}

-

-		return fromObject;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.emf.converter;
+
+import org.eclipse.core.databinding.conversion.Converter;
+import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.uml2.uml.Enumeration;
+import org.eclipse.uml2.uml.EnumerationLiteral;
+import org.eclipse.uml2.uml.InstanceSpecification;
+import org.eclipse.uml2.uml.InstanceValue;
+import org.eclipse.uml2.uml.ValueSpecification;
+
+
+/**
+ * Converter for enumeration values
+ */
+public class ValueSpecificationToEnumerationConverter extends Converter implements IConverter {
+
+	/**
+	 * @param fromType
+	 * @param toType
+	 */
+	public ValueSpecificationToEnumerationConverter() {
+		super(ValueSpecification.class, Enumeration.class);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object convert(Object fromObject) {
+		if (fromObject instanceof InstanceValue) {
+			InstanceSpecification instanceSpecification = ((InstanceValue) fromObject).getInstance();
+			if (instanceSpecification instanceof EnumerationLiteral) {
+				return (instanceSpecification);
+			}
+		}
+
+		return fromObject;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToIntegerConverter.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToIntegerConverter.java
index 98df4ae9388..98df4ae9388 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToIntegerConverter.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToIntegerConverter.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToStringConverter.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToStringConverter.java
index 1323d2233f9..1323d2233f9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToStringConverter.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToStringConverter.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/FeatureValueUtils.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/FeatureValueUtils.java
index 206a271d375..c55ce0f15c2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/FeatureValueUtils.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/FeatureValueUtils.java
@@ -1,133 +1,133 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.extendedtypes.Activator;

-import org.eclipse.papyrus.infra.extendedtypes.emf.converter.ConverterNotfoundException;

-import org.eclipse.papyrus.infra.extendedtypes.emf.converter.ConverterRegistry;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.util.SetValuesActionConfigurationSwitch;

-import org.eclipse.uml2.uml.DataType;

-import org.eclipse.uml2.uml.InstanceValue;

-import org.eclipse.uml2.uml.ValueSpecification;

-

-

-/**

- * Utility class to get values from a {@link FeatureValue}

- */

-public class FeatureValueUtils {

-

-	protected FeatureValueUtils() {

-		// no instanciation, helper class

-	}

-

-	/**

-	 * Returns the value to set for a given feature of a given element

-	 *

-	 * @param elementToConfigure

-	 *            eobject for which feature is set. This must not be <code>null</code>

-	 * @param feature

-	 *            {@link EStructuralFeature} to set. This must not be <code>null</code>

-	 * @param valueModel

-	 *            configuration of the value, stored in the model

-	 * @return the real value that will be set to the object or <code>null</code> if none could be computed

-	 */

-	public static Object getValue(final EObject elementToConfigure, final EStructuralFeature feature, final FeatureValue featureValue) {

-

-		Object result = new SetValuesActionConfigurationSwitch<Object>() {

-			/**

-			 * {@inheritDoc}

-			 */

-			@Override

-			public Object caseConstantValue(ConstantValue object) {

-				ValueSpecification valueSpecification = object.getValueInstance();

-

-				if (valueSpecification == null) {

-					return null;

-				}

-

-				try {

-					EClassifier type = feature.getEType();

-					if (type instanceof EEnum) {

-						String value = ((InstanceValue) valueSpecification).getInstance().getName();

-						return ((EEnum) type).getEEnumLiteral(value).getInstance();

-						// return ConverterRegistry.getSingleton().convert(EEnum.class, valueSpecification);

-					} else if (type instanceof EDataType) {

-						final EDataType pType = (EDataType) type;

-						final String name = pType.getName();

-						if ("Boolean".equals(name)) {

-							return ConverterRegistry.getSingleton().convert(boolean.class, valueSpecification);

-						} else if ("Integer".equals(name)) {

-							return ConverterRegistry.getSingleton().convert(int.class, valueSpecification);

-						} else if ("Real".equals(name)) {

-							return ConverterRegistry.getSingleton().convert(double.class, valueSpecification);

-						} else if ("String".equals(name)) {

-							return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);

-						} else if ("UnlimitedNatural".equals(name)) {

-							return ConverterRegistry.getSingleton().convert(int.class, valueSpecification);

-						} else { // custom PrimitiveType

-							return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);

-						}

-					} else if (type instanceof DataType) {// FIXME manage the data type

-						return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);

-					}

-					return ConverterRegistry.getSingleton().convert(feature.getEType().getInstanceClass(), valueSpecification);

-				} catch (ConverterNotfoundException e) {

-					Activator.log.error("Impossible to convert " + valueSpecification + " to fit feature type :" + feature, e);

-				}

-				return super.caseConstantValue(object);

-			}

-

-			/**

-			 * {@inheritDoc}

-			 */

-			@Override

-			public Object caseQueryExecutionValue(QueryExecutionValue object) {

-				throw new UnsupportedOperationException("Query execution values resolution has not been implemented yet");

-			};

-

-			/**

-			 * {@inheritDoc}

-			 */

-			@Override

-			public Object caseDynamicValue(DynamicValue object) {

-				throw new UnsupportedOperationException("Dynamic values resolution has not been implemented yet");

-			};

-

-			/**

-			 * {@inheritDoc}

-			 */

-			@Override

-			public Object caseListValue(ListValue object) {

-				// resolve one by one all features in the values list of this listvalue

-				List<Object> results = new ArrayList<Object>();

-				for (FeatureValue value : object.getValues()) {

-					Object singleResult = getValue(elementToConfigure, feature, value);

-					results.add(singleResult);

-				}

-				return results;

-			};

-

-		}.doSwitch(featureValue);

-		return result;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.papyrus.infra.extendedtypes.Activator;
+import org.eclipse.papyrus.infra.extendedtypes.emf.converter.ConverterNotfoundException;
+import org.eclipse.papyrus.infra.extendedtypes.emf.converter.ConverterRegistry;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.util.SetValuesActionConfigurationSwitch;
+import org.eclipse.uml2.uml.DataType;
+import org.eclipse.uml2.uml.InstanceValue;
+import org.eclipse.uml2.uml.ValueSpecification;
+
+
+/**
+ * Utility class to get values from a {@link FeatureValue}
+ */
+public class FeatureValueUtils {
+
+	protected FeatureValueUtils() {
+		// no instanciation, helper class
+	}
+
+	/**
+	 * Returns the value to set for a given feature of a given element
+	 *
+	 * @param elementToConfigure
+	 *            eobject for which feature is set. This must not be <code>null</code>
+	 * @param feature
+	 *            {@link EStructuralFeature} to set. This must not be <code>null</code>
+	 * @param valueModel
+	 *            configuration of the value, stored in the model
+	 * @return the real value that will be set to the object or <code>null</code> if none could be computed
+	 */
+	public static Object getValue(final EObject elementToConfigure, final EStructuralFeature feature, final FeatureValue featureValue) {
+
+		Object result = new SetValuesActionConfigurationSwitch<Object>() {
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			public Object caseConstantValue(ConstantValue object) {
+				ValueSpecification valueSpecification = object.getValueInstance();
+
+				if (valueSpecification == null) {
+					return null;
+				}
+
+				try {
+					EClassifier type = feature.getEType();
+					if (type instanceof EEnum) {
+						String value = ((InstanceValue) valueSpecification).getInstance().getName();
+						return ((EEnum) type).getEEnumLiteral(value).getInstance();
+						// return ConverterRegistry.getSingleton().convert(EEnum.class, valueSpecification);
+					} else if (type instanceof EDataType) {
+						final EDataType pType = (EDataType) type;
+						final String name = pType.getName();
+						if ("Boolean".equals(name)) {
+							return ConverterRegistry.getSingleton().convert(boolean.class, valueSpecification);
+						} else if ("Integer".equals(name)) {
+							return ConverterRegistry.getSingleton().convert(int.class, valueSpecification);
+						} else if ("Real".equals(name)) {
+							return ConverterRegistry.getSingleton().convert(double.class, valueSpecification);
+						} else if ("String".equals(name)) {
+							return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);
+						} else if ("UnlimitedNatural".equals(name)) {
+							return ConverterRegistry.getSingleton().convert(int.class, valueSpecification);
+						} else { // custom PrimitiveType
+							return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);
+						}
+					} else if (type instanceof DataType) {// FIXME manage the data type
+						return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);
+					}
+					return ConverterRegistry.getSingleton().convert(feature.getEType().getInstanceClass(), valueSpecification);
+				} catch (ConverterNotfoundException e) {
+					Activator.log.error("Impossible to convert " + valueSpecification + " to fit feature type :" + feature, e);
+				}
+				return super.caseConstantValue(object);
+			}
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			public Object caseQueryExecutionValue(QueryExecutionValue object) {
+				throw new UnsupportedOperationException("Query execution values resolution has not been implemented yet");
+			};
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			public Object caseDynamicValue(DynamicValue object) {
+				throw new UnsupportedOperationException("Dynamic values resolution has not been implemented yet");
+			};
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			public Object caseListValue(ListValue object) {
+				// resolve one by one all features in the values list of this listvalue
+				List<Object> results = new ArrayList<Object>();
+				for (FeatureValue value : object.getValues()) {
+					Object singleResult = getValue(elementToConfigure, feature, value);
+					results.add(singleResult);
+				}
+				return results;
+			};
+
+		}.doSwitch(featureValue);
+		return result;
+	}
+
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfigurationModelCreation.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfigurationModelCreation.java
index 5af9e6fcb2a..6d12242f591 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfigurationModelCreation.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfigurationModelCreation.java
@@ -1,29 +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:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;

-

-import org.eclipse.papyrus.infra.extendedtypes.IActionConfigurationModelCreation;

-

-/**

- * {@link IActionConfigurationModelCreation} for {@link SetValuesActionConfiguration}

- */

-public class SetValuesActionConfigurationModelCreation implements IActionConfigurationModelCreation<SetValuesActionConfiguration> {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public SetValuesActionConfiguration createConfigurationModel() {

-		return SetValuesActionConfigurationFactory.eINSTANCE.createSetValuesActionConfiguration();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
+
+import org.eclipse.papyrus.infra.extendedtypes.IActionConfigurationModelCreation;
+
+/**
+ * {@link IActionConfigurationModelCreation} for {@link SetValuesActionConfiguration}
+ */
+public class SetValuesActionConfigurationModelCreation implements IActionConfigurationModelCreation<SetValuesActionConfiguration> {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public SetValuesActionConfiguration createConfigurationModel() {
+		return SetValuesActionConfigurationFactory.eINSTANCE.createSetValuesActionConfiguration();
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionCreationElementValidator.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionCreationElementValidator.java
index 9495c16b42a..d29eefca7ab 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionCreationElementValidator.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionCreationElementValidator.java
@@ -1,38 +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:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;

-

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.extendedtypes.IActionCreationElementValidator;

-import org.eclipse.papyrus.infra.extendedtypes.ICreationElementValidator;

-

-/**

- * {@link ICreationElementValidator} for {@link SetValuesActionConfiguration}

- */

-public class SetValuesActionCreationElementValidator implements IActionCreationElementValidator<SetValuesActionConfiguration> {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean canCreate(CreateElementRequest request) {

-		return true;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void init(SetValuesActionConfiguration configuration) {

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
+
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.papyrus.infra.extendedtypes.IActionCreationElementValidator;
+import org.eclipse.papyrus.infra.extendedtypes.ICreationElementValidator;
+
+/**
+ * {@link ICreationElementValidator} for {@link SetValuesActionConfiguration}
+ */
+public class SetValuesActionCreationElementValidator implements IActionCreationElementValidator<SetValuesActionConfiguration> {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean canCreate(CreateElementRequest request) {
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void init(SetValuesActionConfiguration configuration) {
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionEditHelperAdvice.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionEditHelperAdvice.java
index 3a34685e377..b15c8b417d9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionEditHelperAdvice.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionEditHelperAdvice.java
@@ -1,179 +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:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;

-

-import java.util.HashMap;

-import java.util.Map;

-import java.util.Map.Entry;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-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.IEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.infra.extendedtypes.IActionEditHelperAdvice;

-import org.eclipse.papyrus.infra.extendedtypes.emf.Activator;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-

-/**

- * advice for the {@link SetValuesActionConfiguration}

- */

-public class SetValuesActionEditHelperAdvice extends AbstractEditHelperAdvice implements IActionEditHelperAdvice<SetValuesActionConfiguration> {

-

-	/** list of the features to set */

-	// protected Map<String, FeatureValue> featuresToValues = null;

-	/** list of runtime defined features */

-	// protected Map<String, FeatureValue> featuresToRuntimeDefinitions = null;

-

-	/** list of static defined features */

-	protected Map<String, FeatureValue> featuresToStaticDefinitions = null;

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void init(SetValuesActionConfiguration configuration) {

-		// featuresToRuntimeDefinitions = new HashMap<String, FeatureValue>();

-		featuresToStaticDefinitions = new HashMap<String, FeatureValue>();

-		if (configuration == null) {

-			return;

-		}

-		for (FeatureToSet featureToSet : configuration.getFeaturesToSet()) {

-			featuresToStaticDefinitions.put(featureToSet.getFeatureName(), featureToSet.getValue());

-		}

-	}

-

-	/**

-	 * Default Constructor

-	 */

-	public SetValuesActionEditHelperAdvice() {

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean approveRequest(IEditCommandRequest request) {

-		return super.approveRequest(request);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getBeforeCreateCommand(CreateElementRequest request) {

-		return super.getBeforeCreateCommand(request);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getAfterCreateCommand(CreateElementRequest request) {

-		return super.getAfterCreateCommand(request);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {

-		return super.getBeforeConfigureCommand(request);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getAfterConfigureCommand(ConfigureRequest request) {

-		ICommand resultCommand = null;

-

-		// retrieve eobject

-		EObject elementToConfigure = request.getElementToConfigure();

-		if (elementToConfigure == null) {

-			return null;

-		}

-		// retrieve edit service to get features from configure command

-		IElementEditService service = ElementEditServiceUtils.getCommandProvider(elementToConfigure);

-		if (service == null) {

-			Activator.log.error("Impossible to get edit service from element: " + elementToConfigure, null);

-			return null;

-		}

-

-		for (Entry<String, FeatureValue> featureEntry : featuresToStaticDefinitions.entrySet()) {

-			// retrieve feature value

-			ICommand command = getSetFeatureValueCommand(elementToConfigure, featureEntry.getKey(), featureEntry.getValue(), service, request);

-			if (command != null) {

-				if (resultCommand == null) {

-					resultCommand = command;

-				} else {

-					resultCommand = resultCommand.compose(command);

-				}

-			}

-		}

-

-		// if(!featuresToRuntimeDefinitions.isEmpty()) {

-		// ICommand command = getDynamicSetFeatureValueCommand(elementToConfigure, featuresToRuntimeDefinitions, service, request);

-		// if(command !=null) {

-		// if(resultCommand == null) {

-		// resultCommand = command;

-		// } else {

-		// resultCommand = resultCommand.compose(command);

-		// }

-		// }

-		// }

-

-

-		if (resultCommand != null) {

-			return resultCommand.reduce();

-		}

-

-

-		return super.getAfterConfigureCommand(request);

-	}

-

-

-	/**

-	 * @param elementToConfigure

-	 *            the eobject to configure

-	 * @param name

-	 *            the name of the feature to set

-	 * @param value

-	 *            the new value of the feature

-	 */

-	protected ICommand getSetFeatureValueCommand(EObject elementToConfigure, String name, FeatureValue featureValue, IElementEditService service, ConfigureRequest configureRequest) {

-		if (name == null) {

-			Activator.log.debug("No feature name has been set.");

-			return null;

-		}

-		if (elementToConfigure.eClass() == null) {

-			Activator.log.error("Impossible to find EClass from EObject: " + elementToConfigure, null);

-			return null;

-		}

-		// retrieve structural feature for the element to configure

-		EStructuralFeature feature = elementToConfigure.eClass().getEStructuralFeature(name);

-		if (feature == null) {

-			Activator.log.error("Impossible to find feature " + name + " for eobject " + elementToConfigure, null);

-			return null;

-		}

-		Object value = FeatureValueUtils.getValue(elementToConfigure, feature, featureValue);

-		SetRequest request = new SetRequest(elementToConfigure, feature, value);

-		// duplicate parameters from configure request?

-		request.addParameters(configureRequest.getParameters());

-		return service.getEditCommand(request);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+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.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.extendedtypes.IActionEditHelperAdvice;
+import org.eclipse.papyrus.infra.extendedtypes.emf.Activator;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+
+/**
+ * advice for the {@link SetValuesActionConfiguration}
+ */
+public class SetValuesActionEditHelperAdvice extends AbstractEditHelperAdvice implements IActionEditHelperAdvice<SetValuesActionConfiguration> {
+
+	/** list of the features to set */
+	// protected Map<String, FeatureValue> featuresToValues = null;
+	/** list of runtime defined features */
+	// protected Map<String, FeatureValue> featuresToRuntimeDefinitions = null;
+
+	/** list of static defined features */
+	protected Map<String, FeatureValue> featuresToStaticDefinitions = null;
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void init(SetValuesActionConfiguration configuration) {
+		// featuresToRuntimeDefinitions = new HashMap<String, FeatureValue>();
+		featuresToStaticDefinitions = new HashMap<String, FeatureValue>();
+		if (configuration == null) {
+			return;
+		}
+		for (FeatureToSet featureToSet : configuration.getFeaturesToSet()) {
+			featuresToStaticDefinitions.put(featureToSet.getFeatureName(), featureToSet.getValue());
+		}
+	}
+
+	/**
+	 * Default Constructor
+	 */
+	public SetValuesActionEditHelperAdvice() {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean approveRequest(IEditCommandRequest request) {
+		return super.approveRequest(request);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getBeforeCreateCommand(CreateElementRequest request) {
+		return super.getBeforeCreateCommand(request);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getAfterCreateCommand(CreateElementRequest request) {
+		return super.getAfterCreateCommand(request);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {
+		return super.getBeforeConfigureCommand(request);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getAfterConfigureCommand(ConfigureRequest request) {
+		ICommand resultCommand = null;
+
+		// retrieve eobject
+		EObject elementToConfigure = request.getElementToConfigure();
+		if (elementToConfigure == null) {
+			return null;
+		}
+		// retrieve edit service to get features from configure command
+		IElementEditService service = ElementEditServiceUtils.getCommandProvider(elementToConfigure);
+		if (service == null) {
+			Activator.log.error("Impossible to get edit service from element: " + elementToConfigure, null);
+			return null;
+		}
+
+		for (Entry<String, FeatureValue> featureEntry : featuresToStaticDefinitions.entrySet()) {
+			// retrieve feature value
+			ICommand command = getSetFeatureValueCommand(elementToConfigure, featureEntry.getKey(), featureEntry.getValue(), service, request);
+			if (command != null) {
+				if (resultCommand == null) {
+					resultCommand = command;
+				} else {
+					resultCommand = resultCommand.compose(command);
+				}
+			}
+		}
+
+		// if(!featuresToRuntimeDefinitions.isEmpty()) {
+		// ICommand command = getDynamicSetFeatureValueCommand(elementToConfigure, featuresToRuntimeDefinitions, service, request);
+		// if(command !=null) {
+		// if(resultCommand == null) {
+		// resultCommand = command;
+		// } else {
+		// resultCommand = resultCommand.compose(command);
+		// }
+		// }
+		// }
+
+
+		if (resultCommand != null) {
+			return resultCommand.reduce();
+		}
+
+
+		return super.getAfterConfigureCommand(request);
+	}
+
+
+	/**
+	 * @param elementToConfigure
+	 *            the eobject to configure
+	 * @param name
+	 *            the name of the feature to set
+	 * @param value
+	 *            the new value of the feature
+	 */
+	protected ICommand getSetFeatureValueCommand(EObject elementToConfigure, String name, FeatureValue featureValue, IElementEditService service, ConfigureRequest configureRequest) {
+		if (name == null) {
+			Activator.log.debug("No feature name has been set.");
+			return null;
+		}
+		if (elementToConfigure.eClass() == null) {
+			Activator.log.error("Impossible to find EClass from EObject: " + elementToConfigure, null);
+			return null;
+		}
+		// retrieve structural feature for the element to configure
+		EStructuralFeature feature = elementToConfigure.eClass().getEStructuralFeature(name);
+		if (feature == null) {
+			Activator.log.error("Impossible to find feature " + name + " for eobject " + elementToConfigure, null);
+			return null;
+		}
+		Object value = FeatureValueUtils.getValue(elementToConfigure, feature, featureValue);
+		SetRequest request = new SetRequest(elementToConfigure, feature, value);
+		// duplicate parameters from configure request?
+		request.addParameters(configureRequest.getParameters());
+		return service.getEditCommand(request);
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/.classpath b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/.classpath
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.classpath
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/.project b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.project
index 387caa58b2d..387caa58b2d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/.project
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.project
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/META-INF/MANIFEST.MF b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/META-INF/MANIFEST.MF
index 037db1e567c..f39408954dd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
  org.eclipse.gmf.runtime.common.ui.services;bundle-version="1.3.0",
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.extendedtypes.emf;bundle-version="1.2.0"
 Export-Package: org.eclipse.papyrus.infra.extendedtypes.internal.ui;x-internal:=true,
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/about.html b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/about.html
new file mode 100644
index 00000000000..d35d5aed64c
--- /dev/null
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.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/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/build.properties b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/build.properties
index 1995453f217..1995453f217 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/build.properties
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/build.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/icons/configuration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/icons/configuration.gif
index 0b1be97b8cf..0b1be97b8cf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/icons/configuration.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/icons/configuration.gif
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/error.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/icons/error.gif
index 9b048d60532..9b048d60532 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/icons/error.gif
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/icons/error.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/plugin.properties b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/plugin.properties
index c2430244dbb..c2430244dbb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/plugin.properties
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/plugin.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/plugin.xml b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/plugin.xml
index 4b17ab28cce..4b17ab28cce 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/plugin.xml
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/plugin.xml
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/pom.xml b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/pom.xml
index 6ade2bece4e..1c80d954045 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/pom.xml
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-xtypes</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.extendedtypes.ui</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/schema/extendedElementTypeActionProvider.exsd b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/schema/extendedElementTypeActionProvider.exsd
index 54f98fd52ff..54f98fd52ff 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/schema/extendedElementTypeActionProvider.exsd
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/schema/extendedElementTypeActionProvider.exsd
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/LogUtil.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/LogUtil.java
index f8c60c10ede..f8c60c10ede 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/LogUtil.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/LogUtil.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/UserExtendedTypesProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/UserExtendedTypesProvider.java
index d3cef4a6cf9..d3cef4a6cf9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/UserExtendedTypesProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/UserExtendedTypesProvider.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/advice/RuntimeValuesEditionActionConfigurationModelCreation.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/advice/RuntimeValuesEditionActionConfigurationModelCreation.java
index bb1504f8d86..b73840bec65 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/advice/RuntimeValuesEditionActionConfigurationModelCreation.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/advice/RuntimeValuesEditionActionConfigurationModelCreation.java
@@ -1,32 +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:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes.internal.ui.advice;

-

-import org.eclipse.papyrus.infra.extendedtypes.IActionConfigurationModelCreation;

-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationFactory;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;

-

-/**

- * {@link IActionConfigurationModelCreation} for {@link SetValuesActionConfiguration}

- */

-public class RuntimeValuesEditionActionConfigurationModelCreation implements IActionConfigurationModelCreation<RuntimeValuesEditionActionConfiguration> {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public RuntimeValuesEditionActionConfiguration createConfigurationModel() {

-		return RuntimeValuesEditionActionConfigurationFactory.eINSTANCE.createRuntimeValuesEditionActionConfiguration();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.internal.ui.advice;
+
+import org.eclipse.papyrus.infra.extendedtypes.IActionConfigurationModelCreation;
+import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationFactory;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;
+
+/**
+ * {@link IActionConfigurationModelCreation} for {@link SetValuesActionConfiguration}
+ */
+public class RuntimeValuesEditionActionConfigurationModelCreation implements IActionConfigurationModelCreation<RuntimeValuesEditionActionConfiguration> {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public RuntimeValuesEditionActionConfiguration createConfigurationModel() {
+		return RuntimeValuesEditionActionConfigurationFactory.eINSTANCE.createRuntimeValuesEditionActionConfiguration();
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/advice/RuntimeValuesEditionActionCreationElementValidator.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/advice/RuntimeValuesEditionActionCreationElementValidator.java
index 720166b8a16..5935078c353 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/advice/RuntimeValuesEditionActionCreationElementValidator.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/advice/RuntimeValuesEditionActionCreationElementValidator.java
@@ -1,40 +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:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes.internal.ui.advice;

-

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.extendedtypes.IActionCreationElementValidator;

-import org.eclipse.papyrus.infra.extendedtypes.ICreationElementValidator;

-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;

-

-/**

- * {@link ICreationElementValidator} for {@link SetValuesActionConfiguration}

- */

-public class RuntimeValuesEditionActionCreationElementValidator implements IActionCreationElementValidator<RuntimeValuesEditionActionConfiguration> {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean canCreate(CreateElementRequest request) {

-		return true;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void init(RuntimeValuesEditionActionConfiguration configuration) {

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.internal.ui.advice;
+
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.papyrus.infra.extendedtypes.IActionCreationElementValidator;
+import org.eclipse.papyrus.infra.extendedtypes.ICreationElementValidator;
+import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;
+
+/**
+ * {@link ICreationElementValidator} for {@link SetValuesActionConfiguration}
+ */
+public class RuntimeValuesEditionActionCreationElementValidator implements IActionCreationElementValidator<RuntimeValuesEditionActionConfiguration> {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean canCreate(CreateElementRequest request) {
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void init(RuntimeValuesEditionActionConfiguration configuration) {
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/advice/RuntimeValuesEditionActionEditHelperAdvice.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/advice/RuntimeValuesEditionActionEditHelperAdvice.java
index 68e45a6a6c6..bd4ee6fda36 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/advice/RuntimeValuesEditionActionEditHelperAdvice.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/advice/RuntimeValuesEditionActionEditHelperAdvice.java
@@ -34,7 +34,7 @@ import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactioncon
 import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay;
 import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;
 import org.eclipse.papyrus.infra.properties.contexts.View;
-import org.eclipse.papyrus.views.properties.creation.EditionDialog;
+import org.eclipse.papyrus.infra.properties.ui.creation.EditionDialog;
 import org.eclipse.swt.widgets.Display;
 
 /**
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/handlers/DeployExtendedTypeSetConfigurationHandler.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/handlers/DeployExtendedTypeSetConfigurationHandler.java
index 502e1d0b5cc..99ab5404eeb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/handlers/DeployExtendedTypeSetConfigurationHandler.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/handlers/DeployExtendedTypeSetConfigurationHandler.java
@@ -1,147 +1,147 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes.internal.ui.handlers;

-

-import java.util.Iterator;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.commands.IHandler;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.MultiStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.core.runtime.jobs.IJobChangeEvent;

-import org.eclipse.core.runtime.jobs.Job;

-import org.eclipse.core.runtime.jobs.JobChangeAdapter;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.extendedtypes.Activator;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSetRegistry;

-import org.eclipse.papyrus.infra.extendedtypes.internal.ui.preferences.ExtendedTypesPreferences;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.handlers.HandlerUtil;

-import org.eclipse.ui.statushandlers.StatusManager;

-

-

-/**

- * Handler to deploy new configuration

- */

-public class DeployExtendedTypeSetConfigurationHandler extends AbstractHandler implements IHandler {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);

-		if (!(currentSelection instanceof IStructuredSelection) || currentSelection.isEmpty()) {

-			return null;

-		}

-

-		final IStructuredSelection selection = (IStructuredSelection) currentSelection;

-

-		final Shell activeShell = HandlerUtil.getActiveShell(event);

-

-		Job job = new Job("Deploy extended type set configuration") {

-

-			@Override

-			protected IStatus run(IProgressMonitor monitor) {

-				monitor.beginTask("Deploying selected configurations", selection.size());

-

-				return doExecute(selection, monitor);

-			}

-		};

-

-		job.addJobChangeListener(new JobChangeAdapter() {

-

-			@Override

-			public void done(final IJobChangeEvent event) {

-				activeShell.getDisplay().asyncExec(new Runnable() {

-

-					public void run() {

-						if (event.getResult().isOK()) {

-							MessageDialog.openInformation(activeShell, "Success", event.getResult().getMessage());

-						} else if (event.getResult().getSeverity() < IStatus.ERROR) { // Errors are already logged

-							StatusManager.getManager().handle(event.getResult(), StatusManager.SHOW);

-						}

-					}

-				});

-			}

-		});

-

-		job.setUser(true);

-		job.schedule();

-

-		return null;

-	}

-

-	protected IStatus doExecute(IStructuredSelection selection, IProgressMonitor monitor) {

-		Iterator<?> selectionIterator = selection.iterator();

-

-		MultiStatus result = new MultiStatus(Activator.PLUGIN_ID, IStatus.OK, "The 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;

-				}

-

-

-				String fileName = selectedFile.getFullPath().removeFileExtension().lastSegment();

-				monitor.subTask("Deploy " + fileName);

-

-				URI emfURI = null;

-				if (selectedFile.getFullPath() != null) {

-					emfURI = URI.createPlatformResourceURI(selectedFile.getFullPath().toString(), true);

-				} else if (selectedFile.getRawLocation() != null) {

-					emfURI = URI.createFileURI(selectedFile.getRawLocation().toString());

-				}

-

-				if (emfURI == null) {

-					monitor.worked(1);

-					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a valid configuration file"));

-					continue;

-				}

-

-				ExtendedTypesPreferences.registerWorkspaceDefinition(fileName, selectedFile.getFullPath().toString());

-

-				monitor.subTask("Reset Element Types Registry");

-				ExtendedElementTypeSetRegistry.getInstance().loadExtendedElementTypeSet(fileName);

-				monitor.worked(1);

-

-				result.add(new Status(IStatus.OK, Activator.PLUGIN_ID, "The extended types configuration has been successfully deployed and activated"));

-			}

-		}

-

-		if (result.getChildren().length == 1) {

-			return result.getChildren()[0];

-		} else { // Merge the result and specify an appropriate message based on the result

-			if (result.isOK()) {

-				return result;

-			} else {

-				MultiStatus actualResult = new MultiStatus(Activator.PLUGIN_ID, result.getCode(), "Some errors occurred during the deployment", result.getException());

-				actualResult.merge(result);

-				return actualResult;

-			}

-		}

-	}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.internal.ui.handlers;
+
+import java.util.Iterator;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.IJobChangeEvent;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.jobs.JobChangeAdapter;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.extendedtypes.Activator;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSetRegistry;
+import org.eclipse.papyrus.infra.extendedtypes.internal.ui.preferences.ExtendedTypesPreferences;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.eclipse.ui.statushandlers.StatusManager;
+
+
+/**
+ * Handler to deploy new configuration
+ */
+public class DeployExtendedTypeSetConfigurationHandler extends AbstractHandler implements IHandler {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);
+		if (!(currentSelection instanceof IStructuredSelection) || currentSelection.isEmpty()) {
+			return null;
+		}
+
+		final IStructuredSelection selection = (IStructuredSelection) currentSelection;
+
+		final Shell activeShell = HandlerUtil.getActiveShell(event);
+
+		Job job = new Job("Deploy extended type set configuration") {
+
+			@Override
+			protected IStatus run(IProgressMonitor monitor) {
+				monitor.beginTask("Deploying selected configurations", selection.size());
+
+				return doExecute(selection, monitor);
+			}
+		};
+
+		job.addJobChangeListener(new JobChangeAdapter() {
+
+			@Override
+			public void done(final IJobChangeEvent event) {
+				activeShell.getDisplay().asyncExec(new Runnable() {
+
+					public void run() {
+						if (event.getResult().isOK()) {
+							MessageDialog.openInformation(activeShell, "Success", event.getResult().getMessage());
+						} else if (event.getResult().getSeverity() < IStatus.ERROR) { // Errors are already logged
+							StatusManager.getManager().handle(event.getResult(), StatusManager.SHOW);
+						}
+					}
+				});
+			}
+		});
+
+		job.setUser(true);
+		job.schedule();
+
+		return null;
+	}
+
+	protected IStatus doExecute(IStructuredSelection selection, IProgressMonitor monitor) {
+		Iterator<?> selectionIterator = selection.iterator();
+
+		MultiStatus result = new MultiStatus(Activator.PLUGIN_ID, IStatus.OK, "The 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;
+				}
+
+
+				String fileName = selectedFile.getFullPath().removeFileExtension().lastSegment();
+				monitor.subTask("Deploy " + fileName);
+
+				URI emfURI = null;
+				if (selectedFile.getFullPath() != null) {
+					emfURI = URI.createPlatformResourceURI(selectedFile.getFullPath().toString(), true);
+				} else if (selectedFile.getRawLocation() != null) {
+					emfURI = URI.createFileURI(selectedFile.getRawLocation().toString());
+				}
+
+				if (emfURI == null) {
+					monitor.worked(1);
+					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a valid configuration file"));
+					continue;
+				}
+
+				ExtendedTypesPreferences.registerWorkspaceDefinition(fileName, selectedFile.getFullPath().toString());
+
+				monitor.subTask("Reset Element Types Registry");
+				ExtendedElementTypeSetRegistry.getInstance().loadExtendedElementTypeSet(fileName);
+				monitor.worked(1);
+
+				result.add(new Status(IStatus.OK, Activator.PLUGIN_ID, "The extended types 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;
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/handlers/UndeployExtendedTypeSetConfigurationHandler.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/handlers/UndeployExtendedTypeSetConfigurationHandler.java
index efdaf143c40..84dd1297d29 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/handlers/UndeployExtendedTypeSetConfigurationHandler.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/handlers/UndeployExtendedTypeSetConfigurationHandler.java
@@ -1,148 +1,148 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes.internal.ui.handlers;

-

-import java.util.Iterator;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.MultiStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.core.runtime.jobs.IJobChangeEvent;

-import org.eclipse.core.runtime.jobs.Job;

-import org.eclipse.core.runtime.jobs.JobChangeAdapter;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.extendedtypes.Activator;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSetRegistry;

-import org.eclipse.papyrus.infra.extendedtypes.internal.ui.preferences.ExtendedTypesPreferences;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.handlers.HandlerUtil;

-import org.eclipse.ui.statushandlers.StatusManager;

-

-

-/**

- * @author RS211865

- */

-public class UndeployExtendedTypeSetConfigurationHandler extends AbstractHandler {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);

-		if (!(currentSelection instanceof IStructuredSelection) || currentSelection.isEmpty()) {

-			return null;

-		}

-

-		final IStructuredSelection selection = (IStructuredSelection) currentSelection;

-

-		final Shell activeShell = HandlerUtil.getActiveShell(event);

-

-		Job job = new Job("Undeploy extended type set configuration") {

-

-			@Override

-			protected IStatus run(IProgressMonitor monitor) {

-				monitor.beginTask("Undeploying selected configurations", selection.size());

-

-				return doExecute(selection, monitor);

-			}

-		};

-

-		job.addJobChangeListener(new JobChangeAdapter() {

-

-			@Override

-			public void done(final IJobChangeEvent event) {

-				activeShell.getDisplay().asyncExec(new Runnable() {

-

-					public void run() {

-						if (event.getResult().isOK()) {

-							MessageDialog.openInformation(activeShell, "Success", event.getResult().getMessage());

-						} else if (event.getResult().getSeverity() < IStatus.ERROR) { // Errors are already logged

-							StatusManager.getManager().handle(event.getResult(), StatusManager.SHOW);

-						}

-					}

-				});

-			}

-		});

-

-		job.setUser(true);

-		job.schedule();

-

-		return null;

-	}

-

-	protected IStatus doExecute(IStructuredSelection selection, IProgressMonitor monitor) {

-		Iterator<?> selectionIterator = selection.iterator();

-

-		MultiStatus result = new MultiStatus(Activator.PLUGIN_ID, IStatus.OK, "The extended types configuration has been successfully undeployed", null);

-

-		while (selectionIterator.hasNext()) {

-			Object selectedElement = selectionIterator.next();

-			if (selectedElement instanceof IAdaptable) {

-				IFile selectedFile = (IFile) ((IAdaptable) selectedElement).getAdapter(IFile.class);

-				if (selectedFile == null) {

-					monitor.worked(1);

-					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a file"));

-					continue;

-				}

-

-

-				String fileName = selectedFile.getFullPath().removeFileExtension().lastSegment();

-				monitor.subTask("Deploy " + fileName);

-

-				URI emfURI = null;

-				if (selectedFile.getFullPath() != null) {

-					emfURI = URI.createPlatformResourceURI(selectedFile.getFullPath().toString(), true);

-				} else if (selectedFile.getRawLocation() != null) {

-					emfURI = URI.createFileURI(selectedFile.getRawLocation().toString());

-				}

-

-				if (emfURI == null) {

-					monitor.worked(1);

-					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a valid configuration file"));

-					continue;

-				}

-

-				ExtendedTypesPreferences.unregisterWorkspaceDefinition(fileName);

-

-				monitor.subTask("Reset Element Types Registry");

-				ExtendedElementTypeSetRegistry.getInstance().unload(fileName);

-				monitor.worked(1);

-

-				// relaunch papyrus service

-

-				result.add(new Status(IStatus.OK, Activator.PLUGIN_ID, "The extended types configuration has been successfully undeployed"));

-			}

-		}

-

-		if (result.getChildren().length == 1) {

-			return result.getChildren()[0];

-		} else { // Merge the result and specify an appropriate message based on the result

-			if (result.isOK()) {

-				return result;

-			} else {

-				MultiStatus actualResult = new MultiStatus(Activator.PLUGIN_ID, result.getCode(), "Some errors occurred during the undeployment", result.getException());

-				actualResult.merge(result);

-				return actualResult;

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.internal.ui.handlers;
+
+import java.util.Iterator;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.IJobChangeEvent;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.jobs.JobChangeAdapter;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.extendedtypes.Activator;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSetRegistry;
+import org.eclipse.papyrus.infra.extendedtypes.internal.ui.preferences.ExtendedTypesPreferences;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.eclipse.ui.statushandlers.StatusManager;
+
+
+/**
+ * @author RS211865
+ */
+public class UndeployExtendedTypeSetConfigurationHandler extends AbstractHandler {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);
+		if (!(currentSelection instanceof IStructuredSelection) || currentSelection.isEmpty()) {
+			return null;
+		}
+
+		final IStructuredSelection selection = (IStructuredSelection) currentSelection;
+
+		final Shell activeShell = HandlerUtil.getActiveShell(event);
+
+		Job job = new Job("Undeploy extended type set configuration") {
+
+			@Override
+			protected IStatus run(IProgressMonitor monitor) {
+				monitor.beginTask("Undeploying selected configurations", selection.size());
+
+				return doExecute(selection, monitor);
+			}
+		};
+
+		job.addJobChangeListener(new JobChangeAdapter() {
+
+			@Override
+			public void done(final IJobChangeEvent event) {
+				activeShell.getDisplay().asyncExec(new Runnable() {
+
+					public void run() {
+						if (event.getResult().isOK()) {
+							MessageDialog.openInformation(activeShell, "Success", event.getResult().getMessage());
+						} else if (event.getResult().getSeverity() < IStatus.ERROR) { // Errors are already logged
+							StatusManager.getManager().handle(event.getResult(), StatusManager.SHOW);
+						}
+					}
+				});
+			}
+		});
+
+		job.setUser(true);
+		job.schedule();
+
+		return null;
+	}
+
+	protected IStatus doExecute(IStructuredSelection selection, IProgressMonitor monitor) {
+		Iterator<?> selectionIterator = selection.iterator();
+
+		MultiStatus result = new MultiStatus(Activator.PLUGIN_ID, IStatus.OK, "The extended types configuration has been successfully undeployed", null);
+
+		while (selectionIterator.hasNext()) {
+			Object selectedElement = selectionIterator.next();
+			if (selectedElement instanceof IAdaptable) {
+				IFile selectedFile = (IFile) ((IAdaptable) selectedElement).getAdapter(IFile.class);
+				if (selectedFile == null) {
+					monitor.worked(1);
+					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a file"));
+					continue;
+				}
+
+
+				String fileName = selectedFile.getFullPath().removeFileExtension().lastSegment();
+				monitor.subTask("Deploy " + fileName);
+
+				URI emfURI = null;
+				if (selectedFile.getFullPath() != null) {
+					emfURI = URI.createPlatformResourceURI(selectedFile.getFullPath().toString(), true);
+				} else if (selectedFile.getRawLocation() != null) {
+					emfURI = URI.createFileURI(selectedFile.getRawLocation().toString());
+				}
+
+				if (emfURI == null) {
+					monitor.worked(1);
+					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a valid configuration file"));
+					continue;
+				}
+
+				ExtendedTypesPreferences.unregisterWorkspaceDefinition(fileName);
+
+				monitor.subTask("Reset Element Types Registry");
+				ExtendedElementTypeSetRegistry.getInstance().unload(fileName);
+				monitor.worked(1);
+
+				// relaunch papyrus service
+
+				result.add(new Status(IStatus.OK, Activator.PLUGIN_ID, "The extended types configuration has been successfully undeployed"));
+			}
+		}
+
+		if (result.getChildren().length == 1) {
+			return result.getChildren()[0];
+		} else { // Merge the result and specify an appropriate message based on the result
+			if (result.isOK()) {
+				return result;
+			} else {
+				MultiStatus actualResult = new MultiStatus(Activator.PLUGIN_ID, result.getCode(), "Some errors occurred during the undeployment", result.getException());
+				actualResult.merge(result);
+				return actualResult;
+			}
+		}
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/preferences/ExtendedTypesPreferences.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/preferences/ExtendedTypesPreferences.java
index 24019b61961..eefd7b8f20e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/preferences/ExtendedTypesPreferences.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/preferences/ExtendedTypesPreferences.java
@@ -1,306 +1,306 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *  Christian W. Damus - bug 485220

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes.internal.ui.preferences;

-

-import java.io.IOException;

-import java.io.StringReader;

-import java.io.StringWriter;

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.preferences.InstanceScope;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.extendedtypes.internal.ui.LogUtil;

-import org.eclipse.ui.IMemento;

-import org.eclipse.ui.WorkbenchException;

-import org.eclipse.ui.XMLMemento;

-import org.eclipse.ui.preferences.ScopedPreferenceStore;

-

-/**

- * Preferences management for extended types

- */

-public class ExtendedTypesPreferences {

-

-	/** id for the preference store for extended types redefinitions */

-	public final static String EXTENDED_TYPES_REDEFINITIONS = "extendedTypesRedefinitions"; //$NON-NLS-1$

-

-	/** id for the node: extended types redefinition */

-	public final static String EXTENDED_TYPES_REDEFINITION = "extendedTypesRedefinition"; //$NON-NLS-1$

-

-	public static final String EXTENDED_TYPES_SET_WORKSPACE_DEFINITION = "extendedTypeSetsWorkspaceDefinition";

-

-	/** name of the ID attribute */

-	public final static String ID = "id"; //$NON-NLS-1$

-

-	/** name for the field giving the path to the XML file */

-	public final static String PATH = "path"; //$NON-NLS-1$

-

-	private static IPreferenceStore preferences;

-

-	/**

-	 * Returns the preference store used to store elementTypes preferences.

-	 *

-	 * @return the preference store of the plugin

-	 */

-	protected synchronized static IPreferenceStore getPreferenceStore() {

-		if (preferences == null) {

-			preferences = new ScopedPreferenceStore(InstanceScope.INSTANCE,

-					org.eclipse.papyrus.infra.extendedtypes.Activator.PLUGIN_ID);

-		}

-

-		return preferences;

-	}

-

-	/**

-	 * Retrieves the root memento from the plugin preferences for all extended types redefinition

-	 * redefinitions.

-	 *

-	 * @return the root memento if there were existing customizations, a newly created one otherwise (empty one)

-	 */

-	protected static XMLMemento getLocalRedefinitions() {

-		String sValue = getPreferenceStore().getString(EXTENDED_TYPES_REDEFINITIONS);

-		try {

-			if (sValue != null && !sValue.equals("")) { //$NON-NLS-1$

-				XMLMemento rootMemento = XMLMemento.createReadRoot(new StringReader(sValue));

-				return rootMemento;

-			} else {

-				return XMLMemento.createWriteRoot(EXTENDED_TYPES_REDEFINITIONS);

-			}

-		} catch (WorkbenchException e) {

-			LogUtil.LOG.error("Impossible to read preferences for extended types local redefinitions", e);

-		}

-		return null;

-	}

-

-	/**

-	 * Register a new local redefinition of a extendedTypes.

-	 *

-	 * @param extendedTypesID

-	 *            the id of the extendedTypes to register

-	 * @param path

-	 *            the path to the configuration of the extendedTypes

-	 * @return the memento that has been registered

-	 */

-	public static IMemento registerLocalRedefinition(String extendedTypesID, String path) {

-		XMLMemento rootMemento = getLocalRedefinitions();

-		// try to find an existing local definition for this extendedTypes

-		IMemento memento = getExtendedTypesRedefinitionNode(extendedTypesID);

-		// if one exists, remove it from the preferences

-		if (memento != null) {

-			unregisterLocalRedefinition(extendedTypesID);

-		}

-		// then register the new one

-		IMemento newMemento = rootMemento.createChild(EXTENDED_TYPES_REDEFINITION);

-		newMemento.putString(ID, extendedTypesID);

-		newMemento.putString(PATH, path);

-		saveLocalRedefinitions(rootMemento);

-		return newMemento;

-	}

-

-	/**

-	 * Returns the memento associated to the extendedTypes, or <code>null</code> if none exists

-	 *

-	 * @param extendedTypesID

-	 *            the identifier of the extendedTypes to find

-	 * @return the memento found or <code>null</code> if no customization exists for this extendedTypes

-	 */

-	private static IMemento getExtendedTypesRedefinitionNode(String extendedTypesID) {

-		XMLMemento rootMemento = getLocalRedefinitions();

-		IMemento[] redefinitions = rootMemento.getChildren(EXTENDED_TYPES_REDEFINITION);

-		for (IMemento redefinitionMemento : redefinitions) {

-			String extendedTypesNodeID = redefinitionMemento.getString(ID);

-			// check equals. extendedTypes ID is not null, as checked at the begining of the method.

-			if (extendedTypesID.equals(extendedTypesNodeID)) {

-				return redefinitionMemento;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the memento associated to the extendedTypes set definition in workspace, or <code>null</code> if none exists

-	 *

-	 * @return the memento found or <code>null</code> if no customization exists for this extendedTypes

-	 */

-	protected static IMemento[] getWorkspaceDefinitions() {

-		XMLMemento rootMemento = getLocalRedefinitions();

-		IMemento[] workspaceDefinitions = rootMemento.getChildren(EXTENDED_TYPES_SET_WORKSPACE_DEFINITION);

-		return workspaceDefinitions;

-	}

-

-	/**

-	 * Returns the memento associated to the extendedTypes set definition in workspace, or <code>null</code> if none exists

-	 *

-	 * @return the memento found or <code>null</code> if no customization exists for this extendedTypes

-	 */

-	protected static IMemento getWorkspaceDefinition(String extendedTypeSetsID) {

-		if (extendedTypeSetsID == null) {

-			return null;

-		}

-		IMemento[] workspaceDefinitions = getWorkspaceDefinitions();

-		if (workspaceDefinitions == null || workspaceDefinitions.length == 0) {

-			return null;

-		}

-		for (IMemento memento : workspaceDefinitions) {

-			String id = memento.getString(ID);

-			if (extendedTypeSetsID.equals(id)) {

-				return memento;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the path for a given extended type local redefinition

-	 *

-	 * @param extendedTypesID

-	 *            the unique identifier of the extended type to retrieve

-	 * @return the path to the configuration of the extended types or <code>null</code> if no customization exists for this extended type

-	 *         configuration

-	 */

-	public static String getExtendedTypesRedefinition(String extendedTypesID) {

-		if (extendedTypesID == null) {

-			LogUtil.LOG.debug("Trying to find preferences for a null extended type set identifier");

-		}

-		IMemento memento = getExtendedTypesRedefinitionNode(extendedTypesID);

-		if (memento != null) {

-			return memento.getString(PATH);

-		}

-		return null;

-	}

-

-	/**

-	 * Unregister a specific local redefinition

-	 *

-	 * @param extendedTypesID

-	 *            the identifier of the extended types set to unregister

-	 */

-	public static void unregisterLocalRedefinition(String extendedTypesID) {

-		XMLMemento rootMemento = getLocalRedefinitions();

-		// no remove method...

-		// so, creation of a new root memento, then, duplicate all entries

-		// except the one to

-		// delete...

-		XMLMemento newRootMemento = XMLMemento.createWriteRoot(EXTENDED_TYPES_REDEFINITIONS);

-		for (IMemento memento : rootMemento.getChildren(EXTENDED_TYPES_REDEFINITION)) {

-			if (!memento.getString(ID).equals(extendedTypesID)) {

-				newRootMemento.putMemento(memento);

-			}

-		}

-		for (IMemento memento : rootMemento.getChildren(EXTENDED_TYPES_SET_WORKSPACE_DEFINITION)) {

-			newRootMemento.putMemento(memento);

-		}

-		// save new Memento

-		saveLocalRedefinitions(newRootMemento);

-	}

-

-	/**

-	 * @param extendedTypesID

-	 */

-	public static void unregisterWorkspaceDefinition(String extendedTypesID) {

-		XMLMemento rootMemento = getLocalRedefinitions();

-		// no remove method...

-		// so, creation of a new root memento, then, duplicate all entries

-		// except the one to

-		// delete...

-		XMLMemento newRootMemento = XMLMemento.createWriteRoot(EXTENDED_TYPES_REDEFINITIONS);

-		for (IMemento memento : rootMemento.getChildren(EXTENDED_TYPES_REDEFINITION)) {

-			newRootMemento.putMemento(memento);

-		}

-		for (IMemento memento : rootMemento.getChildren(EXTENDED_TYPES_SET_WORKSPACE_DEFINITION)) {

-			if (!memento.getString(ID).equals(extendedTypesID)) {

-				newRootMemento.putMemento(memento);

-			}

-		}

-		// save new Memento

-		saveLocalRedefinitions(newRootMemento);

-	}

-

-	/**

-	 * saves the given root memento with the given key in the preference area

-	 *

-	 * @param xmlMemento

-	 *            the memento to save

-	 * @param key

-	 *            the key for the preference store

-	 */

-	private static void saveMemento(XMLMemento xmlMemento, String key) {

-		// save memento

-		StringWriter writer = new StringWriter();

-		try {

-			xmlMemento.save(writer);

-			if (getPreferenceStore() != null) {

-				getPreferenceStore().setValue(key, writer.toString());

-			}

-		} catch (IOException e) {

-			LogUtil.LOG.error("input/ouput exception", e);

-		}

-	}

-

-	/**

-	 * Saves the set of local redefinitions into the preference store

-	 *

-	 * @param rootMemento

-	 *            the memento to save

-	 */

-	public static void saveLocalRedefinitions(XMLMemento rootMemento) {

-		saveMemento(rootMemento, EXTENDED_TYPES_REDEFINITIONS);

-	}

-

-	/**

-	 * Returns all the paths in the workspace that should be an extended type set to load, with the id as a key

-	 *

-	 * @return

-	 */

-	public static Map<String, String> getLocalExtendedTypesDefinitions() {

-		IMemento[] mementos = getWorkspaceDefinitions();

-		if (mementos != null && mementos.length > 0) {

-			Map<String, String> idToPath = new HashMap<String, String>();

-			for (IMemento memento : mementos) {

-				String id = memento.getString(ID);

-				String path = memento.getString(PATH);

-				if (id != null && !"".equals(id) && path != null && !"".equals(PATH)) {

-					idToPath.put(id, path);

-				}

-			}

-			return idToPath;

-		}

-		return null;

-	}

-

-	/**

-	 * Register a new local redefinition of a extendedTypes.

-	 *

-	 * @param extendedTypesID

-	 *            the id of the extendedTypes to register

-	 * @param path

-	 *            the path to the configuration of the extendedTypes

-	 * @return the memento that has been registered

-	 */

-	public static IMemento registerWorkspaceDefinition(String extendedTypesID, String path) {

-		XMLMemento rootMemento = getLocalRedefinitions();

-		// try to find an existing local definition for this extendedTypes

-		IMemento memento = getWorkspaceDefinition(extendedTypesID);

-		// if one exists, remove it from the preferences

-		if (memento != null) {

-			unregisterWorkspaceDefinition(extendedTypesID);

-		}

-		// then register the new one

-		IMemento newMemento = rootMemento.createChild(EXTENDED_TYPES_SET_WORKSPACE_DEFINITION);

-		newMemento.putString(ID, extendedTypesID);

-		newMemento.putString(PATH, path);

-		saveLocalRedefinitions(rootMemento);

-		return newMemento;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.internal.ui.preferences;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.extendedtypes.internal.ui.LogUtil;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.WorkbenchException;
+import org.eclipse.ui.XMLMemento;
+import org.eclipse.ui.preferences.ScopedPreferenceStore;
+
+/**
+ * Preferences management for extended types
+ */
+public class ExtendedTypesPreferences {
+
+	/** id for the preference store for extended types redefinitions */
+	public final static String EXTENDED_TYPES_REDEFINITIONS = "extendedTypesRedefinitions"; //$NON-NLS-1$
+
+	/** id for the node: extended types redefinition */
+	public final static String EXTENDED_TYPES_REDEFINITION = "extendedTypesRedefinition"; //$NON-NLS-1$
+
+	public static final String EXTENDED_TYPES_SET_WORKSPACE_DEFINITION = "extendedTypeSetsWorkspaceDefinition";
+
+	/** name of the ID attribute */
+	public final static String ID = "id"; //$NON-NLS-1$
+
+	/** name for the field giving the path to the XML file */
+	public final static String PATH = "path"; //$NON-NLS-1$
+
+	private static IPreferenceStore preferences;
+
+	/**
+	 * Returns the preference store used to store elementTypes preferences.
+	 *
+	 * @return the preference store of the plugin
+	 */
+	protected synchronized static IPreferenceStore getPreferenceStore() {
+		if (preferences == null) {
+			preferences = new ScopedPreferenceStore(InstanceScope.INSTANCE,
+					org.eclipse.papyrus.infra.extendedtypes.Activator.PLUGIN_ID);
+		}
+
+		return preferences;
+	}
+
+	/**
+	 * Retrieves the root memento from the plugin preferences for all extended types redefinition
+	 * redefinitions.
+	 *
+	 * @return the root memento if there were existing customizations, a newly created one otherwise (empty one)
+	 */
+	protected static XMLMemento getLocalRedefinitions() {
+		String sValue = getPreferenceStore().getString(EXTENDED_TYPES_REDEFINITIONS);
+		try {
+			if (sValue != null && !sValue.equals("")) { //$NON-NLS-1$
+				XMLMemento rootMemento = XMLMemento.createReadRoot(new StringReader(sValue));
+				return rootMemento;
+			} else {
+				return XMLMemento.createWriteRoot(EXTENDED_TYPES_REDEFINITIONS);
+			}
+		} catch (WorkbenchException e) {
+			LogUtil.LOG.error("Impossible to read preferences for extended types local redefinitions", e);
+		}
+		return null;
+	}
+
+	/**
+	 * Register a new local redefinition of a extendedTypes.
+	 *
+	 * @param extendedTypesID
+	 *            the id of the extendedTypes to register
+	 * @param path
+	 *            the path to the configuration of the extendedTypes
+	 * @return the memento that has been registered
+	 */
+	public static IMemento registerLocalRedefinition(String extendedTypesID, String path) {
+		XMLMemento rootMemento = getLocalRedefinitions();
+		// try to find an existing local definition for this extendedTypes
+		IMemento memento = getExtendedTypesRedefinitionNode(extendedTypesID);
+		// if one exists, remove it from the preferences
+		if (memento != null) {
+			unregisterLocalRedefinition(extendedTypesID);
+		}
+		// then register the new one
+		IMemento newMemento = rootMemento.createChild(EXTENDED_TYPES_REDEFINITION);
+		newMemento.putString(ID, extendedTypesID);
+		newMemento.putString(PATH, path);
+		saveLocalRedefinitions(rootMemento);
+		return newMemento;
+	}
+
+	/**
+	 * Returns the memento associated to the extendedTypes, or <code>null</code> if none exists
+	 *
+	 * @param extendedTypesID
+	 *            the identifier of the extendedTypes to find
+	 * @return the memento found or <code>null</code> if no customization exists for this extendedTypes
+	 */
+	private static IMemento getExtendedTypesRedefinitionNode(String extendedTypesID) {
+		XMLMemento rootMemento = getLocalRedefinitions();
+		IMemento[] redefinitions = rootMemento.getChildren(EXTENDED_TYPES_REDEFINITION);
+		for (IMemento redefinitionMemento : redefinitions) {
+			String extendedTypesNodeID = redefinitionMemento.getString(ID);
+			// check equals. extendedTypes ID is not null, as checked at the begining of the method.
+			if (extendedTypesID.equals(extendedTypesNodeID)) {
+				return redefinitionMemento;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the memento associated to the extendedTypes set definition in workspace, or <code>null</code> if none exists
+	 *
+	 * @return the memento found or <code>null</code> if no customization exists for this extendedTypes
+	 */
+	protected static IMemento[] getWorkspaceDefinitions() {
+		XMLMemento rootMemento = getLocalRedefinitions();
+		IMemento[] workspaceDefinitions = rootMemento.getChildren(EXTENDED_TYPES_SET_WORKSPACE_DEFINITION);
+		return workspaceDefinitions;
+	}
+
+	/**
+	 * Returns the memento associated to the extendedTypes set definition in workspace, or <code>null</code> if none exists
+	 *
+	 * @return the memento found or <code>null</code> if no customization exists for this extendedTypes
+	 */
+	protected static IMemento getWorkspaceDefinition(String extendedTypeSetsID) {
+		if (extendedTypeSetsID == null) {
+			return null;
+		}
+		IMemento[] workspaceDefinitions = getWorkspaceDefinitions();
+		if (workspaceDefinitions == null || workspaceDefinitions.length == 0) {
+			return null;
+		}
+		for (IMemento memento : workspaceDefinitions) {
+			String id = memento.getString(ID);
+			if (extendedTypeSetsID.equals(id)) {
+				return memento;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the path for a given extended type local redefinition
+	 *
+	 * @param extendedTypesID
+	 *            the unique identifier of the extended type to retrieve
+	 * @return the path to the configuration of the extended types or <code>null</code> if no customization exists for this extended type
+	 *         configuration
+	 */
+	public static String getExtendedTypesRedefinition(String extendedTypesID) {
+		if (extendedTypesID == null) {
+			LogUtil.LOG.debug("Trying to find preferences for a null extended type set identifier");
+		}
+		IMemento memento = getExtendedTypesRedefinitionNode(extendedTypesID);
+		if (memento != null) {
+			return memento.getString(PATH);
+		}
+		return null;
+	}
+
+	/**
+	 * Unregister a specific local redefinition
+	 *
+	 * @param extendedTypesID
+	 *            the identifier of the extended types set to unregister
+	 */
+	public static void unregisterLocalRedefinition(String extendedTypesID) {
+		XMLMemento rootMemento = getLocalRedefinitions();
+		// no remove method...
+		// so, creation of a new root memento, then, duplicate all entries
+		// except the one to
+		// delete...
+		XMLMemento newRootMemento = XMLMemento.createWriteRoot(EXTENDED_TYPES_REDEFINITIONS);
+		for (IMemento memento : rootMemento.getChildren(EXTENDED_TYPES_REDEFINITION)) {
+			if (!memento.getString(ID).equals(extendedTypesID)) {
+				newRootMemento.putMemento(memento);
+			}
+		}
+		for (IMemento memento : rootMemento.getChildren(EXTENDED_TYPES_SET_WORKSPACE_DEFINITION)) {
+			newRootMemento.putMemento(memento);
+		}
+		// save new Memento
+		saveLocalRedefinitions(newRootMemento);
+	}
+
+	/**
+	 * @param extendedTypesID
+	 */
+	public static void unregisterWorkspaceDefinition(String extendedTypesID) {
+		XMLMemento rootMemento = getLocalRedefinitions();
+		// no remove method...
+		// so, creation of a new root memento, then, duplicate all entries
+		// except the one to
+		// delete...
+		XMLMemento newRootMemento = XMLMemento.createWriteRoot(EXTENDED_TYPES_REDEFINITIONS);
+		for (IMemento memento : rootMemento.getChildren(EXTENDED_TYPES_REDEFINITION)) {
+			newRootMemento.putMemento(memento);
+		}
+		for (IMemento memento : rootMemento.getChildren(EXTENDED_TYPES_SET_WORKSPACE_DEFINITION)) {
+			if (!memento.getString(ID).equals(extendedTypesID)) {
+				newRootMemento.putMemento(memento);
+			}
+		}
+		// save new Memento
+		saveLocalRedefinitions(newRootMemento);
+	}
+
+	/**
+	 * saves the given root memento with the given key in the preference area
+	 *
+	 * @param xmlMemento
+	 *            the memento to save
+	 * @param key
+	 *            the key for the preference store
+	 */
+	private static void saveMemento(XMLMemento xmlMemento, String key) {
+		// save memento
+		StringWriter writer = new StringWriter();
+		try {
+			xmlMemento.save(writer);
+			if (getPreferenceStore() != null) {
+				getPreferenceStore().setValue(key, writer.toString());
+			}
+		} catch (IOException e) {
+			LogUtil.LOG.error("input/ouput exception", e);
+		}
+	}
+
+	/**
+	 * Saves the set of local redefinitions into the preference store
+	 *
+	 * @param rootMemento
+	 *            the memento to save
+	 */
+	public static void saveLocalRedefinitions(XMLMemento rootMemento) {
+		saveMemento(rootMemento, EXTENDED_TYPES_REDEFINITIONS);
+	}
+
+	/**
+	 * Returns all the paths in the workspace that should be an extended type set to load, with the id as a key
+	 *
+	 * @return
+	 */
+	public static Map<String, String> getLocalExtendedTypesDefinitions() {
+		IMemento[] mementos = getWorkspaceDefinitions();
+		if (mementos != null && mementos.length > 0) {
+			Map<String, String> idToPath = new HashMap<String, String>();
+			for (IMemento memento : mementos) {
+				String id = memento.getString(ID);
+				String path = memento.getString(PATH);
+				if (id != null && !"".equals(id) && path != null && !"".equals(PATH)) {
+					idToPath.put(id, path);
+				}
+			}
+			return idToPath;
+		}
+		return null;
+	}
+
+	/**
+	 * Register a new local redefinition of a extendedTypes.
+	 *
+	 * @param extendedTypesID
+	 *            the id of the extendedTypes to register
+	 * @param path
+	 *            the path to the configuration of the extendedTypes
+	 * @return the memento that has been registered
+	 */
+	public static IMemento registerWorkspaceDefinition(String extendedTypesID, String path) {
+		XMLMemento rootMemento = getLocalRedefinitions();
+		// try to find an existing local definition for this extendedTypes
+		IMemento memento = getWorkspaceDefinition(extendedTypesID);
+		// if one exists, remove it from the preferences
+		if (memento != null) {
+			unregisterWorkspaceDefinition(extendedTypesID);
+		}
+		// then register the new one
+		IMemento newMemento = rootMemento.createChild(EXTENDED_TYPES_SET_WORKSPACE_DEFINITION);
+		newMemento.putString(ID, extendedTypesID);
+		newMemento.putString(PATH, path);
+		saveLocalRedefinitions(rootMemento);
+		return newMemento;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/ExtendedElementTypeActionService.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/ExtendedElementTypeActionService.java
index 76adba425eb..85dcdb77e92 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/ExtendedElementTypeActionService.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/ExtendedElementTypeActionService.java
@@ -1,201 +1,201 @@
-/*****************************************************************************

- * 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:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes.ui.providers;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy;

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.common.core.service.IProvider;

-import org.eclipse.gmf.runtime.common.core.service.Service;

-import org.eclipse.gmf.runtime.common.ui.services.util.ActivityFilterProviderDescriptor;

-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.Activator;

-

-

-/**

- * Service to retrieve the provider giving the command for a specific {@link ActionConfiguration}

- */

-public class ExtendedElementTypeActionService extends Service {

-

-	/** singleton instance of this service */

-	protected final static ExtendedElementTypeActionService instance = new ExtendedElementTypeActionService();

-

-	/**

-	 * initialize the service

-	 */

-	static {

-		instance.configureProviders(Activator.PLUGIN_ID, "extendedElementTypeActionProvider"); //$NON-NLS-1$

-	}

-

-	/**

-	 * Default constructor.

-	 */

-	protected ExtendedElementTypeActionService() {

-

-	}

-

-	/**

-	 * Returns the singleton instance of this service

-	 *

-	 * @return the singleton instance of this service

-	 */

-	synchronized public static ExtendedElementTypeActionService getInstance() {

-		return instance;

-	}

-

-	/**

-	 * @see org.eclipse.gmf.runtime.common.core.service.Service#newProviderDescriptor(org.eclipse.core.runtime.IConfigurationElement)

-	 */

-	@Override

-	protected Service.ProviderDescriptor newProviderDescriptor(IConfigurationElement element) {

-		return new ProviderDescriptor(element);

-	}

-

-	/**

-	 * Returns all providers in the service

-	 *

-	 * @return the list of providers found or an empty list.

-	 */

-	public List<IExtendedElementTypeActionProvider> getProviders() {

-		List<IExtendedElementTypeActionProvider> providers = new ArrayList<IExtendedElementTypeActionProvider>();

-		execute(ExecutionStrategy.REVERSE, new GetAllExtendedElementTypeActionProvidersOperation(providers));

-		return providers;

-	}

-

-	/**

-	 * Returns the provider with the given identifier

-	 *

-	 * @param actionConfiguration

-	 *            the actionConfiguration for the provider to retrieve

-	 * @return the provider found or <code>null</code>.

-	 */

-	public IExtendedElementTypeActionProvider getProvider(ActionConfiguration actionConfiguration) {

-		@SuppressWarnings({ "unchecked", "rawtypes" })

-		List<IExtendedElementTypeActionProvider> providers = execute(ExecutionStrategy.REVERSE, new GetExtendedElementTypeActionProviderOperation(actionConfiguration));

-		Iterator<IExtendedElementTypeActionProvider> it = providers.iterator();

-		while (it.hasNext()) {

-			IExtendedElementTypeActionProvider aspectActionProvider = it.next();

-			if (aspectActionProvider != null) {

-				return aspectActionProvider;

-			}

-		}

-		return null; // backward compatibility

-	}

-

-	/**

-	 * Returns the command for the given {@link ActionConfiguration}.

-	 *

-	 * @param elementsToEdit

-	 *            list of elements to edit

-	 *

-	 * @param configuration

-	 *            the configuration of the action

-	 * @return the {@link ICommand} configured by the parameter or <code>null</code>.

-	 * @throws ProviderNotFoundException

-	 *             exception thrown when the provider was not found for this configuration

-	 */

-	public ICommand getICommand(List<? extends Object> elementsToEdit, ActionConfiguration configuration) throws ProviderNotFoundException {

-		IExtendedElementTypeActionProvider provider = getProvider(configuration);

-		if (provider != null) {

-			return provider.getICommand(elementsToEdit, configuration);

-		}

-		throw new ProviderNotFoundException(configuration);

-	}

-

-	/**

-	 * Returns the command for the given {@link ActionConfiguration}.

-	 *

-	 * @param elementsToEdit

-	 *            list of elements to edit

-	 *

-	 * @param configuration

-	 *            the configuration of the action

-	 * @return the {@link ICommand} configured by the parameter or <code>null</code>.

-	 * @throws ProviderNotFoundException

-	 *             exception thrown when the provider was not found for this configuration

-	 */

-	public ICommand getPreValidationCommand(List<? extends Object> elementsToEdit, ActionConfiguration configuration) throws ProviderNotFoundException {

-		IExtendedElementTypeActionProvider provider = getProvider(configuration);

-		if (provider != null) {

-			return provider.getBeforeCreateValidationCommand(elementsToEdit, configuration);

-		}

-		throw new ProviderNotFoundException(configuration);

-	}

-

-	/**

-	 * A descriptor for aspect tool providers defined by a configuration element.

-	 */

-	protected static class ProviderDescriptor extends ActivityFilterProviderDescriptor {

-

-		/** the provider configuration parsed from XML */

-		protected ExtentedElementTypeActionProviderConfiguration providerConfiguration;

-

-		/**

-		 * Constructs a <code>ISemanticProvider</code> descriptor for

-		 * the specified configuration element.

-		 *

-		 * @param element

-		 *            The configuration element describing the provider.

-		 */

-		public ProviderDescriptor(IConfigurationElement element) {

-			super(element);

-			this.providerConfiguration = ExtentedElementTypeActionProviderConfiguration.parse(element);

-			Assert.isNotNull(providerConfiguration);

-		}

-

-		/**

-		 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)

-		 */

-		@Override

-		public boolean provides(IOperation operation) {

-			if (!super.provides(operation)) {

-				return false;

-			}

-			if (operation instanceof GetAllExtendedElementTypeActionProvidersOperation) {

-				return true;

-			}

-			if (operation instanceof GetExtendedElementTypeActionProviderOperation) {

-				String providerConfigurationClassName = providerConfiguration.getConfigurationClassName();

-				if (providerConfigurationClassName == null) {

-					Activator.log.error("Error during the parsing of the action configuration extension point", null);

-					return false;

-				}

-				String configurationClassName = ((GetExtendedElementTypeActionProviderOperation) operation).getActionConfiguration().eClass().getInstanceClassName();

-				return providerConfigurationClassName.equals(configurationClassName);

-			}

-			return false;

-		}

-

-		/**

-		 * @see org.eclipse.gmf.runtime.common.core.service.Service.ProviderDescriptor#getProvider()

-		 */

-		@Override

-		public IProvider getProvider() {

-			if (provider == null) {

-				IProvider newProvider = super.getProvider();

-				if (provider instanceof IExtendedElementTypeActionProvider) {

-					IExtendedElementTypeActionProvider defaultProvider = (IExtendedElementTypeActionProvider) newProvider;

-					defaultProvider.setConfiguration(getElement());

-				}

-				return newProvider;

-			}

-			return super.getProvider();

-		}

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.ui.providers;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy;
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.common.core.service.IProvider;
+import org.eclipse.gmf.runtime.common.core.service.Service;
+import org.eclipse.gmf.runtime.common.ui.services.util.ActivityFilterProviderDescriptor;
+import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.Activator;
+
+
+/**
+ * Service to retrieve the provider giving the command for a specific {@link ActionConfiguration}
+ */
+public class ExtendedElementTypeActionService extends Service {
+
+	/** singleton instance of this service */
+	protected final static ExtendedElementTypeActionService instance = new ExtendedElementTypeActionService();
+
+	/**
+	 * initialize the service
+	 */
+	static {
+		instance.configureProviders(Activator.PLUGIN_ID, "extendedElementTypeActionProvider"); //$NON-NLS-1$
+	}
+
+	/**
+	 * Default constructor.
+	 */
+	protected ExtendedElementTypeActionService() {
+
+	}
+
+	/**
+	 * Returns the singleton instance of this service
+	 *
+	 * @return the singleton instance of this service
+	 */
+	synchronized public static ExtendedElementTypeActionService getInstance() {
+		return instance;
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.common.core.service.Service#newProviderDescriptor(org.eclipse.core.runtime.IConfigurationElement)
+	 */
+	@Override
+	protected Service.ProviderDescriptor newProviderDescriptor(IConfigurationElement element) {
+		return new ProviderDescriptor(element);
+	}
+
+	/**
+	 * Returns all providers in the service
+	 *
+	 * @return the list of providers found or an empty list.
+	 */
+	public List<IExtendedElementTypeActionProvider> getProviders() {
+		List<IExtendedElementTypeActionProvider> providers = new ArrayList<IExtendedElementTypeActionProvider>();
+		execute(ExecutionStrategy.REVERSE, new GetAllExtendedElementTypeActionProvidersOperation(providers));
+		return providers;
+	}
+
+	/**
+	 * Returns the provider with the given identifier
+	 *
+	 * @param actionConfiguration
+	 *            the actionConfiguration for the provider to retrieve
+	 * @return the provider found or <code>null</code>.
+	 */
+	public IExtendedElementTypeActionProvider getProvider(ActionConfiguration actionConfiguration) {
+		@SuppressWarnings({ "unchecked", "rawtypes" })
+		List<IExtendedElementTypeActionProvider> providers = execute(ExecutionStrategy.REVERSE, new GetExtendedElementTypeActionProviderOperation(actionConfiguration));
+		Iterator<IExtendedElementTypeActionProvider> it = providers.iterator();
+		while (it.hasNext()) {
+			IExtendedElementTypeActionProvider aspectActionProvider = it.next();
+			if (aspectActionProvider != null) {
+				return aspectActionProvider;
+			}
+		}
+		return null; // backward compatibility
+	}
+
+	/**
+	 * Returns the command for the given {@link ActionConfiguration}.
+	 *
+	 * @param elementsToEdit
+	 *            list of elements to edit
+	 *
+	 * @param configuration
+	 *            the configuration of the action
+	 * @return the {@link ICommand} configured by the parameter or <code>null</code>.
+	 * @throws ProviderNotFoundException
+	 *             exception thrown when the provider was not found for this configuration
+	 */
+	public ICommand getICommand(List<? extends Object> elementsToEdit, ActionConfiguration configuration) throws ProviderNotFoundException {
+		IExtendedElementTypeActionProvider provider = getProvider(configuration);
+		if (provider != null) {
+			return provider.getICommand(elementsToEdit, configuration);
+		}
+		throw new ProviderNotFoundException(configuration);
+	}
+
+	/**
+	 * Returns the command for the given {@link ActionConfiguration}.
+	 *
+	 * @param elementsToEdit
+	 *            list of elements to edit
+	 *
+	 * @param configuration
+	 *            the configuration of the action
+	 * @return the {@link ICommand} configured by the parameter or <code>null</code>.
+	 * @throws ProviderNotFoundException
+	 *             exception thrown when the provider was not found for this configuration
+	 */
+	public ICommand getPreValidationCommand(List<? extends Object> elementsToEdit, ActionConfiguration configuration) throws ProviderNotFoundException {
+		IExtendedElementTypeActionProvider provider = getProvider(configuration);
+		if (provider != null) {
+			return provider.getBeforeCreateValidationCommand(elementsToEdit, configuration);
+		}
+		throw new ProviderNotFoundException(configuration);
+	}
+
+	/**
+	 * A descriptor for aspect tool providers defined by a configuration element.
+	 */
+	protected static class ProviderDescriptor extends ActivityFilterProviderDescriptor {
+
+		/** the provider configuration parsed from XML */
+		protected ExtentedElementTypeActionProviderConfiguration providerConfiguration;
+
+		/**
+		 * Constructs a <code>ISemanticProvider</code> descriptor for
+		 * the specified configuration element.
+		 *
+		 * @param element
+		 *            The configuration element describing the provider.
+		 */
+		public ProviderDescriptor(IConfigurationElement element) {
+			super(element);
+			this.providerConfiguration = ExtentedElementTypeActionProviderConfiguration.parse(element);
+			Assert.isNotNull(providerConfiguration);
+		}
+
+		/**
+		 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
+		 */
+		@Override
+		public boolean provides(IOperation operation) {
+			if (!super.provides(operation)) {
+				return false;
+			}
+			if (operation instanceof GetAllExtendedElementTypeActionProvidersOperation) {
+				return true;
+			}
+			if (operation instanceof GetExtendedElementTypeActionProviderOperation) {
+				String providerConfigurationClassName = providerConfiguration.getConfigurationClassName();
+				if (providerConfigurationClassName == null) {
+					Activator.log.error("Error during the parsing of the action configuration extension point", null);
+					return false;
+				}
+				String configurationClassName = ((GetExtendedElementTypeActionProviderOperation) operation).getActionConfiguration().eClass().getInstanceClassName();
+				return providerConfigurationClassName.equals(configurationClassName);
+			}
+			return false;
+		}
+
+		/**
+		 * @see org.eclipse.gmf.runtime.common.core.service.Service.ProviderDescriptor#getProvider()
+		 */
+		@Override
+		public IProvider getProvider() {
+			if (provider == null) {
+				IProvider newProvider = super.getProvider();
+				if (provider instanceof IExtendedElementTypeActionProvider) {
+					IExtendedElementTypeActionProvider defaultProvider = (IExtendedElementTypeActionProvider) newProvider;
+					defaultProvider.setConfiguration(getElement());
+				}
+				return newProvider;
+			}
+			return super.getProvider();
+		}
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/ExtentedElementTypeActionProviderConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/ExtentedElementTypeActionProviderConfiguration.java
index 0ead8f19736..752c6201469 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/ExtentedElementTypeActionProviderConfiguration.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/ExtentedElementTypeActionProviderConfiguration.java
@@ -1,82 +1,82 @@
-/*****************************************************************************

- * 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:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes.ui.providers;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.gmf.runtime.common.core.service.AbstractProviderConfiguration;

-

-/**

- * Provider configuration for the aspect tool factory extension point.

- */

-public class ExtentedElementTypeActionProviderConfiguration extends AbstractProviderConfiguration {

-

-	/** field for provider class name */

-	protected static final String CLASS = "class";

-

-	/** field for configuration class name */

-	private static final String CONFIGURATION_CLASS = "configurationClass";

-

-	/** class name of the provider */

-	protected final String className;

-

-	/** class name of the configuration */

-	private final String configurationClassName;

-

-	/**

-	 * Creates and builds a new provider contribution descriptor by parsing its configuration element.

-	 *

-	 * @param configElement

-	 *            A provider XML configuration element

-	 * @return A provider XML contribution descriptor

-	 */

-	public static ExtentedElementTypeActionProviderConfiguration parse(IConfigurationElement configElement) {

-		Assert.isNotNull(configElement, "null provider configuration element"); //$NON-NLS-1$

-		return new ExtentedElementTypeActionProviderConfiguration(configElement);

-	}

-

-	/**

-	 * Creates a new <code>ProviderContributionDescriptor</code> instance

-	 * by parsing its configuration element.

-	 *

-	 * @param configElement

-	 *            The provider XML configuration element

-	 */

-	protected ExtentedElementTypeActionProviderConfiguration(IConfigurationElement configElement) {

-		// retrieve only ID, to test if the factory is the right one before creating whole element

-		className = configElement.getAttribute(CLASS);

-		Assert.isNotNull(className, "impossible to get the class name for the provider");

-

-		configurationClassName = configElement.getAttribute(CONFIGURATION_CLASS);

-		Assert.isNotNull(className, "impossible to get the class name for the provider");

-	}

-

-

-	/**

-	 * Returns the class name of the provider configured by this configuration

-	 *

-	 * @return the id of the factory

-	 */

-	public String getClassName() {

-		return className;

-	}

-

-	/**

-	 * Name of the configuration class

-	 *

-	 * @return the configuration Class Name

-	 */

-	public String getConfigurationClassName() {

-		return configurationClassName;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.ui.providers;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.gmf.runtime.common.core.service.AbstractProviderConfiguration;
+
+/**
+ * Provider configuration for the aspect tool factory extension point.
+ */
+public class ExtentedElementTypeActionProviderConfiguration extends AbstractProviderConfiguration {
+
+	/** field for provider class name */
+	protected static final String CLASS = "class";
+
+	/** field for configuration class name */
+	private static final String CONFIGURATION_CLASS = "configurationClass";
+
+	/** class name of the provider */
+	protected final String className;
+
+	/** class name of the configuration */
+	private final String configurationClassName;
+
+	/**
+	 * Creates and builds a new provider contribution descriptor by parsing its configuration element.
+	 *
+	 * @param configElement
+	 *            A provider XML configuration element
+	 * @return A provider XML contribution descriptor
+	 */
+	public static ExtentedElementTypeActionProviderConfiguration parse(IConfigurationElement configElement) {
+		Assert.isNotNull(configElement, "null provider configuration element"); //$NON-NLS-1$
+		return new ExtentedElementTypeActionProviderConfiguration(configElement);
+	}
+
+	/**
+	 * Creates a new <code>ProviderContributionDescriptor</code> instance
+	 * by parsing its configuration element.
+	 *
+	 * @param configElement
+	 *            The provider XML configuration element
+	 */
+	protected ExtentedElementTypeActionProviderConfiguration(IConfigurationElement configElement) {
+		// retrieve only ID, to test if the factory is the right one before creating whole element
+		className = configElement.getAttribute(CLASS);
+		Assert.isNotNull(className, "impossible to get the class name for the provider");
+
+		configurationClassName = configElement.getAttribute(CONFIGURATION_CLASS);
+		Assert.isNotNull(className, "impossible to get the class name for the provider");
+	}
+
+
+	/**
+	 * Returns the class name of the provider configured by this configuration
+	 *
+	 * @return the id of the factory
+	 */
+	public String getClassName() {
+		return className;
+	}
+
+	/**
+	 * Name of the configuration class
+	 *
+	 * @return the configuration Class Name
+	 */
+	public String getConfigurationClassName() {
+		return configurationClassName;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/GetAllExtendedElementTypeActionProvidersOperation.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/GetAllExtendedElementTypeActionProvidersOperation.java
index 1d2a6ef5297..d337ddb5497 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/GetAllExtendedElementTypeActionProvidersOperation.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/GetAllExtendedElementTypeActionProvidersOperation.java
@@ -1,48 +1,48 @@
-/*****************************************************************************

- * 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:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes.ui.providers;

-

-import java.util.List;

-

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.common.core.service.IProvider;

-

-

-/**

- * Operation that returns all providers for the {@link ExtendedElementTypeActionService}.

- */

-public class GetAllExtendedElementTypeActionProvidersOperation implements IOperation {

-

-	/** list of providers to fill */

-	private final List<IExtendedElementTypeActionProvider> providers;

-

-	/**

-	 * Creates a new GetAllExtendedElementTypeActionProvidersOperation.

-	 *

-	 * @param providers

-	 *            the list of providers to fill

-	 */

-	public GetAllExtendedElementTypeActionProvidersOperation(List<IExtendedElementTypeActionProvider> providers) {

-		this.providers = providers;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Object execute(IProvider provider) {

-		if (provider instanceof IExtendedElementTypeActionProvider) {

-			providers.add((IExtendedElementTypeActionProvider) provider);

-		}

-		return providers;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.ui.providers;
+
+import java.util.List;
+
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.common.core.service.IProvider;
+
+
+/**
+ * Operation that returns all providers for the {@link ExtendedElementTypeActionService}.
+ */
+public class GetAllExtendedElementTypeActionProvidersOperation implements IOperation {
+
+	/** list of providers to fill */
+	private final List<IExtendedElementTypeActionProvider> providers;
+
+	/**
+	 * Creates a new GetAllExtendedElementTypeActionProvidersOperation.
+	 *
+	 * @param providers
+	 *            the list of providers to fill
+	 */
+	public GetAllExtendedElementTypeActionProvidersOperation(List<IExtendedElementTypeActionProvider> providers) {
+		this.providers = providers;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public Object execute(IProvider provider) {
+		if (provider instanceof IExtendedElementTypeActionProvider) {
+			providers.add((IExtendedElementTypeActionProvider) provider);
+		}
+		return providers;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/GetExtendedElementTypeActionProviderOperation.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/GetExtendedElementTypeActionProviderOperation.java
index 8345661b35f..96c66787d69 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/GetExtendedElementTypeActionProviderOperation.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/GetExtendedElementTypeActionProviderOperation.java
@@ -1,53 +1,53 @@
-/*****************************************************************************

- * 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:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes.ui.providers;

-

-import org.eclipse.gmf.runtime.common.core.service.IOperation;

-import org.eclipse.gmf.runtime.common.core.service.IProvider;

-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;

-

-

-/**

- * Operation that returns the first provider with given id

- */

-public class GetExtendedElementTypeActionProviderOperation implements IOperation {

-

-	/** action configuration for the provider to find */

-	private final ActionConfiguration actionConfiguration;

-

-	/**

-	 * Creates a new {@link GetExtendedElementTypeActionProviderOperation}.

-	 *

-	 * @param actionConfiguration

-	 *            action configuration for the provider to find

-	 */

-	public GetExtendedElementTypeActionProviderOperation(ActionConfiguration actionConfiguration) {

-		this.actionConfiguration = actionConfiguration;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Object execute(IProvider provider) {

-		return provider;

-	}

-

-	/**

-	 * Returns the action configuration for this operation

-	 *

-	 * @return the action configuration for this operation

-	 */

-	public ActionConfiguration getActionConfiguration() {

-		return actionConfiguration;

-	}

-

-}

+/*****************************************************************************
+ * 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:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.ui.providers;
+
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.common.core.service.IProvider;
+import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;
+
+
+/**
+ * Operation that returns the first provider with given id
+ */
+public class GetExtendedElementTypeActionProviderOperation implements IOperation {
+
+	/** action configuration for the provider to find */
+	private final ActionConfiguration actionConfiguration;
+
+	/**
+	 * Creates a new {@link GetExtendedElementTypeActionProviderOperation}.
+	 *
+	 * @param actionConfiguration
+	 *            action configuration for the provider to find
+	 */
+	public GetExtendedElementTypeActionProviderOperation(ActionConfiguration actionConfiguration) {
+		this.actionConfiguration = actionConfiguration;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public Object execute(IProvider provider) {
+		return provider;
+	}
+
+	/**
+	 * Returns the action configuration for this operation
+	 *
+	 * @return the action configuration for this operation
+	 */
+	public ActionConfiguration getActionConfiguration() {
+		return actionConfiguration;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/IExtendedElementTypeActionProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/IExtendedElementTypeActionProvider.java
index 0fdaf5162f2..3f835e93559 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/IExtendedElementTypeActionProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/IExtendedElementTypeActionProvider.java
@@ -1,61 +1,61 @@
-/*****************************************************************************

- * 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:

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes.ui.providers;

-

-import java.util.List;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.service.IProvider;

-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;

-

-

-/**

- * Provider for extended element types action

- */

-public interface IExtendedElementTypeActionProvider extends IProvider {

-

-	/**

-	 * Returns the command to execute for the given configuration

-	 *

-	 * @param elementsToEdit

-	 *            list of elements to edit

-	 *

-	 * @param configuration

-	 *            the configuration for the command

-	 *

-	 * @return the command to execute for the given configuration

-	 */

-	public ICommand getICommand(List<? extends Object> elementsToEdit, ActionConfiguration configuration);

-

-	/**

-	 * Returns the command to execute for the given configuration to check if it will be executable

-	 *

-	 * @param elementsToEdit

-	 *            list of elements to edit

-	 *

-	 * @param configuration

-	 *            the configuration for the command

-	 *

-	 * @return the command to execute for the given configuration. should do nothing on the model (either null or identity command), only return an

-	 *         Unexecutable command if creation is not allowed

-	 */

-	public ICommand getBeforeCreateValidationCommand(List<? extends Object> elementsToEdit, ActionConfiguration configuration);

-

-	/**

-	 * Sets the configuration for this provider, given the configuration element

-	 *

-	 * @param element

-	 *            the element that configures this provider

-	 */

-	public void setConfiguration(IConfigurationElement element);

-}

+/*****************************************************************************
+ * 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:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.ui.providers;
+
+import java.util.List;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.core.service.IProvider;
+import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;
+
+
+/**
+ * Provider for extended element types action
+ */
+public interface IExtendedElementTypeActionProvider extends IProvider {
+
+	/**
+	 * Returns the command to execute for the given configuration
+	 *
+	 * @param elementsToEdit
+	 *            list of elements to edit
+	 *
+	 * @param configuration
+	 *            the configuration for the command
+	 *
+	 * @return the command to execute for the given configuration
+	 */
+	public ICommand getICommand(List<? extends Object> elementsToEdit, ActionConfiguration configuration);
+
+	/**
+	 * Returns the command to execute for the given configuration to check if it will be executable
+	 *
+	 * @param elementsToEdit
+	 *            list of elements to edit
+	 *
+	 * @param configuration
+	 *            the configuration for the command
+	 *
+	 * @return the command to execute for the given configuration. should do nothing on the model (either null or identity command), only return an
+	 *         Unexecutable command if creation is not allowed
+	 */
+	public ICommand getBeforeCreateValidationCommand(List<? extends Object> elementsToEdit, ActionConfiguration configuration);
+
+	/**
+	 * Sets the configuration for this provider, given the configuration element
+	 *
+	 * @param element
+	 *            the element that configures this provider
+	 */
+	public void setConfiguration(IConfigurationElement element);
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/ProviderNotFoundException.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/ProviderNotFoundException.java
index 5d3657a2b55..5d3657a2b55 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/ProviderNotFoundException.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/ProviderNotFoundException.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/.classpath b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.classpath
index 50aae142c50..50aae142c50 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/.classpath
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.classpath
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/.project b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.project
index e9351f0b98e..6276e028691 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/.project
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.extendedtypes</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>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.extendedtypes</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/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.core.resources.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.core.resources.prefs
index b9eceea0c66..9743ce0e106 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,4 @@
-#Thu Mar 24 15:06:10 CET 2011

-eclipse.preferences.version=1

-encoding//model/ExtendedTypes.ecore=UTF-8

-encoding//model/ExtendedTypes.ecorediag=UTF-8

+#Thu Mar 24 15:06:10 CET 2011
+eclipse.preferences.version=1
+encoding//model/ExtendedTypes.ecore=UTF-8
+encoding//model/ExtendedTypes.ecorediag=UTF-8
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..b3aa6d60f94
--- /dev/null
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF
index 7d4781596c9..c27591ff9a9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF
@@ -1,30 +1,30 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.infra.extendedtypes,

- org.eclipse.papyrus.infra.extendedtypes.advices,

- org.eclipse.papyrus.infra.extendedtypes.impl,

- org.eclipse.papyrus.infra.extendedtypes.internal.spi;x-friends:="org.eclipse.papyrus.infra.extendedtypes.ui",

- org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration,

- org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl,

- org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.util,

- org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration,

- org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl,

- org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.util,

- org.eclipse.papyrus.infra.extendedtypes.semantic,

- org.eclipse.papyrus.infra.extendedtypes.types,

- org.eclipse.papyrus.infra.extendedtypes.util

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.extendedtypes;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0"
+Export-Package: org.eclipse.papyrus.infra.extendedtypes,
+ org.eclipse.papyrus.infra.extendedtypes.advices,
+ org.eclipse.papyrus.infra.extendedtypes.impl,
+ org.eclipse.papyrus.infra.extendedtypes.internal.spi;x-friends:="org.eclipse.papyrus.infra.extendedtypes.ui",
+ org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration,
+ org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl,
+ org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.util,
+ org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration,
+ org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl,
+ org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.util,
+ org.eclipse.papyrus.infra.extendedtypes.semantic,
+ org.eclipse.papyrus.infra.extendedtypes.types,
+ org.eclipse.papyrus.infra.extendedtypes.util
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.extendedtypes;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/about.html b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/about.html
new file mode 100644
index 00000000000..d35d5aed64c
--- /dev/null
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/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.extendedtypes/build.properties b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/build.properties
index 9e8f4164078..9e8f4164078 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/build.properties
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/build.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore
index 632a12059d0..b3605b58449 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore
@@ -1,64 +1,64 @@
-<?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="extendedtypes" nsURI="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"

-    nsPrefix="extendedtypes">

-  <eClassifiers xsi:type="ecore:EClass" name="ExtendedElementTypeSet" eSuperTypes="#//ConfigurationElement">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="elementType" lowerBound="1"

-        upperBound="-1" eType="#//ElementTypeConfiguration" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="extensible" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ElementTypeConfiguration" abstract="true"

-      eSuperTypes="#//ConfigurationElement">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hint" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"

-        defaultValueLiteral="ExtendedElements"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kindName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"

-        defaultValueLiteral="org.eclipse.gmf.runtime.emf.type.core.IHintedType"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="specializedTypesID" lowerBound="1"

-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="matcherConfiguration" eType="#//MatcherConfiguration"

-        containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="IconEntry">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bundleId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ConfigurationElement" abstract="true">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"

-        eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="iconEntry" eType="#//IconEntry"

-        containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="MatcherConfiguration" abstract="true"/>

-  <eClassifiers xsi:type="ecore:EClass" name="ActionConfiguration" abstract="true"

-      eSuperTypes="#//ConfigurationElement"/>

-  <eClassifiers xsi:type="ecore:EClass" name="ViewActionConfiguration" abstract="true"

-      eSuperTypes="#//ActionConfiguration"/>

-  <eClassifiers xsi:type="ecore:EClass" name="SemanticActionConfiguration" abstract="true"

-      eSuperTypes="#//ActionConfiguration"/>

-  <eClassifiers xsi:type="ecore:EClass" name="SemanticTypeConfiguration" abstract="true"

-      eSuperTypes="#//ElementTypeConfiguration">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="Configuration specific to element types registered to manipulate Domain Specific elements."/>

-    </eAnnotations>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ViewTypeConfiguration" abstract="true"

-      eSuperTypes="#//ElementTypeConfiguration">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="Configuration specific to element types registered to manipulate graphical elements in GMF diagrams"/>

-    </eAnnotations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="specializedDiagramTypeID"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ElementTypeAdviceConfiguration" abstract="true"

-      eSuperTypes="#//ConfigurationElement"/>

-  <eClassifiers xsi:type="ecore:EClass" name="AspectSemanticTypeConfiguration" eSuperTypes="#//SemanticTypeConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="actionConfiguration" upperBound="-1"

-        eType="#//SemanticActionConfiguration" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="AspectViewTypeConfiguration" eSuperTypes="#//ViewTypeConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="actionConfiguration" upperBound="-1"

-        eType="#//ViewActionConfiguration" containment="true"/>

-  </eClassifiers>

-</ecore:EPackage>

+<?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="extendedtypes" nsURI="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"
+    nsPrefix="extendedtypes">
+  <eClassifiers xsi:type="ecore:EClass" name="ExtendedElementTypeSet" eSuperTypes="#//ConfigurationElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="elementType" lowerBound="1"
+        upperBound="-1" eType="#//ElementTypeConfiguration" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="extensible" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ElementTypeConfiguration" abstract="true"
+      eSuperTypes="#//ConfigurationElement">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hint" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        defaultValueLiteral="ExtendedElements"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kindName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        defaultValueLiteral="org.eclipse.gmf.runtime.emf.type.core.IHintedType"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="specializedTypesID" lowerBound="1"
+        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="matcherConfiguration" eType="#//MatcherConfiguration"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IconEntry">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bundleId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ConfigurationElement" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"
+        eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="iconEntry" eType="#//IconEntry"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="MatcherConfiguration" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ActionConfiguration" abstract="true"
+      eSuperTypes="#//ConfigurationElement"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ViewActionConfiguration" abstract="true"
+      eSuperTypes="#//ActionConfiguration"/>
+  <eClassifiers xsi:type="ecore:EClass" name="SemanticActionConfiguration" abstract="true"
+      eSuperTypes="#//ActionConfiguration"/>
+  <eClassifiers xsi:type="ecore:EClass" name="SemanticTypeConfiguration" abstract="true"
+      eSuperTypes="#//ElementTypeConfiguration">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Configuration specific to element types registered to manipulate Domain Specific elements."/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ViewTypeConfiguration" abstract="true"
+      eSuperTypes="#//ElementTypeConfiguration">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Configuration specific to element types registered to manipulate graphical elements in GMF diagrams"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="specializedDiagramTypeID"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ElementTypeAdviceConfiguration" abstract="true"
+      eSuperTypes="#//ConfigurationElement"/>
+  <eClassifiers xsi:type="ecore:EClass" name="AspectSemanticTypeConfiguration" eSuperTypes="#//SemanticTypeConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="actionConfiguration" upperBound="-1"
+        eType="#//SemanticActionConfiguration" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AspectViewTypeConfiguration" eSuperTypes="#//ViewTypeConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="actionConfiguration" upperBound="-1"
+        eType="#//ViewActionConfiguration" containment="true"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecorediag b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecorediag
index 59719be883a..dec7c8e072b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecorediag
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecorediag
@@ -1,396 +1,396 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram 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" xmi:id="_pHTPAOAjEd-0CYOJPs0ewQ" type="EcoreTools" name="ExtendedTypes" measurementUnit="Pixel">

-  <children xmi:type="notation:Node" xmi:id="_AtZG0OA1Ed-0CYOJPs0ewQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_Ati30OA1Ed-0CYOJPs0ewQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_Ati30eA1Ed-0CYOJPs0ewQ" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_hEerQF21EeOaP_1Gowzb-Q" type="2001">

-        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ExtendedElementTypeSet/extensible"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hEerQV21EeOaP_1Gowzb-Q"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Ati30uA1Ed-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Ati30-A1Ed-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Ati31OA1Ed-0CYOJPs0ewQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Ati31eA1Ed-0CYOJPs0ewQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Ati31uA1Ed-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Ati31-A1Ed-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Ati32OA1Ed-0CYOJPs0ewQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_AtZG0eA1Ed-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10" fillColor="8905185" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ExtendedElementTypeSet"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AtZG0uA1Ed-0CYOJPs0ewQ" x="730" y="215" width="263" height="123"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_D22yIOA1Ed-0CYOJPs0ewQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_D22yI-A1Ed-0CYOJPs0ewQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_D22yJOA1Ed-0CYOJPs0ewQ" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_yKWz0OA3Ed-0CYOJPs0ewQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ElementTypeConfiguration/kindName"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_yKWz0eA3Ed-0CYOJPs0ewQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_qw89UOA3Ed-0CYOJPs0ewQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ElementTypeConfiguration/hint"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qw89UeA3Ed-0CYOJPs0ewQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_4DzTcOA3Ed-0CYOJPs0ewQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ElementTypeConfiguration/specializedTypesID"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4DzTceA3Ed-0CYOJPs0ewQ"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_D22yJeA1Ed-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_D22yJuA1Ed-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_D22yJ-A1Ed-0CYOJPs0ewQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_D22yKOA1Ed-0CYOJPs0ewQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_D22yKeA1Ed-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_D22yKuA1Ed-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_D22yK-A1Ed-0CYOJPs0ewQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_D22yIeA1Ed-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10" fillColor="8905185" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ElementTypeConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D22yIuA1Ed-0CYOJPs0ewQ" x="1130" y="215" width="243" height="123"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_RFg54OA3Ed-0CYOJPs0ewQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_RFg54-A3Ed-0CYOJPs0ewQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_RFg55OA3Ed-0CYOJPs0ewQ" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_U2KhAOA3Ed-0CYOJPs0ewQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//IconEntry/iconPath"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_U2KhAeA3Ed-0CYOJPs0ewQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_TW8xAOA3Ed-0CYOJPs0ewQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//IconEntry/bundleId"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TW8xAeA3Ed-0CYOJPs0ewQ"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_RFg55eA3Ed-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_RFg55uA3Ed-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_RFg55-A3Ed-0CYOJPs0ewQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_RFg56OA3Ed-0CYOJPs0ewQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_RFg56eA3Ed-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_RFg56uA3Ed-0CYOJPs0ewQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_RFg56-A3Ed-0CYOJPs0ewQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_RFg54eA3Ed-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10" fillColor="8905185" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//IconEntry"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RFg54uA3Ed-0CYOJPs0ewQ" x="685" y="35" width="243" height="103"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_vF928FaMEeOnIbrN_mmRsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_vGD9kFaMEeOnIbrN_mmRsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_vGFLsFaMEeOnIbrN_mmRsw" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_xXoXkFaMEeOnIbrN_mmRsw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ConfigurationElement/name"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xXoXkVaMEeOnIbrN_mmRsw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="__vM6EFaMEeOnIbrN_mmRsw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ConfigurationElement/identifier"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vM6EVaMEeOnIbrN_mmRsw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_59WQMFaMEeOnIbrN_mmRsw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ConfigurationElement/description"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_59WQMVaMEeOnIbrN_mmRsw"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_vGFLsVaMEeOnIbrN_mmRsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_vGFLslaMEeOnIbrN_mmRsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_vGFLs1aMEeOnIbrN_mmRsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_vGHA4FaMEeOnIbrN_mmRsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_vGHA4VaMEeOnIbrN_mmRsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_vGHA4laMEeOnIbrN_mmRsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_vGHA41aMEeOnIbrN_mmRsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_vF928VaMEeOnIbrN_mmRsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12632256" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ConfigurationElement"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vF928laMEeOnIbrN_mmRsw" x="295" y="35" width="243" height="103"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_BqvHwFaPEeOnIbrN_mmRsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_Bq6G4FaPEeOnIbrN_mmRsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_Bq7VAFaPEeOnIbrN_mmRsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Bq7VAVaPEeOnIbrN_mmRsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Bq7VAlaPEeOnIbrN_mmRsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Bq7VA1aPEeOnIbrN_mmRsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Bq78EFaPEeOnIbrN_mmRsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Bq78EVaPEeOnIbrN_mmRsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Bq8jIFaPEeOnIbrN_mmRsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Bq8jIVaPEeOnIbrN_mmRsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_BqvHwVaPEeOnIbrN_mmRsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12632256" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//MatcherConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BqvHwlaPEeOnIbrN_mmRsw" x="1570" y="215" width="243" height="113"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="__MkT0FacEeOnIbrN_mmRsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="__MmwEFacEeOnIbrN_mmRsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="__MnXIFacEeOnIbrN_mmRsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="__MnXIVacEeOnIbrN_mmRsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="__MnXIlacEeOnIbrN_mmRsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="__MnXI1acEeOnIbrN_mmRsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="__MolQFacEeOnIbrN_mmRsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="__MolQVacEeOnIbrN_mmRsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="__MolQlacEeOnIbrN_mmRsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="__MolQ1acEeOnIbrN_mmRsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="__Mk64FacEeOnIbrN_mmRsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12632256" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ActionConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="__Mk64VacEeOnIbrN_mmRsw" x="110" y="225" width="223" height="113"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_HlSSQFadEeOnIbrN_mmRsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_HlUHcFadEeOnIbrN_mmRsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_HlVVkFadEeOnIbrN_mmRsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_HlVVkVadEeOnIbrN_mmRsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_HlVVkladEeOnIbrN_mmRsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_HlVVk1adEeOnIbrN_mmRsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_HlV8oFadEeOnIbrN_mmRsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_HlV8oVadEeOnIbrN_mmRsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_HlV8oladEeOnIbrN_mmRsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_HlV8o1adEeOnIbrN_mmRsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_HlSSQVadEeOnIbrN_mmRsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="8905185" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ViewActionConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HlSSQladEeOnIbrN_mmRsw" x="55" y="770" width="183" height="117"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_NL1rEFadEeOnIbrN_mmRsw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_NL3gQFadEeOnIbrN_mmRsw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_NL4uYFadEeOnIbrN_mmRsw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_NL4uYVadEeOnIbrN_mmRsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_NL4uYladEeOnIbrN_mmRsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_NL4uY1adEeOnIbrN_mmRsw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_NL58gFadEeOnIbrN_mmRsw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_NL58gVadEeOnIbrN_mmRsw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_NL58gladEeOnIbrN_mmRsw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_NL58g1adEeOnIbrN_mmRsw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_NL2SIFadEeOnIbrN_mmRsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="8905185" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//SemanticActionConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NL2SIVadEeOnIbrN_mmRsw" x="240" y="535" width="203" height="168"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_gQ6R4Fd2EeOMz7r5xDmlGQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_gRAYgFd2EeOMz7r5xDmlGQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_gRC0wFd2EeOMz7r5xDmlGQ" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_gRC0wVd2EeOMz7r5xDmlGQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_gRC0wld2EeOMz7r5xDmlGQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_gRC0w1d2EeOMz7r5xDmlGQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_gRFRAFd2EeOMz7r5xDmlGQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_gRFRAVd2EeOMz7r5xDmlGQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_gRFRAld2EeOMz7r5xDmlGQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_gRFRA1d2EeOMz7r5xDmlGQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_gQ6R4Vd2EeOMz7r5xDmlGQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//SemanticTypeConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gQ6R4ld2EeOMz7r5xDmlGQ" x="990" y="395" width="243" height="113"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_r2M6AFd2EeOMz7r5xDmlGQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_r2PWQFd2EeOMz7r5xDmlGQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_r2P9UFd2EeOMz7r5xDmlGQ" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_u04IYIiaEeGlC_7TvaBunA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ViewTypeConfiguration/specializedDiagramTypeID"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_u04IYYiaEeGlC_7TvaBunA"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_r2P9UVd2EeOMz7r5xDmlGQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_r2P9Uld2EeOMz7r5xDmlGQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_r2P9U1d2EeOMz7r5xDmlGQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_r2RLcFd2EeOMz7r5xDmlGQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_r2RLcVd2EeOMz7r5xDmlGQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_r2RLcld2EeOMz7r5xDmlGQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_r2RLc1d2EeOMz7r5xDmlGQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_r2M6AVd2EeOMz7r5xDmlGQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ViewTypeConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r2M6Ald2EeOMz7r5xDmlGQ" x="1270" y="395" width="303" height="113"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_LZtoMFg0EeOZc_L6ctfnzA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_LZu2UFg0EeOZc_L6ctfnzA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_LZvdYFg0EeOZc_L6ctfnzA" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_LZvdYVg0EeOZc_L6ctfnzA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_LZvdYlg0EeOZc_L6ctfnzA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_LZvdY1g0EeOZc_L6ctfnzA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_LZwEcFg0EeOZc_L6ctfnzA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_LZwEcVg0EeOZc_L6ctfnzA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_LZwEclg0EeOZc_L6ctfnzA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_LZwEc1g0EeOZc_L6ctfnzA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_LZtoMVg0EeOZc_L6ctfnzA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ElementTypeAdviceConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LZtoMlg0EeOZc_L6ctfnzA" x="413" y="215" width="243" height="122"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_JtQagIHCEeOIquxre78irQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_Jtg5MIHCEeOIquxre78irQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_JtiuYIHCEeOIquxre78irQ" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_JtiuYYHCEeOIquxre78irQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_JtiuYoHCEeOIquxre78irQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_JtiuY4HCEeOIquxre78irQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_JtkjkIHCEeOIquxre78irQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_JtkjkYHCEeOIquxre78irQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_JtkjkoHCEeOIquxre78irQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Jtkjk4HCEeOIquxre78irQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_JtQagYHCEeOIquxre78irQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//AspectSemanticTypeConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JtQagoHCEeOIquxre78irQ" x="990" y="590" width="238" height="112"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_uzyBMIHCEeOIquxre78irQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_uz25sIHCEeOIquxre78irQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_uz3gwIHCEeOIquxre78irQ" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_uz3gwYHCEeOIquxre78irQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_uz3gwoHCEeOIquxre78irQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_uz3gw4HCEeOIquxre78irQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_uz4H0IHCEeOIquxre78irQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_uz4H0YHCEeOIquxre78irQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_uz4H0oHCEeOIquxre78irQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_uz4H04HCEeOIquxre78irQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_uzyBMYHCEeOIquxre78irQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//AspectViewTypeConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uzyBMoHCEeOIquxre78irQ" x="1275" y="585" width="303" height="318"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_pHTPAeAjEd-0CYOJPs0ewQ"/>

-  <element xmi:type="ecore:EPackage" href="ExtendedTypes.ecore#/"/>

-  <edges xmi:type="notation:Edge" xmi:id="_GOjCQOA1Ed-0CYOJPs0ewQ" type="3002" source="_AtZG0OA1Ed-0CYOJPs0ewQ" target="_D22yIOA1Ed-0CYOJPs0ewQ">

-    <children xmi:type="notation:Node" xmi:id="_GOjCROA1Ed-0CYOJPs0ewQ" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_GOjCReA1Ed-0CYOJPs0ewQ" x="-19" y="-11"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_GOjCRuA1Ed-0CYOJPs0ewQ" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_GOjCR-A1Ed-0CYOJPs0ewQ" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_GOjCQeA1Ed-0CYOJPs0ewQ" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_GOjCQuA1Ed-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="ExtendedTypes.ecore#//ExtendedElementTypeSet/elementType"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GOjCQ-A1Ed-0CYOJPs0ewQ" points="[142, -7, -321, 17]$[343, -9, -120, 15]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MaUoAOA1Ed-0CYOJPs0ewQ" id="(0.993006993006993,0.4152542372881356)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_al4SUOA2Ed-0CYOJPs0ewQ" id="(0.0076045627376425855,0.40707964601769914)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Y42TUOA3Ed-0CYOJPs0ewQ" type="3002" source="_vF928FaMEeOnIbrN_mmRsw" target="_RFg54OA3Ed-0CYOJPs0ewQ">

-    <children xmi:type="notation:Node" xmi:id="_Y5AEUOA3Ed-0CYOJPs0ewQ" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Y5AEUeA3Ed-0CYOJPs0ewQ" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Y5AEUuA3Ed-0CYOJPs0ewQ" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Y5AEU-A3Ed-0CYOJPs0ewQ" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Y42TUeA3Ed-0CYOJPs0ewQ" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Y42TUuA3Ed-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="ExtendedTypes.ecore#//ConfigurationElement/iconEntry"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Y42TU-A3Ed-0CYOJPs0ewQ" points="[42, 1, -207, 5]$[317, 23, 68, 27]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Y5AEVOA3Ed-0CYOJPs0ewQ" id="(0.9781931464174455,0.5274725274725275)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_PWwdwFaNEeOnIbrN_mmRsw" type="3003" source="_AtZG0OA1Ed-0CYOJPs0ewQ" target="_vF928FaMEeOnIbrN_mmRsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_PWwdwVaNEeOnIbrN_mmRsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_PWwdwlaNEeOnIbrN_mmRsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PWwdw1aNEeOnIbrN_mmRsw" points="[-29, -4, 477, 85]$[-29, -45, 477, 44]$[-470, -45, 36, 44]$[-470, -83, 36, 6]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PW3LcFaNEeOnIbrN_mmRsw" id="(0.5944055944055944,0.033707865168539325)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QoA_YFaPEeOnIbrN_mmRsw" id="(0.34890965732087226,0.945054945054945)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_P5L1YFaNEeOnIbrN_mmRsw" type="3003" source="_D22yIOA1Ed-0CYOJPs0ewQ" target="_vF928FaMEeOnIbrN_mmRsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_P5L1YVaNEeOnIbrN_mmRsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_P5MccFaNEeOnIbrN_mmRsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_P5MccVaNEeOnIbrN_mmRsw" points="[-41, -1, 794, 130]$[-41, -42, 794, 89]$[-834, -42, 1, 89]$[-834, -80, 1, 51]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P5U_UFaNEeOnIbrN_mmRsw" id="(0.49794238683127573,0.016260162601626018)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_4W5vcFaPEeOnIbrN_mmRsw" type="3002" source="_D22yIOA1Ed-0CYOJPs0ewQ" target="_BqvHwFaPEeOnIbrN_mmRsw">

-    <children xmi:type="notation:Node" xmi:id="_4W69kFaPEeOnIbrN_mmRsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_4W69kVaPEeOnIbrN_mmRsw" x="-42" y="-11"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_4W7koFaPEeOnIbrN_mmRsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_4W8LsFaPEeOnIbrN_mmRsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_4W5vcVaPEeOnIbrN_mmRsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_4W5vclaPEeOnIbrN_mmRsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="ExtendedTypes.ecore#//ElementTypeConfiguration/matcherConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4W5vc1aPEeOnIbrN_mmRsw" points="[27, -29, -434, 31]$[226, -29, -235, 31]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4XCSUFaPEeOnIbrN_mmRsw" id="(0.8888888888888888,0.8292682926829268)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4XCSUVaPEeOnIbrN_mmRsw" id="(0.9762845849802372,0.3655913978494624)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_E94LIFadEeOnIbrN_mmRsw" type="3003" source="__MkT0FacEeOnIbrN_mmRsw" target="_vF928FaMEeOnIbrN_mmRsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_E94LIVadEeOnIbrN_mmRsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_E94LIladEeOnIbrN_mmRsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_E94LI1adEeOnIbrN_mmRsw" points="[54, -9, -92, 106]$[54, -59, -92, 56]$[206, -59, 60, 56]$[206, -98, 60, 17]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_E971gFadEeOnIbrN_mmRsw" id="(0.45493562231759654,0.08433734939759036)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_E98ckFadEeOnIbrN_mmRsw" id="(0.25691699604743085,0.8349514563106796)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_cxGvwFadEeOnIbrN_mmRsw" type="3003" source="_HlSSQFadEeOnIbrN_mmRsw" target="__MkT0FacEeOnIbrN_mmRsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_cxGvwVadEeOnIbrN_mmRsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_cxGvwladEeOnIbrN_mmRsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cxGvw1adEeOnIbrN_mmRsw" points="[3, -4, -80, 443]$[3, -329, -80, 118]$[73, -329, -10, 118]$[73, -438, -10, 9]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cxLBMFadEeOnIbrN_mmRsw" id="(0.5081967213114754,0.04225352112676056)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eZwIkFadEeOnIbrN_mmRsw" id="(0.5407725321888412,0.927710843373494)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_f0YTgFadEeOnIbrN_mmRsw" type="3003" source="_NL1rEFadEeOnIbrN_mmRsw" target="__MkT0FacEeOnIbrN_mmRsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_f0YTgVadEeOnIbrN_mmRsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_f0YTgladEeOnIbrN_mmRsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f0YTg1adEeOnIbrN_mmRsw" points="[-3, -14, 212, 210]$[-3, -104, 212, 120]$[-119, -104, 96, 120]$[-119, -213, 96, 11]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f0ck8FadEeOnIbrN_mmRsw" id="(0.4918032786885246,0.08641975308641975)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f03x4IHCEeOIquxre78irQ" id="(0.06278026905829596,0.9026548672566371)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_0TGN0Fd2EeOMz7r5xDmlGQ" type="3003" source="_gQ6R4Fd2EeOMz7r5xDmlGQ" target="_D22yIOA1Ed-0CYOJPs0ewQ">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0TGN0Vd2EeOMz7r5xDmlGQ" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_0TGN0ld2EeOMz7r5xDmlGQ" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0TGN01d2EeOMz7r5xDmlGQ" points="[16, -13, -144, 89]$[16, -43, -144, 59]$[156, -43, -4, 59]$[156, -72, -4, 30]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0TP-0Fd2EeOMz7r5xDmlGQ" id="(0.43209876543209874,0.12389380530973451)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0TP-0Vd2EeOMz7r5xDmlGQ" id="(0.5185185185185185,0.7560975609756098)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_02Dw8Fd2EeOMz7r5xDmlGQ" type="3003" source="_r2M6AFd2EeOMz7r5xDmlGQ" target="_D22yIOA1Ed-0CYOJPs0ewQ">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_02Dw8Vd2EeOMz7r5xDmlGQ" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_02Dw8ld2EeOMz7r5xDmlGQ" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_02Dw81d2EeOMz7r5xDmlGQ" points="[2, -19, 189, 82]$[2, -49, 189, 52]$[-168, -49, 19, 52]$[-168, -78, 19, 23]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_02JQgFd2EeOMz7r5xDmlGQ" id="(0.49201277955271566,0.17699115044247787)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_02J3kFd2EeOMz7r5xDmlGQ" id="(0.41975308641975306,0.8130081300813008)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_IzApwFeGEeOMz7r5xDmlGQ" type="3003" source="_LZtoMFg0EeOZc_L6ctfnzA" target="_vF928FaMEeOnIbrN_mmRsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_IzApwVeGEeOMz7r5xDmlGQ" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_IzApwleGEeOMz7r5xDmlGQ" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IzApw1eGEeOMz7r5xDmlGQ" points="[67, -20, 149, 130]$[67, -61, 149, 89]$[-81, -61, 1, 89]$[-81, -99, 1, 51]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IzE7MFeGEeOMz7r5xDmlGQ" id="(0.3497942386831276,0.17117117117117117)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_J2f2EIHCEeOIquxre78irQ" type="3003" source="_JtQagIHCEeOIquxre78irQ" target="_gQ6R4Fd2EeOMz7r5xDmlGQ">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_J2f2EYHCEeOIquxre78irQ" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_J2f2EoHCEeOIquxre78irQ" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J2f2E4HCEeOIquxre78irQ" points="[6, -55, 4, 140]$[6, -139, 4, 56]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_KRcFoIHCEeOIquxre78irQ" type="3002" source="_JtQagIHCEeOIquxre78irQ" target="_NL1rEFadEeOnIbrN_mmRsw">

-    <children xmi:type="notation:Node" xmi:id="_KRcssIHCEeOIquxre78irQ" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KRcssYHCEeOIquxre78irQ" x="-8" y="15"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_KRdTwIHCEeOIquxre78irQ" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KRdTwYHCEeOIquxre78irQ" x="41" y="-16"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_KRcFoYHCEeOIquxre78irQ" routing="Rectilinear" closestDistance="true" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_KRcFooHCEeOIquxre78irQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="ExtendedTypes.ecore#//AspectSemanticTypeConfiguration/actionConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KRcFo4HCEeOIquxre78irQ" points="[-4, 1, 650, -20]$[-279, 1, 375, -20]$[-279, 17, 375, -4]$[-553, 17, 101, -4]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iWwf0IHCEeOIquxre78irQ" id="(0.0546218487394958,0.2857142857142857)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ypPP0IHCEeOIquxre78irQ" type="3003" source="_uzyBMIHCEeOIquxre78irQ" target="_r2M6AFd2EeOMz7r5xDmlGQ">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ypPP0YHCEeOIquxre78irQ" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ypPP0oHCEeOIquxre78irQ" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ypPP04HCEeOIquxre78irQ" points="[-10, -7, 7, 135]$[-10, -86, 7, 56]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ypSTIIHCEeOIquxre78irQ" id="(0.5412541254125413,0.06837606837606838)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_OivtUIHDEeOIquxre78irQ" type="3002" source="_uzyBMIHCEeOIquxre78irQ" target="_HlSSQFadEeOnIbrN_mmRsw">

-    <children xmi:type="notation:Node" xmi:id="_OiwUYIHDEeOIquxre78irQ" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_OiwUYYHDEeOIquxre78irQ" x="85" y="-18"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_OiwUYoHDEeOIquxre78irQ" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_OiwUY4HDEeOIquxre78irQ" x="133" y="17"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_OivtUYHDEeOIquxre78irQ" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_OivtUoHDEeOIquxre78irQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="ExtendedTypes.ecore#//AspectViewTypeConfiguration/actionConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OivtU4HDEeOIquxre78irQ" points="[-28, -29, 1097, -10]$[-1067, -29, 58, -10]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Oi1M4IHDEeOIquxre78irQ" id="(0.14521452145214522,0.6446540880503144)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Oi1M4YHDEeOIquxre78irQ" id="(0.6830601092896175,0.17937219730941703)"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram 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" xmi:id="_pHTPAOAjEd-0CYOJPs0ewQ" type="EcoreTools" name="ExtendedTypes" measurementUnit="Pixel">
+  <children xmi:type="notation:Node" xmi:id="_AtZG0OA1Ed-0CYOJPs0ewQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Ati30OA1Ed-0CYOJPs0ewQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Ati30eA1Ed-0CYOJPs0ewQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_hEerQF21EeOaP_1Gowzb-Q" type="2001">
+        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ExtendedElementTypeSet/extensible"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hEerQV21EeOaP_1Gowzb-Q"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Ati30uA1Ed-0CYOJPs0ewQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Ati30-A1Ed-0CYOJPs0ewQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Ati31OA1Ed-0CYOJPs0ewQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Ati31eA1Ed-0CYOJPs0ewQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Ati31uA1Ed-0CYOJPs0ewQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Ati31-A1Ed-0CYOJPs0ewQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Ati32OA1Ed-0CYOJPs0ewQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_AtZG0eA1Ed-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10" fillColor="8905185" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ExtendedElementTypeSet"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AtZG0uA1Ed-0CYOJPs0ewQ" x="730" y="215" width="263" height="123"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_D22yIOA1Ed-0CYOJPs0ewQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_D22yI-A1Ed-0CYOJPs0ewQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_D22yJOA1Ed-0CYOJPs0ewQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_yKWz0OA3Ed-0CYOJPs0ewQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ElementTypeConfiguration/kindName"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_yKWz0eA3Ed-0CYOJPs0ewQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_qw89UOA3Ed-0CYOJPs0ewQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ElementTypeConfiguration/hint"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qw89UeA3Ed-0CYOJPs0ewQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_4DzTcOA3Ed-0CYOJPs0ewQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ElementTypeConfiguration/specializedTypesID"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4DzTceA3Ed-0CYOJPs0ewQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_D22yJeA1Ed-0CYOJPs0ewQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_D22yJuA1Ed-0CYOJPs0ewQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_D22yJ-A1Ed-0CYOJPs0ewQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_D22yKOA1Ed-0CYOJPs0ewQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_D22yKeA1Ed-0CYOJPs0ewQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_D22yKuA1Ed-0CYOJPs0ewQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_D22yK-A1Ed-0CYOJPs0ewQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_D22yIeA1Ed-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10" fillColor="8905185" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ElementTypeConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D22yIuA1Ed-0CYOJPs0ewQ" x="1130" y="215" width="243" height="123"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_RFg54OA3Ed-0CYOJPs0ewQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_RFg54-A3Ed-0CYOJPs0ewQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_RFg55OA3Ed-0CYOJPs0ewQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_U2KhAOA3Ed-0CYOJPs0ewQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//IconEntry/iconPath"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_U2KhAeA3Ed-0CYOJPs0ewQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_TW8xAOA3Ed-0CYOJPs0ewQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//IconEntry/bundleId"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TW8xAeA3Ed-0CYOJPs0ewQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_RFg55eA3Ed-0CYOJPs0ewQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_RFg55uA3Ed-0CYOJPs0ewQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_RFg55-A3Ed-0CYOJPs0ewQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_RFg56OA3Ed-0CYOJPs0ewQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_RFg56eA3Ed-0CYOJPs0ewQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_RFg56uA3Ed-0CYOJPs0ewQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_RFg56-A3Ed-0CYOJPs0ewQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_RFg54eA3Ed-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10" fillColor="8905185" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//IconEntry"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RFg54uA3Ed-0CYOJPs0ewQ" x="685" y="35" width="243" height="103"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_vF928FaMEeOnIbrN_mmRsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_vGD9kFaMEeOnIbrN_mmRsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_vGFLsFaMEeOnIbrN_mmRsw" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_xXoXkFaMEeOnIbrN_mmRsw" type="2001">
+        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ConfigurationElement/name"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xXoXkVaMEeOnIbrN_mmRsw"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="__vM6EFaMEeOnIbrN_mmRsw" type="2001">
+        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ConfigurationElement/identifier"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__vM6EVaMEeOnIbrN_mmRsw"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_59WQMFaMEeOnIbrN_mmRsw" type="2001">
+        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ConfigurationElement/description"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_59WQMVaMEeOnIbrN_mmRsw"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_vGFLsVaMEeOnIbrN_mmRsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_vGFLslaMEeOnIbrN_mmRsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_vGFLs1aMEeOnIbrN_mmRsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_vGHA4FaMEeOnIbrN_mmRsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_vGHA4VaMEeOnIbrN_mmRsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_vGHA4laMEeOnIbrN_mmRsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_vGHA41aMEeOnIbrN_mmRsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_vF928VaMEeOnIbrN_mmRsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12632256" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ConfigurationElement"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vF928laMEeOnIbrN_mmRsw" x="295" y="35" width="243" height="103"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_BqvHwFaPEeOnIbrN_mmRsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Bq6G4FaPEeOnIbrN_mmRsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Bq7VAFaPEeOnIbrN_mmRsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Bq7VAVaPEeOnIbrN_mmRsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Bq7VAlaPEeOnIbrN_mmRsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Bq7VA1aPEeOnIbrN_mmRsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Bq78EFaPEeOnIbrN_mmRsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Bq78EVaPEeOnIbrN_mmRsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Bq8jIFaPEeOnIbrN_mmRsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Bq8jIVaPEeOnIbrN_mmRsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_BqvHwVaPEeOnIbrN_mmRsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12632256" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//MatcherConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BqvHwlaPEeOnIbrN_mmRsw" x="1570" y="215" width="243" height="113"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="__MkT0FacEeOnIbrN_mmRsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="__MmwEFacEeOnIbrN_mmRsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="__MnXIFacEeOnIbrN_mmRsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="__MnXIVacEeOnIbrN_mmRsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="__MnXIlacEeOnIbrN_mmRsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="__MnXI1acEeOnIbrN_mmRsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="__MolQFacEeOnIbrN_mmRsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="__MolQVacEeOnIbrN_mmRsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="__MolQlacEeOnIbrN_mmRsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="__MolQ1acEeOnIbrN_mmRsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="__Mk64FacEeOnIbrN_mmRsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12632256" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ActionConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="__Mk64VacEeOnIbrN_mmRsw" x="110" y="225" width="223" height="113"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_HlSSQFadEeOnIbrN_mmRsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_HlUHcFadEeOnIbrN_mmRsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_HlVVkFadEeOnIbrN_mmRsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_HlVVkVadEeOnIbrN_mmRsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_HlVVkladEeOnIbrN_mmRsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_HlVVk1adEeOnIbrN_mmRsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_HlV8oFadEeOnIbrN_mmRsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_HlV8oVadEeOnIbrN_mmRsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_HlV8oladEeOnIbrN_mmRsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_HlV8o1adEeOnIbrN_mmRsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_HlSSQVadEeOnIbrN_mmRsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="8905185" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ViewActionConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HlSSQladEeOnIbrN_mmRsw" x="55" y="770" width="183" height="117"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_NL1rEFadEeOnIbrN_mmRsw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_NL3gQFadEeOnIbrN_mmRsw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_NL4uYFadEeOnIbrN_mmRsw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_NL4uYVadEeOnIbrN_mmRsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_NL4uYladEeOnIbrN_mmRsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_NL4uY1adEeOnIbrN_mmRsw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_NL58gFadEeOnIbrN_mmRsw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_NL58gVadEeOnIbrN_mmRsw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_NL58gladEeOnIbrN_mmRsw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_NL58g1adEeOnIbrN_mmRsw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_NL2SIFadEeOnIbrN_mmRsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="8905185" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//SemanticActionConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NL2SIVadEeOnIbrN_mmRsw" x="240" y="535" width="203" height="168"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_gQ6R4Fd2EeOMz7r5xDmlGQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_gRAYgFd2EeOMz7r5xDmlGQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_gRC0wFd2EeOMz7r5xDmlGQ" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_gRC0wVd2EeOMz7r5xDmlGQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_gRC0wld2EeOMz7r5xDmlGQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_gRC0w1d2EeOMz7r5xDmlGQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_gRFRAFd2EeOMz7r5xDmlGQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_gRFRAVd2EeOMz7r5xDmlGQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_gRFRAld2EeOMz7r5xDmlGQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_gRFRA1d2EeOMz7r5xDmlGQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_gQ6R4Vd2EeOMz7r5xDmlGQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//SemanticTypeConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gQ6R4ld2EeOMz7r5xDmlGQ" x="990" y="395" width="243" height="113"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_r2M6AFd2EeOMz7r5xDmlGQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_r2PWQFd2EeOMz7r5xDmlGQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_r2P9UFd2EeOMz7r5xDmlGQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_u04IYIiaEeGlC_7TvaBunA" type="2001">
+        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ViewTypeConfiguration/specializedDiagramTypeID"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_u04IYYiaEeGlC_7TvaBunA"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_r2P9UVd2EeOMz7r5xDmlGQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_r2P9Uld2EeOMz7r5xDmlGQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_r2P9U1d2EeOMz7r5xDmlGQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_r2RLcFd2EeOMz7r5xDmlGQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_r2RLcVd2EeOMz7r5xDmlGQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_r2RLcld2EeOMz7r5xDmlGQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_r2RLc1d2EeOMz7r5xDmlGQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_r2M6AVd2EeOMz7r5xDmlGQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ViewTypeConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r2M6Ald2EeOMz7r5xDmlGQ" x="1270" y="395" width="303" height="113"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_LZtoMFg0EeOZc_L6ctfnzA" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_LZu2UFg0EeOZc_L6ctfnzA" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_LZvdYFg0EeOZc_L6ctfnzA" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_LZvdYVg0EeOZc_L6ctfnzA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_LZvdYlg0EeOZc_L6ctfnzA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_LZvdY1g0EeOZc_L6ctfnzA"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_LZwEcFg0EeOZc_L6ctfnzA" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_LZwEcVg0EeOZc_L6ctfnzA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_LZwEclg0EeOZc_L6ctfnzA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_LZwEc1g0EeOZc_L6ctfnzA"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_LZtoMVg0EeOZc_L6ctfnzA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ElementTypeAdviceConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LZtoMlg0EeOZc_L6ctfnzA" x="413" y="215" width="243" height="122"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_JtQagIHCEeOIquxre78irQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Jtg5MIHCEeOIquxre78irQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_JtiuYIHCEeOIquxre78irQ" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_JtiuYYHCEeOIquxre78irQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_JtiuYoHCEeOIquxre78irQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_JtiuY4HCEeOIquxre78irQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_JtkjkIHCEeOIquxre78irQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_JtkjkYHCEeOIquxre78irQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_JtkjkoHCEeOIquxre78irQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Jtkjk4HCEeOIquxre78irQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_JtQagYHCEeOIquxre78irQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//AspectSemanticTypeConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JtQagoHCEeOIquxre78irQ" x="990" y="590" width="238" height="112"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_uzyBMIHCEeOIquxre78irQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_uz25sIHCEeOIquxre78irQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_uz3gwIHCEeOIquxre78irQ" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_uz3gwYHCEeOIquxre78irQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_uz3gwoHCEeOIquxre78irQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uz3gw4HCEeOIquxre78irQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_uz4H0IHCEeOIquxre78irQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_uz4H0YHCEeOIquxre78irQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_uz4H0oHCEeOIquxre78irQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uz4H04HCEeOIquxre78irQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_uzyBMYHCEeOIquxre78irQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//AspectViewTypeConfiguration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uzyBMoHCEeOIquxre78irQ" x="1275" y="585" width="303" height="318"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_pHTPAeAjEd-0CYOJPs0ewQ"/>
+  <element xmi:type="ecore:EPackage" href="ExtendedTypes.ecore#/"/>
+  <edges xmi:type="notation:Edge" xmi:id="_GOjCQOA1Ed-0CYOJPs0ewQ" type="3002" source="_AtZG0OA1Ed-0CYOJPs0ewQ" target="_D22yIOA1Ed-0CYOJPs0ewQ">
+    <children xmi:type="notation:Node" xmi:id="_GOjCROA1Ed-0CYOJPs0ewQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_GOjCReA1Ed-0CYOJPs0ewQ" x="-19" y="-11"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_GOjCRuA1Ed-0CYOJPs0ewQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_GOjCR-A1Ed-0CYOJPs0ewQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_GOjCQeA1Ed-0CYOJPs0ewQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_GOjCQuA1Ed-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="ExtendedTypes.ecore#//ExtendedElementTypeSet/elementType"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GOjCQ-A1Ed-0CYOJPs0ewQ" points="[142, -7, -321, 17]$[343, -9, -120, 15]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MaUoAOA1Ed-0CYOJPs0ewQ" id="(0.993006993006993,0.4152542372881356)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_al4SUOA2Ed-0CYOJPs0ewQ" id="(0.0076045627376425855,0.40707964601769914)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Y42TUOA3Ed-0CYOJPs0ewQ" type="3002" source="_vF928FaMEeOnIbrN_mmRsw" target="_RFg54OA3Ed-0CYOJPs0ewQ">
+    <children xmi:type="notation:Node" xmi:id="_Y5AEUOA3Ed-0CYOJPs0ewQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Y5AEUeA3Ed-0CYOJPs0ewQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Y5AEUuA3Ed-0CYOJPs0ewQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Y5AEU-A3Ed-0CYOJPs0ewQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Y42TUeA3Ed-0CYOJPs0ewQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Y42TUuA3Ed-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="ExtendedTypes.ecore#//ConfigurationElement/iconEntry"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Y42TU-A3Ed-0CYOJPs0ewQ" points="[42, 1, -207, 5]$[317, 23, 68, 27]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Y5AEVOA3Ed-0CYOJPs0ewQ" id="(0.9781931464174455,0.5274725274725275)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_PWwdwFaNEeOnIbrN_mmRsw" type="3003" source="_AtZG0OA1Ed-0CYOJPs0ewQ" target="_vF928FaMEeOnIbrN_mmRsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_PWwdwVaNEeOnIbrN_mmRsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_PWwdwlaNEeOnIbrN_mmRsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PWwdw1aNEeOnIbrN_mmRsw" points="[-29, -4, 477, 85]$[-29, -45, 477, 44]$[-470, -45, 36, 44]$[-470, -83, 36, 6]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PW3LcFaNEeOnIbrN_mmRsw" id="(0.5944055944055944,0.033707865168539325)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QoA_YFaPEeOnIbrN_mmRsw" id="(0.34890965732087226,0.945054945054945)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_P5L1YFaNEeOnIbrN_mmRsw" type="3003" source="_D22yIOA1Ed-0CYOJPs0ewQ" target="_vF928FaMEeOnIbrN_mmRsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_P5L1YVaNEeOnIbrN_mmRsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_P5MccFaNEeOnIbrN_mmRsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_P5MccVaNEeOnIbrN_mmRsw" points="[-41, -1, 794, 130]$[-41, -42, 794, 89]$[-834, -42, 1, 89]$[-834, -80, 1, 51]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P5U_UFaNEeOnIbrN_mmRsw" id="(0.49794238683127573,0.016260162601626018)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_4W5vcFaPEeOnIbrN_mmRsw" type="3002" source="_D22yIOA1Ed-0CYOJPs0ewQ" target="_BqvHwFaPEeOnIbrN_mmRsw">
+    <children xmi:type="notation:Node" xmi:id="_4W69kFaPEeOnIbrN_mmRsw" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_4W69kVaPEeOnIbrN_mmRsw" x="-42" y="-11"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_4W7koFaPEeOnIbrN_mmRsw" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_4W8LsFaPEeOnIbrN_mmRsw" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_4W5vcVaPEeOnIbrN_mmRsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_4W5vclaPEeOnIbrN_mmRsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="ExtendedTypes.ecore#//ElementTypeConfiguration/matcherConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4W5vc1aPEeOnIbrN_mmRsw" points="[27, -29, -434, 31]$[226, -29, -235, 31]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4XCSUFaPEeOnIbrN_mmRsw" id="(0.8888888888888888,0.8292682926829268)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4XCSUVaPEeOnIbrN_mmRsw" id="(0.9762845849802372,0.3655913978494624)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_E94LIFadEeOnIbrN_mmRsw" type="3003" source="__MkT0FacEeOnIbrN_mmRsw" target="_vF928FaMEeOnIbrN_mmRsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_E94LIVadEeOnIbrN_mmRsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_E94LIladEeOnIbrN_mmRsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_E94LI1adEeOnIbrN_mmRsw" points="[54, -9, -92, 106]$[54, -59, -92, 56]$[206, -59, 60, 56]$[206, -98, 60, 17]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_E971gFadEeOnIbrN_mmRsw" id="(0.45493562231759654,0.08433734939759036)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_E98ckFadEeOnIbrN_mmRsw" id="(0.25691699604743085,0.8349514563106796)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_cxGvwFadEeOnIbrN_mmRsw" type="3003" source="_HlSSQFadEeOnIbrN_mmRsw" target="__MkT0FacEeOnIbrN_mmRsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_cxGvwVadEeOnIbrN_mmRsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_cxGvwladEeOnIbrN_mmRsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cxGvw1adEeOnIbrN_mmRsw" points="[3, -4, -80, 443]$[3, -329, -80, 118]$[73, -329, -10, 118]$[73, -438, -10, 9]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cxLBMFadEeOnIbrN_mmRsw" id="(0.5081967213114754,0.04225352112676056)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eZwIkFadEeOnIbrN_mmRsw" id="(0.5407725321888412,0.927710843373494)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_f0YTgFadEeOnIbrN_mmRsw" type="3003" source="_NL1rEFadEeOnIbrN_mmRsw" target="__MkT0FacEeOnIbrN_mmRsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_f0YTgVadEeOnIbrN_mmRsw" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_f0YTgladEeOnIbrN_mmRsw" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f0YTg1adEeOnIbrN_mmRsw" points="[-3, -14, 212, 210]$[-3, -104, 212, 120]$[-119, -104, 96, 120]$[-119, -213, 96, 11]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f0ck8FadEeOnIbrN_mmRsw" id="(0.4918032786885246,0.08641975308641975)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f03x4IHCEeOIquxre78irQ" id="(0.06278026905829596,0.9026548672566371)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_0TGN0Fd2EeOMz7r5xDmlGQ" type="3003" source="_gQ6R4Fd2EeOMz7r5xDmlGQ" target="_D22yIOA1Ed-0CYOJPs0ewQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0TGN0Vd2EeOMz7r5xDmlGQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_0TGN0ld2EeOMz7r5xDmlGQ" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0TGN01d2EeOMz7r5xDmlGQ" points="[16, -13, -144, 89]$[16, -43, -144, 59]$[156, -43, -4, 59]$[156, -72, -4, 30]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0TP-0Fd2EeOMz7r5xDmlGQ" id="(0.43209876543209874,0.12389380530973451)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0TP-0Vd2EeOMz7r5xDmlGQ" id="(0.5185185185185185,0.7560975609756098)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_02Dw8Fd2EeOMz7r5xDmlGQ" type="3003" source="_r2M6AFd2EeOMz7r5xDmlGQ" target="_D22yIOA1Ed-0CYOJPs0ewQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_02Dw8Vd2EeOMz7r5xDmlGQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_02Dw8ld2EeOMz7r5xDmlGQ" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_02Dw81d2EeOMz7r5xDmlGQ" points="[2, -19, 189, 82]$[2, -49, 189, 52]$[-168, -49, 19, 52]$[-168, -78, 19, 23]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_02JQgFd2EeOMz7r5xDmlGQ" id="(0.49201277955271566,0.17699115044247787)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_02J3kFd2EeOMz7r5xDmlGQ" id="(0.41975308641975306,0.8130081300813008)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_IzApwFeGEeOMz7r5xDmlGQ" type="3003" source="_LZtoMFg0EeOZc_L6ctfnzA" target="_vF928FaMEeOnIbrN_mmRsw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_IzApwVeGEeOMz7r5xDmlGQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_IzApwleGEeOMz7r5xDmlGQ" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IzApw1eGEeOMz7r5xDmlGQ" points="[67, -20, 149, 130]$[67, -61, 149, 89]$[-81, -61, 1, 89]$[-81, -99, 1, 51]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IzE7MFeGEeOMz7r5xDmlGQ" id="(0.3497942386831276,0.17117117117117117)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_J2f2EIHCEeOIquxre78irQ" type="3003" source="_JtQagIHCEeOIquxre78irQ" target="_gQ6R4Fd2EeOMz7r5xDmlGQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_J2f2EYHCEeOIquxre78irQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_J2f2EoHCEeOIquxre78irQ" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J2f2E4HCEeOIquxre78irQ" points="[6, -55, 4, 140]$[6, -139, 4, 56]"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_KRcFoIHCEeOIquxre78irQ" type="3002" source="_JtQagIHCEeOIquxre78irQ" target="_NL1rEFadEeOnIbrN_mmRsw">
+    <children xmi:type="notation:Node" xmi:id="_KRcssIHCEeOIquxre78irQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KRcssYHCEeOIquxre78irQ" x="-8" y="15"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_KRdTwIHCEeOIquxre78irQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KRdTwYHCEeOIquxre78irQ" x="41" y="-16"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_KRcFoYHCEeOIquxre78irQ" routing="Rectilinear" closestDistance="true" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_KRcFooHCEeOIquxre78irQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="ExtendedTypes.ecore#//AspectSemanticTypeConfiguration/actionConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KRcFo4HCEeOIquxre78irQ" points="[-4, 1, 650, -20]$[-279, 1, 375, -20]$[-279, 17, 375, -4]$[-553, 17, 101, -4]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iWwf0IHCEeOIquxre78irQ" id="(0.0546218487394958,0.2857142857142857)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_ypPP0IHCEeOIquxre78irQ" type="3003" source="_uzyBMIHCEeOIquxre78irQ" target="_r2M6AFd2EeOMz7r5xDmlGQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ypPP0YHCEeOIquxre78irQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_ypPP0oHCEeOIquxre78irQ" fontName="Segoe UI"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ypPP04HCEeOIquxre78irQ" points="[-10, -7, 7, 135]$[-10, -86, 7, 56]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ypSTIIHCEeOIquxre78irQ" id="(0.5412541254125413,0.06837606837606838)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_OivtUIHDEeOIquxre78irQ" type="3002" source="_uzyBMIHCEeOIquxre78irQ" target="_HlSSQFadEeOnIbrN_mmRsw">
+    <children xmi:type="notation:Node" xmi:id="_OiwUYIHDEeOIquxre78irQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_OiwUYYHDEeOIquxre78irQ" x="85" y="-18"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_OiwUYoHDEeOIquxre78irQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_OiwUY4HDEeOIquxre78irQ" x="133" y="17"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_OivtUYHDEeOIquxre78irQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_OivtUoHDEeOIquxre78irQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="ExtendedTypes.ecore#//AspectViewTypeConfiguration/actionConfiguration"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OivtU4HDEeOIquxre78irQ" points="[-28, -29, 1097, -10]$[-1067, -29, 58, -10]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Oi1M4IHDEeOIquxre78irQ" id="(0.14521452145214522,0.6446540880503144)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Oi1M4YHDEeOIquxre78irQ" id="(0.6830601092896175,0.17937219730941703)"/>
+  </edges>
+</notation:Diagram>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel
index a69abb53eea..a69abb53eea 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/InvariantContainerConfiguration.ecore b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantContainerConfiguration.ecore
index c11a512b311..c11a512b311 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/InvariantContainerConfiguration.ecore
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantContainerConfiguration.ecore
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/InvariantContainerConfiguration.ecorediag b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantContainerConfiguration.ecorediag
index a7d36d4e800..a7d36d4e800 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/InvariantContainerConfiguration.ecorediag
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantContainerConfiguration.ecorediag
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/InvariantContainerConfiguration.genmodel b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantContainerConfiguration.genmodel
index e370f0ec056..e370f0ec056 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/InvariantContainerConfiguration.genmodel
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantContainerConfiguration.genmodel
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.ecore b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.ecore
index 733a4536d89..733a4536d89 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.ecore
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.ecore
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.ecorediag b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.ecorediag
index 7da4b3c881c..7da4b3c881c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.ecorediag
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.ecorediag
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.genmodel b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.genmodel
index 293d863d31e..293d863d31e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.genmodel
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.genmodel
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/plugin.properties b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/plugin.properties
index 424ae39f876..cd7f34a00f2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/plugin.properties
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/plugin.properties
@@ -1,12 +1,12 @@
-###############################################################################

-# Copyright (c) 2010 CEA LIST.

-# All rights reserved. This program and the accompanying materials 

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-# 

-# Contributors:

-#     CEA LIST - initial API and implementation

-###############################################################################

-pluginName=Papyrus enhanced types metamodel plugin

-providerName=Eclipse Modeling Project

+###############################################################################
+# Copyright (c) 2010 CEA LIST.
+# All rights reserved. This program and the accompanying materials 
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     CEA LIST - initial API and implementation
+###############################################################################
+pluginName=Papyrus enhanced types metamodel plugin
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/plugin.xml b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/plugin.xml
index ab8ef8d6d4c..ab8ef8d6d4c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/plugin.xml
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/plugin.xml
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/pom.xml b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/pom.xml
index 9404841f2b4..9a55cb5df33 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/pom.xml
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/pom.xml
@@ -2,13 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-xtypes</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath>../../../releng/main</relativePath>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.extendedtypes</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/aspectActionConfiguration.exsd b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/aspectActionConfiguration.exsd
index 263ec8afad5..45bfd237340 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/aspectActionConfiguration.exsd
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/aspectActionConfiguration.exsd
@@ -1,156 +1,156 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.extendedtypes" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.extendedtypes" id="aspectActionConfiguration" name="Aspect Action Configuration"/>

-      </appInfo>

-      <documentation>

-         Extension point to describe new kind of Pre/Post actions in the extended element types framework.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appInfo>

-            <meta.element />

-         </appInfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="aspectAction"/>

-         </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="aspectAction">

-      <complexType>

-         <attribute name="configurationClass" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-         <attribute name="semanticTypeDescriptor" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.IActionContainerDescriptor"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-         <attribute name="editHelperAdvice" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.IActionEditHelperAdvice"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-         <attribute name="configurationModelCreation" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.IActionConfigurationModelCreation"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-         <attribute name="creationElementValidator" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.IActionCreationElementValidator"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         0.10.1

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         See examples in the emf or uml extended types

-      </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) 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

-      </documentation>

-   </annotation>

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.extendedtypes" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.extendedtypes" id="aspectActionConfiguration" name="Aspect Action Configuration"/>
+      </appInfo>
+      <documentation>
+         Extension point to describe new kind of Pre/Post actions in the extended element types framework.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="aspectAction"/>
+         </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="aspectAction">
+      <complexType>
+         <attribute name="configurationClass" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="semanticTypeDescriptor" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.IActionContainerDescriptor"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="editHelperAdvice" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.IActionEditHelperAdvice"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="configurationModelCreation" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.IActionConfigurationModelCreation"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="creationElementValidator" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.IActionCreationElementValidator"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         0.10.1
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         See examples in the emf or uml extended types
+      </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) 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
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/elementMatcherConfiguration.exsd b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/elementMatcherConfiguration.exsd
index 6a3b87e33ad..6a3b87e33ad 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/elementMatcherConfiguration.exsd
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/elementMatcherConfiguration.exsd
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/extendedElementTypeSet.exsd b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/extendedElementTypeSet.exsd
index 4489e6359c7..4489e6359c7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/extendedElementTypeSet.exsd
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/extendedElementTypeSet.exsd
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/extendedTypeConfiguration.exsd b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/extendedTypeConfiguration.exsd
index bd02f7fe3a8..bd02f7fe3a8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/extendedTypeConfiguration.exsd
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/extendedTypeConfiguration.exsd
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/invariantRule.exsd b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/invariantRule.exsd
index 86e2f06cd0f..86e2f06cd0f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/invariantRule.exsd
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/invariantRule.exsd
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/semanticTypeFactory.exsd b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/semanticTypeFactory.exsd
index 1c9fc0286c6..1c9fc0286c6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/semanticTypeFactory.exsd
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/semanticTypeFactory.exsd
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/userExtendedTypes.exsd b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/userExtendedTypes.exsd
index 2ef22bd14e0..2ef22bd14e0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/schema/userExtendedTypes.exsd
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/userExtendedTypes.exsd
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ActionConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ActionConfiguration.java
index ea1f27d9ae7..306580d0d2d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ActionConfiguration.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ActionConfiguration.java
@@ -1,26 +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.infra.extendedtypes;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Action Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getActionConfiguration()

- * @model abstract="true"

- * @generated

- */

-public interface ActionConfiguration extends ConfigurationElement {

-} // ActionConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Action Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getActionConfiguration()
+ * @model abstract="true"
+ * @generated
+ */
+public interface ActionConfiguration extends ConfigurationElement {
+} // ActionConfiguration
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/AspectSemanticTypeConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/AspectSemanticTypeConfiguration.java
index f035f0e1bf6..94f330b8d74 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/AspectSemanticTypeConfiguration.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/AspectSemanticTypeConfiguration.java
@@ -1,50 +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.extendedtypes;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Aspect Semantic Type Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration#getActionConfiguration <em>Action Configuration</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getAspectSemanticTypeConfiguration()

- * @model

- * @generated

- */

-public interface AspectSemanticTypeConfiguration extends SemanticTypeConfiguration {

-

-	/**

-	 * Returns the value of the '<em><b>Action Configuration</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Action Configuration</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>Action Configuration</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getAspectSemanticTypeConfiguration_ActionConfiguration()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<SemanticActionConfiguration> getActionConfiguration();

-} // AspectSemanticTypeConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Aspect Semantic Type Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration#getActionConfiguration <em>Action Configuration</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getAspectSemanticTypeConfiguration()
+ * @model
+ * @generated
+ */
+public interface AspectSemanticTypeConfiguration extends SemanticTypeConfiguration {
+
+	/**
+	 * Returns the value of the '<em><b>Action Configuration</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Action Configuration</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>Action Configuration</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getAspectSemanticTypeConfiguration_ActionConfiguration()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<SemanticActionConfiguration> getActionConfiguration();
+} // AspectSemanticTypeConfiguration
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/AspectViewTypeConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/AspectViewTypeConfiguration.java
index 6e507907d6e..3b8f0e858ba 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/AspectViewTypeConfiguration.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/AspectViewTypeConfiguration.java
@@ -1,50 +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.extendedtypes;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Aspect View Type Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration#getActionConfiguration <em>Action Configuration</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getAspectViewTypeConfiguration()

- * @model

- * @generated

- */

-public interface AspectViewTypeConfiguration extends ViewTypeConfiguration {

-

-	/**

-	 * Returns the value of the '<em><b>Action Configuration</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Action Configuration</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>Action Configuration</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getAspectViewTypeConfiguration_ActionConfiguration()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<ViewActionConfiguration> getActionConfiguration();

-} // AspectViewTypeConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Aspect View Type Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration#getActionConfiguration <em>Action Configuration</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getAspectViewTypeConfiguration()
+ * @model
+ * @generated
+ */
+public interface AspectViewTypeConfiguration extends ViewTypeConfiguration {
+
+	/**
+	 * Returns the value of the '<em><b>Action Configuration</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Action Configuration</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>Action Configuration</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getAspectViewTypeConfiguration_ActionConfiguration()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<ViewActionConfiguration> getActionConfiguration();
+} // AspectViewTypeConfiguration
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/AspectViewTypeFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/AspectViewTypeFactory.java
index e39930f241a..842f0e68c6c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/AspectViewTypeFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/AspectViewTypeFactory.java
@@ -1,106 +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:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes;

-

-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-

-

-/**

- * @author RS211865

- */

-public class AspectViewTypeFactory extends AbstractConfigurableElementTypeFactory<AspectViewTypeConfiguration> {

-

-	/**

-	 * Default Constructor

-	 */

-	public AspectViewTypeFactory() {

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected IEditHelperAdvice createEditHelperAdvice(AspectViewTypeConfiguration configuration) {

-		// List<SemanticActionConfiguration> semanticActionConfigurations = configuration.getActionConfiguration();

-		// List<IEditHelperAdvice> actionAdvices = new ArrayList<IEditHelperAdvice>(semanticActionConfigurations.size());

-		// for(SemanticActionConfiguration actionConfiguration : semanticActionConfigurations) {

-		// IEditHelperAdvice advice = AspectConfigurationFactoryRegistry.getInstance().createEditHelperAdvice(actionConfiguration);

-		// if(advice!=null) {

-		// actionAdvices.add(advice);

-		// // } else {

-		// // Activator.log.error("Impossible to create an advice for :" + actionConfiguration, null);

-		// }

-		// }

-		// if(actionAdvices!=null && actionAdvices.size() > 0) {

-		// return new ComposedEditHelperAdvice(actionAdvices);

-		// }

-		return new AbstractEditHelperAdvice() {

-

-		};

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected IContainerDescriptor createContainerDescriptor(AspectViewTypeConfiguration configuration) {

-		// List<SemanticActionConfiguration> semanticActionConfigurations = configuration.getActionConfiguration();

-		// List<IContainerDescriptor> containerDescriptors = new ArrayList<IContainerDescriptor>(semanticActionConfigurations.size());

-		// for(SemanticActionConfiguration actionConfiguration : semanticActionConfigurations) {

-		// IContainerDescriptor containerDescriptor = AspectConfigurationFactoryRegistry.getInstance().createContainerDescriptor(actionConfiguration);

-		// if(containerDescriptor!=null) {

-		// containerDescriptors.add(containerDescriptor);

-		// // } else {

-		// // Activator.log.error("Impossible to create a container descriptor for :" + actionConfiguration, null);

-		// }

-		// }

-		// if(containerDescriptors!=null && containerDescriptors.size() > 0) {

-		// return new ComposedContainerDescriptor(containerDescriptors);

-		// }

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public ICreationElementValidator createElementCreationValidator(AspectViewTypeConfiguration configuration) {

-		// List<SemanticActionConfiguration> semanticActionConfigurations = configuration.getActionConfiguration();

-		// List<ICreationElementValidator> actionValidators = new ArrayList<ICreationElementValidator>(semanticActionConfigurations.size());

-		// for(SemanticActionConfiguration actionConfiguration : semanticActionConfigurations) {

-		// ICreationElementValidator validator = AspectConfigurationFactoryRegistry.getInstance().createCreationElementValidator(actionConfiguration);

-		// if(validator!=null) {

-		// actionValidators.add(validator);

-		// // } else {

-		// // Activator.log.error("Impossible to create a creation element validator for :" + actionConfiguration, null);

-		// }

-		// }

-		// if(actionValidators!=null && actionValidators.size() > 0) {

-		// return new ComposedElementCreationValidator(actionValidators);

-		// }

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected IElementMatcher createElementMatcher(AspectViewTypeConfiguration configuration) {

-		// these element types are there only for creation => it can not be match at any time

-		return new NullElementMatcher();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes;
+
+import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+import org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+
+
+/**
+ * @author RS211865
+ */
+public class AspectViewTypeFactory extends AbstractConfigurableElementTypeFactory<AspectViewTypeConfiguration> {
+
+	/**
+	 * Default Constructor
+	 */
+	public AspectViewTypeFactory() {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected IEditHelperAdvice createEditHelperAdvice(AspectViewTypeConfiguration configuration) {
+		// List<SemanticActionConfiguration> semanticActionConfigurations = configuration.getActionConfiguration();
+		// List<IEditHelperAdvice> actionAdvices = new ArrayList<IEditHelperAdvice>(semanticActionConfigurations.size());
+		// for(SemanticActionConfiguration actionConfiguration : semanticActionConfigurations) {
+		// IEditHelperAdvice advice = AspectConfigurationFactoryRegistry.getInstance().createEditHelperAdvice(actionConfiguration);
+		// if(advice!=null) {
+		// actionAdvices.add(advice);
+		// // } else {
+		// // Activator.log.error("Impossible to create an advice for :" + actionConfiguration, null);
+		// }
+		// }
+		// if(actionAdvices!=null && actionAdvices.size() > 0) {
+		// return new ComposedEditHelperAdvice(actionAdvices);
+		// }
+		return new AbstractEditHelperAdvice() {
+
+		};
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected IContainerDescriptor createContainerDescriptor(AspectViewTypeConfiguration configuration) {
+		// List<SemanticActionConfiguration> semanticActionConfigurations = configuration.getActionConfiguration();
+		// List<IContainerDescriptor> containerDescriptors = new ArrayList<IContainerDescriptor>(semanticActionConfigurations.size());
+		// for(SemanticActionConfiguration actionConfiguration : semanticActionConfigurations) {
+		// IContainerDescriptor containerDescriptor = AspectConfigurationFactoryRegistry.getInstance().createContainerDescriptor(actionConfiguration);
+		// if(containerDescriptor!=null) {
+		// containerDescriptors.add(containerDescriptor);
+		// // } else {
+		// // Activator.log.error("Impossible to create a container descriptor for :" + actionConfiguration, null);
+		// }
+		// }
+		// if(containerDescriptors!=null && containerDescriptors.size() > 0) {
+		// return new ComposedContainerDescriptor(containerDescriptors);
+		// }
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ICreationElementValidator createElementCreationValidator(AspectViewTypeConfiguration configuration) {
+		// List<SemanticActionConfiguration> semanticActionConfigurations = configuration.getActionConfiguration();
+		// List<ICreationElementValidator> actionValidators = new ArrayList<ICreationElementValidator>(semanticActionConfigurations.size());
+		// for(SemanticActionConfiguration actionConfiguration : semanticActionConfigurations) {
+		// ICreationElementValidator validator = AspectConfigurationFactoryRegistry.getInstance().createCreationElementValidator(actionConfiguration);
+		// if(validator!=null) {
+		// actionValidators.add(validator);
+		// // } else {
+		// // Activator.log.error("Impossible to create a creation element validator for :" + actionConfiguration, null);
+		// }
+		// }
+		// if(actionValidators!=null && actionValidators.size() > 0) {
+		// return new ComposedElementCreationValidator(actionValidators);
+		// }
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected IElementMatcher createElementMatcher(AspectViewTypeConfiguration configuration) {
+		// these element types are there only for creation => it can not be match at any time
+		return new NullElementMatcher();
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ConfigurationElement.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ConfigurationElement.java
index d8330f55224..5c3ed24bdf5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ConfigurationElement.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ConfigurationElement.java
@@ -1,150 +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.infra.extendedtypes;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Configuration Element</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getDescription <em>Description</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIdentifier <em>Identifier</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIconEntry <em>Icon Entry</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getConfigurationElement()

- * @model abstract="true"

- * @generated

- */

-public interface ConfigurationElement 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.infra.extendedtypes.ExtendedtypesPackage#getConfigurationElement_Name()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#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>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Description</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Description</em>' attribute.

-	 * @see #setDescription(String)

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getConfigurationElement_Description()

-	 * @model

-	 * @generated

-	 */

-	String getDescription();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getDescription <em>Description</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Description</em>' attribute.

-	 * @see #getDescription()

-	 * @generated

-	 */

-	void setDescription(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Identifier</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Identifier</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Identifier</em>' attribute.

-	 * @see #setIdentifier(String)

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getConfigurationElement_Identifier()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getIdentifier();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIdentifier <em>Identifier</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Identifier</em>' attribute.

-	 * @see #getIdentifier()

-	 * @generated

-	 */

-	void setIdentifier(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Icon Entry</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Icon Entry</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>Icon Entry</em>' containment reference.

-	 * @see #setIconEntry(IconEntry)

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getConfigurationElement_IconEntry()

-	 * @model containment="true"

-	 * @generated

-	 */

-	IconEntry getIconEntry();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIconEntry <em>Icon Entry</em>}' containment

-	 * reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Icon Entry</em>' containment reference.

-	 * @see #getIconEntry()

-	 * @generated

-	 */

-	void setIconEntry(IconEntry value);

-} // ConfigurationElement

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Configuration Element</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getDescription <em>Description</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIdentifier <em>Identifier</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIconEntry <em>Icon Entry</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getConfigurationElement()
+ * @model abstract="true"
+ * @generated
+ */
+public interface ConfigurationElement 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.infra.extendedtypes.ExtendedtypesPackage#getConfigurationElement_Name()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#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>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Description</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Description</em>' attribute.
+	 * @see #setDescription(String)
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getConfigurationElement_Description()
+	 * @model
+	 * @generated
+	 */
+	String getDescription();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getDescription <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Description</em>' attribute.
+	 * @see #getDescription()
+	 * @generated
+	 */
+	void setDescription(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Identifier</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Identifier</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Identifier</em>' attribute.
+	 * @see #setIdentifier(String)
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getConfigurationElement_Identifier()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getIdentifier();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIdentifier <em>Identifier</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Identifier</em>' attribute.
+	 * @see #getIdentifier()
+	 * @generated
+	 */
+	void setIdentifier(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Icon Entry</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Icon Entry</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>Icon Entry</em>' containment reference.
+	 * @see #setIconEntry(IconEntry)
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getConfigurationElement_IconEntry()
+	 * @model containment="true"
+	 * @generated
+	 */
+	IconEntry getIconEntry();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIconEntry <em>Icon Entry</em>}' containment
+	 * reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Icon Entry</em>' containment reference.
+	 * @see #getIconEntry()
+	 * @generated
+	 */
+	void setIconEntry(IconEntry value);
+} // ConfigurationElement
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ElementTypeAdviceConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ElementTypeAdviceConfiguration.java
index c2c6fc298cc..c9d2ce7a231 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ElementTypeAdviceConfiguration.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ElementTypeAdviceConfiguration.java
@@ -1,26 +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.infra.extendedtypes;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Element Type Advice Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getElementTypeAdviceConfiguration()

- * @model abstract="true"

- * @generated

- */

-public interface ElementTypeAdviceConfiguration extends ConfigurationElement {

-} // ElementTypeAdviceConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Element Type Advice Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getElementTypeAdviceConfiguration()
+ * @model abstract="true"
+ * @generated
+ */
+public interface ElementTypeAdviceConfiguration extends ConfigurationElement {
+} // ElementTypeAdviceConfiguration
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ElementTypeConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ElementTypeConfiguration.java
index da4e0a1cb04..787f583fe3f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ElementTypeConfiguration.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ElementTypeConfiguration.java
@@ -1,140 +1,140 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Element Type Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getHint <em>Hint</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getKindName <em>Kind Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getSpecializedTypesID <em>Specialized Types ID</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getElementTypeConfiguration()

- * @model abstract="true"

- * @generated

- */

-public interface ElementTypeConfiguration extends ConfigurationElement {

-

-	/**

-	 * Returns the value of the '<em><b>Hint</b></em>' attribute.

-	 * The default value is <code>"ExtendedElements"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Hint</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Hint</em>' attribute.

-	 * @see #setHint(String)

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getElementTypeConfiguration_Hint()

-	 * @model default="ExtendedElements"

-	 * @generated

-	 */

-	String getHint();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getHint <em>Hint</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Hint</em>' attribute.

-	 * @see #getHint()

-	 * @generated

-	 */

-	void setHint(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Kind Name</b></em>' attribute.

-	 * The default value is <code>"org.eclipse.gmf.runtime.emf.type.core.IHintedType"</code>.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Kind 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>Kind Name</em>' attribute.

-	 * @see #setKindName(String)

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getElementTypeConfiguration_KindName()

-	 * @model default="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-	 * @generated

-	 */

-	String getKindName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getKindName <em>Kind Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Kind Name</em>' attribute.

-	 * @see #getKindName()

-	 * @generated

-	 */

-	void setKindName(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Specialized Types ID</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Specialized Types ID</em>' attribute list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Specialized Types ID</em>' attribute list.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getElementTypeConfiguration_SpecializedTypesID()

-	 * @model required="true"

-	 * @generated

-	 */

-	EList<String> getSpecializedTypesID();

-

-	/**

-	 * Returns the value of the '<em><b>Matcher Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Matcher Configuration</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>Matcher Configuration</em>' containment reference.

-	 * @see #setMatcherConfiguration(MatcherConfiguration)

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getElementTypeConfiguration_MatcherConfiguration()

-	 * @model containment="true"

-	 * @generated

-	 */

-	MatcherConfiguration getMatcherConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getMatcherConfiguration

-	 * <em>Matcher Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Matcher Configuration</em>' containment reference.

-	 * @see #getMatcherConfiguration()

-	 * @generated

-	 */

-	void setMatcherConfiguration(MatcherConfiguration value);

-} // ElementTypeConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Element Type Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getHint <em>Hint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getKindName <em>Kind Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getSpecializedTypesID <em>Specialized Types ID</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getElementTypeConfiguration()
+ * @model abstract="true"
+ * @generated
+ */
+public interface ElementTypeConfiguration extends ConfigurationElement {
+
+	/**
+	 * Returns the value of the '<em><b>Hint</b></em>' attribute.
+	 * The default value is <code>"ExtendedElements"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Hint</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Hint</em>' attribute.
+	 * @see #setHint(String)
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getElementTypeConfiguration_Hint()
+	 * @model default="ExtendedElements"
+	 * @generated
+	 */
+	String getHint();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getHint <em>Hint</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Hint</em>' attribute.
+	 * @see #getHint()
+	 * @generated
+	 */
+	void setHint(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Kind Name</b></em>' attribute.
+	 * The default value is <code>"org.eclipse.gmf.runtime.emf.type.core.IHintedType"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Kind 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>Kind Name</em>' attribute.
+	 * @see #setKindName(String)
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getElementTypeConfiguration_KindName()
+	 * @model default="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+	 * @generated
+	 */
+	String getKindName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getKindName <em>Kind Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Kind Name</em>' attribute.
+	 * @see #getKindName()
+	 * @generated
+	 */
+	void setKindName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Specialized Types ID</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.String}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Specialized Types ID</em>' attribute list isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Specialized Types ID</em>' attribute list.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getElementTypeConfiguration_SpecializedTypesID()
+	 * @model required="true"
+	 * @generated
+	 */
+	EList<String> getSpecializedTypesID();
+
+	/**
+	 * Returns the value of the '<em><b>Matcher Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Matcher Configuration</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>Matcher Configuration</em>' containment reference.
+	 * @see #setMatcherConfiguration(MatcherConfiguration)
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getElementTypeConfiguration_MatcherConfiguration()
+	 * @model containment="true"
+	 * @generated
+	 */
+	MatcherConfiguration getMatcherConfiguration();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getMatcherConfiguration
+	 * <em>Matcher Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Matcher Configuration</em>' containment reference.
+	 * @see #getMatcherConfiguration()
+	 * @generated
+	 */
+	void setMatcherConfiguration(MatcherConfiguration value);
+} // ElementTypeConfiguration
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeSet.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeSet.java
index 2d818bc0539..5b78cc65a24 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeSet.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeSet.java
@@ -1,79 +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.extendedtypes;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Extended Element Type Set</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#getElementType <em>Element Type</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#isExtensible <em>Extensible</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeSet()

- * @model

- * @generated

- */

-public interface ExtendedElementTypeSet extends ConfigurationElement {

-

-	/**

-	 * Returns the value of the '<em><b>Element Type</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Element Type</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>Element Type</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeSet_ElementType()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	EList<ElementTypeConfiguration> getElementType();

-

-	/**

-	 * Returns the value of the '<em><b>Extensible</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Extensible</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Extensible</em>' attribute.

-	 * @see #setExtensible(boolean)

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeSet_Extensible()

-	 * @model

-	 * @generated

-	 */

-	boolean isExtensible();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#isExtensible <em>Extensible</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Extensible</em>' attribute.

-	 * @see #isExtensible()

-	 * @generated

-	 */

-	void setExtensible(boolean value);

-} // ExtendedElementTypeSet

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Extended Element Type Set</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#getElementType <em>Element Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#isExtensible <em>Extensible</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeSet()
+ * @model
+ * @generated
+ */
+public interface ExtendedElementTypeSet extends ConfigurationElement {
+
+	/**
+	 * Returns the value of the '<em><b>Element Type</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Element Type</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>Element Type</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeSet_ElementType()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	EList<ElementTypeConfiguration> getElementType();
+
+	/**
+	 * Returns the value of the '<em><b>Extensible</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Extensible</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Extensible</em>' attribute.
+	 * @see #setExtensible(boolean)
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeSet_Extensible()
+	 * @model
+	 * @generated
+	 */
+	boolean isExtensible();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#isExtensible <em>Extensible</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Extensible</em>' attribute.
+	 * @see #isExtensible()
+	 * @generated
+	 */
+	void setExtensible(boolean value);
+} // ExtendedElementTypeSet
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedtypesFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedtypesFactory.java
index c66e9c81bfe..ceb1dd69bc5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedtypesFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedtypesFactory.java
@@ -1,86 +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.extendedtypes;

-

-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.extendedtypes.ExtendedtypesPackage

- * @generated

- */

-public interface ExtendedtypesFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	ExtendedtypesFactory eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Extended Element Type Set</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Extended Element Type Set</em>'.

-	 * @generated

-	 */

-	ExtendedElementTypeSet createExtendedElementTypeSet();

-

-	/**

-	 * Returns a new object of class '<em>Icon Entry</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Icon Entry</em>'.

-	 * @generated

-	 */

-	IconEntry createIconEntry();

-

-	/**

-	 * Returns a new object of class '<em>Aspect Semantic Type Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Aspect Semantic Type Configuration</em>'.

-	 * @generated

-	 */

-	AspectSemanticTypeConfiguration createAspectSemanticTypeConfiguration();

-

-	/**

-	 * Returns a new object of class '<em>Aspect View Type Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Aspect View Type Configuration</em>'.

-	 * @generated

-	 */

-	AspectViewTypeConfiguration createAspectViewTypeConfiguration();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	ExtendedtypesPackage getExtendedtypesPackage();

-} // ExtendedtypesFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes;
+
+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.extendedtypes.ExtendedtypesPackage
+ * @generated
+ */
+public interface ExtendedtypesFactory extends EFactory {
+
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	ExtendedtypesFactory eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Extended Element Type Set</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Extended Element Type Set</em>'.
+	 * @generated
+	 */
+	ExtendedElementTypeSet createExtendedElementTypeSet();
+
+	/**
+	 * Returns a new object of class '<em>Icon Entry</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Icon Entry</em>'.
+	 * @generated
+	 */
+	IconEntry createIconEntry();
+
+	/**
+	 * Returns a new object of class '<em>Aspect Semantic Type Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Aspect Semantic Type Configuration</em>'.
+	 * @generated
+	 */
+	AspectSemanticTypeConfiguration createAspectSemanticTypeConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>Aspect View Type Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Aspect View Type Configuration</em>'.
+	 * @generated
+	 */
+	AspectViewTypeConfiguration createAspectViewTypeConfiguration();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	ExtendedtypesPackage getExtendedtypesPackage();
+} // ExtendedtypesFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedtypesPackage.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedtypesPackage.java
index 866540f3f3a..917438089c9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedtypesPackage.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedtypesPackage.java
@@ -1,1421 +1,1421 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes;

-

-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 enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory

- * @model kind="package"

- * @generated

- */

-public interface ExtendedtypesPackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "extendedtypes"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "extendedtypes"; //$NON-NLS-1$

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	ExtendedtypesPackage eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ConfigurationElementImpl <em>Configuration Element</em>}'

-	 * class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ConfigurationElementImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getConfigurationElement()

-	 * @generated

-	 */

-	int CONFIGURATION_ELEMENT = 3;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONFIGURATION_ELEMENT__NAME = 0;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONFIGURATION_ELEMENT__DESCRIPTION = 1;

-

-	/**

-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONFIGURATION_ELEMENT__IDENTIFIER = 2;

-

-	/**

-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONFIGURATION_ELEMENT__ICON_ENTRY = 3;

-

-	/**

-	 * The number of structural features of the '<em>Configuration Element</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONFIGURATION_ELEMENT_FEATURE_COUNT = 4;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeSetImpl <em>Extended Element Type Set</em>}'

-	 * class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeSetImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getExtendedElementTypeSet()

-	 * @generated

-	 */

-	int EXTENDED_ELEMENT_TYPE_SET = 0;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EXTENDED_ELEMENT_TYPE_SET__NAME = CONFIGURATION_ELEMENT__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EXTENDED_ELEMENT_TYPE_SET__DESCRIPTION = CONFIGURATION_ELEMENT__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EXTENDED_ELEMENT_TYPE_SET__IDENTIFIER = CONFIGURATION_ELEMENT__IDENTIFIER;

-

-	/**

-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EXTENDED_ELEMENT_TYPE_SET__ICON_ENTRY = CONFIGURATION_ELEMENT__ICON_ENTRY;

-

-	/**

-	 * The feature id for the '<em><b>Element Type</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE = CONFIGURATION_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Extensible</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE = CONFIGURATION_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Extended Element Type Set</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EXTENDED_ELEMENT_TYPE_SET_FEATURE_COUNT = CONFIGURATION_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeConfigurationImpl

-	 * <em>Element Type Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getElementTypeConfiguration()

-	 * @generated

-	 */

-	int ELEMENT_TYPE_CONFIGURATION = 1;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ELEMENT_TYPE_CONFIGURATION__NAME = CONFIGURATION_ELEMENT__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ELEMENT_TYPE_CONFIGURATION__DESCRIPTION = CONFIGURATION_ELEMENT__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ELEMENT_TYPE_CONFIGURATION__IDENTIFIER = CONFIGURATION_ELEMENT__IDENTIFIER;

-

-	/**

-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY = CONFIGURATION_ELEMENT__ICON_ENTRY;

-

-	/**

-	 * The feature id for the '<em><b>Hint</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ELEMENT_TYPE_CONFIGURATION__HINT = CONFIGURATION_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Kind Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ELEMENT_TYPE_CONFIGURATION__KIND_NAME = CONFIGURATION_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = CONFIGURATION_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = CONFIGURATION_ELEMENT_FEATURE_COUNT + 3;

-

-	/**

-	 * The number of structural features of the '<em>Element Type Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT = CONFIGURATION_ELEMENT_FEATURE_COUNT + 4;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.IconEntryImpl <em>Icon Entry</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.IconEntryImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getIconEntry()

-	 * @generated

-	 */

-	int ICON_ENTRY = 2;

-

-	/**

-	 * The feature id for the '<em><b>Icon Path</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ICON_ENTRY__ICON_PATH = 0;

-

-	/**

-	 * The feature id for the '<em><b>Bundle Id</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ICON_ENTRY__BUNDLE_ID = 1;

-

-	/**

-	 * The number of structural features of the '<em>Icon Entry</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ICON_ENTRY_FEATURE_COUNT = 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.MatcherConfigurationImpl <em>Matcher Configuration</em>}'

-	 * class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.MatcherConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getMatcherConfiguration()

-	 * @generated

-	 */

-	int MATCHER_CONFIGURATION = 4;

-

-	/**

-	 * The number of structural features of the '<em>Matcher Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int MATCHER_CONFIGURATION_FEATURE_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ActionConfigurationImpl <em>Action Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ActionConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getActionConfiguration()

-	 * @generated

-	 */

-	int ACTION_CONFIGURATION = 5;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ACTION_CONFIGURATION__NAME = CONFIGURATION_ELEMENT__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ACTION_CONFIGURATION__DESCRIPTION = CONFIGURATION_ELEMENT__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ACTION_CONFIGURATION__IDENTIFIER = CONFIGURATION_ELEMENT__IDENTIFIER;

-

-	/**

-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ACTION_CONFIGURATION__ICON_ENTRY = CONFIGURATION_ELEMENT__ICON_ENTRY;

-

-	/**

-	 * The number of structural features of the '<em>Action Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ACTION_CONFIGURATION_FEATURE_COUNT = CONFIGURATION_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ViewActionConfigurationImpl <em>View Action Configuration</em>} ' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ViewActionConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getViewActionConfiguration()

-	 * @generated

-	 */

-	int VIEW_ACTION_CONFIGURATION = 6;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_ACTION_CONFIGURATION__NAME = ACTION_CONFIGURATION__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_ACTION_CONFIGURATION__DESCRIPTION = ACTION_CONFIGURATION__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_ACTION_CONFIGURATION__IDENTIFIER = ACTION_CONFIGURATION__IDENTIFIER;

-

-	/**

-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_ACTION_CONFIGURATION__ICON_ENTRY = ACTION_CONFIGURATION__ICON_ENTRY;

-

-	/**

-	 * The number of structural features of the '<em>View Action Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_ACTION_CONFIGURATION_FEATURE_COUNT = ACTION_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.SemanticActionConfigurationImpl

-	 * <em>Semantic Action Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.SemanticActionConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getSemanticActionConfiguration()

-	 * @generated

-	 */

-	int SEMANTIC_ACTION_CONFIGURATION = 7;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SEMANTIC_ACTION_CONFIGURATION__NAME = ACTION_CONFIGURATION__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SEMANTIC_ACTION_CONFIGURATION__DESCRIPTION = ACTION_CONFIGURATION__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SEMANTIC_ACTION_CONFIGURATION__IDENTIFIER = ACTION_CONFIGURATION__IDENTIFIER;

-

-	/**

-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SEMANTIC_ACTION_CONFIGURATION__ICON_ENTRY = ACTION_CONFIGURATION__ICON_ENTRY;

-

-	/**

-	 * The number of structural features of the '<em>Semantic Action Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SEMANTIC_ACTION_CONFIGURATION_FEATURE_COUNT = ACTION_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.SemanticTypeConfigurationImpl

-	 * <em>Semantic Type Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.SemanticTypeConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getSemanticTypeConfiguration()

-	 * @generated

-	 */

-	int SEMANTIC_TYPE_CONFIGURATION = 8;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SEMANTIC_TYPE_CONFIGURATION__NAME = ELEMENT_TYPE_CONFIGURATION__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SEMANTIC_TYPE_CONFIGURATION__DESCRIPTION = ELEMENT_TYPE_CONFIGURATION__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SEMANTIC_TYPE_CONFIGURATION__IDENTIFIER = ELEMENT_TYPE_CONFIGURATION__IDENTIFIER;

-

-	/**

-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SEMANTIC_TYPE_CONFIGURATION__ICON_ENTRY = ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY;

-

-	/**

-	 * The feature id for the '<em><b>Hint</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SEMANTIC_TYPE_CONFIGURATION__HINT = ELEMENT_TYPE_CONFIGURATION__HINT;

-

-	/**

-	 * The feature id for the '<em><b>Kind Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SEMANTIC_TYPE_CONFIGURATION__KIND_NAME = ELEMENT_TYPE_CONFIGURATION__KIND_NAME;

-

-	/**

-	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SEMANTIC_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID;

-

-	/**

-	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SEMANTIC_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION;

-

-	/**

-	 * The number of structural features of the '<em>Semantic Type Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SEMANTIC_TYPE_CONFIGURATION_FEATURE_COUNT = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ViewTypeConfigurationImpl <em>View Type Configuration</em>}'

-	 * class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ViewTypeConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getViewTypeConfiguration()

-	 * @generated

-	 */

-	int VIEW_TYPE_CONFIGURATION = 9;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_TYPE_CONFIGURATION__NAME = ELEMENT_TYPE_CONFIGURATION__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_TYPE_CONFIGURATION__DESCRIPTION = ELEMENT_TYPE_CONFIGURATION__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_TYPE_CONFIGURATION__IDENTIFIER = ELEMENT_TYPE_CONFIGURATION__IDENTIFIER;

-

-	/**

-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_TYPE_CONFIGURATION__ICON_ENTRY = ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY;

-

-	/**

-	 * The feature id for the '<em><b>Hint</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_TYPE_CONFIGURATION__HINT = ELEMENT_TYPE_CONFIGURATION__HINT;

-

-	/**

-	 * The feature id for the '<em><b>Kind Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_TYPE_CONFIGURATION__KIND_NAME = ELEMENT_TYPE_CONFIGURATION__KIND_NAME;

-

-	/**

-	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID;

-

-	/**

-	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Specialized Diagram Type ID</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>View Type Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIEW_TYPE_CONFIGURATION_FEATURE_COUNT = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeAdviceConfigurationImpl

-	 * <em>Element Type Advice Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeAdviceConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getElementTypeAdviceConfiguration()

-	 * @generated

-	 */

-	int ELEMENT_TYPE_ADVICE_CONFIGURATION = 10;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ELEMENT_TYPE_ADVICE_CONFIGURATION__NAME = CONFIGURATION_ELEMENT__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ELEMENT_TYPE_ADVICE_CONFIGURATION__DESCRIPTION = CONFIGURATION_ELEMENT__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ELEMENT_TYPE_ADVICE_CONFIGURATION__IDENTIFIER = CONFIGURATION_ELEMENT__IDENTIFIER;

-

-	/**

-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ELEMENT_TYPE_ADVICE_CONFIGURATION__ICON_ENTRY = CONFIGURATION_ELEMENT__ICON_ENTRY;

-

-	/**

-	 * The number of structural features of the '<em>Element Type Advice Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ELEMENT_TYPE_ADVICE_CONFIGURATION_FEATURE_COUNT = CONFIGURATION_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.AspectSemanticTypeConfigurationImpl

-	 * <em>Aspect Semantic Type Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.AspectSemanticTypeConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getAspectSemanticTypeConfiguration()

-	 * @generated

-	 */

-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION = 11;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__NAME = SEMANTIC_TYPE_CONFIGURATION__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__DESCRIPTION = SEMANTIC_TYPE_CONFIGURATION__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__IDENTIFIER = SEMANTIC_TYPE_CONFIGURATION__IDENTIFIER;

-

-	/**

-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__ICON_ENTRY = SEMANTIC_TYPE_CONFIGURATION__ICON_ENTRY;

-

-	/**

-	 * The feature id for the '<em><b>Hint</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__HINT = SEMANTIC_TYPE_CONFIGURATION__HINT;

-

-	/**

-	 * The feature id for the '<em><b>Kind Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__KIND_NAME = SEMANTIC_TYPE_CONFIGURATION__KIND_NAME;

-

-	/**

-	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = SEMANTIC_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID;

-

-	/**

-	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = SEMANTIC_TYPE_CONFIGURATION__MATCHER_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Action Configuration</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION = SEMANTIC_TYPE_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Aspect Semantic Type Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION_FEATURE_COUNT = SEMANTIC_TYPE_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.AspectViewTypeConfigurationImpl

-	 * <em>Aspect View Type Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.AspectViewTypeConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getAspectViewTypeConfiguration()

-	 * @generated

-	 */

-	int ASPECT_VIEW_TYPE_CONFIGURATION = 12;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ASPECT_VIEW_TYPE_CONFIGURATION__NAME = VIEW_TYPE_CONFIGURATION__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ASPECT_VIEW_TYPE_CONFIGURATION__DESCRIPTION = VIEW_TYPE_CONFIGURATION__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ASPECT_VIEW_TYPE_CONFIGURATION__IDENTIFIER = VIEW_TYPE_CONFIGURATION__IDENTIFIER;

-

-	/**

-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ASPECT_VIEW_TYPE_CONFIGURATION__ICON_ENTRY = VIEW_TYPE_CONFIGURATION__ICON_ENTRY;

-

-	/**

-	 * The feature id for the '<em><b>Hint</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ASPECT_VIEW_TYPE_CONFIGURATION__HINT = VIEW_TYPE_CONFIGURATION__HINT;

-

-	/**

-	 * The feature id for the '<em><b>Kind Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ASPECT_VIEW_TYPE_CONFIGURATION__KIND_NAME = VIEW_TYPE_CONFIGURATION__KIND_NAME;

-

-	/**

-	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ASPECT_VIEW_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = VIEW_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID;

-

-	/**

-	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ASPECT_VIEW_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = VIEW_TYPE_CONFIGURATION__MATCHER_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Specialized Diagram Type ID</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ASPECT_VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID = VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID;

-

-	/**

-	 * The feature id for the '<em><b>Action Configuration</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION = VIEW_TYPE_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Aspect View Type Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int ASPECT_VIEW_TYPE_CONFIGURATION_FEATURE_COUNT = VIEW_TYPE_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet <em>Extended Element Type Set</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Extended Element Type Set</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet

-	 * @generated

-	 */

-	EClass getExtendedElementTypeSet();

-

-	/**

-	 * Returns the meta object for the containment reference list ' {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#getElementType <em>Element Type</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Element Type</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#getElementType()

-	 * @see #getExtendedElementTypeSet()

-	 * @generated

-	 */

-	EReference getExtendedElementTypeSet_ElementType();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#isExtensible

-	 * <em>Extensible</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Extensible</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#isExtensible()

-	 * @see #getExtendedElementTypeSet()

-	 * @generated

-	 */

-	EAttribute getExtendedElementTypeSet_Extensible();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration <em>Element Type Configuration</em>} '.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Element Type Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration

-	 * @generated

-	 */

-	EClass getElementTypeConfiguration();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getHint <em>Hint</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Hint</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getHint()

-	 * @see #getElementTypeConfiguration()

-	 * @generated

-	 */

-	EAttribute getElementTypeConfiguration_Hint();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getKindName

-	 * <em>Kind Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Kind Name</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getKindName()

-	 * @see #getElementTypeConfiguration()

-	 * @generated

-	 */

-	EAttribute getElementTypeConfiguration_KindName();

-

-	/**

-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getSpecializedTypesID

-	 * <em>Specialized Types ID</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute list '<em>Specialized Types ID</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getSpecializedTypesID()

-	 * @see #getElementTypeConfiguration()

-	 * @generated

-	 */

-	EAttribute getElementTypeConfiguration_SpecializedTypesID();

-

-	/**

-	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Matcher Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getMatcherConfiguration()

-	 * @see #getElementTypeConfiguration()

-	 * @generated

-	 */

-	EReference getElementTypeConfiguration_MatcherConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry <em>Icon Entry</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Icon Entry</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.IconEntry

-	 * @generated

-	 */

-	EClass getIconEntry();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getIconPath <em>Icon Path</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Icon Path</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.IconEntry#getIconPath()

-	 * @see #getIconEntry()

-	 * @generated

-	 */

-	EAttribute getIconEntry_IconPath();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getBundleId <em>Bundle Id</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Bundle Id</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.IconEntry#getBundleId()

-	 * @see #getIconEntry()

-	 * @generated

-	 */

-	EAttribute getIconEntry_BundleId();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement <em>Configuration Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Configuration Element</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement

-	 * @generated

-	 */

-	EClass getConfigurationElement();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getName <em>Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Name</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getName()

-	 * @see #getConfigurationElement()

-	 * @generated

-	 */

-	EAttribute getConfigurationElement_Name();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getDescription

-	 * <em>Description</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Description</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getDescription()

-	 * @see #getConfigurationElement()

-	 * @generated

-	 */

-	EAttribute getConfigurationElement_Description();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIdentifier

-	 * <em>Identifier</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Identifier</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIdentifier()

-	 * @see #getConfigurationElement()

-	 * @generated

-	 */

-	EAttribute getConfigurationElement_Identifier();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIconEntry

-	 * <em>Icon Entry</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Icon Entry</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIconEntry()

-	 * @see #getConfigurationElement()

-	 * @generated

-	 */

-	EReference getConfigurationElement_IconEntry();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration <em>Matcher Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Matcher Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration

-	 * @generated

-	 */

-	EClass getMatcherConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration <em>Action Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Action Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration

-	 * @generated

-	 */

-	EClass getActionConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration <em>View Action Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>View Action Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration

-	 * @generated

-	 */

-	EClass getViewActionConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration

-	 * <em>Semantic Action Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Semantic Action Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration

-	 * @generated

-	 */

-	EClass getSemanticActionConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration

-	 * <em>Semantic Type Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Semantic Type Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration

-	 * @generated

-	 */

-	EClass getSemanticTypeConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration <em>View Type Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>View Type Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration

-	 * @generated

-	 */

-	EClass getViewTypeConfiguration();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration#getSpecializedDiagramTypeID

-	 * <em>Specialized Diagram Type ID</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Specialized Diagram Type ID</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration#getSpecializedDiagramTypeID()

-	 * @see #getViewTypeConfiguration()

-	 * @generated

-	 */

-	EAttribute getViewTypeConfiguration_SpecializedDiagramTypeID();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration

-	 * <em>Element Type Advice Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Element Type Advice Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration

-	 * @generated

-	 */

-	EClass getElementTypeAdviceConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration

-	 * <em>Aspect Semantic Type Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Aspect Semantic Type Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration

-	 * @generated

-	 */

-	EClass getAspectSemanticTypeConfiguration();

-

-	/**

-	 * Returns the meta object for the containment reference list ' {@link org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration#getActionConfiguration <em>Action Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Action Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration#getActionConfiguration()

-	 * @see #getAspectSemanticTypeConfiguration()

-	 * @generated

-	 */

-	EReference getAspectSemanticTypeConfiguration_ActionConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration

-	 * <em>Aspect View Type Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Aspect View Type Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration

-	 * @generated

-	 */

-	EClass getAspectViewTypeConfiguration();

-

-	/**

-	 * Returns the meta object for the containment reference list ' {@link org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration#getActionConfiguration <em>Action Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Action Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration#getActionConfiguration()

-	 * @see #getAspectViewTypeConfiguration()

-	 * @generated

-	 */

-	EReference getAspectViewTypeConfiguration_ActionConfiguration();

-

-	/**

-	 * 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

-	 */

-	ExtendedtypesFactory getExtendedtypesFactory();

-} // ExtendedtypesPackage

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes;
+
+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 enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface ExtendedtypesPackage extends EPackage {
+
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNAME = "extendedtypes"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_PREFIX = "extendedtypes"; //$NON-NLS-1$
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	ExtendedtypesPackage eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ConfigurationElementImpl <em>Configuration Element</em>}'
+	 * class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ConfigurationElementImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getConfigurationElement()
+	 * @generated
+	 */
+	int CONFIGURATION_ELEMENT = 3;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONFIGURATION_ELEMENT__NAME = 0;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONFIGURATION_ELEMENT__DESCRIPTION = 1;
+
+	/**
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONFIGURATION_ELEMENT__IDENTIFIER = 2;
+
+	/**
+	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONFIGURATION_ELEMENT__ICON_ENTRY = 3;
+
+	/**
+	 * The number of structural features of the '<em>Configuration Element</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CONFIGURATION_ELEMENT_FEATURE_COUNT = 4;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeSetImpl <em>Extended Element Type Set</em>}'
+	 * class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeSetImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getExtendedElementTypeSet()
+	 * @generated
+	 */
+	int EXTENDED_ELEMENT_TYPE_SET = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENDED_ELEMENT_TYPE_SET__NAME = CONFIGURATION_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENDED_ELEMENT_TYPE_SET__DESCRIPTION = CONFIGURATION_ELEMENT__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENDED_ELEMENT_TYPE_SET__IDENTIFIER = CONFIGURATION_ELEMENT__IDENTIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENDED_ELEMENT_TYPE_SET__ICON_ENTRY = CONFIGURATION_ELEMENT__ICON_ENTRY;
+
+	/**
+	 * The feature id for the '<em><b>Element Type</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE = CONFIGURATION_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Extensible</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE = CONFIGURATION_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Extended Element Type Set</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENDED_ELEMENT_TYPE_SET_FEATURE_COUNT = CONFIGURATION_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeConfigurationImpl
+	 * <em>Element Type Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getElementTypeConfiguration()
+	 * @generated
+	 */
+	int ELEMENT_TYPE_CONFIGURATION = 1;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ELEMENT_TYPE_CONFIGURATION__NAME = CONFIGURATION_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ELEMENT_TYPE_CONFIGURATION__DESCRIPTION = CONFIGURATION_ELEMENT__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ELEMENT_TYPE_CONFIGURATION__IDENTIFIER = CONFIGURATION_ELEMENT__IDENTIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY = CONFIGURATION_ELEMENT__ICON_ENTRY;
+
+	/**
+	 * The feature id for the '<em><b>Hint</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ELEMENT_TYPE_CONFIGURATION__HINT = CONFIGURATION_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Kind Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ELEMENT_TYPE_CONFIGURATION__KIND_NAME = CONFIGURATION_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = CONFIGURATION_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = CONFIGURATION_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the '<em>Element Type Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT = CONFIGURATION_ELEMENT_FEATURE_COUNT + 4;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.IconEntryImpl <em>Icon Entry</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.IconEntryImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getIconEntry()
+	 * @generated
+	 */
+	int ICON_ENTRY = 2;
+
+	/**
+	 * The feature id for the '<em><b>Icon Path</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ICON_ENTRY__ICON_PATH = 0;
+
+	/**
+	 * The feature id for the '<em><b>Bundle Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ICON_ENTRY__BUNDLE_ID = 1;
+
+	/**
+	 * The number of structural features of the '<em>Icon Entry</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ICON_ENTRY_FEATURE_COUNT = 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.MatcherConfigurationImpl <em>Matcher Configuration</em>}'
+	 * class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.MatcherConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getMatcherConfiguration()
+	 * @generated
+	 */
+	int MATCHER_CONFIGURATION = 4;
+
+	/**
+	 * The number of structural features of the '<em>Matcher Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int MATCHER_CONFIGURATION_FEATURE_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ActionConfigurationImpl <em>Action Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ActionConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getActionConfiguration()
+	 * @generated
+	 */
+	int ACTION_CONFIGURATION = 5;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ACTION_CONFIGURATION__NAME = CONFIGURATION_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ACTION_CONFIGURATION__DESCRIPTION = CONFIGURATION_ELEMENT__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ACTION_CONFIGURATION__IDENTIFIER = CONFIGURATION_ELEMENT__IDENTIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ACTION_CONFIGURATION__ICON_ENTRY = CONFIGURATION_ELEMENT__ICON_ENTRY;
+
+	/**
+	 * The number of structural features of the '<em>Action Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ACTION_CONFIGURATION_FEATURE_COUNT = CONFIGURATION_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ViewActionConfigurationImpl <em>View Action Configuration</em>} ' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ViewActionConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getViewActionConfiguration()
+	 * @generated
+	 */
+	int VIEW_ACTION_CONFIGURATION = 6;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VIEW_ACTION_CONFIGURATION__NAME = ACTION_CONFIGURATION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VIEW_ACTION_CONFIGURATION__DESCRIPTION = ACTION_CONFIGURATION__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VIEW_ACTION_CONFIGURATION__IDENTIFIER = ACTION_CONFIGURATION__IDENTIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VIEW_ACTION_CONFIGURATION__ICON_ENTRY = ACTION_CONFIGURATION__ICON_ENTRY;
+
+	/**
+	 * The number of structural features of the '<em>View Action Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VIEW_ACTION_CONFIGURATION_FEATURE_COUNT = ACTION_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.SemanticActionConfigurationImpl
+	 * <em>Semantic Action Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.SemanticActionConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getSemanticActionConfiguration()
+	 * @generated
+	 */
+	int SEMANTIC_ACTION_CONFIGURATION = 7;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SEMANTIC_ACTION_CONFIGURATION__NAME = ACTION_CONFIGURATION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SEMANTIC_ACTION_CONFIGURATION__DESCRIPTION = ACTION_CONFIGURATION__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SEMANTIC_ACTION_CONFIGURATION__IDENTIFIER = ACTION_CONFIGURATION__IDENTIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SEMANTIC_ACTION_CONFIGURATION__ICON_ENTRY = ACTION_CONFIGURATION__ICON_ENTRY;
+
+	/**
+	 * The number of structural features of the '<em>Semantic Action Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SEMANTIC_ACTION_CONFIGURATION_FEATURE_COUNT = ACTION_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.SemanticTypeConfigurationImpl
+	 * <em>Semantic Type Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.SemanticTypeConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getSemanticTypeConfiguration()
+	 * @generated
+	 */
+	int SEMANTIC_TYPE_CONFIGURATION = 8;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SEMANTIC_TYPE_CONFIGURATION__NAME = ELEMENT_TYPE_CONFIGURATION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SEMANTIC_TYPE_CONFIGURATION__DESCRIPTION = ELEMENT_TYPE_CONFIGURATION__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SEMANTIC_TYPE_CONFIGURATION__IDENTIFIER = ELEMENT_TYPE_CONFIGURATION__IDENTIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SEMANTIC_TYPE_CONFIGURATION__ICON_ENTRY = ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY;
+
+	/**
+	 * The feature id for the '<em><b>Hint</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SEMANTIC_TYPE_CONFIGURATION__HINT = ELEMENT_TYPE_CONFIGURATION__HINT;
+
+	/**
+	 * The feature id for the '<em><b>Kind Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SEMANTIC_TYPE_CONFIGURATION__KIND_NAME = ELEMENT_TYPE_CONFIGURATION__KIND_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SEMANTIC_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID;
+
+	/**
+	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SEMANTIC_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION;
+
+	/**
+	 * The number of structural features of the '<em>Semantic Type Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SEMANTIC_TYPE_CONFIGURATION_FEATURE_COUNT = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ViewTypeConfigurationImpl <em>View Type Configuration</em>}'
+	 * class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ViewTypeConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getViewTypeConfiguration()
+	 * @generated
+	 */
+	int VIEW_TYPE_CONFIGURATION = 9;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VIEW_TYPE_CONFIGURATION__NAME = ELEMENT_TYPE_CONFIGURATION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VIEW_TYPE_CONFIGURATION__DESCRIPTION = ELEMENT_TYPE_CONFIGURATION__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VIEW_TYPE_CONFIGURATION__IDENTIFIER = ELEMENT_TYPE_CONFIGURATION__IDENTIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VIEW_TYPE_CONFIGURATION__ICON_ENTRY = ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY;
+
+	/**
+	 * The feature id for the '<em><b>Hint</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VIEW_TYPE_CONFIGURATION__HINT = ELEMENT_TYPE_CONFIGURATION__HINT;
+
+	/**
+	 * The feature id for the '<em><b>Kind Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VIEW_TYPE_CONFIGURATION__KIND_NAME = ELEMENT_TYPE_CONFIGURATION__KIND_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VIEW_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID;
+
+	/**
+	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VIEW_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Specialized Diagram Type ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>View Type Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int VIEW_TYPE_CONFIGURATION_FEATURE_COUNT = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeAdviceConfigurationImpl
+	 * <em>Element Type Advice Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeAdviceConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getElementTypeAdviceConfiguration()
+	 * @generated
+	 */
+	int ELEMENT_TYPE_ADVICE_CONFIGURATION = 10;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ELEMENT_TYPE_ADVICE_CONFIGURATION__NAME = CONFIGURATION_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ELEMENT_TYPE_ADVICE_CONFIGURATION__DESCRIPTION = CONFIGURATION_ELEMENT__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ELEMENT_TYPE_ADVICE_CONFIGURATION__IDENTIFIER = CONFIGURATION_ELEMENT__IDENTIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ELEMENT_TYPE_ADVICE_CONFIGURATION__ICON_ENTRY = CONFIGURATION_ELEMENT__ICON_ENTRY;
+
+	/**
+	 * The number of structural features of the '<em>Element Type Advice Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ELEMENT_TYPE_ADVICE_CONFIGURATION_FEATURE_COUNT = CONFIGURATION_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.AspectSemanticTypeConfigurationImpl
+	 * <em>Aspect Semantic Type Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.AspectSemanticTypeConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getAspectSemanticTypeConfiguration()
+	 * @generated
+	 */
+	int ASPECT_SEMANTIC_TYPE_CONFIGURATION = 11;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__NAME = SEMANTIC_TYPE_CONFIGURATION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__DESCRIPTION = SEMANTIC_TYPE_CONFIGURATION__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__IDENTIFIER = SEMANTIC_TYPE_CONFIGURATION__IDENTIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__ICON_ENTRY = SEMANTIC_TYPE_CONFIGURATION__ICON_ENTRY;
+
+	/**
+	 * The feature id for the '<em><b>Hint</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__HINT = SEMANTIC_TYPE_CONFIGURATION__HINT;
+
+	/**
+	 * The feature id for the '<em><b>Kind Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__KIND_NAME = SEMANTIC_TYPE_CONFIGURATION__KIND_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = SEMANTIC_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID;
+
+	/**
+	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = SEMANTIC_TYPE_CONFIGURATION__MATCHER_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Action Configuration</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION = SEMANTIC_TYPE_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Aspect Semantic Type Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ASPECT_SEMANTIC_TYPE_CONFIGURATION_FEATURE_COUNT = SEMANTIC_TYPE_CONFIGURATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.AspectViewTypeConfigurationImpl
+	 * <em>Aspect View Type Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.AspectViewTypeConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getAspectViewTypeConfiguration()
+	 * @generated
+	 */
+	int ASPECT_VIEW_TYPE_CONFIGURATION = 12;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ASPECT_VIEW_TYPE_CONFIGURATION__NAME = VIEW_TYPE_CONFIGURATION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ASPECT_VIEW_TYPE_CONFIGURATION__DESCRIPTION = VIEW_TYPE_CONFIGURATION__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ASPECT_VIEW_TYPE_CONFIGURATION__IDENTIFIER = VIEW_TYPE_CONFIGURATION__IDENTIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ASPECT_VIEW_TYPE_CONFIGURATION__ICON_ENTRY = VIEW_TYPE_CONFIGURATION__ICON_ENTRY;
+
+	/**
+	 * The feature id for the '<em><b>Hint</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ASPECT_VIEW_TYPE_CONFIGURATION__HINT = VIEW_TYPE_CONFIGURATION__HINT;
+
+	/**
+	 * The feature id for the '<em><b>Kind Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ASPECT_VIEW_TYPE_CONFIGURATION__KIND_NAME = VIEW_TYPE_CONFIGURATION__KIND_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ASPECT_VIEW_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = VIEW_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID;
+
+	/**
+	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ASPECT_VIEW_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = VIEW_TYPE_CONFIGURATION__MATCHER_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Specialized Diagram Type ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ASPECT_VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID = VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID;
+
+	/**
+	 * The feature id for the '<em><b>Action Configuration</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION = VIEW_TYPE_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Aspect View Type Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ASPECT_VIEW_TYPE_CONFIGURATION_FEATURE_COUNT = VIEW_TYPE_CONFIGURATION_FEATURE_COUNT + 1;
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet <em>Extended Element Type Set</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Extended Element Type Set</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet
+	 * @generated
+	 */
+	EClass getExtendedElementTypeSet();
+
+	/**
+	 * Returns the meta object for the containment reference list ' {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#getElementType <em>Element Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference list '<em>Element Type</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#getElementType()
+	 * @see #getExtendedElementTypeSet()
+	 * @generated
+	 */
+	EReference getExtendedElementTypeSet_ElementType();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#isExtensible
+	 * <em>Extensible</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Extensible</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#isExtensible()
+	 * @see #getExtendedElementTypeSet()
+	 * @generated
+	 */
+	EAttribute getExtendedElementTypeSet_Extensible();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration <em>Element Type Configuration</em>} '.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Element Type Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration
+	 * @generated
+	 */
+	EClass getElementTypeConfiguration();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getHint <em>Hint</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Hint</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getHint()
+	 * @see #getElementTypeConfiguration()
+	 * @generated
+	 */
+	EAttribute getElementTypeConfiguration_Hint();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getKindName
+	 * <em>Kind Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Kind Name</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getKindName()
+	 * @see #getElementTypeConfiguration()
+	 * @generated
+	 */
+	EAttribute getElementTypeConfiguration_KindName();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getSpecializedTypesID
+	 * <em>Specialized Types ID</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute list '<em>Specialized Types ID</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getSpecializedTypesID()
+	 * @see #getElementTypeConfiguration()
+	 * @generated
+	 */
+	EAttribute getElementTypeConfiguration_SpecializedTypesID();
+
+	/**
+	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference '<em>Matcher Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getMatcherConfiguration()
+	 * @see #getElementTypeConfiguration()
+	 * @generated
+	 */
+	EReference getElementTypeConfiguration_MatcherConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry <em>Icon Entry</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Icon Entry</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.IconEntry
+	 * @generated
+	 */
+	EClass getIconEntry();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getIconPath <em>Icon Path</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Icon Path</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.IconEntry#getIconPath()
+	 * @see #getIconEntry()
+	 * @generated
+	 */
+	EAttribute getIconEntry_IconPath();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getBundleId <em>Bundle Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Bundle Id</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.IconEntry#getBundleId()
+	 * @see #getIconEntry()
+	 * @generated
+	 */
+	EAttribute getIconEntry_BundleId();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement <em>Configuration Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Configuration Element</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement
+	 * @generated
+	 */
+	EClass getConfigurationElement();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getName()
+	 * @see #getConfigurationElement()
+	 * @generated
+	 */
+	EAttribute getConfigurationElement_Name();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getDescription
+	 * <em>Description</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Description</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getDescription()
+	 * @see #getConfigurationElement()
+	 * @generated
+	 */
+	EAttribute getConfigurationElement_Description();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIdentifier
+	 * <em>Identifier</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Identifier</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIdentifier()
+	 * @see #getConfigurationElement()
+	 * @generated
+	 */
+	EAttribute getConfigurationElement_Identifier();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIconEntry
+	 * <em>Icon Entry</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference '<em>Icon Entry</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIconEntry()
+	 * @see #getConfigurationElement()
+	 * @generated
+	 */
+	EReference getConfigurationElement_IconEntry();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration <em>Matcher Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Matcher Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration
+	 * @generated
+	 */
+	EClass getMatcherConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration <em>Action Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Action Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration
+	 * @generated
+	 */
+	EClass getActionConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration <em>View Action Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>View Action Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration
+	 * @generated
+	 */
+	EClass getViewActionConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration
+	 * <em>Semantic Action Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Semantic Action Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration
+	 * @generated
+	 */
+	EClass getSemanticActionConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration
+	 * <em>Semantic Type Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Semantic Type Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration
+	 * @generated
+	 */
+	EClass getSemanticTypeConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration <em>View Type Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>View Type Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration
+	 * @generated
+	 */
+	EClass getViewTypeConfiguration();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration#getSpecializedDiagramTypeID
+	 * <em>Specialized Diagram Type ID</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Specialized Diagram Type ID</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration#getSpecializedDiagramTypeID()
+	 * @see #getViewTypeConfiguration()
+	 * @generated
+	 */
+	EAttribute getViewTypeConfiguration_SpecializedDiagramTypeID();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration
+	 * <em>Element Type Advice Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Element Type Advice Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration
+	 * @generated
+	 */
+	EClass getElementTypeAdviceConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration
+	 * <em>Aspect Semantic Type Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Aspect Semantic Type Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration
+	 * @generated
+	 */
+	EClass getAspectSemanticTypeConfiguration();
+
+	/**
+	 * Returns the meta object for the containment reference list ' {@link org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration#getActionConfiguration <em>Action Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference list '<em>Action Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration#getActionConfiguration()
+	 * @see #getAspectSemanticTypeConfiguration()
+	 * @generated
+	 */
+	EReference getAspectSemanticTypeConfiguration_ActionConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration
+	 * <em>Aspect View Type Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Aspect View Type Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration
+	 * @generated
+	 */
+	EClass getAspectViewTypeConfiguration();
+
+	/**
+	 * Returns the meta object for the containment reference list ' {@link org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration#getActionConfiguration <em>Action Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference list '<em>Action Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration#getActionConfiguration()
+	 * @see #getAspectViewTypeConfiguration()
+	 * @generated
+	 */
+	EReference getAspectViewTypeConfiguration_ActionConfiguration();
+
+	/**
+	 * 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
+	 */
+	ExtendedtypesFactory getExtendedtypesFactory();
+} // ExtendedtypesPackage
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/IconEntry.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/IconEntry.java
index 28442463c77..f754368b808 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/IconEntry.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/IconEntry.java
@@ -1,91 +1,91 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Icon Entry</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getIconPath <em>Icon Path</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getBundleId <em>Bundle Id</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getIconEntry()

- * @model

- * @generated

- */

-public interface IconEntry extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Icon Path</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Icon Path</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 Path</em>' attribute.

-	 * @see #setIconPath(String)

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getIconEntry_IconPath()

-	 * @model

-	 * @generated

-	 */

-	String getIconPath();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getIconPath <em>Icon Path</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Icon Path</em>' attribute.

-	 * @see #getIconPath()

-	 * @generated

-	 */

-	void setIconPath(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Bundle Id</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Bundle Id</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Bundle Id</em>' attribute.

-	 * @see #setBundleId(String)

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getIconEntry_BundleId()

-	 * @model

-	 * @generated

-	 */

-	String getBundleId();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getBundleId <em>Bundle Id</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Bundle Id</em>' attribute.

-	 * @see #getBundleId()

-	 * @generated

-	 */

-	void setBundleId(String value);

-} // IconEntry

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Icon Entry</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getIconPath <em>Icon Path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getBundleId <em>Bundle Id</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getIconEntry()
+ * @model
+ * @generated
+ */
+public interface IconEntry extends EObject {
+
+	/**
+	 * Returns the value of the '<em><b>Icon Path</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Icon Path</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 Path</em>' attribute.
+	 * @see #setIconPath(String)
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getIconEntry_IconPath()
+	 * @model
+	 * @generated
+	 */
+	String getIconPath();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getIconPath <em>Icon Path</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Icon Path</em>' attribute.
+	 * @see #getIconPath()
+	 * @generated
+	 */
+	void setIconPath(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Bundle Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Bundle Id</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Bundle Id</em>' attribute.
+	 * @see #setBundleId(String)
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getIconEntry_BundleId()
+	 * @model
+	 * @generated
+	 */
+	String getBundleId();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getBundleId <em>Bundle Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Bundle Id</em>' attribute.
+	 * @see #getBundleId()
+	 * @generated
+	 */
+	void setBundleId(String value);
+} // IconEntry
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/MatcherConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/MatcherConfiguration.java
index 493313bab40..c345cfaad59 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/MatcherConfiguration.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/MatcherConfiguration.java
@@ -1,28 +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.infra.extendedtypes;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Matcher Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getMatcherConfiguration()

- * @model abstract="true"

- * @generated

- */

-public interface MatcherConfiguration extends EObject {

-} // MatcherConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Matcher Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getMatcherConfiguration()
+ * @model abstract="true"
+ * @generated
+ */
+public interface MatcherConfiguration extends EObject {
+} // MatcherConfiguration
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/SemanticActionConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/SemanticActionConfiguration.java
index db163c3ad0f..ae50c3deebe 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/SemanticActionConfiguration.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/SemanticActionConfiguration.java
@@ -1,26 +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.infra.extendedtypes;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Semantic Action Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getSemanticActionConfiguration()

- * @model abstract="true"

- * @generated

- */

-public interface SemanticActionConfiguration extends ActionConfiguration {

-} // SemanticActionConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Semantic Action Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getSemanticActionConfiguration()
+ * @model abstract="true"
+ * @generated
+ */
+public interface SemanticActionConfiguration extends ActionConfiguration {
+} // SemanticActionConfiguration
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/SemanticTypeConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/SemanticTypeConfiguration.java
index 9797c801350..aaf989eb278 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/SemanticTypeConfiguration.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/SemanticTypeConfiguration.java
@@ -1,30 +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.infra.extendedtypes;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Semantic Type Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Configuration specific to element types registered to manipulate Domain Specific elements.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getSemanticTypeConfiguration()

- * @model abstract="true"

- * @generated

- */

-public interface SemanticTypeConfiguration extends ElementTypeConfiguration {

-} // SemanticTypeConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Semantic Type Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Configuration specific to element types registered to manipulate Domain Specific elements.
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getSemanticTypeConfiguration()
+ * @model abstract="true"
+ * @generated
+ */
+public interface SemanticTypeConfiguration extends ElementTypeConfiguration {
+} // SemanticTypeConfiguration
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ViewActionConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ViewActionConfiguration.java
index 2b25c733fcc..36516999ef1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ViewActionConfiguration.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ViewActionConfiguration.java
@@ -1,26 +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.infra.extendedtypes;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>View Action Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getViewActionConfiguration()

- * @model abstract="true"

- * @generated

- */

-public interface ViewActionConfiguration extends ActionConfiguration {

-} // ViewActionConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>View Action Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getViewActionConfiguration()
+ * @model abstract="true"
+ * @generated
+ */
+public interface ViewActionConfiguration extends ActionConfiguration {
+} // ViewActionConfiguration
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ViewTypeConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ViewTypeConfiguration.java
index 7c53efcd172..4106cdbc99a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ViewTypeConfiguration.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ViewTypeConfiguration.java
@@ -1,65 +1,65 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>View Type Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Configuration specific to element types registered to manipulate graphical elements in GMF diagrams

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration#getSpecializedDiagramTypeID <em>Specialized Diagram Type ID</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getViewTypeConfiguration()

- * @model abstract="true"

- * @generated

- */

-public interface ViewTypeConfiguration extends ElementTypeConfiguration {

-

-	/**

-	 * Returns the value of the '<em><b>Specialized Diagram Type ID</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Specialized Diagram Type ID</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Specialized Diagram Type ID</em>' attribute.

-	 * @see #setSpecializedDiagramTypeID(String)

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getViewTypeConfiguration_SpecializedDiagramTypeID()

-	 * @model

-	 * @generated

-	 */

-	String getSpecializedDiagramTypeID();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration#getSpecializedDiagramTypeID

-	 * <em>Specialized Diagram Type ID</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Specialized Diagram Type ID</em>' attribute.

-	 * @see #getSpecializedDiagramTypeID()

-	 * @generated

-	 */

-	void setSpecializedDiagramTypeID(String value);

-} // ViewTypeConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>View Type Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Configuration specific to element types registered to manipulate graphical elements in GMF diagrams
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration#getSpecializedDiagramTypeID <em>Specialized Diagram Type ID</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getViewTypeConfiguration()
+ * @model abstract="true"
+ * @generated
+ */
+public interface ViewTypeConfiguration extends ElementTypeConfiguration {
+
+	/**
+	 * Returns the value of the '<em><b>Specialized Diagram Type ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Specialized Diagram Type ID</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Specialized Diagram Type ID</em>' attribute.
+	 * @see #setSpecializedDiagramTypeID(String)
+	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getViewTypeConfiguration_SpecializedDiagramTypeID()
+	 * @model
+	 * @generated
+	 */
+	String getSpecializedDiagramTypeID();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration#getSpecializedDiagramTypeID
+	 * <em>Specialized Diagram Type ID</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Specialized Diagram Type ID</em>' attribute.
+	 * @see #getSpecializedDiagramTypeID()
+	 * @generated
+	 */
+	void setSpecializedDiagramTypeID(String value);
+} // ViewTypeConfiguration
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ActionConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ActionConfigurationImpl.java
index 85512237f43..776108ba90d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ActionConfigurationImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ActionConfigurationImpl.java
@@ -1,50 +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.extendedtypes.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Action Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public abstract class ActionConfigurationImpl extends ConfigurationElementImpl implements ActionConfiguration {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ActionConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ExtendedtypesPackage.eINSTANCE.getActionConfiguration();

-	}

-} // ActionConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Action Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class ActionConfigurationImpl extends ConfigurationElementImpl implements ActionConfiguration {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ActionConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExtendedtypesPackage.eINSTANCE.getActionConfiguration();
+	}
+} // ActionConfigurationImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/AspectSemanticTypeConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/AspectSemanticTypeConfigurationImpl.java
index 02349317f2e..e04b0d686ee 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/AspectSemanticTypeConfigurationImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/AspectSemanticTypeConfigurationImpl.java
@@ -1,165 +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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.extendedtypes.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.extendedtypes.AspectSemanticTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Aspect Semantic Type Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.AspectSemanticTypeConfigurationImpl#getActionConfiguration <em>Action Configuration</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class AspectSemanticTypeConfigurationImpl extends SemanticTypeConfigurationImpl implements AspectSemanticTypeConfiguration {

-

-	/**

-	 * The cached value of the '{@link #getActionConfiguration() <em>Action Configuration</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getActionConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<SemanticActionConfiguration> actionConfiguration;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected AspectSemanticTypeConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ExtendedtypesPackage.eINSTANCE.getAspectSemanticTypeConfiguration();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<SemanticActionConfiguration> getActionConfiguration() {

-		if (actionConfiguration == null) {

-			actionConfiguration = new EObjectContainmentEList<SemanticActionConfiguration>(SemanticActionConfiguration.class, this, ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION);

-		}

-		return actionConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION:

-			return ((InternalEList<?>) getActionConfiguration()).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 ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION:

-			return getActionConfiguration();

-		}

-		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 ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION:

-			getActionConfiguration().clear();

-			getActionConfiguration().addAll((Collection<? extends SemanticActionConfiguration>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION:

-			getActionConfiguration().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION:

-			return actionConfiguration != null && !actionConfiguration.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-} // AspectSemanticTypeConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.extendedtypes.AspectSemanticTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Aspect Semantic Type Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.AspectSemanticTypeConfigurationImpl#getActionConfiguration <em>Action Configuration</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class AspectSemanticTypeConfigurationImpl extends SemanticTypeConfigurationImpl implements AspectSemanticTypeConfiguration {
+
+	/**
+	 * The cached value of the '{@link #getActionConfiguration() <em>Action Configuration</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getActionConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<SemanticActionConfiguration> actionConfiguration;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected AspectSemanticTypeConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExtendedtypesPackage.eINSTANCE.getAspectSemanticTypeConfiguration();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EList<SemanticActionConfiguration> getActionConfiguration() {
+		if (actionConfiguration == null) {
+			actionConfiguration = new EObjectContainmentEList<SemanticActionConfiguration>(SemanticActionConfiguration.class, this, ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION);
+		}
+		return actionConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
+			return ((InternalEList<?>) getActionConfiguration()).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 ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
+			return getActionConfiguration();
+		}
+		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 ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
+			getActionConfiguration().clear();
+			getActionConfiguration().addAll((Collection<? extends SemanticActionConfiguration>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
+			getActionConfiguration().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
+			return actionConfiguration != null && !actionConfiguration.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+} // AspectSemanticTypeConfigurationImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/AspectViewTypeConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/AspectViewTypeConfigurationImpl.java
index 560e00b1296..dceb451af27 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/AspectViewTypeConfigurationImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/AspectViewTypeConfigurationImpl.java
@@ -1,165 +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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.extendedtypes.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.extendedtypes.AspectViewTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Aspect View Type Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.AspectViewTypeConfigurationImpl#getActionConfiguration <em>Action Configuration</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class AspectViewTypeConfigurationImpl extends ViewTypeConfigurationImpl implements AspectViewTypeConfiguration {

-

-	/**

-	 * The cached value of the '{@link #getActionConfiguration() <em>Action Configuration</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getActionConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ViewActionConfiguration> actionConfiguration;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected AspectViewTypeConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ExtendedtypesPackage.eINSTANCE.getAspectViewTypeConfiguration();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ViewActionConfiguration> getActionConfiguration() {

-		if (actionConfiguration == null) {

-			actionConfiguration = new EObjectContainmentEList<ViewActionConfiguration>(ViewActionConfiguration.class, this, ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION);

-		}

-		return actionConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION:

-			return ((InternalEList<?>) getActionConfiguration()).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 ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION:

-			return getActionConfiguration();

-		}

-		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 ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION:

-			getActionConfiguration().clear();

-			getActionConfiguration().addAll((Collection<? extends ViewActionConfiguration>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION:

-			getActionConfiguration().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION:

-			return actionConfiguration != null && !actionConfiguration.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-} // AspectViewTypeConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.extendedtypes.AspectViewTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Aspect View Type Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.AspectViewTypeConfigurationImpl#getActionConfiguration <em>Action Configuration</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class AspectViewTypeConfigurationImpl extends ViewTypeConfigurationImpl implements AspectViewTypeConfiguration {
+
+	/**
+	 * The cached value of the '{@link #getActionConfiguration() <em>Action Configuration</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getActionConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ViewActionConfiguration> actionConfiguration;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected AspectViewTypeConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExtendedtypesPackage.eINSTANCE.getAspectViewTypeConfiguration();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EList<ViewActionConfiguration> getActionConfiguration() {
+		if (actionConfiguration == null) {
+			actionConfiguration = new EObjectContainmentEList<ViewActionConfiguration>(ViewActionConfiguration.class, this, ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION);
+		}
+		return actionConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
+			return ((InternalEList<?>) getActionConfiguration()).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 ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
+			return getActionConfiguration();
+		}
+		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 ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
+			getActionConfiguration().clear();
+			getActionConfiguration().addAll((Collection<? extends ViewActionConfiguration>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
+			getActionConfiguration().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
+			return actionConfiguration != null && !actionConfiguration.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+} // AspectViewTypeConfigurationImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ConfigurationElementImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ConfigurationElementImpl.java
index 740cf473838..9048852af38 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ConfigurationElementImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ConfigurationElementImpl.java
@@ -1,395 +1,395 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.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.impl.EObjectImpl;

-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.infra.extendedtypes.IconEntry;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Configuration Element</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ConfigurationElementImpl#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ConfigurationElementImpl#getDescription <em>Description</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ConfigurationElementImpl#getIdentifier <em>Identifier</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ConfigurationElementImpl#getIconEntry <em>Icon Entry</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public abstract class ConfigurationElementImpl extends EObjectImpl implements ConfigurationElement {

-

-	/**

-	 * 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 #getDescription() <em>Description</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getDescription()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String DESCRIPTION_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getDescription()

-	 * @generated

-	 * @ordered

-	 */

-	protected String description = DESCRIPTION_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getIdentifier()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String IDENTIFIER_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getIdentifier()

-	 * @generated

-	 * @ordered

-	 */

-	protected String identifier = IDENTIFIER_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getIconEntry() <em>Icon Entry</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getIconEntry()

-	 * @generated

-	 * @ordered

-	 */

-	protected IconEntry iconEntry;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConfigurationElementImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ExtendedtypesPackage.eINSTANCE.getConfigurationElement();

-	}

-

-	/**

-	 * <!-- 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, ExtendedtypesPackage.CONFIGURATION_ELEMENT__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getDescription() {

-		return description;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setDescription(String newDescription) {

-		String oldDescription = description;

-		description = newDescription;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.CONFIGURATION_ELEMENT__DESCRIPTION, oldDescription, description));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getIdentifier() {

-		return identifier;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setIdentifier(String newIdentifier) {

-		String oldIdentifier = identifier;

-		identifier = newIdentifier;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.CONFIGURATION_ELEMENT__IDENTIFIER, oldIdentifier, identifier));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public IconEntry getIconEntry() {

-		return iconEntry;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetIconEntry(IconEntry newIconEntry, NotificationChain msgs) {

-		IconEntry oldIconEntry = iconEntry;

-		iconEntry = newIconEntry;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY, oldIconEntry, newIconEntry);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setIconEntry(IconEntry newIconEntry) {

-		if (newIconEntry != iconEntry) {

-			NotificationChain msgs = null;

-			if (iconEntry != null) {

-				msgs = ((InternalEObject) iconEntry).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY, null, msgs);

-			}

-			if (newIconEntry != null) {

-				msgs = ((InternalEObject) newIconEntry).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY, null, msgs);

-			}

-			msgs = basicSetIconEntry(newIconEntry, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		} else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY, newIconEntry, newIconEntry));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY:

-			return basicSetIconEntry(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 ExtendedtypesPackage.CONFIGURATION_ELEMENT__NAME:

-			return getName();

-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__DESCRIPTION:

-			return getDescription();

-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__IDENTIFIER:

-			return getIdentifier();

-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY:

-			return getIconEntry();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__NAME:

-			setName((String) newValue);

-			return;

-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__DESCRIPTION:

-			setDescription((String) newValue);

-			return;

-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__IDENTIFIER:

-			setIdentifier((String) newValue);

-			return;

-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY:

-			setIconEntry((IconEntry) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__DESCRIPTION:

-			setDescription(DESCRIPTION_EDEFAULT);

-			return;

-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__IDENTIFIER:

-			setIdentifier(IDENTIFIER_EDEFAULT);

-			return;

-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY:

-			setIconEntry((IconEntry) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__DESCRIPTION:

-			return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);

-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__IDENTIFIER:

-			return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);

-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY:

-			return iconEntry != 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: "); //$NON-NLS-1$

-		result.append(name);

-		result.append(", description: "); //$NON-NLS-1$

-		result.append(description);

-		result.append(", identifier: "); //$NON-NLS-1$

-		result.append(identifier);

-		result.append(')');

-		return result.toString();

-	}

-} // ConfigurationElementImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.impl.EObjectImpl;
+import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.IconEntry;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Configuration Element</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ConfigurationElementImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ConfigurationElementImpl#getDescription <em>Description</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ConfigurationElementImpl#getIdentifier <em>Identifier</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ConfigurationElementImpl#getIconEntry <em>Icon Entry</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class ConfigurationElementImpl extends EObjectImpl implements ConfigurationElement {
+
+	/**
+	 * 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 #getDescription() <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DESCRIPTION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected String description = DESCRIPTION_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getIdentifier()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String IDENTIFIER_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getIdentifier()
+	 * @generated
+	 * @ordered
+	 */
+	protected String identifier = IDENTIFIER_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getIconEntry() <em>Icon Entry</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getIconEntry()
+	 * @generated
+	 * @ordered
+	 */
+	protected IconEntry iconEntry;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ConfigurationElementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExtendedtypesPackage.eINSTANCE.getConfigurationElement();
+	}
+
+	/**
+	 * <!-- 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, ExtendedtypesPackage.CONFIGURATION_ELEMENT__NAME, oldName, name));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getDescription() {
+		return description;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setDescription(String newDescription) {
+		String oldDescription = description;
+		description = newDescription;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.CONFIGURATION_ELEMENT__DESCRIPTION, oldDescription, description));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getIdentifier() {
+		return identifier;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setIdentifier(String newIdentifier) {
+		String oldIdentifier = identifier;
+		identifier = newIdentifier;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.CONFIGURATION_ELEMENT__IDENTIFIER, oldIdentifier, identifier));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public IconEntry getIconEntry() {
+		return iconEntry;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetIconEntry(IconEntry newIconEntry, NotificationChain msgs) {
+		IconEntry oldIconEntry = iconEntry;
+		iconEntry = newIconEntry;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY, oldIconEntry, newIconEntry);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setIconEntry(IconEntry newIconEntry) {
+		if (newIconEntry != iconEntry) {
+			NotificationChain msgs = null;
+			if (iconEntry != null) {
+				msgs = ((InternalEObject) iconEntry).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY, null, msgs);
+			}
+			if (newIconEntry != null) {
+				msgs = ((InternalEObject) newIconEntry).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY, null, msgs);
+			}
+			msgs = basicSetIconEntry(newIconEntry, msgs);
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		} else if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY, newIconEntry, newIconEntry));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY:
+			return basicSetIconEntry(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 ExtendedtypesPackage.CONFIGURATION_ELEMENT__NAME:
+			return getName();
+		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
+			return getDescription();
+		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__IDENTIFIER:
+			return getIdentifier();
+		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY:
+			return getIconEntry();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__NAME:
+			setName((String) newValue);
+			return;
+		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
+			setDescription((String) newValue);
+			return;
+		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__IDENTIFIER:
+			setIdentifier((String) newValue);
+			return;
+		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY:
+			setIconEntry((IconEntry) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
+			setDescription(DESCRIPTION_EDEFAULT);
+			return;
+		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__IDENTIFIER:
+			setIdentifier(IDENTIFIER_EDEFAULT);
+			return;
+		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY:
+			setIconEntry((IconEntry) null);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
+			return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__IDENTIFIER:
+			return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
+		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY:
+			return iconEntry != 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: "); //$NON-NLS-1$
+		result.append(name);
+		result.append(", description: "); //$NON-NLS-1$
+		result.append(description);
+		result.append(", identifier: "); //$NON-NLS-1$
+		result.append(identifier);
+		result.append(')');
+		return result.toString();
+	}
+} // ConfigurationElementImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ElementTypeAdviceConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ElementTypeAdviceConfigurationImpl.java
index e5aa627942e..f6abe268d39 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ElementTypeAdviceConfigurationImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ElementTypeAdviceConfigurationImpl.java
@@ -1,50 +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.extendedtypes.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Element Type Advice Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public abstract class ElementTypeAdviceConfigurationImpl extends ConfigurationElementImpl implements ElementTypeAdviceConfiguration {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ElementTypeAdviceConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ExtendedtypesPackage.eINSTANCE.getElementTypeAdviceConfiguration();

-	}

-} // ElementTypeAdviceConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Element Type Advice Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class ElementTypeAdviceConfigurationImpl extends ConfigurationElementImpl implements ElementTypeAdviceConfiguration {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ElementTypeAdviceConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExtendedtypesPackage.eINSTANCE.getElementTypeAdviceConfiguration();
+	}
+} // ElementTypeAdviceConfigurationImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ElementTypeConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ElementTypeConfigurationImpl.java
index 44f5c46adcd..1b51e373ab4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ElementTypeConfigurationImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ElementTypeConfigurationImpl.java
@@ -1,378 +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.infra.extendedtypes.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.EDataTypeUniqueEList;

-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Element Type Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeConfigurationImpl#getHint <em>Hint</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeConfigurationImpl#getKindName <em>Kind Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeConfigurationImpl#getSpecializedTypesID <em>Specialized Types ID</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeConfigurationImpl#getMatcherConfiguration <em>Matcher Configuration</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public abstract class ElementTypeConfigurationImpl extends ConfigurationElementImpl implements ElementTypeConfiguration {

-

-	/**

-	 * The default value of the '{@link #getHint() <em>Hint</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getHint()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String HINT_EDEFAULT = "ExtendedElements"; //$NON-NLS-1$

-

-	/**

-	 * The cached value of the '{@link #getHint() <em>Hint</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getHint()

-	 * @generated

-	 * @ordered

-	 */

-	protected String hint = HINT_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getKindName() <em>Kind Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getKindName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String KIND_NAME_EDEFAULT = "org.eclipse.gmf.runtime.emf.type.core.IHintedType"; //$NON-NLS-1$

-

-	/**

-	 * The cached value of the '{@link #getKindName() <em>Kind Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getKindName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String kindName = KIND_NAME_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getSpecializedTypesID() <em>Specialized Types ID</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSpecializedTypesID()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> specializedTypesID;

-

-	/**

-	 * The cached value of the '{@link #getMatcherConfiguration() <em>Matcher Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getMatcherConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected MatcherConfiguration matcherConfiguration;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ElementTypeConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ExtendedtypesPackage.eINSTANCE.getElementTypeConfiguration();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getHint() {

-		return hint;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setHint(String newHint) {

-		String oldHint = hint;

-		hint = newHint;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__HINT, oldHint, hint));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getKindName() {

-		return kindName;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setKindName(String newKindName) {

-		String oldKindName = kindName;

-		kindName = newKindName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__KIND_NAME, oldKindName, kindName));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<String> getSpecializedTypesID() {

-		if (specializedTypesID == null) {

-			specializedTypesID = new EDataTypeUniqueEList<String>(String.class, this, ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID);

-		}

-		return specializedTypesID;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public MatcherConfiguration getMatcherConfiguration() {

-		return matcherConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetMatcherConfiguration(MatcherConfiguration newMatcherConfiguration, NotificationChain msgs) {

-		MatcherConfiguration oldMatcherConfiguration = matcherConfiguration;

-		matcherConfiguration = newMatcherConfiguration;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, oldMatcherConfiguration, newMatcherConfiguration);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setMatcherConfiguration(MatcherConfiguration newMatcherConfiguration) {

-		if (newMatcherConfiguration != matcherConfiguration) {

-			NotificationChain msgs = null;

-			if (matcherConfiguration != null) {

-				msgs = ((InternalEObject) matcherConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, null, msgs);

-			}

-			if (newMatcherConfiguration != null) {

-				msgs = ((InternalEObject) newMatcherConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, null, msgs);

-			}

-			msgs = basicSetMatcherConfiguration(newMatcherConfiguration, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		} else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, newMatcherConfiguration, newMatcherConfiguration));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:

-			return basicSetMatcherConfiguration(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 ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__HINT:

-			return getHint();

-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__KIND_NAME:

-			return getKindName();

-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:

-			return getSpecializedTypesID();

-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:

-			return getMatcherConfiguration();

-		}

-		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 ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__HINT:

-			setHint((String) newValue);

-			return;

-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__KIND_NAME:

-			setKindName((String) newValue);

-			return;

-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:

-			getSpecializedTypesID().clear();

-			getSpecializedTypesID().addAll((Collection<? extends String>) newValue);

-			return;

-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:

-			setMatcherConfiguration((MatcherConfiguration) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__HINT:

-			setHint(HINT_EDEFAULT);

-			return;

-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__KIND_NAME:

-			setKindName(KIND_NAME_EDEFAULT);

-			return;

-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:

-			getSpecializedTypesID().clear();

-			return;

-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:

-			setMatcherConfiguration((MatcherConfiguration) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__HINT:

-			return HINT_EDEFAULT == null ? hint != null : !HINT_EDEFAULT.equals(hint);

-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__KIND_NAME:

-			return KIND_NAME_EDEFAULT == null ? kindName != null : !KIND_NAME_EDEFAULT.equals(kindName);

-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:

-			return specializedTypesID != null && !specializedTypesID.isEmpty();

-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:

-			return matcherConfiguration != 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(" (hint: "); //$NON-NLS-1$

-		result.append(hint);

-		result.append(", kindName: "); //$NON-NLS-1$

-		result.append(kindName);

-		result.append(", specializedTypesID: "); //$NON-NLS-1$

-		result.append(specializedTypesID);

-		result.append(')');

-		return result.toString();

-	}

-} // ElementTypeConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.EDataTypeUniqueEList;
+import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Element Type Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeConfigurationImpl#getHint <em>Hint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeConfigurationImpl#getKindName <em>Kind Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeConfigurationImpl#getSpecializedTypesID <em>Specialized Types ID</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeConfigurationImpl#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class ElementTypeConfigurationImpl extends ConfigurationElementImpl implements ElementTypeConfiguration {
+
+	/**
+	 * The default value of the '{@link #getHint() <em>Hint</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getHint()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String HINT_EDEFAULT = "ExtendedElements"; //$NON-NLS-1$
+
+	/**
+	 * The cached value of the '{@link #getHint() <em>Hint</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getHint()
+	 * @generated
+	 * @ordered
+	 */
+	protected String hint = HINT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getKindName() <em>Kind Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getKindName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String KIND_NAME_EDEFAULT = "org.eclipse.gmf.runtime.emf.type.core.IHintedType"; //$NON-NLS-1$
+
+	/**
+	 * The cached value of the '{@link #getKindName() <em>Kind Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getKindName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String kindName = KIND_NAME_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getSpecializedTypesID() <em>Specialized Types ID</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getSpecializedTypesID()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> specializedTypesID;
+
+	/**
+	 * The cached value of the '{@link #getMatcherConfiguration() <em>Matcher Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getMatcherConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected MatcherConfiguration matcherConfiguration;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ElementTypeConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExtendedtypesPackage.eINSTANCE.getElementTypeConfiguration();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getHint() {
+		return hint;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setHint(String newHint) {
+		String oldHint = hint;
+		hint = newHint;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__HINT, oldHint, hint));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getKindName() {
+		return kindName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setKindName(String newKindName) {
+		String oldKindName = kindName;
+		kindName = newKindName;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__KIND_NAME, oldKindName, kindName));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EList<String> getSpecializedTypesID() {
+		if (specializedTypesID == null) {
+			specializedTypesID = new EDataTypeUniqueEList<String>(String.class, this, ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID);
+		}
+		return specializedTypesID;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public MatcherConfiguration getMatcherConfiguration() {
+		return matcherConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetMatcherConfiguration(MatcherConfiguration newMatcherConfiguration, NotificationChain msgs) {
+		MatcherConfiguration oldMatcherConfiguration = matcherConfiguration;
+		matcherConfiguration = newMatcherConfiguration;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, oldMatcherConfiguration, newMatcherConfiguration);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setMatcherConfiguration(MatcherConfiguration newMatcherConfiguration) {
+		if (newMatcherConfiguration != matcherConfiguration) {
+			NotificationChain msgs = null;
+			if (matcherConfiguration != null) {
+				msgs = ((InternalEObject) matcherConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, null, msgs);
+			}
+			if (newMatcherConfiguration != null) {
+				msgs = ((InternalEObject) newMatcherConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, null, msgs);
+			}
+			msgs = basicSetMatcherConfiguration(newMatcherConfiguration, msgs);
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		} else if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, newMatcherConfiguration, newMatcherConfiguration));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
+			return basicSetMatcherConfiguration(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 ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
+			return getHint();
+		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__KIND_NAME:
+			return getKindName();
+		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
+			return getSpecializedTypesID();
+		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
+			return getMatcherConfiguration();
+		}
+		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 ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
+			setHint((String) newValue);
+			return;
+		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__KIND_NAME:
+			setKindName((String) newValue);
+			return;
+		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
+			getSpecializedTypesID().clear();
+			getSpecializedTypesID().addAll((Collection<? extends String>) newValue);
+			return;
+		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
+			setMatcherConfiguration((MatcherConfiguration) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
+			setHint(HINT_EDEFAULT);
+			return;
+		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__KIND_NAME:
+			setKindName(KIND_NAME_EDEFAULT);
+			return;
+		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
+			getSpecializedTypesID().clear();
+			return;
+		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
+			setMatcherConfiguration((MatcherConfiguration) null);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
+			return HINT_EDEFAULT == null ? hint != null : !HINT_EDEFAULT.equals(hint);
+		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__KIND_NAME:
+			return KIND_NAME_EDEFAULT == null ? kindName != null : !KIND_NAME_EDEFAULT.equals(kindName);
+		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
+			return specializedTypesID != null && !specializedTypesID.isEmpty();
+		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
+			return matcherConfiguration != 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(" (hint: "); //$NON-NLS-1$
+		result.append(hint);
+		result.append(", kindName: "); //$NON-NLS-1$
+		result.append(kindName);
+		result.append(", specializedTypesID: "); //$NON-NLS-1$
+		result.append(specializedTypesID);
+		result.append(')');
+		return result.toString();
+	}
+} // ElementTypeConfigurationImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedElementTypeSetImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedElementTypeSetImpl.java
index b41bd7c17a6..6e9ad76d6ce 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedElementTypeSetImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedElementTypeSetImpl.java
@@ -1,242 +1,242 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.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.InternalEList;

-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Extended Element Type Set</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeSetImpl#getElementType <em>Element Type</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeSetImpl#isExtensible <em>Extensible</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ExtendedElementTypeSetImpl extends ConfigurationElementImpl implements ExtendedElementTypeSet {

-

-	/**

-	 * The cached value of the '{@link #getElementType() <em>Element Type</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getElementType()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ElementTypeConfiguration> elementType;

-

-	/**

-	 * The default value of the '{@link #isExtensible() <em>Extensible</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isExtensible()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean EXTENSIBLE_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isExtensible() <em>Extensible</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isExtensible()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean extensible = EXTENSIBLE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ExtendedElementTypeSetImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ExtendedtypesPackage.eINSTANCE.getExtendedElementTypeSet();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<ElementTypeConfiguration> getElementType() {

-		if (elementType == null) {

-			elementType = new EObjectContainmentEList<ElementTypeConfiguration>(ElementTypeConfiguration.class, this, ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE);

-		}

-		return elementType;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public boolean isExtensible() {

-		return extensible;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setExtensible(boolean newExtensible) {

-		boolean oldExtensible = extensible;

-		extensible = newExtensible;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE, oldExtensible, extensible));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE:

-			return ((InternalEList<?>) getElementType()).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 ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE:

-			return getElementType();

-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE:

-			return isExtensible();

-		}

-		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 ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE:

-			getElementType().clear();

-			getElementType().addAll((Collection<? extends ElementTypeConfiguration>) newValue);

-			return;

-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE:

-			setExtensible((Boolean) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE:

-			getElementType().clear();

-			return;

-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE:

-			setExtensible(EXTENSIBLE_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE:

-			return elementType != null && !elementType.isEmpty();

-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE:

-			return extensible != EXTENSIBLE_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(" (extensible: "); //$NON-NLS-1$

-		result.append(extensible);

-		result.append(')');

-		return result.toString();

-	}

-} // ExtendedElementTypeSetImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.InternalEList;
+import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Extended Element Type Set</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeSetImpl#getElementType <em>Element Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeSetImpl#isExtensible <em>Extensible</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ExtendedElementTypeSetImpl extends ConfigurationElementImpl implements ExtendedElementTypeSet {
+
+	/**
+	 * The cached value of the '{@link #getElementType() <em>Element Type</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getElementType()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ElementTypeConfiguration> elementType;
+
+	/**
+	 * The default value of the '{@link #isExtensible() <em>Extensible</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isExtensible()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean EXTENSIBLE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isExtensible() <em>Extensible</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isExtensible()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean extensible = EXTENSIBLE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ExtendedElementTypeSetImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExtendedtypesPackage.eINSTANCE.getExtendedElementTypeSet();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EList<ElementTypeConfiguration> getElementType() {
+		if (elementType == null) {
+			elementType = new EObjectContainmentEList<ElementTypeConfiguration>(ElementTypeConfiguration.class, this, ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE);
+		}
+		return elementType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean isExtensible() {
+		return extensible;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setExtensible(boolean newExtensible) {
+		boolean oldExtensible = extensible;
+		extensible = newExtensible;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE, oldExtensible, extensible));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE:
+			return ((InternalEList<?>) getElementType()).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 ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE:
+			return getElementType();
+		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE:
+			return isExtensible();
+		}
+		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 ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE:
+			getElementType().clear();
+			getElementType().addAll((Collection<? extends ElementTypeConfiguration>) newValue);
+			return;
+		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE:
+			setExtensible((Boolean) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE:
+			getElementType().clear();
+			return;
+		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE:
+			setExtensible(EXTENSIBLE_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE:
+			return elementType != null && !elementType.isEmpty();
+		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE:
+			return extensible != EXTENSIBLE_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(" (extensible: "); //$NON-NLS-1$
+		result.append(extensible);
+		result.append(')');
+		return result.toString();
+	}
+} // ExtendedElementTypeSetImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedtypesFactoryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedtypesFactoryImpl.java
index 6bb03ab501b..adecf7571b8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedtypesFactoryImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedtypesFactoryImpl.java
@@ -1,153 +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.infra.extendedtypes.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.extendedtypes.AspectSemanticTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.infra.extendedtypes.IconEntry;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ExtendedtypesFactoryImpl extends EFactoryImpl implements ExtendedtypesFactory {

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static ExtendedtypesFactory init() {

-		try {

-			ExtendedtypesFactory theExtendedtypesFactory = (ExtendedtypesFactory) EPackage.Registry.INSTANCE.getEFactory(ExtendedtypesPackage.eNS_URI);

-			if (theExtendedtypesFactory != null) {

-				return theExtendedtypesFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new ExtendedtypesFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ExtendedtypesFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET:

-			return createExtendedElementTypeSet();

-		case ExtendedtypesPackage.ICON_ENTRY:

-			return createIconEntry();

-		case ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION:

-			return createAspectSemanticTypeConfiguration();

-		case ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION:

-			return createAspectViewTypeConfiguration();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ExtendedElementTypeSet createExtendedElementTypeSet() {

-		ExtendedElementTypeSetImpl extendedElementTypeSet = new ExtendedElementTypeSetImpl();

-		return extendedElementTypeSet;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public IconEntry createIconEntry() {

-		IconEntryImpl iconEntry = new IconEntryImpl();

-		return iconEntry;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public AspectSemanticTypeConfiguration createAspectSemanticTypeConfiguration() {

-		AspectSemanticTypeConfigurationImpl aspectSemanticTypeConfiguration = new AspectSemanticTypeConfigurationImpl();

-		return aspectSemanticTypeConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public AspectViewTypeConfiguration createAspectViewTypeConfiguration() {

-		AspectViewTypeConfigurationImpl aspectViewTypeConfiguration = new AspectViewTypeConfigurationImpl();

-		return aspectViewTypeConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ExtendedtypesPackage getExtendedtypesPackage() {

-		return (ExtendedtypesPackage) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static ExtendedtypesPackage getPackage() {

-		return ExtendedtypesPackage.eINSTANCE;

-	}

-} // ExtendedtypesFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.extendedtypes.AspectSemanticTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.IconEntry;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ExtendedtypesFactoryImpl extends EFactoryImpl implements ExtendedtypesFactory {
+
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static ExtendedtypesFactory init() {
+		try {
+			ExtendedtypesFactory theExtendedtypesFactory = (ExtendedtypesFactory) EPackage.Registry.INSTANCE.getEFactory(ExtendedtypesPackage.eNS_URI);
+			if (theExtendedtypesFactory != null) {
+				return theExtendedtypesFactory;
+			}
+		} catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new ExtendedtypesFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ExtendedtypesFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET:
+			return createExtendedElementTypeSet();
+		case ExtendedtypesPackage.ICON_ENTRY:
+			return createIconEntry();
+		case ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION:
+			return createAspectSemanticTypeConfiguration();
+		case ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION:
+			return createAspectViewTypeConfiguration();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ExtendedElementTypeSet createExtendedElementTypeSet() {
+		ExtendedElementTypeSetImpl extendedElementTypeSet = new ExtendedElementTypeSetImpl();
+		return extendedElementTypeSet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public IconEntry createIconEntry() {
+		IconEntryImpl iconEntry = new IconEntryImpl();
+		return iconEntry;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public AspectSemanticTypeConfiguration createAspectSemanticTypeConfiguration() {
+		AspectSemanticTypeConfigurationImpl aspectSemanticTypeConfiguration = new AspectSemanticTypeConfigurationImpl();
+		return aspectSemanticTypeConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public AspectViewTypeConfiguration createAspectViewTypeConfiguration() {
+		AspectViewTypeConfigurationImpl aspectViewTypeConfiguration = new AspectViewTypeConfigurationImpl();
+		return aspectViewTypeConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ExtendedtypesPackage getExtendedtypesPackage() {
+		return (ExtendedtypesPackage) getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static ExtendedtypesPackage getPackage() {
+		return ExtendedtypesPackage.eINSTANCE;
+	}
+} // ExtendedtypesFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedtypesPackageImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedtypesPackageImpl.java
index 7775f47ae3b..06588cce800 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedtypesPackageImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedtypesPackageImpl.java
@@ -1,628 +1,628 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.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.extendedtypes.ActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;

-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.infra.extendedtypes.IconEntry;

-import org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ExtendedtypesPackageImpl extends EPackageImpl implements ExtendedtypesPackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass extendedElementTypeSetEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass elementTypeConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass iconEntryEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass configurationElementEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass matcherConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass actionConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass viewActionConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass semanticActionConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass semanticTypeConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass viewTypeConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass elementTypeAdviceConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass aspectSemanticTypeConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass aspectViewTypeConfigurationEClass = 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.extendedtypes.ExtendedtypesPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private ExtendedtypesPackageImpl() {

-		super(eNS_URI, ExtendedtypesFactory.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 ExtendedtypesPackage#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 ExtendedtypesPackage init() {

-		if (isInited) {

-			return (ExtendedtypesPackage) EPackage.Registry.INSTANCE.getEPackage(ExtendedtypesPackage.eNS_URI);

-		}

-		// Obtain or create and register package

-		ExtendedtypesPackageImpl theExtendedtypesPackage = (ExtendedtypesPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ExtendedtypesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ExtendedtypesPackageImpl());

-		isInited = true;

-		// Initialize simple dependencies

-		EcorePackage.eINSTANCE.eClass();

-		// Create package meta-data objects

-		theExtendedtypesPackage.createPackageContents();

-		// Initialize created meta-data

-		theExtendedtypesPackage.initializePackageContents();

-		// Mark meta-data to indicate it can't be changed

-		theExtendedtypesPackage.freeze();

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(ExtendedtypesPackage.eNS_URI, theExtendedtypesPackage);

-		return theExtendedtypesPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getExtendedElementTypeSet() {

-		return extendedElementTypeSetEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getExtendedElementTypeSet_ElementType() {

-		return (EReference) extendedElementTypeSetEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getExtendedElementTypeSet_Extensible() {

-		return (EAttribute) extendedElementTypeSetEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getElementTypeConfiguration() {

-		return elementTypeConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getElementTypeConfiguration_Hint() {

-		return (EAttribute) elementTypeConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getElementTypeConfiguration_KindName() {

-		return (EAttribute) elementTypeConfigurationEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getElementTypeConfiguration_SpecializedTypesID() {

-		return (EAttribute) elementTypeConfigurationEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getElementTypeConfiguration_MatcherConfiguration() {

-		return (EReference) elementTypeConfigurationEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getIconEntry() {

-		return iconEntryEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getIconEntry_IconPath() {

-		return (EAttribute) iconEntryEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getIconEntry_BundleId() {

-		return (EAttribute) iconEntryEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getConfigurationElement() {

-		return configurationElementEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getConfigurationElement_Name() {

-		return (EAttribute) configurationElementEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getConfigurationElement_Description() {

-		return (EAttribute) configurationElementEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getConfigurationElement_Identifier() {

-		return (EAttribute) configurationElementEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getConfigurationElement_IconEntry() {

-		return (EReference) configurationElementEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getMatcherConfiguration() {

-		return matcherConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getActionConfiguration() {

-		return actionConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getViewActionConfiguration() {

-		return viewActionConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getSemanticActionConfiguration() {

-		return semanticActionConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getSemanticTypeConfiguration() {

-		return semanticTypeConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getViewTypeConfiguration() {

-		return viewTypeConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getViewTypeConfiguration_SpecializedDiagramTypeID() {

-		return (EAttribute) viewTypeConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getElementTypeAdviceConfiguration() {

-		return elementTypeAdviceConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getAspectSemanticTypeConfiguration() {

-		return aspectSemanticTypeConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getAspectSemanticTypeConfiguration_ActionConfiguration() {

-		return (EReference) aspectSemanticTypeConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getAspectViewTypeConfiguration() {

-		return aspectViewTypeConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getAspectViewTypeConfiguration_ActionConfiguration() {

-		return (EReference) aspectViewTypeConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ExtendedtypesFactory getExtendedtypesFactory() {

-		return (ExtendedtypesFactory) 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

-		extendedElementTypeSetEClass = createEClass(EXTENDED_ELEMENT_TYPE_SET);

-		createEReference(extendedElementTypeSetEClass, EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE);

-		createEAttribute(extendedElementTypeSetEClass, EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE);

-		elementTypeConfigurationEClass = createEClass(ELEMENT_TYPE_CONFIGURATION);

-		createEAttribute(elementTypeConfigurationEClass, ELEMENT_TYPE_CONFIGURATION__HINT);

-		createEAttribute(elementTypeConfigurationEClass, ELEMENT_TYPE_CONFIGURATION__KIND_NAME);

-		createEAttribute(elementTypeConfigurationEClass, ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID);

-		createEReference(elementTypeConfigurationEClass, ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION);

-		iconEntryEClass = createEClass(ICON_ENTRY);

-		createEAttribute(iconEntryEClass, ICON_ENTRY__ICON_PATH);

-		createEAttribute(iconEntryEClass, ICON_ENTRY__BUNDLE_ID);

-		configurationElementEClass = createEClass(CONFIGURATION_ELEMENT);

-		createEAttribute(configurationElementEClass, CONFIGURATION_ELEMENT__NAME);

-		createEAttribute(configurationElementEClass, CONFIGURATION_ELEMENT__DESCRIPTION);

-		createEAttribute(configurationElementEClass, CONFIGURATION_ELEMENT__IDENTIFIER);

-		createEReference(configurationElementEClass, CONFIGURATION_ELEMENT__ICON_ENTRY);

-		matcherConfigurationEClass = createEClass(MATCHER_CONFIGURATION);

-		actionConfigurationEClass = createEClass(ACTION_CONFIGURATION);

-		viewActionConfigurationEClass = createEClass(VIEW_ACTION_CONFIGURATION);

-		semanticActionConfigurationEClass = createEClass(SEMANTIC_ACTION_CONFIGURATION);

-		semanticTypeConfigurationEClass = createEClass(SEMANTIC_TYPE_CONFIGURATION);

-		viewTypeConfigurationEClass = createEClass(VIEW_TYPE_CONFIGURATION);

-		createEAttribute(viewTypeConfigurationEClass, VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID);

-		elementTypeAdviceConfigurationEClass = createEClass(ELEMENT_TYPE_ADVICE_CONFIGURATION);

-		aspectSemanticTypeConfigurationEClass = createEClass(ASPECT_SEMANTIC_TYPE_CONFIGURATION);

-		createEReference(aspectSemanticTypeConfigurationEClass, ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION);

-		aspectViewTypeConfigurationEClass = createEClass(ASPECT_VIEW_TYPE_CONFIGURATION);

-		createEReference(aspectViewTypeConfigurationEClass, ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION);

-	}

-

-	/**

-	 * <!-- 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

-		extendedElementTypeSetEClass.getESuperTypes().add(this.getConfigurationElement());

-		elementTypeConfigurationEClass.getESuperTypes().add(this.getConfigurationElement());

-		actionConfigurationEClass.getESuperTypes().add(this.getConfigurationElement());

-		viewActionConfigurationEClass.getESuperTypes().add(this.getActionConfiguration());

-		semanticActionConfigurationEClass.getESuperTypes().add(this.getActionConfiguration());

-		semanticTypeConfigurationEClass.getESuperTypes().add(this.getElementTypeConfiguration());

-		viewTypeConfigurationEClass.getESuperTypes().add(this.getElementTypeConfiguration());

-		elementTypeAdviceConfigurationEClass.getESuperTypes().add(this.getConfigurationElement());

-		aspectSemanticTypeConfigurationEClass.getESuperTypes().add(this.getSemanticTypeConfiguration());

-		aspectViewTypeConfigurationEClass.getESuperTypes().add(this.getViewTypeConfiguration());

-		// Initialize classes and features; add operations and parameters

-		initEClass(extendedElementTypeSetEClass, ExtendedElementTypeSet.class, "ExtendedElementTypeSet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getExtendedElementTypeSet_ElementType(), this.getElementTypeConfiguration(), null,

-				"elementType", null, 1, -1, ExtendedElementTypeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getExtendedElementTypeSet_Extensible(), theEcorePackage.getEBoolean(), "extensible", null, 0, 1, ExtendedElementTypeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEClass(elementTypeConfigurationEClass, ElementTypeConfiguration.class, "ElementTypeConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getElementTypeConfiguration_Hint(), ecorePackage.getEString(), "hint", "ExtendedElements", 0, 1, ElementTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getElementTypeConfiguration_KindName(), ecorePackage.getEString(),

-				"kindName", "org.eclipse.gmf.runtime.emf.type.core.IHintedType", 0, 1, ElementTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getElementTypeConfiguration_SpecializedTypesID(), ecorePackage.getEString(),

-				"specializedTypesID", null, 1, -1, ElementTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getElementTypeConfiguration_MatcherConfiguration(), this.getMatcherConfiguration(), null,

-				"matcherConfiguration", null, 0, 1, ElementTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEClass(iconEntryEClass, IconEntry.class, "IconEntry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getIconEntry_IconPath(), ecorePackage.getEString(), "iconPath", null, 0, 1, IconEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getIconEntry_BundleId(), ecorePackage.getEString(), "bundleId", null, 0, 1, IconEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEClass(configurationElementEClass, ConfigurationElement.class, "ConfigurationElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getConfigurationElement_Name(), theEcorePackage.getEString(), "name", null, 1, 1, ConfigurationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getConfigurationElement_Description(), theEcorePackage.getEString(), "description", null, 0, 1, ConfigurationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getConfigurationElement_Identifier(), theEcorePackage.getEString(), "identifier", null, 1, 1, ConfigurationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getConfigurationElement_IconEntry(), this.getIconEntry(), null,

-				"iconEntry", null, 0, 1, ConfigurationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEClass(matcherConfigurationEClass, MatcherConfiguration.class, "MatcherConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEClass(actionConfigurationEClass, ActionConfiguration.class, "ActionConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEClass(viewActionConfigurationEClass, ViewActionConfiguration.class, "ViewActionConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEClass(semanticActionConfigurationEClass, SemanticActionConfiguration.class, "SemanticActionConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEClass(semanticTypeConfigurationEClass, SemanticTypeConfiguration.class, "SemanticTypeConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEClass(viewTypeConfigurationEClass, ViewTypeConfiguration.class, "ViewTypeConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getViewTypeConfiguration_SpecializedDiagramTypeID(), ecorePackage.getEString(),

-				"specializedDiagramTypeID", null, 0, 1, ViewTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEClass(elementTypeAdviceConfigurationEClass, ElementTypeAdviceConfiguration.class, "ElementTypeAdviceConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEClass(aspectSemanticTypeConfigurationEClass, AspectSemanticTypeConfiguration.class, "AspectSemanticTypeConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getAspectSemanticTypeConfiguration_ActionConfiguration(), this.getSemanticActionConfiguration(), null,

-				"actionConfiguration", null, 0, -1, AspectSemanticTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEClass(aspectViewTypeConfigurationEClass, AspectViewTypeConfiguration.class, "AspectViewTypeConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getAspectViewTypeConfiguration_ActionConfiguration(), this.getViewActionConfiguration(), null,

-				"actionConfiguration", null, 0, -1, AspectViewTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		// Create resource

-		createResource(eNS_URI);

-	}

-} // ExtendedtypesPackageImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.extendedtypes.ActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;
+import org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.IconEntry;
+import org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ExtendedtypesPackageImpl extends EPackageImpl implements ExtendedtypesPackage {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass extendedElementTypeSetEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass elementTypeConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass iconEntryEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass configurationElementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass matcherConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass actionConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass viewActionConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass semanticActionConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass semanticTypeConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass viewTypeConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass elementTypeAdviceConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass aspectSemanticTypeConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass aspectViewTypeConfigurationEClass = 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.extendedtypes.ExtendedtypesPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private ExtendedtypesPackageImpl() {
+		super(eNS_URI, ExtendedtypesFactory.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 ExtendedtypesPackage#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 ExtendedtypesPackage init() {
+		if (isInited) {
+			return (ExtendedtypesPackage) EPackage.Registry.INSTANCE.getEPackage(ExtendedtypesPackage.eNS_URI);
+		}
+		// Obtain or create and register package
+		ExtendedtypesPackageImpl theExtendedtypesPackage = (ExtendedtypesPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ExtendedtypesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ExtendedtypesPackageImpl());
+		isInited = true;
+		// Initialize simple dependencies
+		EcorePackage.eINSTANCE.eClass();
+		// Create package meta-data objects
+		theExtendedtypesPackage.createPackageContents();
+		// Initialize created meta-data
+		theExtendedtypesPackage.initializePackageContents();
+		// Mark meta-data to indicate it can't be changed
+		theExtendedtypesPackage.freeze();
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(ExtendedtypesPackage.eNS_URI, theExtendedtypesPackage);
+		return theExtendedtypesPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getExtendedElementTypeSet() {
+		return extendedElementTypeSetEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getExtendedElementTypeSet_ElementType() {
+		return (EReference) extendedElementTypeSetEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getExtendedElementTypeSet_Extensible() {
+		return (EAttribute) extendedElementTypeSetEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getElementTypeConfiguration() {
+		return elementTypeConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getElementTypeConfiguration_Hint() {
+		return (EAttribute) elementTypeConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getElementTypeConfiguration_KindName() {
+		return (EAttribute) elementTypeConfigurationEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getElementTypeConfiguration_SpecializedTypesID() {
+		return (EAttribute) elementTypeConfigurationEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getElementTypeConfiguration_MatcherConfiguration() {
+		return (EReference) elementTypeConfigurationEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getIconEntry() {
+		return iconEntryEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getIconEntry_IconPath() {
+		return (EAttribute) iconEntryEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getIconEntry_BundleId() {
+		return (EAttribute) iconEntryEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getConfigurationElement() {
+		return configurationElementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getConfigurationElement_Name() {
+		return (EAttribute) configurationElementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getConfigurationElement_Description() {
+		return (EAttribute) configurationElementEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getConfigurationElement_Identifier() {
+		return (EAttribute) configurationElementEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getConfigurationElement_IconEntry() {
+		return (EReference) configurationElementEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getMatcherConfiguration() {
+		return matcherConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getActionConfiguration() {
+		return actionConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getViewActionConfiguration() {
+		return viewActionConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getSemanticActionConfiguration() {
+		return semanticActionConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getSemanticTypeConfiguration() {
+		return semanticTypeConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getViewTypeConfiguration() {
+		return viewTypeConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getViewTypeConfiguration_SpecializedDiagramTypeID() {
+		return (EAttribute) viewTypeConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getElementTypeAdviceConfiguration() {
+		return elementTypeAdviceConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getAspectSemanticTypeConfiguration() {
+		return aspectSemanticTypeConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getAspectSemanticTypeConfiguration_ActionConfiguration() {
+		return (EReference) aspectSemanticTypeConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getAspectViewTypeConfiguration() {
+		return aspectViewTypeConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getAspectViewTypeConfiguration_ActionConfiguration() {
+		return (EReference) aspectViewTypeConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ExtendedtypesFactory getExtendedtypesFactory() {
+		return (ExtendedtypesFactory) 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
+		extendedElementTypeSetEClass = createEClass(EXTENDED_ELEMENT_TYPE_SET);
+		createEReference(extendedElementTypeSetEClass, EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE);
+		createEAttribute(extendedElementTypeSetEClass, EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE);
+		elementTypeConfigurationEClass = createEClass(ELEMENT_TYPE_CONFIGURATION);
+		createEAttribute(elementTypeConfigurationEClass, ELEMENT_TYPE_CONFIGURATION__HINT);
+		createEAttribute(elementTypeConfigurationEClass, ELEMENT_TYPE_CONFIGURATION__KIND_NAME);
+		createEAttribute(elementTypeConfigurationEClass, ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID);
+		createEReference(elementTypeConfigurationEClass, ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION);
+		iconEntryEClass = createEClass(ICON_ENTRY);
+		createEAttribute(iconEntryEClass, ICON_ENTRY__ICON_PATH);
+		createEAttribute(iconEntryEClass, ICON_ENTRY__BUNDLE_ID);
+		configurationElementEClass = createEClass(CONFIGURATION_ELEMENT);
+		createEAttribute(configurationElementEClass, CONFIGURATION_ELEMENT__NAME);
+		createEAttribute(configurationElementEClass, CONFIGURATION_ELEMENT__DESCRIPTION);
+		createEAttribute(configurationElementEClass, CONFIGURATION_ELEMENT__IDENTIFIER);
+		createEReference(configurationElementEClass, CONFIGURATION_ELEMENT__ICON_ENTRY);
+		matcherConfigurationEClass = createEClass(MATCHER_CONFIGURATION);
+		actionConfigurationEClass = createEClass(ACTION_CONFIGURATION);
+		viewActionConfigurationEClass = createEClass(VIEW_ACTION_CONFIGURATION);
+		semanticActionConfigurationEClass = createEClass(SEMANTIC_ACTION_CONFIGURATION);
+		semanticTypeConfigurationEClass = createEClass(SEMANTIC_TYPE_CONFIGURATION);
+		viewTypeConfigurationEClass = createEClass(VIEW_TYPE_CONFIGURATION);
+		createEAttribute(viewTypeConfigurationEClass, VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID);
+		elementTypeAdviceConfigurationEClass = createEClass(ELEMENT_TYPE_ADVICE_CONFIGURATION);
+		aspectSemanticTypeConfigurationEClass = createEClass(ASPECT_SEMANTIC_TYPE_CONFIGURATION);
+		createEReference(aspectSemanticTypeConfigurationEClass, ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION);
+		aspectViewTypeConfigurationEClass = createEClass(ASPECT_VIEW_TYPE_CONFIGURATION);
+		createEReference(aspectViewTypeConfigurationEClass, ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION);
+	}
+
+	/**
+	 * <!-- 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
+		extendedElementTypeSetEClass.getESuperTypes().add(this.getConfigurationElement());
+		elementTypeConfigurationEClass.getESuperTypes().add(this.getConfigurationElement());
+		actionConfigurationEClass.getESuperTypes().add(this.getConfigurationElement());
+		viewActionConfigurationEClass.getESuperTypes().add(this.getActionConfiguration());
+		semanticActionConfigurationEClass.getESuperTypes().add(this.getActionConfiguration());
+		semanticTypeConfigurationEClass.getESuperTypes().add(this.getElementTypeConfiguration());
+		viewTypeConfigurationEClass.getESuperTypes().add(this.getElementTypeConfiguration());
+		elementTypeAdviceConfigurationEClass.getESuperTypes().add(this.getConfigurationElement());
+		aspectSemanticTypeConfigurationEClass.getESuperTypes().add(this.getSemanticTypeConfiguration());
+		aspectViewTypeConfigurationEClass.getESuperTypes().add(this.getViewTypeConfiguration());
+		// Initialize classes and features; add operations and parameters
+		initEClass(extendedElementTypeSetEClass, ExtendedElementTypeSet.class, "ExtendedElementTypeSet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getExtendedElementTypeSet_ElementType(), this.getElementTypeConfiguration(), null,
+				"elementType", null, 1, -1, ExtendedElementTypeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getExtendedElementTypeSet_Extensible(), theEcorePackage.getEBoolean(), "extensible", null, 0, 1, ExtendedElementTypeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(elementTypeConfigurationEClass, ElementTypeConfiguration.class, "ElementTypeConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getElementTypeConfiguration_Hint(), ecorePackage.getEString(), "hint", "ExtendedElements", 0, 1, ElementTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getElementTypeConfiguration_KindName(), ecorePackage.getEString(),
+				"kindName", "org.eclipse.gmf.runtime.emf.type.core.IHintedType", 0, 1, ElementTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getElementTypeConfiguration_SpecializedTypesID(), ecorePackage.getEString(),
+				"specializedTypesID", null, 1, -1, ElementTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getElementTypeConfiguration_MatcherConfiguration(), this.getMatcherConfiguration(), null,
+				"matcherConfiguration", null, 0, 1, ElementTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(iconEntryEClass, IconEntry.class, "IconEntry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getIconEntry_IconPath(), ecorePackage.getEString(), "iconPath", null, 0, 1, IconEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getIconEntry_BundleId(), ecorePackage.getEString(), "bundleId", null, 0, 1, IconEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(configurationElementEClass, ConfigurationElement.class, "ConfigurationElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getConfigurationElement_Name(), theEcorePackage.getEString(), "name", null, 1, 1, ConfigurationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getConfigurationElement_Description(), theEcorePackage.getEString(), "description", null, 0, 1, ConfigurationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getConfigurationElement_Identifier(), theEcorePackage.getEString(), "identifier", null, 1, 1, ConfigurationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getConfigurationElement_IconEntry(), this.getIconEntry(), null,
+				"iconEntry", null, 0, 1, ConfigurationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(matcherConfigurationEClass, MatcherConfiguration.class, "MatcherConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(actionConfigurationEClass, ActionConfiguration.class, "ActionConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(viewActionConfigurationEClass, ViewActionConfiguration.class, "ViewActionConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(semanticActionConfigurationEClass, SemanticActionConfiguration.class, "SemanticActionConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(semanticTypeConfigurationEClass, SemanticTypeConfiguration.class, "SemanticTypeConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(viewTypeConfigurationEClass, ViewTypeConfiguration.class, "ViewTypeConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getViewTypeConfiguration_SpecializedDiagramTypeID(), ecorePackage.getEString(),
+				"specializedDiagramTypeID", null, 0, 1, ViewTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(elementTypeAdviceConfigurationEClass, ElementTypeAdviceConfiguration.class, "ElementTypeAdviceConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(aspectSemanticTypeConfigurationEClass, AspectSemanticTypeConfiguration.class, "AspectSemanticTypeConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getAspectSemanticTypeConfiguration_ActionConfiguration(), this.getSemanticActionConfiguration(), null,
+				"actionConfiguration", null, 0, -1, AspectSemanticTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(aspectViewTypeConfigurationEClass, AspectViewTypeConfiguration.class, "AspectViewTypeConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getAspectViewTypeConfiguration_ActionConfiguration(), this.getViewActionConfiguration(), null,
+				"actionConfiguration", null, 0, -1, AspectViewTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		// Create resource
+		createResource(eNS_URI);
+	}
+} // ExtendedtypesPackageImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/IconEntryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/IconEntryImpl.java
index a72c41acaaf..d62dbe78983 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/IconEntryImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/IconEntryImpl.java
@@ -1,242 +1,242 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.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.EObjectImpl;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.infra.extendedtypes.IconEntry;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Icon Entry</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.IconEntryImpl#getIconPath <em>Icon Path</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.IconEntryImpl#getBundleId <em>Bundle Id</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class IconEntryImpl extends EObjectImpl implements IconEntry {

-

-	/**

-	 * The default value of the '{@link #getIconPath() <em>Icon Path</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getIconPath()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ICON_PATH_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getIconPath()

-	 * @generated

-	 * @ordered

-	 */

-	protected String iconPath = ICON_PATH_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getBundleId() <em>Bundle Id</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getBundleId()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String BUNDLE_ID_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getBundleId() <em>Bundle Id</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getBundleId()

-	 * @generated

-	 * @ordered

-	 */

-	protected String bundleId = BUNDLE_ID_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IconEntryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ExtendedtypesPackage.eINSTANCE.getIconEntry();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getIconPath() {

-		return iconPath;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setIconPath(String newIconPath) {

-		String oldIconPath = iconPath;

-		iconPath = newIconPath;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.ICON_ENTRY__ICON_PATH, oldIconPath, iconPath));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getBundleId() {

-		return bundleId;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setBundleId(String newBundleId) {

-		String oldBundleId = bundleId;

-		bundleId = newBundleId;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.ICON_ENTRY__BUNDLE_ID, oldBundleId, bundleId));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ExtendedtypesPackage.ICON_ENTRY__ICON_PATH:

-			return getIconPath();

-		case ExtendedtypesPackage.ICON_ENTRY__BUNDLE_ID:

-			return getBundleId();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ExtendedtypesPackage.ICON_ENTRY__ICON_PATH:

-			setIconPath((String) newValue);

-			return;

-		case ExtendedtypesPackage.ICON_ENTRY__BUNDLE_ID:

-			setBundleId((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ExtendedtypesPackage.ICON_ENTRY__ICON_PATH:

-			setIconPath(ICON_PATH_EDEFAULT);

-			return;

-		case ExtendedtypesPackage.ICON_ENTRY__BUNDLE_ID:

-			setBundleId(BUNDLE_ID_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ExtendedtypesPackage.ICON_ENTRY__ICON_PATH:

-			return ICON_PATH_EDEFAULT == null ? iconPath != null : !ICON_PATH_EDEFAULT.equals(iconPath);

-		case ExtendedtypesPackage.ICON_ENTRY__BUNDLE_ID:

-			return BUNDLE_ID_EDEFAULT == null ? bundleId != null : !BUNDLE_ID_EDEFAULT.equals(bundleId);

-		}

-		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(" (iconPath: "); //$NON-NLS-1$

-		result.append(iconPath);

-		result.append(", bundleId: "); //$NON-NLS-1$

-		result.append(bundleId);

-		result.append(')');

-		return result.toString();

-	}

-} // IconEntryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.EObjectImpl;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.IconEntry;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Icon Entry</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.IconEntryImpl#getIconPath <em>Icon Path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.IconEntryImpl#getBundleId <em>Bundle Id</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class IconEntryImpl extends EObjectImpl implements IconEntry {
+
+	/**
+	 * The default value of the '{@link #getIconPath() <em>Icon Path</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getIconPath()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ICON_PATH_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getIconPath()
+	 * @generated
+	 * @ordered
+	 */
+	protected String iconPath = ICON_PATH_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getBundleId() <em>Bundle Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getBundleId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String BUNDLE_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getBundleId() <em>Bundle Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getBundleId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String bundleId = BUNDLE_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected IconEntryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExtendedtypesPackage.eINSTANCE.getIconEntry();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getIconPath() {
+		return iconPath;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setIconPath(String newIconPath) {
+		String oldIconPath = iconPath;
+		iconPath = newIconPath;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.ICON_ENTRY__ICON_PATH, oldIconPath, iconPath));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getBundleId() {
+		return bundleId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setBundleId(String newBundleId) {
+		String oldBundleId = bundleId;
+		bundleId = newBundleId;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.ICON_ENTRY__BUNDLE_ID, oldBundleId, bundleId));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case ExtendedtypesPackage.ICON_ENTRY__ICON_PATH:
+			return getIconPath();
+		case ExtendedtypesPackage.ICON_ENTRY__BUNDLE_ID:
+			return getBundleId();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case ExtendedtypesPackage.ICON_ENTRY__ICON_PATH:
+			setIconPath((String) newValue);
+			return;
+		case ExtendedtypesPackage.ICON_ENTRY__BUNDLE_ID:
+			setBundleId((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case ExtendedtypesPackage.ICON_ENTRY__ICON_PATH:
+			setIconPath(ICON_PATH_EDEFAULT);
+			return;
+		case ExtendedtypesPackage.ICON_ENTRY__BUNDLE_ID:
+			setBundleId(BUNDLE_ID_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case ExtendedtypesPackage.ICON_ENTRY__ICON_PATH:
+			return ICON_PATH_EDEFAULT == null ? iconPath != null : !ICON_PATH_EDEFAULT.equals(iconPath);
+		case ExtendedtypesPackage.ICON_ENTRY__BUNDLE_ID:
+			return BUNDLE_ID_EDEFAULT == null ? bundleId != null : !BUNDLE_ID_EDEFAULT.equals(bundleId);
+		}
+		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(" (iconPath: "); //$NON-NLS-1$
+		result.append(iconPath);
+		result.append(", bundleId: "); //$NON-NLS-1$
+		result.append(bundleId);
+		result.append(')');
+		return result.toString();
+	}
+} // IconEntryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/MatcherConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/MatcherConfigurationImpl.java
index b78aac204f2..9c520ab6a30 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/MatcherConfigurationImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/MatcherConfigurationImpl.java
@@ -1,51 +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.extendedtypes.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.EObjectImpl;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Matcher Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public abstract class MatcherConfigurationImpl extends EObjectImpl implements MatcherConfiguration {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected MatcherConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ExtendedtypesPackage.eINSTANCE.getMatcherConfiguration();

-	}

-} // MatcherConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Matcher Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class MatcherConfigurationImpl extends EObjectImpl implements MatcherConfiguration {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected MatcherConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExtendedtypesPackage.eINSTANCE.getMatcherConfiguration();
+	}
+} // MatcherConfigurationImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/SemanticActionConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/SemanticActionConfigurationImpl.java
index 5422e4b54f8..2cb3eb92817 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/SemanticActionConfigurationImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/SemanticActionConfigurationImpl.java
@@ -1,50 +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.extendedtypes.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Semantic Action Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public abstract class SemanticActionConfigurationImpl extends ActionConfigurationImpl implements SemanticActionConfiguration {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected SemanticActionConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ExtendedtypesPackage.eINSTANCE.getSemanticActionConfiguration();

-	}

-} // SemanticActionConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Semantic Action Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class SemanticActionConfigurationImpl extends ActionConfigurationImpl implements SemanticActionConfiguration {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected SemanticActionConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExtendedtypesPackage.eINSTANCE.getSemanticActionConfiguration();
+	}
+} // SemanticActionConfigurationImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/SemanticTypeConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/SemanticTypeConfigurationImpl.java
index 33b178807b7..596422f305b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/SemanticTypeConfigurationImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/SemanticTypeConfigurationImpl.java
@@ -1,50 +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.extendedtypes.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Semantic Type Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public abstract class SemanticTypeConfigurationImpl extends ElementTypeConfigurationImpl implements SemanticTypeConfiguration {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected SemanticTypeConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ExtendedtypesPackage.eINSTANCE.getSemanticTypeConfiguration();

-	}

-} // SemanticTypeConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Semantic Type Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class SemanticTypeConfigurationImpl extends ElementTypeConfigurationImpl implements SemanticTypeConfiguration {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected SemanticTypeConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExtendedtypesPackage.eINSTANCE.getSemanticTypeConfiguration();
+	}
+} // SemanticTypeConfigurationImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ViewActionConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ViewActionConfigurationImpl.java
index a46768bf351..820853416ae 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ViewActionConfigurationImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ViewActionConfigurationImpl.java
@@ -1,50 +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.extendedtypes.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>View Action Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public abstract class ViewActionConfigurationImpl extends ActionConfigurationImpl implements ViewActionConfiguration {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ViewActionConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ExtendedtypesPackage.eINSTANCE.getViewActionConfiguration();

-	}

-} // ViewActionConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>View Action Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class ViewActionConfigurationImpl extends ActionConfigurationImpl implements ViewActionConfiguration {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ViewActionConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExtendedtypesPackage.eINSTANCE.getViewActionConfiguration();
+	}
+} // ViewActionConfigurationImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ViewTypeConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ViewTypeConfigurationImpl.java
index 033583e8df7..f94129eb43a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ViewTypeConfigurationImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ViewTypeConfigurationImpl.java
@@ -1,182 +1,182 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.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.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>View Type Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ViewTypeConfigurationImpl#getSpecializedDiagramTypeID <em>Specialized Diagram Type ID</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public abstract class ViewTypeConfigurationImpl extends ElementTypeConfigurationImpl implements ViewTypeConfiguration {

-

-	/**

-	 * The default value of the '{@link #getSpecializedDiagramTypeID() <em>Specialized Diagram Type ID</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSpecializedDiagramTypeID()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String SPECIALIZED_DIAGRAM_TYPE_ID_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getSpecializedDiagramTypeID() <em>Specialized Diagram Type ID</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSpecializedDiagramTypeID()

-	 * @generated

-	 * @ordered

-	 */

-	protected String specializedDiagramTypeID = SPECIALIZED_DIAGRAM_TYPE_ID_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ViewTypeConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ExtendedtypesPackage.eINSTANCE.getViewTypeConfiguration();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getSpecializedDiagramTypeID() {

-		return specializedDiagramTypeID;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setSpecializedDiagramTypeID(String newSpecializedDiagramTypeID) {

-		String oldSpecializedDiagramTypeID = specializedDiagramTypeID;

-		specializedDiagramTypeID = newSpecializedDiagramTypeID;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID, oldSpecializedDiagramTypeID, specializedDiagramTypeID));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ExtendedtypesPackage.VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID:

-			return getSpecializedDiagramTypeID();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ExtendedtypesPackage.VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID:

-			setSpecializedDiagramTypeID((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ExtendedtypesPackage.VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID:

-			setSpecializedDiagramTypeID(SPECIALIZED_DIAGRAM_TYPE_ID_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ExtendedtypesPackage.VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID:

-			return SPECIALIZED_DIAGRAM_TYPE_ID_EDEFAULT == null ? specializedDiagramTypeID != null : !SPECIALIZED_DIAGRAM_TYPE_ID_EDEFAULT.equals(specializedDiagramTypeID);

-		}

-		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(" (specializedDiagramTypeID: "); //$NON-NLS-1$

-		result.append(specializedDiagramTypeID);

-		result.append(')');

-		return result.toString();

-	}

-} // ViewTypeConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>View Type Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ViewTypeConfigurationImpl#getSpecializedDiagramTypeID <em>Specialized Diagram Type ID</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class ViewTypeConfigurationImpl extends ElementTypeConfigurationImpl implements ViewTypeConfiguration {
+
+	/**
+	 * The default value of the '{@link #getSpecializedDiagramTypeID() <em>Specialized Diagram Type ID</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getSpecializedDiagramTypeID()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SPECIALIZED_DIAGRAM_TYPE_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getSpecializedDiagramTypeID() <em>Specialized Diagram Type ID</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getSpecializedDiagramTypeID()
+	 * @generated
+	 * @ordered
+	 */
+	protected String specializedDiagramTypeID = SPECIALIZED_DIAGRAM_TYPE_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ViewTypeConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExtendedtypesPackage.eINSTANCE.getViewTypeConfiguration();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getSpecializedDiagramTypeID() {
+		return specializedDiagramTypeID;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setSpecializedDiagramTypeID(String newSpecializedDiagramTypeID) {
+		String oldSpecializedDiagramTypeID = specializedDiagramTypeID;
+		specializedDiagramTypeID = newSpecializedDiagramTypeID;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID, oldSpecializedDiagramTypeID, specializedDiagramTypeID));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case ExtendedtypesPackage.VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID:
+			return getSpecializedDiagramTypeID();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case ExtendedtypesPackage.VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID:
+			setSpecializedDiagramTypeID((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case ExtendedtypesPackage.VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID:
+			setSpecializedDiagramTypeID(SPECIALIZED_DIAGRAM_TYPE_ID_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case ExtendedtypesPackage.VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID:
+			return SPECIALIZED_DIAGRAM_TYPE_ID_EDEFAULT == null ? specializedDiagramTypeID != null : !SPECIALIZED_DIAGRAM_TYPE_ID_EDEFAULT.equals(specializedDiagramTypeID);
+		}
+		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(" (specializedDiagramTypeID: "); //$NON-NLS-1$
+		result.append(specializedDiagramTypeID);
+		result.append(')');
+		return result.toString();
+	}
+} // ViewTypeConfigurationImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/HierarchyPermission.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/HierarchyPermission.java
index 172bfdb3a29..638808816cc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/HierarchyPermission.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/HierarchyPermission.java
@@ -1,120 +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.extendedtypes.invariantcontainerconfiguration;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Hierarchy Permission</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#getChildType <em>Child Type</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsPermitted <em>Is Permitted</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsStrict <em>Is Strict</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage#getHierarchyPermission()

- * @model

- * @generated

- */

-public interface HierarchyPermission extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Child Type</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Child Type</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Child Type</em>' attribute.

-	 * @see #setChildType(String)

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage#getHierarchyPermission_ChildType()

-	 * @model

-	 * @generated

-	 */

-	String getChildType();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#getChildType <em>Child Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Child Type</em>' attribute.

-	 * @see #getChildType()

-	 * @generated

-	 */

-	void setChildType(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Is Permitted</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Is Permitted</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Is Permitted</em>' attribute.

-	 * @see #setIsPermitted(boolean)

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage#getHierarchyPermission_IsPermitted()

-	 * @model

-	 * @generated

-	 */

-	boolean isIsPermitted();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsPermitted <em>Is Permitted</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Is Permitted</em>' attribute.

-	 * @see #isIsPermitted()

-	 * @generated

-	 */

-	void setIsPermitted(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Is Strict</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Is Strict</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Is Strict</em>' attribute.

-	 * @see #setIsStrict(boolean)

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage#getHierarchyPermission_IsStrict()

-	 * @model

-	 * @generated

-	 */

-	boolean isIsStrict();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsStrict <em>Is Strict</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Is Strict</em>' attribute.

-	 * @see #isIsStrict()

-	 * @generated

-	 */

-	void setIsStrict(boolean value);

-

-} // HierarchyPermission

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantcontainerconfiguration;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Hierarchy Permission</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#getChildType <em>Child Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsPermitted <em>Is Permitted</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsStrict <em>Is Strict</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage#getHierarchyPermission()
+ * @model
+ * @generated
+ */
+public interface HierarchyPermission extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Child Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Child Type</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Child Type</em>' attribute.
+	 * @see #setChildType(String)
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage#getHierarchyPermission_ChildType()
+	 * @model
+	 * @generated
+	 */
+	String getChildType();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#getChildType <em>Child Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Child Type</em>' attribute.
+	 * @see #getChildType()
+	 * @generated
+	 */
+	void setChildType(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Is Permitted</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Is Permitted</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Is Permitted</em>' attribute.
+	 * @see #setIsPermitted(boolean)
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage#getHierarchyPermission_IsPermitted()
+	 * @model
+	 * @generated
+	 */
+	boolean isIsPermitted();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsPermitted <em>Is Permitted</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Is Permitted</em>' attribute.
+	 * @see #isIsPermitted()
+	 * @generated
+	 */
+	void setIsPermitted(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Is Strict</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Is Strict</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Is Strict</em>' attribute.
+	 * @see #setIsStrict(boolean)
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage#getHierarchyPermission_IsStrict()
+	 * @model
+	 * @generated
+	 */
+	boolean isIsStrict();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsStrict <em>Is Strict</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Is Strict</em>' attribute.
+	 * @see #isIsStrict()
+	 * @generated
+	 */
+	void setIsStrict(boolean value);
+
+} // HierarchyPermission
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfiguration.java
index e4da3a4c859..51b3b875bca 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfiguration.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfiguration.java
@@ -1,51 +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.extendedtypes.invariantcontainerconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Invariant Container Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration#getPermissions <em>Permissions</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage#getInvariantContainerConfiguration()

- * @model

- * @generated

- */

-public interface InvariantContainerConfiguration extends InvariantRuleConfiguration {

-	/**

-	 * Returns the value of the '<em><b>Permissions</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Permissions</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>Permissions</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage#getInvariantContainerConfiguration_Permissions()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<HierarchyPermission> getPermissions();

-

-} // InvariantContainerConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantcontainerconfiguration;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Invariant Container Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration#getPermissions <em>Permissions</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage#getInvariantContainerConfiguration()
+ * @model
+ * @generated
+ */
+public interface InvariantContainerConfiguration extends InvariantRuleConfiguration {
+	/**
+	 * Returns the value of the '<em><b>Permissions</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Permissions</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>Permissions</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage#getInvariantContainerConfiguration_Permissions()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<HierarchyPermission> getPermissions();
+
+} // InvariantContainerConfiguration
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationFactory.java
index 75e07a3aa47..d323c3a99e0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationFactory.java
@@ -1,66 +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.infra.extendedtypes.invariantcontainerconfiguration;

-

-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.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage

- * @generated

- */

-public interface InvariantContainerConfigurationFactory extends EFactory {

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	InvariantContainerConfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Invariant Container Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Invariant Container Configuration</em>'.

-	 * @generated

-	 */

-	InvariantContainerConfiguration createInvariantContainerConfiguration();

-

-	/**

-	 * Returns a new object of class '<em>Hierarchy Permission</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Hierarchy Permission</em>'.

-	 * @generated

-	 */

-	HierarchyPermission createHierarchyPermission();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	InvariantContainerConfigurationPackage getInvariantContainerConfigurationPackage();

-

-} // InvariantContainerConfigurationFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantcontainerconfiguration;
+
+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.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage
+ * @generated
+ */
+public interface InvariantContainerConfigurationFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	InvariantContainerConfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Invariant Container Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Invariant Container Configuration</em>'.
+	 * @generated
+	 */
+	InvariantContainerConfiguration createInvariantContainerConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>Hierarchy Permission</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Hierarchy Permission</em>'.
+	 * @generated
+	 */
+	HierarchyPermission createHierarchyPermission();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	InvariantContainerConfigurationPackage getInvariantContainerConfigurationPackage();
+
+} // InvariantContainerConfigurationFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationPackage.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationPackage.java
index b876ecc4697..b2c47c6441e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationPackage.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationPackage.java
@@ -1,333 +1,333 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.invariantcontainerconfiguration;

-

-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.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;

-

-/**

- * <!-- 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.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationFactory

- * @model kind="package"

- * @generated

- */

-public interface InvariantContainerConfigurationPackage extends EPackage {

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "invariantcontainerconfiguration";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/container/1.0";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "invariantcontainerconfiguration";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	InvariantContainerConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationImpl <em>Invariant Container Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationPackageImpl#getInvariantContainerConfiguration()

-	 * @generated

-	 */

-	int INVARIANT_CONTAINER_CONFIGURATION = 0;

-

-	/**

-	 * The feature id for the '<em><b>Permissions</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS = InvariantSemanticTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Invariant Container Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_CONTAINER_CONFIGURATION_FEATURE_COUNT = InvariantSemanticTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of operations of the '<em>Invariant Container Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_CONTAINER_CONFIGURATION_OPERATION_COUNT = InvariantSemanticTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.HierarchyPermissionImpl <em>Hierarchy Permission</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.HierarchyPermissionImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationPackageImpl#getHierarchyPermission()

-	 * @generated

-	 */

-	int HIERARCHY_PERMISSION = 1;

-

-	/**

-	 * The feature id for the '<em><b>Child Type</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int HIERARCHY_PERMISSION__CHILD_TYPE = 0;

-

-	/**

-	 * The feature id for the '<em><b>Is Permitted</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int HIERARCHY_PERMISSION__IS_PERMITTED = 1;

-

-	/**

-	 * The feature id for the '<em><b>Is Strict</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int HIERARCHY_PERMISSION__IS_STRICT = 2;

-

-	/**

-	 * The number of structural features of the '<em>Hierarchy Permission</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int HIERARCHY_PERMISSION_FEATURE_COUNT = 3;

-

-	/**

-	 * The number of operations of the '<em>Hierarchy Permission</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int HIERARCHY_PERMISSION_OPERATION_COUNT = 0;

-

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration <em>Invariant Container Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Invariant Container Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration

-	 * @generated

-	 */

-	EClass getInvariantContainerConfiguration();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration#getPermissions <em>Permissions</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Permissions</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration#getPermissions()

-	 * @see #getInvariantContainerConfiguration()

-	 * @generated

-	 */

-	EReference getInvariantContainerConfiguration_Permissions();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission <em>Hierarchy Permission</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Hierarchy Permission</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission

-	 * @generated

-	 */

-	EClass getHierarchyPermission();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#getChildType <em>Child Type</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Child Type</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#getChildType()

-	 * @see #getHierarchyPermission()

-	 * @generated

-	 */

-	EAttribute getHierarchyPermission_ChildType();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsPermitted <em>Is Permitted</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Is Permitted</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsPermitted()

-	 * @see #getHierarchyPermission()

-	 * @generated

-	 */

-	EAttribute getHierarchyPermission_IsPermitted();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsStrict <em>Is Strict</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Is Strict</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsStrict()

-	 * @see #getHierarchyPermission()

-	 * @generated

-	 */

-	EAttribute getHierarchyPermission_IsStrict();

-

-	/**

-	 * 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

-	 */

-	InvariantContainerConfigurationFactory getInvariantContainerConfigurationFactory();

-

-	/**

-	 * <!-- 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.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationImpl <em>Invariant Container Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationPackageImpl#getInvariantContainerConfiguration()

-		 * @generated

-		 */

-		EClass INVARIANT_CONTAINER_CONFIGURATION = eINSTANCE.getInvariantContainerConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Permissions</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS = eINSTANCE.getInvariantContainerConfiguration_Permissions();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.HierarchyPermissionImpl <em>Hierarchy Permission</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.HierarchyPermissionImpl

-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationPackageImpl#getHierarchyPermission()

-		 * @generated

-		 */

-		EClass HIERARCHY_PERMISSION = eINSTANCE.getHierarchyPermission();

-

-		/**

-		 * The meta object literal for the '<em><b>Child Type</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute HIERARCHY_PERMISSION__CHILD_TYPE = eINSTANCE.getHierarchyPermission_ChildType();

-

-		/**

-		 * The meta object literal for the '<em><b>Is Permitted</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute HIERARCHY_PERMISSION__IS_PERMITTED = eINSTANCE.getHierarchyPermission_IsPermitted();

-

-		/**

-		 * The meta object literal for the '<em><b>Is Strict</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute HIERARCHY_PERMISSION__IS_STRICT = eINSTANCE.getHierarchyPermission_IsStrict();

-

-	}

-

-} // InvariantContainerConfigurationPackage

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantcontainerconfiguration;
+
+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.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
+
+/**
+ * <!-- 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.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface InvariantContainerConfigurationPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNAME = "invariantcontainerconfiguration";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/container/1.0";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_PREFIX = "invariantcontainerconfiguration";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	InvariantContainerConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationImpl <em>Invariant Container Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationPackageImpl#getInvariantContainerConfiguration()
+	 * @generated
+	 */
+	int INVARIANT_CONTAINER_CONFIGURATION = 0;
+
+	/**
+	 * The feature id for the '<em><b>Permissions</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS = InvariantSemanticTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Invariant Container Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_CONTAINER_CONFIGURATION_FEATURE_COUNT = InvariantSemanticTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Invariant Container Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_CONTAINER_CONFIGURATION_OPERATION_COUNT = InvariantSemanticTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.HierarchyPermissionImpl <em>Hierarchy Permission</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.HierarchyPermissionImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationPackageImpl#getHierarchyPermission()
+	 * @generated
+	 */
+	int HIERARCHY_PERMISSION = 1;
+
+	/**
+	 * The feature id for the '<em><b>Child Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int HIERARCHY_PERMISSION__CHILD_TYPE = 0;
+
+	/**
+	 * The feature id for the '<em><b>Is Permitted</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int HIERARCHY_PERMISSION__IS_PERMITTED = 1;
+
+	/**
+	 * The feature id for the '<em><b>Is Strict</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int HIERARCHY_PERMISSION__IS_STRICT = 2;
+
+	/**
+	 * The number of structural features of the '<em>Hierarchy Permission</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int HIERARCHY_PERMISSION_FEATURE_COUNT = 3;
+
+	/**
+	 * The number of operations of the '<em>Hierarchy Permission</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int HIERARCHY_PERMISSION_OPERATION_COUNT = 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration <em>Invariant Container Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Invariant Container Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration
+	 * @generated
+	 */
+	EClass getInvariantContainerConfiguration();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration#getPermissions <em>Permissions</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference list '<em>Permissions</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration#getPermissions()
+	 * @see #getInvariantContainerConfiguration()
+	 * @generated
+	 */
+	EReference getInvariantContainerConfiguration_Permissions();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission <em>Hierarchy Permission</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Hierarchy Permission</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission
+	 * @generated
+	 */
+	EClass getHierarchyPermission();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#getChildType <em>Child Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Child Type</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#getChildType()
+	 * @see #getHierarchyPermission()
+	 * @generated
+	 */
+	EAttribute getHierarchyPermission_ChildType();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsPermitted <em>Is Permitted</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Is Permitted</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsPermitted()
+	 * @see #getHierarchyPermission()
+	 * @generated
+	 */
+	EAttribute getHierarchyPermission_IsPermitted();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsStrict <em>Is Strict</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Is Strict</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsStrict()
+	 * @see #getHierarchyPermission()
+	 * @generated
+	 */
+	EAttribute getHierarchyPermission_IsStrict();
+
+	/**
+	 * 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
+	 */
+	InvariantContainerConfigurationFactory getInvariantContainerConfigurationFactory();
+
+	/**
+	 * <!-- 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.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationImpl <em>Invariant Container Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationPackageImpl#getInvariantContainerConfiguration()
+		 * @generated
+		 */
+		EClass INVARIANT_CONTAINER_CONFIGURATION = eINSTANCE.getInvariantContainerConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Permissions</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS = eINSTANCE.getInvariantContainerConfiguration_Permissions();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.HierarchyPermissionImpl <em>Hierarchy Permission</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.HierarchyPermissionImpl
+		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationPackageImpl#getHierarchyPermission()
+		 * @generated
+		 */
+		EClass HIERARCHY_PERMISSION = eINSTANCE.getHierarchyPermission();
+
+		/**
+		 * The meta object literal for the '<em><b>Child Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute HIERARCHY_PERMISSION__CHILD_TYPE = eINSTANCE.getHierarchyPermission_ChildType();
+
+		/**
+		 * The meta object literal for the '<em><b>Is Permitted</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute HIERARCHY_PERMISSION__IS_PERMITTED = eINSTANCE.getHierarchyPermission_IsPermitted();
+
+		/**
+		 * The meta object literal for the '<em><b>Is Strict</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute HIERARCHY_PERMISSION__IS_STRICT = eINSTANCE.getHierarchyPermission_IsStrict();
+
+	}
+
+} // InvariantContainerConfigurationPackage
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/HierarchyPermissionImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/HierarchyPermissionImpl.java
index fc4f5e3adc3..3a592474fb0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/HierarchyPermissionImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/HierarchyPermissionImpl.java
@@ -1,302 +1,302 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.invariantcontainerconfiguration.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.extendedtypes.invariantcontainerconfiguration.HierarchyPermission;

-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Hierarchy Permission</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.HierarchyPermissionImpl#getChildType <em>Child Type</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.HierarchyPermissionImpl#isIsPermitted <em>Is Permitted</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.HierarchyPermissionImpl#isIsStrict <em>Is Strict</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implements HierarchyPermission {

-	/**

-	 * The default value of the '{@link #getChildType() <em>Child Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getChildType()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String CHILD_TYPE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getChildType() <em>Child Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getChildType()

-	 * @generated

-	 * @ordered

-	 */

-	protected String childType = CHILD_TYPE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isIsPermitted() <em>Is Permitted</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isIsPermitted()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean IS_PERMITTED_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isIsPermitted() <em>Is Permitted</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isIsPermitted()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean isPermitted = IS_PERMITTED_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isIsStrict() <em>Is Strict</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isIsStrict()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean IS_STRICT_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isIsStrict() <em>Is Strict</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isIsStrict()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean isStrict = IS_STRICT_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected HierarchyPermissionImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return InvariantContainerConfigurationPackage.Literals.HIERARCHY_PERMISSION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getChildType() {

-		return childType;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setChildType(String newChildType) {

-		String oldChildType = childType;

-		childType = newChildType;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE, oldChildType, childType));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public boolean isIsPermitted() {

-		return isPermitted;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setIsPermitted(boolean newIsPermitted) {

-		boolean oldIsPermitted = isPermitted;

-		isPermitted = newIsPermitted;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED, oldIsPermitted, isPermitted));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public boolean isIsStrict() {

-		return isStrict;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setIsStrict(boolean newIsStrict) {

-		boolean oldIsStrict = isStrict;

-		isStrict = newIsStrict;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT, oldIsStrict, isStrict));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE:

-			return getChildType();

-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED:

-			return isIsPermitted();

-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT:

-			return isIsStrict();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE:

-			setChildType((String) newValue);

-			return;

-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED:

-			setIsPermitted((Boolean) newValue);

-			return;

-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT:

-			setIsStrict((Boolean) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE:

-			setChildType(CHILD_TYPE_EDEFAULT);

-			return;

-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED:

-			setIsPermitted(IS_PERMITTED_EDEFAULT);

-			return;

-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT:

-			setIsStrict(IS_STRICT_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE:

-			return CHILD_TYPE_EDEFAULT == null ? childType != null : !CHILD_TYPE_EDEFAULT.equals(childType);

-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED:

-			return isPermitted != IS_PERMITTED_EDEFAULT;

-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT:

-			return isStrict != IS_STRICT_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(" (childType: ");

-		result.append(childType);

-		result.append(", isPermitted: ");

-		result.append(isPermitted);

-		result.append(", isStrict: ");

-		result.append(isStrict);

-		result.append(')');

-		return result.toString();

-	}

-

-} // HierarchyPermissionImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantcontainerconfiguration.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.extendedtypes.invariantcontainerconfiguration.HierarchyPermission;
+import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Hierarchy Permission</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.HierarchyPermissionImpl#getChildType <em>Child Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.HierarchyPermissionImpl#isIsPermitted <em>Is Permitted</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.HierarchyPermissionImpl#isIsStrict <em>Is Strict</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implements HierarchyPermission {
+	/**
+	 * The default value of the '{@link #getChildType() <em>Child Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getChildType()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CHILD_TYPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getChildType() <em>Child Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getChildType()
+	 * @generated
+	 * @ordered
+	 */
+	protected String childType = CHILD_TYPE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isIsPermitted() <em>Is Permitted</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isIsPermitted()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean IS_PERMITTED_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isIsPermitted() <em>Is Permitted</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isIsPermitted()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean isPermitted = IS_PERMITTED_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isIsStrict() <em>Is Strict</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isIsStrict()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean IS_STRICT_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isIsStrict() <em>Is Strict</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isIsStrict()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean isStrict = IS_STRICT_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected HierarchyPermissionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return InvariantContainerConfigurationPackage.Literals.HIERARCHY_PERMISSION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String getChildType() {
+		return childType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setChildType(String newChildType) {
+		String oldChildType = childType;
+		childType = newChildType;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE, oldChildType, childType));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean isIsPermitted() {
+		return isPermitted;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setIsPermitted(boolean newIsPermitted) {
+		boolean oldIsPermitted = isPermitted;
+		isPermitted = newIsPermitted;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED, oldIsPermitted, isPermitted));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean isIsStrict() {
+		return isStrict;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setIsStrict(boolean newIsStrict) {
+		boolean oldIsStrict = isStrict;
+		isStrict = newIsStrict;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT, oldIsStrict, isStrict));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE:
+			return getChildType();
+		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED:
+			return isIsPermitted();
+		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT:
+			return isIsStrict();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE:
+			setChildType((String) newValue);
+			return;
+		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED:
+			setIsPermitted((Boolean) newValue);
+			return;
+		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT:
+			setIsStrict((Boolean) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE:
+			setChildType(CHILD_TYPE_EDEFAULT);
+			return;
+		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED:
+			setIsPermitted(IS_PERMITTED_EDEFAULT);
+			return;
+		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT:
+			setIsStrict(IS_STRICT_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE:
+			return CHILD_TYPE_EDEFAULT == null ? childType != null : !CHILD_TYPE_EDEFAULT.equals(childType);
+		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED:
+			return isPermitted != IS_PERMITTED_EDEFAULT;
+		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT:
+			return isStrict != IS_STRICT_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(" (childType: ");
+		result.append(childType);
+		result.append(", isPermitted: ");
+		result.append(isPermitted);
+		result.append(", isStrict: ");
+		result.append(isStrict);
+		result.append(')');
+		return result.toString();
+	}
+
+} // HierarchyPermissionImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/InvariantContainerConfigurationFactoryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/InvariantContainerConfigurationFactoryImpl.java
index 35aeac7a27e..26d77cdf80b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/InvariantContainerConfigurationFactoryImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/InvariantContainerConfigurationFactoryImpl.java
@@ -1,125 +1,125 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.invariantcontainerconfiguration.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.extendedtypes.invariantcontainerconfiguration.HierarchyPermission;

-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationFactory;

-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class InvariantContainerConfigurationFactoryImpl extends EFactoryImpl implements InvariantContainerConfigurationFactory {

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static InvariantContainerConfigurationFactory init() {

-		try {

-			InvariantContainerConfigurationFactory theInvariantContainerConfigurationFactory = (InvariantContainerConfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(InvariantContainerConfigurationPackage.eNS_URI);

-			if (theInvariantContainerConfigurationFactory != null) {

-				return theInvariantContainerConfigurationFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new InvariantContainerConfigurationFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantContainerConfigurationFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION:

-			return createInvariantContainerConfiguration();

-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION:

-			return createHierarchyPermission();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantContainerConfiguration createInvariantContainerConfiguration() {

-		InvariantContainerConfigurationImpl invariantContainerConfiguration = new InvariantContainerConfigurationImpl();

-		return invariantContainerConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public HierarchyPermission createHierarchyPermission() {

-		HierarchyPermissionImpl hierarchyPermission = new HierarchyPermissionImpl();

-		return hierarchyPermission;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantContainerConfigurationPackage getInvariantContainerConfigurationPackage() {

-		return (InvariantContainerConfigurationPackage) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static InvariantContainerConfigurationPackage getPackage() {

-		return InvariantContainerConfigurationPackage.eINSTANCE;

-	}

-

-} // InvariantContainerConfigurationFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantcontainerconfiguration.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.extendedtypes.invariantcontainerconfiguration.HierarchyPermission;
+import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationFactory;
+import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class InvariantContainerConfigurationFactoryImpl extends EFactoryImpl implements InvariantContainerConfigurationFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static InvariantContainerConfigurationFactory init() {
+		try {
+			InvariantContainerConfigurationFactory theInvariantContainerConfigurationFactory = (InvariantContainerConfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(InvariantContainerConfigurationPackage.eNS_URI);
+			if (theInvariantContainerConfigurationFactory != null) {
+				return theInvariantContainerConfigurationFactory;
+			}
+		} catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new InvariantContainerConfigurationFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public InvariantContainerConfigurationFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+		case InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION:
+			return createInvariantContainerConfiguration();
+		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION:
+			return createHierarchyPermission();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public InvariantContainerConfiguration createInvariantContainerConfiguration() {
+		InvariantContainerConfigurationImpl invariantContainerConfiguration = new InvariantContainerConfigurationImpl();
+		return invariantContainerConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public HierarchyPermission createHierarchyPermission() {
+		HierarchyPermissionImpl hierarchyPermission = new HierarchyPermissionImpl();
+		return hierarchyPermission;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public InvariantContainerConfigurationPackage getInvariantContainerConfigurationPackage() {
+		return (InvariantContainerConfigurationPackage) getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static InvariantContainerConfigurationPackage getPackage() {
+		return InvariantContainerConfigurationPackage.eINSTANCE;
+	}
+
+} // InvariantContainerConfigurationFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/InvariantContainerConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/InvariantContainerConfigurationImpl.java
index a254594d9f3..0b5d9867055 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/InvariantContainerConfigurationImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/InvariantContainerConfigurationImpl.java
@@ -1,166 +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.extendedtypes.invariantcontainerconfiguration.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.extendedtypes.invariantcontainerconfiguration.HierarchyPermission;

-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantRuleConfigurationImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Invariant Container Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationImpl#getPermissions <em>Permissions</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class InvariantContainerConfigurationImpl extends InvariantRuleConfigurationImpl implements InvariantContainerConfiguration {

-	/**

-	 * The cached value of the '{@link #getPermissions() <em>Permissions</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getPermissions()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<HierarchyPermission> permissions;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected InvariantContainerConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return InvariantContainerConfigurationPackage.Literals.INVARIANT_CONTAINER_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<HierarchyPermission> getPermissions() {

-		if (permissions == null) {

-			permissions = new EObjectContainmentEList<HierarchyPermission>(HierarchyPermission.class, this, InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS);

-		}

-		return permissions;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS:

-			return ((InternalEList<?>) getPermissions()).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 InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS:

-			return getPermissions();

-		}

-		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 InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS:

-			getPermissions().clear();

-			getPermissions().addAll((Collection<? extends HierarchyPermission>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS:

-			getPermissions().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS:

-			return permissions != null && !permissions.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // InvariantContainerConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantcontainerconfiguration.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.extendedtypes.invariantcontainerconfiguration.HierarchyPermission;
+import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantRuleConfigurationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Invariant Container Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationImpl#getPermissions <em>Permissions</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class InvariantContainerConfigurationImpl extends InvariantRuleConfigurationImpl implements InvariantContainerConfiguration {
+	/**
+	 * The cached value of the '{@link #getPermissions() <em>Permissions</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getPermissions()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<HierarchyPermission> permissions;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected InvariantContainerConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return InvariantContainerConfigurationPackage.Literals.INVARIANT_CONTAINER_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EList<HierarchyPermission> getPermissions() {
+		if (permissions == null) {
+			permissions = new EObjectContainmentEList<HierarchyPermission>(HierarchyPermission.class, this, InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS);
+		}
+		return permissions;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS:
+			return ((InternalEList<?>) getPermissions()).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 InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS:
+			return getPermissions();
+		}
+		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 InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS:
+			getPermissions().clear();
+			getPermissions().addAll((Collection<? extends HierarchyPermission>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS:
+			getPermissions().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS:
+			return permissions != null && !permissions.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} // InvariantContainerConfigurationImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/InvariantContainerConfigurationPackageImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/InvariantContainerConfigurationPackageImpl.java
index b032a0530a2..7666a1ee9d4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/InvariantContainerConfigurationPackageImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/InvariantContainerConfigurationPackageImpl.java
@@ -1,269 +1,269 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.invariantcontainerconfiguration.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.extendedtypes.invariantcontainerconfiguration.HierarchyPermission;

-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationFactory;

-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class InvariantContainerConfigurationPackageImpl extends EPackageImpl implements InvariantContainerConfigurationPackage {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass invariantContainerConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass hierarchyPermissionEClass = 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.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private InvariantContainerConfigurationPackageImpl() {

-		super(eNS_URI, InvariantContainerConfigurationFactory.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 InvariantContainerConfigurationPackage#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 InvariantContainerConfigurationPackage init() {

-		if (isInited) {

-			return (InvariantContainerConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(InvariantContainerConfigurationPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		InvariantContainerConfigurationPackageImpl theInvariantContainerConfigurationPackage = (InvariantContainerConfigurationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InvariantContainerConfigurationPackageImpl ? EPackage.Registry.INSTANCE

-				.get(eNS_URI) : new InvariantContainerConfigurationPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		InvariantSemanticTypeConfigurationPackage.eINSTANCE.eClass();

-

-		// Create package meta-data objects

-		theInvariantContainerConfigurationPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theInvariantContainerConfigurationPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theInvariantContainerConfigurationPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(InvariantContainerConfigurationPackage.eNS_URI, theInvariantContainerConfigurationPackage);

-		return theInvariantContainerConfigurationPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getInvariantContainerConfiguration() {

-		return invariantContainerConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getInvariantContainerConfiguration_Permissions() {

-		return (EReference) invariantContainerConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getHierarchyPermission() {

-		return hierarchyPermissionEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getHierarchyPermission_ChildType() {

-		return (EAttribute) hierarchyPermissionEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getHierarchyPermission_IsPermitted() {

-		return (EAttribute) hierarchyPermissionEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getHierarchyPermission_IsStrict() {

-		return (EAttribute) hierarchyPermissionEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantContainerConfigurationFactory getInvariantContainerConfigurationFactory() {

-		return (InvariantContainerConfigurationFactory) 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

-		invariantContainerConfigurationEClass = createEClass(INVARIANT_CONTAINER_CONFIGURATION);

-		createEReference(invariantContainerConfigurationEClass, INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS);

-

-		hierarchyPermissionEClass = createEClass(HIERARCHY_PERMISSION);

-		createEAttribute(hierarchyPermissionEClass, HIERARCHY_PERMISSION__CHILD_TYPE);

-		createEAttribute(hierarchyPermissionEClass, HIERARCHY_PERMISSION__IS_PERMITTED);

-		createEAttribute(hierarchyPermissionEClass, HIERARCHY_PERMISSION__IS_STRICT);

-	}

-

-	/**

-	 * <!-- 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

-		InvariantSemanticTypeConfigurationPackage theInvariantSemanticTypeConfigurationPackage = (InvariantSemanticTypeConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(InvariantSemanticTypeConfigurationPackage.eNS_URI);

-		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		invariantContainerConfigurationEClass.getESuperTypes().add(theInvariantSemanticTypeConfigurationPackage.getInvariantRuleConfiguration());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(invariantContainerConfigurationEClass, InvariantContainerConfiguration.class, "InvariantContainerConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getInvariantContainerConfiguration_Permissions(), this.getHierarchyPermission(), null, "permissions", null, 0, -1, InvariantContainerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(hierarchyPermissionEClass, HierarchyPermission.class, "HierarchyPermission", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getHierarchyPermission_ChildType(), theEcorePackage.getEString(), "childType", null, 0, 1, HierarchyPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getHierarchyPermission_IsPermitted(), theEcorePackage.getEBoolean(), "isPermitted", null, 0, 1, HierarchyPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getHierarchyPermission_IsStrict(), theEcorePackage.getEBoolean(), "isStrict", null, 0, 1, HierarchyPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		// Create resource

-		createResource(eNS_URI);

-	}

-

-} // InvariantContainerConfigurationPackageImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantcontainerconfiguration.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.extendedtypes.invariantcontainerconfiguration.HierarchyPermission;
+import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationFactory;
+import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class InvariantContainerConfigurationPackageImpl extends EPackageImpl implements InvariantContainerConfigurationPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass invariantContainerConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass hierarchyPermissionEClass = 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.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private InvariantContainerConfigurationPackageImpl() {
+		super(eNS_URI, InvariantContainerConfigurationFactory.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 InvariantContainerConfigurationPackage#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 InvariantContainerConfigurationPackage init() {
+		if (isInited) {
+			return (InvariantContainerConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(InvariantContainerConfigurationPackage.eNS_URI);
+		}
+
+		// Obtain or create and register package
+		InvariantContainerConfigurationPackageImpl theInvariantContainerConfigurationPackage = (InvariantContainerConfigurationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InvariantContainerConfigurationPackageImpl ? EPackage.Registry.INSTANCE
+				.get(eNS_URI) : new InvariantContainerConfigurationPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		InvariantSemanticTypeConfigurationPackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theInvariantContainerConfigurationPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theInvariantContainerConfigurationPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theInvariantContainerConfigurationPackage.freeze();
+
+
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(InvariantContainerConfigurationPackage.eNS_URI, theInvariantContainerConfigurationPackage);
+		return theInvariantContainerConfigurationPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getInvariantContainerConfiguration() {
+		return invariantContainerConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getInvariantContainerConfiguration_Permissions() {
+		return (EReference) invariantContainerConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getHierarchyPermission() {
+		return hierarchyPermissionEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getHierarchyPermission_ChildType() {
+		return (EAttribute) hierarchyPermissionEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getHierarchyPermission_IsPermitted() {
+		return (EAttribute) hierarchyPermissionEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EAttribute getHierarchyPermission_IsStrict() {
+		return (EAttribute) hierarchyPermissionEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public InvariantContainerConfigurationFactory getInvariantContainerConfigurationFactory() {
+		return (InvariantContainerConfigurationFactory) 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
+		invariantContainerConfigurationEClass = createEClass(INVARIANT_CONTAINER_CONFIGURATION);
+		createEReference(invariantContainerConfigurationEClass, INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS);
+
+		hierarchyPermissionEClass = createEClass(HIERARCHY_PERMISSION);
+		createEAttribute(hierarchyPermissionEClass, HIERARCHY_PERMISSION__CHILD_TYPE);
+		createEAttribute(hierarchyPermissionEClass, HIERARCHY_PERMISSION__IS_PERMITTED);
+		createEAttribute(hierarchyPermissionEClass, HIERARCHY_PERMISSION__IS_STRICT);
+	}
+
+	/**
+	 * <!-- 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
+		InvariantSemanticTypeConfigurationPackage theInvariantSemanticTypeConfigurationPackage = (InvariantSemanticTypeConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(InvariantSemanticTypeConfigurationPackage.eNS_URI);
+		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		invariantContainerConfigurationEClass.getESuperTypes().add(theInvariantSemanticTypeConfigurationPackage.getInvariantRuleConfiguration());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(invariantContainerConfigurationEClass, InvariantContainerConfiguration.class, "InvariantContainerConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getInvariantContainerConfiguration_Permissions(), this.getHierarchyPermission(), null, "permissions", null, 0, -1, InvariantContainerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(hierarchyPermissionEClass, HierarchyPermission.class, "HierarchyPermission", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getHierarchyPermission_ChildType(), theEcorePackage.getEString(), "childType", null, 0, 1, HierarchyPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getHierarchyPermission_IsPermitted(), theEcorePackage.getEBoolean(), "isPermitted", null, 0, 1, HierarchyPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getHierarchyPermission_IsStrict(), theEcorePackage.getEBoolean(), "isStrict", null, 0, 1, HierarchyPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} // InvariantContainerConfigurationPackageImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationAdapterFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationAdapterFactory.java
index a2344ae99da..1253bb13014 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationAdapterFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationAdapterFactory.java
@@ -1,180 +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.infra.extendedtypes.invariantcontainerconfiguration.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.extendedtypes.invariantcontainerconfiguration.HierarchyPermission;

-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;

-

-/**

- * <!-- 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.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage

- * @generated

- */

-public class InvariantContainerConfigurationAdapterFactory extends AdapterFactoryImpl {

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static InvariantContainerConfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantContainerConfigurationAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = InvariantContainerConfigurationPackage.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 InvariantContainerConfigurationSwitch<Adapter> modelSwitch =

-			new InvariantContainerConfigurationSwitch<Adapter>() {

-				@Override

-				public Adapter caseInvariantContainerConfiguration(InvariantContainerConfiguration object) {

-					return createInvariantContainerConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter caseHierarchyPermission(HierarchyPermission object) {

-					return createHierarchyPermissionAdapter();

-				}

-

-				@Override

-				public Adapter caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {

-					return createInvariantRuleConfigurationAdapter();

-				}

-

-				@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.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration <em>Invariant Container Configuration</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.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration

-	 * @generated

-	 */

-	public Adapter createInvariantContainerConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission <em>Hierarchy Permission</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.extendedtypes.invariantcontainerconfiguration.HierarchyPermission

-	 * @generated

-	 */

-	public Adapter createHierarchyPermissionAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration <em>Invariant Rule Configuration</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.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration

-	 * @generated

-	 */

-	public Adapter createInvariantRuleConfigurationAdapter() {

-		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;

-	}

-

-} // InvariantContainerConfigurationAdapterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantcontainerconfiguration.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.extendedtypes.invariantcontainerconfiguration.HierarchyPermission;
+import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
+
+/**
+ * <!-- 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.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage
+ * @generated
+ */
+public class InvariantContainerConfigurationAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static InvariantContainerConfigurationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public InvariantContainerConfigurationAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = InvariantContainerConfigurationPackage.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 InvariantContainerConfigurationSwitch<Adapter> modelSwitch =
+			new InvariantContainerConfigurationSwitch<Adapter>() {
+				@Override
+				public Adapter caseInvariantContainerConfiguration(InvariantContainerConfiguration object) {
+					return createInvariantContainerConfigurationAdapter();
+				}
+
+				@Override
+				public Adapter caseHierarchyPermission(HierarchyPermission object) {
+					return createHierarchyPermissionAdapter();
+				}
+
+				@Override
+				public Adapter caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {
+					return createInvariantRuleConfigurationAdapter();
+				}
+
+				@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.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration <em>Invariant Container Configuration</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.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration
+	 * @generated
+	 */
+	public Adapter createInvariantContainerConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission <em>Hierarchy Permission</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.extendedtypes.invariantcontainerconfiguration.HierarchyPermission
+	 * @generated
+	 */
+	public Adapter createHierarchyPermissionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration <em>Invariant Rule Configuration</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.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration
+	 * @generated
+	 */
+	public Adapter createInvariantRuleConfigurationAdapter() {
+		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;
+	}
+
+} // InvariantContainerConfigurationAdapterFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationResourceFactoryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationResourceFactoryImpl.java
index 7ae9c30fb48..6cc50cec89a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationResourceFactoryImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationResourceFactoryImpl.java
@@ -1,52 +1,52 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.invariantcontainerconfiguration.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.extendedtypes.invariantcontainerconfiguration.util.InvariantContainerConfigurationResourceImpl

- * @generated

- */

-public class InvariantContainerConfigurationResourceFactoryImpl extends ResourceFactoryImpl {

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantContainerConfigurationResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		Resource result = new InvariantContainerConfigurationResourceImpl(uri);

-		return result;

-	}

-

-} // InvariantContainerConfigurationResourceFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantcontainerconfiguration.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.extendedtypes.invariantcontainerconfiguration.util.InvariantContainerConfigurationResourceImpl
+ * @generated
+ */
+public class InvariantContainerConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
+	/**
+	 * Creates an instance of the resource factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public InvariantContainerConfigurationResourceFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Resource createResource(URI uri) {
+		Resource result = new InvariantContainerConfigurationResourceImpl(uri);
+		return result;
+	}
+
+} // InvariantContainerConfigurationResourceFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationResourceImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationResourceImpl.java
index 282b29ddf05..6d28f7a6411 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationResourceImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationResourceImpl.java
@@ -1,40 +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.infra.extendedtypes.invariantcontainerconfiguration.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.extendedtypes.invariantcontainerconfiguration.util.InvariantContainerConfigurationResourceFactoryImpl

- * @generated

- */

-public class InvariantContainerConfigurationResourceImpl extends XMLResourceImpl {

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public InvariantContainerConfigurationResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} // InvariantContainerConfigurationResourceImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantcontainerconfiguration.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.extendedtypes.invariantcontainerconfiguration.util.InvariantContainerConfigurationResourceFactoryImpl
+ * @generated
+ */
+public class InvariantContainerConfigurationResourceImpl extends XMLResourceImpl {
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param uri
+	 *            the URI of the new resource.
+	 * @generated
+	 */
+	public InvariantContainerConfigurationResourceImpl(URI uri) {
+		super(uri);
+	}
+
+} // InvariantContainerConfigurationResourceImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationSwitch.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationSwitch.java
index afc6835c0ca..79da5323bc5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationSwitch.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationSwitch.java
@@ -1,177 +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.infra.extendedtypes.invariantcontainerconfiguration.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.extendedtypes.invariantcontainerconfiguration.HierarchyPermission;

-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;

-

-/**

- * <!-- 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.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage

- * @generated

- */

-public class InvariantContainerConfigurationSwitch<T> extends Switch<T> {

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static InvariantContainerConfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantContainerConfigurationSwitch() {

-		if (modelPackage == null) {

-			modelPackage = InvariantContainerConfigurationPackage.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 InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION: {

-			InvariantContainerConfiguration invariantContainerConfiguration = (InvariantContainerConfiguration) theEObject;

-			T result = caseInvariantContainerConfiguration(invariantContainerConfiguration);

-			if (result == null) {

-				result = caseInvariantRuleConfiguration(invariantContainerConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION: {

-			HierarchyPermission hierarchyPermission = (HierarchyPermission) theEObject;

-			T result = caseHierarchyPermission(hierarchyPermission);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Invariant Container Configuration</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>Invariant Container Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseInvariantContainerConfiguration(InvariantContainerConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Hierarchy Permission</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>Hierarchy Permission</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseHierarchyPermission(HierarchyPermission object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Invariant Rule Configuration</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>Invariant Rule Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseInvariantRuleConfiguration(InvariantRuleConfiguration 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;

-	}

-

-} // InvariantContainerConfigurationSwitch

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantcontainerconfiguration.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.extendedtypes.invariantcontainerconfiguration.HierarchyPermission;
+import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
+
+/**
+ * <!-- 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.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage
+ * @generated
+ */
+public class InvariantContainerConfigurationSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static InvariantContainerConfigurationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public InvariantContainerConfigurationSwitch() {
+		if (modelPackage == null) {
+			modelPackage = InvariantContainerConfigurationPackage.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 InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION: {
+			InvariantContainerConfiguration invariantContainerConfiguration = (InvariantContainerConfiguration) theEObject;
+			T result = caseInvariantContainerConfiguration(invariantContainerConfiguration);
+			if (result == null) {
+				result = caseInvariantRuleConfiguration(invariantContainerConfiguration);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION: {
+			HierarchyPermission hierarchyPermission = (HierarchyPermission) theEObject;
+			T result = caseHierarchyPermission(hierarchyPermission);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Invariant Container Configuration</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>Invariant Container Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseInvariantContainerConfiguration(InvariantContainerConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Hierarchy Permission</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>Hierarchy Permission</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseHierarchyPermission(HierarchyPermission object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Invariant Rule Configuration</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>Invariant Rule Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseInvariantRuleConfiguration(InvariantRuleConfiguration 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;
+	}
+
+} // InvariantContainerConfigurationSwitch
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationXMLProcessor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationXMLProcessor.java
index 988de65e151..4cfa64fb687 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationXMLProcessor.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationXMLProcessor.java
@@ -1,60 +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.extendedtypes.invariantcontainerconfiguration.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.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class InvariantContainerConfigurationXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantContainerConfigurationXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		InvariantContainerConfigurationPackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the InvariantContainerConfigurationResourceFactoryImpl 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 InvariantContainerConfigurationResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new InvariantContainerConfigurationResourceFactoryImpl());

-		}

-		return registrations;

-	}

-

-} // InvariantContainerConfigurationXMLProcessor

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantcontainerconfiguration.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.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;
+
+/**
+ * This class contains helper methods to serialize and deserialize XML documents
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class InvariantContainerConfigurationXMLProcessor extends XMLProcessor {
+
+	/**
+	 * Public constructor to instantiate the helper.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public InvariantContainerConfigurationXMLProcessor() {
+		super((EPackage.Registry.INSTANCE));
+		InvariantContainerConfigurationPackage.eINSTANCE.eClass();
+	}
+
+	/**
+	 * Register for "*" and "xml" file extensions the InvariantContainerConfigurationResourceFactoryImpl 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 InvariantContainerConfigurationResourceFactoryImpl());
+			registrations.put(STAR_EXTENSION, new InvariantContainerConfigurationResourceFactoryImpl());
+		}
+		return registrations;
+	}
+
+} // InvariantContainerConfigurationXMLProcessor
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRule.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRule.java
index fc33b54ec27..79405d201c5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRule.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRule.java
@@ -1,27 +1,27 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>And Rule</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#getAndRule()

- * @model

- * @generated

- */

-public interface AndRule extends ComposedRuleConfiguration {

-} // AndRule

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>And Rule</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#getAndRule()
+ * @model
+ * @generated
+ */
+public interface AndRule extends ComposedRuleConfiguration {
+} // AndRule
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/ComposedRuleConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/ComposedRuleConfiguration.java
index d4b61556dc5..a78e97f0b60 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/ComposedRuleConfiguration.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/ComposedRuleConfiguration.java
@@ -1,50 +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.extendedtypes.invariantsemantictypeconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Composed Rule Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration#getComposedRules <em>Composed Rules</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#getComposedRuleConfiguration()

- * @model abstract="true"

- * @generated

- */

-public interface ComposedRuleConfiguration extends InvariantRuleConfiguration {

-	/**

-	 * Returns the value of the '<em><b>Composed Rules</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Composed Rules</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>Composed Rules</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#getComposedRuleConfiguration_ComposedRules()

-	 * @model lower="2"

-	 * @generated

-	 */

-	EList<InvariantRuleConfiguration> getComposedRules();

-

-} // ComposedRuleConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Composed Rule Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration#getComposedRules <em>Composed Rules</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#getComposedRuleConfiguration()
+ * @model abstract="true"
+ * @generated
+ */
+public interface ComposedRuleConfiguration extends InvariantRuleConfiguration {
+	/**
+	 * Returns the value of the '<em><b>Composed Rules</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Composed Rules</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>Composed Rules</em>' reference list.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#getComposedRuleConfiguration_ComposedRules()
+	 * @model lower="2"
+	 * @generated
+	 */
+	EList<InvariantRuleConfiguration> getComposedRules();
+
+} // ComposedRuleConfiguration
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantRuleConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantRuleConfiguration.java
index 28d53cd220f..de04f47c4f2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantRuleConfiguration.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantRuleConfiguration.java
@@ -1,28 +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.infra.extendedtypes.invariantsemantictypeconfiguration;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Invariant Rule Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#getInvariantRuleConfiguration()

- * @model abstract="true"

- * @generated

- */

-public interface InvariantRuleConfiguration extends EObject {

-} // InvariantRuleConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Invariant Rule Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#getInvariantRuleConfiguration()
+ * @model abstract="true"
+ * @generated
+ */
+public interface InvariantRuleConfiguration extends EObject {
+} // InvariantRuleConfiguration
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeConfiguration.java
index a5c5cb63f57..88bf240af80 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeConfiguration.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeConfiguration.java
@@ -1,62 +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.infra.extendedtypes.invariantsemantictypeconfiguration;

-

-import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Invariant Semantic Type Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration#getInvariantRuleConfiguration <em>Invariant Rule Configuration</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#getInvariantSemanticTypeConfiguration()

- * @model

- * @generated

- */

-public interface InvariantSemanticTypeConfiguration extends SemanticTypeConfiguration {

-	/**

-	 * Returns the value of the '<em><b>Invariant Rule Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Invariant Rule Configuration</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>Invariant Rule Configuration</em>' containment reference.

-	 * @see #setInvariantRuleConfiguration(InvariantRuleConfiguration)

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#getInvariantSemanticTypeConfiguration_InvariantRuleConfiguration()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	InvariantRuleConfiguration getInvariantRuleConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration#getInvariantRuleConfiguration <em>Invariant Rule Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Invariant Rule Configuration</em>' containment reference.

-	 * @see #getInvariantRuleConfiguration()

-	 * @generated

-	 */

-	void setInvariantRuleConfiguration(InvariantRuleConfiguration value);

-

-} // InvariantSemanticTypeConfiguration

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration;
+
+import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Invariant Semantic Type Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration#getInvariantRuleConfiguration <em>Invariant Rule Configuration</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#getInvariantSemanticTypeConfiguration()
+ * @model
+ * @generated
+ */
+public interface InvariantSemanticTypeConfiguration extends SemanticTypeConfiguration {
+	/**
+	 * Returns the value of the '<em><b>Invariant Rule Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Invariant Rule Configuration</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>Invariant Rule Configuration</em>' containment reference.
+	 * @see #setInvariantRuleConfiguration(InvariantRuleConfiguration)
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#getInvariantSemanticTypeConfiguration_InvariantRuleConfiguration()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	InvariantRuleConfiguration getInvariantRuleConfiguration();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration#getInvariantRuleConfiguration <em>Invariant Rule Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the new value of the '<em>Invariant Rule Configuration</em>' containment reference.
+	 * @see #getInvariantRuleConfiguration()
+	 * @generated
+	 */
+	void setInvariantRuleConfiguration(InvariantRuleConfiguration value);
+
+} // InvariantSemanticTypeConfiguration
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeConfigurationFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeConfigurationFactory.java
index b68fb0080b2..4aa21142491 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeConfigurationFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeConfigurationFactory.java
@@ -1,76 +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.infra.extendedtypes.invariantsemantictypeconfiguration;

-

-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.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage

- * @generated

- */

-public interface InvariantSemanticTypeConfigurationFactory extends EFactory {

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	InvariantSemanticTypeConfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Invariant Semantic Type Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Invariant Semantic Type Configuration</em>'.

-	 * @generated

-	 */

-	InvariantSemanticTypeConfiguration createInvariantSemanticTypeConfiguration();

-

-	/**

-	 * Returns a new object of class '<em>And Rule</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>And Rule</em>'.

-	 * @generated

-	 */

-	AndRule createAndRule();

-

-	/**

-	 * Returns a new object of class '<em>Or Rule</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Or Rule</em>'.

-	 * @generated

-	 */

-	OrRule createOrRule();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	InvariantSemanticTypeConfigurationPackage getInvariantSemanticTypeConfigurationPackage();

-

-} // InvariantSemanticTypeConfigurationFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration;
+
+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.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage
+ * @generated
+ */
+public interface InvariantSemanticTypeConfigurationFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	InvariantSemanticTypeConfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Invariant Semantic Type Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Invariant Semantic Type Configuration</em>'.
+	 * @generated
+	 */
+	InvariantSemanticTypeConfiguration createInvariantSemanticTypeConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>And Rule</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>And Rule</em>'.
+	 * @generated
+	 */
+	AndRule createAndRule();
+
+	/**
+	 * Returns a new object of class '<em>Or Rule</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return a new object of class '<em>Or Rule</em>'.
+	 * @generated
+	 */
+	OrRule createOrRule();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	InvariantSemanticTypeConfigurationPackage getInvariantSemanticTypeConfigurationPackage();
+
+} // InvariantSemanticTypeConfigurationFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeConfigurationPackage.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeConfigurationPackage.java
index 4a160ad1537..da304fb1344 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeConfigurationPackage.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeConfigurationPackage.java
@@ -1,519 +1,519 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-

-/**

- * <!-- 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.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationFactory

- * @model kind="package"

- * @generated

- */

-public interface InvariantSemanticTypeConfigurationPackage extends EPackage {

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "invariantsemantictypeconfiguration";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/1.0";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "invariantsemantictypeconfiguration";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	InvariantSemanticTypeConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationImpl <em>Invariant Semantic Type Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getInvariantSemanticTypeConfiguration()

-	 * @generated

-	 */

-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION = 0;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__NAME = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__DESCRIPTION = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__IDENTIFIER = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__IDENTIFIER;

-

-	/**

-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__ICON_ENTRY = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__ICON_ENTRY;

-

-	/**

-	 * The feature id for the '<em><b>Hint</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__HINT = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__HINT;

-

-	/**

-	 * The feature id for the '<em><b>Kind Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__KIND_NAME = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__KIND_NAME;

-

-	/**

-	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID;

-

-	/**

-	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__MATCHER_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Invariant Rule Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Invariant Semantic Type Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION_FEATURE_COUNT = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantRuleConfigurationImpl <em>Invariant Rule Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantRuleConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getInvariantRuleConfiguration()

-	 * @generated

-	 */

-	int INVARIANT_RULE_CONFIGURATION = 1;

-

-	/**

-	 * The number of structural features of the '<em>Invariant Rule Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT = 0;

-

-	/**

-	 * The number of operations of the '<em>Invariant Rule Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.ComposedRuleConfigurationImpl <em>Composed Rule Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.ComposedRuleConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getComposedRuleConfiguration()

-	 * @generated

-	 */

-	int COMPOSED_RULE_CONFIGURATION = 2;

-

-	/**

-	 * The feature id for the '<em><b>Composed Rules</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES = INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Composed Rule Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int COMPOSED_RULE_CONFIGURATION_FEATURE_COUNT = INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of operations of the '<em>Composed Rule Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int COMPOSED_RULE_CONFIGURATION_OPERATION_COUNT = INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.AndRuleImpl <em>And Rule</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.AndRuleImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getAndRule()

-	 * @generated

-	 */

-	int AND_RULE = 3;

-

-	/**

-	 * The feature id for the '<em><b>Composed Rules</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int AND_RULE__COMPOSED_RULES = COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES;

-

-	/**

-	 * The number of structural features of the '<em>And Rule</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int AND_RULE_FEATURE_COUNT = COMPOSED_RULE_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of operations of the '<em>And Rule</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int AND_RULE_OPERATION_COUNT = COMPOSED_RULE_CONFIGURATION_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.OrRuleImpl <em>Or Rule</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.OrRuleImpl

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getOrRule()

-	 * @generated

-	 */

-	int OR_RULE = 4;

-

-	/**

-	 * The feature id for the '<em><b>Composed Rules</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int OR_RULE__COMPOSED_RULES = COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES;

-

-	/**

-	 * The number of structural features of the '<em>Or Rule</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int OR_RULE_FEATURE_COUNT = COMPOSED_RULE_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of operations of the '<em>Or Rule</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int OR_RULE_OPERATION_COUNT = COMPOSED_RULE_CONFIGURATION_OPERATION_COUNT + 0;

-

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration <em>Invariant Semantic Type Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Invariant Semantic Type Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration

-	 * @generated

-	 */

-	EClass getInvariantSemanticTypeConfiguration();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration#getInvariantRuleConfiguration <em>Invariant Rule Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Invariant Rule Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration#getInvariantRuleConfiguration()

-	 * @see #getInvariantSemanticTypeConfiguration()

-	 * @generated

-	 */

-	EReference getInvariantSemanticTypeConfiguration_InvariantRuleConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration <em>Invariant Rule Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Invariant Rule Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration

-	 * @generated

-	 */

-	EClass getInvariantRuleConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration <em>Composed Rule Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Composed Rule Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration

-	 * @generated

-	 */

-	EClass getComposedRuleConfiguration();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration#getComposedRules <em>Composed Rules</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Composed Rules</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration#getComposedRules()

-	 * @see #getComposedRuleConfiguration()

-	 * @generated

-	 */

-	EReference getComposedRuleConfiguration_ComposedRules();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule <em>And Rule</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>And Rule</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule

-	 * @generated

-	 */

-	EClass getAndRule();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule <em>Or Rule</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Or Rule</em>'.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule

-	 * @generated

-	 */

-	EClass getOrRule();

-

-	/**

-	 * 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

-	 */

-	InvariantSemanticTypeConfigurationFactory getInvariantSemanticTypeConfigurationFactory();

-

-	/**

-	 * <!-- 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.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationImpl <em>Invariant Semantic Type Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getInvariantSemanticTypeConfiguration()

-		 * @generated

-		 */

-		EClass INVARIANT_SEMANTIC_TYPE_CONFIGURATION = eINSTANCE.getInvariantSemanticTypeConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Invariant Rule Configuration</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION = eINSTANCE.getInvariantSemanticTypeConfiguration_InvariantRuleConfiguration();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantRuleConfigurationImpl <em>Invariant Rule Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantRuleConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getInvariantRuleConfiguration()

-		 * @generated

-		 */

-		EClass INVARIANT_RULE_CONFIGURATION = eINSTANCE.getInvariantRuleConfiguration();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.ComposedRuleConfigurationImpl <em>Composed Rule Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.ComposedRuleConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getComposedRuleConfiguration()

-		 * @generated

-		 */

-		EClass COMPOSED_RULE_CONFIGURATION = eINSTANCE.getComposedRuleConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Composed Rules</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES = eINSTANCE.getComposedRuleConfiguration_ComposedRules();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.AndRuleImpl <em>And Rule</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.AndRuleImpl

-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getAndRule()

-		 * @generated

-		 */

-		EClass AND_RULE = eINSTANCE.getAndRule();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.OrRuleImpl <em>Or Rule</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.OrRuleImpl

-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getOrRule()

-		 * @generated

-		 */

-		EClass OR_RULE = eINSTANCE.getOrRule();

-

-	}

-

-} // InvariantSemanticTypeConfigurationPackage

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+
+/**
+ * <!-- 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.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface InvariantSemanticTypeConfigurationPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNAME = "invariantsemantictypeconfiguration";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/1.0";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	String eNS_PREFIX = "invariantsemantictypeconfiguration";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	InvariantSemanticTypeConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationImpl <em>Invariant Semantic Type Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getInvariantSemanticTypeConfiguration()
+	 * @generated
+	 */
+	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__NAME = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__DESCRIPTION = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__IDENTIFIER = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__IDENTIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__ICON_ENTRY = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__ICON_ENTRY;
+
+	/**
+	 * The feature id for the '<em><b>Hint</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__HINT = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__HINT;
+
+	/**
+	 * The feature id for the '<em><b>Kind Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__KIND_NAME = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__KIND_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID;
+
+	/**
+	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__MATCHER_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Invariant Rule Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Invariant Semantic Type Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION_FEATURE_COUNT = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantRuleConfigurationImpl <em>Invariant Rule Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantRuleConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getInvariantRuleConfiguration()
+	 * @generated
+	 */
+	int INVARIANT_RULE_CONFIGURATION = 1;
+
+	/**
+	 * The number of structural features of the '<em>Invariant Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT = 0;
+
+	/**
+	 * The number of operations of the '<em>Invariant Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.ComposedRuleConfigurationImpl <em>Composed Rule Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.ComposedRuleConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getComposedRuleConfiguration()
+	 * @generated
+	 */
+	int COMPOSED_RULE_CONFIGURATION = 2;
+
+	/**
+	 * The feature id for the '<em><b>Composed Rules</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES = INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Composed Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int COMPOSED_RULE_CONFIGURATION_FEATURE_COUNT = INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Composed Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int COMPOSED_RULE_CONFIGURATION_OPERATION_COUNT = INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.AndRuleImpl <em>And Rule</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.AndRuleImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getAndRule()
+	 * @generated
+	 */
+	int AND_RULE = 3;
+
+	/**
+	 * The feature id for the '<em><b>Composed Rules</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int AND_RULE__COMPOSED_RULES = COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES;
+
+	/**
+	 * The number of structural features of the '<em>And Rule</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int AND_RULE_FEATURE_COUNT = COMPOSED_RULE_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>And Rule</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int AND_RULE_OPERATION_COUNT = COMPOSED_RULE_CONFIGURATION_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.OrRuleImpl <em>Or Rule</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.OrRuleImpl
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getOrRule()
+	 * @generated
+	 */
+	int OR_RULE = 4;
+
+	/**
+	 * The feature id for the '<em><b>Composed Rules</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int OR_RULE__COMPOSED_RULES = COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES;
+
+	/**
+	 * The number of structural features of the '<em>Or Rule</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int OR_RULE_FEATURE_COUNT = COMPOSED_RULE_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Or Rule</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int OR_RULE_OPERATION_COUNT = COMPOSED_RULE_CONFIGURATION_OPERATION_COUNT + 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration <em>Invariant Semantic Type Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Invariant Semantic Type Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration
+	 * @generated
+	 */
+	EClass getInvariantSemanticTypeConfiguration();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration#getInvariantRuleConfiguration <em>Invariant Rule Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the containment reference '<em>Invariant Rule Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration#getInvariantRuleConfiguration()
+	 * @see #getInvariantSemanticTypeConfiguration()
+	 * @generated
+	 */
+	EReference getInvariantSemanticTypeConfiguration_InvariantRuleConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration <em>Invariant Rule Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Invariant Rule Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration
+	 * @generated
+	 */
+	EClass getInvariantRuleConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration <em>Composed Rule Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Composed Rule Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration
+	 * @generated
+	 */
+	EClass getComposedRuleConfiguration();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration#getComposedRules <em>Composed Rules</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the reference list '<em>Composed Rules</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration#getComposedRules()
+	 * @see #getComposedRuleConfiguration()
+	 * @generated
+	 */
+	EReference getComposedRuleConfiguration_ComposedRules();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule <em>And Rule</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>And Rule</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule
+	 * @generated
+	 */
+	EClass getAndRule();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule <em>Or Rule</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Or Rule</em>'.
+	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule
+	 * @generated
+	 */
+	EClass getOrRule();
+
+	/**
+	 * 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
+	 */
+	InvariantSemanticTypeConfigurationFactory getInvariantSemanticTypeConfigurationFactory();
+
+	/**
+	 * <!-- 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.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationImpl <em>Invariant Semantic Type Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getInvariantSemanticTypeConfiguration()
+		 * @generated
+		 */
+		EClass INVARIANT_SEMANTIC_TYPE_CONFIGURATION = eINSTANCE.getInvariantSemanticTypeConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Invariant Rule Configuration</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION = eINSTANCE.getInvariantSemanticTypeConfiguration_InvariantRuleConfiguration();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantRuleConfigurationImpl <em>Invariant Rule Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantRuleConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getInvariantRuleConfiguration()
+		 * @generated
+		 */
+		EClass INVARIANT_RULE_CONFIGURATION = eINSTANCE.getInvariantRuleConfiguration();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.ComposedRuleConfigurationImpl <em>Composed Rule Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.ComposedRuleConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getComposedRuleConfiguration()
+		 * @generated
+		 */
+		EClass COMPOSED_RULE_CONFIGURATION = eINSTANCE.getComposedRuleConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Composed Rules</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EReference COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES = eINSTANCE.getComposedRuleConfiguration_ComposedRules();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.AndRuleImpl <em>And Rule</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.AndRuleImpl
+		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getAndRule()
+		 * @generated
+		 */
+		EClass AND_RULE = eINSTANCE.getAndRule();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.OrRuleImpl <em>Or Rule</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.OrRuleImpl
+		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getOrRule()
+		 * @generated
+		 */
+		EClass OR_RULE = eINSTANCE.getOrRule();
+
+	}
+
+} // InvariantSemanticTypeConfigurationPackage
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRule.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRule.java
index 7c8821fa27f..9f501f85ea6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRule.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRule.java
@@ -1,27 +1,27 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Or Rule</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#getOrRule()

- * @model

- * @generated

- */

-public interface OrRule extends ComposedRuleConfiguration {

-} // OrRule

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Or Rule</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#getOrRule()
+ * @model
+ * @generated
+ */
+public interface OrRule extends ComposedRuleConfiguration {
+} // OrRule
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/AndRuleImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/AndRuleImpl.java
index 2991ee74743..d3f2f6198f3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/AndRuleImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/AndRuleImpl.java
@@ -1,50 +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.extendedtypes.invariantsemantictypeconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>And Rule</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class AndRuleImpl extends ComposedRuleConfigurationImpl implements AndRule {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected AndRuleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return InvariantSemanticTypeConfigurationPackage.Literals.AND_RULE;

-	}

-

-} // AndRuleImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>And Rule</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class AndRuleImpl extends ComposedRuleConfigurationImpl implements AndRule {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected AndRuleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return InvariantSemanticTypeConfigurationPackage.Literals.AND_RULE;
+	}
+
+} // AndRuleImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/ComposedRuleConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/ComposedRuleConfigurationImpl.java
index 32425aeacc8..9c11a9699f7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/ComposedRuleConfigurationImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/ComposedRuleConfigurationImpl.java
@@ -1,147 +1,147 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.util.EObjectResolvingEList;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Composed Rule Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.ComposedRuleConfigurationImpl#getComposedRules <em>Composed Rules</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public abstract class ComposedRuleConfigurationImpl extends InvariantRuleConfigurationImpl implements ComposedRuleConfiguration {

-	/**

-	 * The cached value of the '{@link #getComposedRules() <em>Composed Rules</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getComposedRules()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<InvariantRuleConfiguration> composedRules;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ComposedRuleConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return InvariantSemanticTypeConfigurationPackage.Literals.COMPOSED_RULE_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<InvariantRuleConfiguration> getComposedRules() {

-		if (composedRules == null) {

-			composedRules = new EObjectResolvingEList<InvariantRuleConfiguration>(InvariantRuleConfiguration.class, this, InvariantSemanticTypeConfigurationPackage.COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES);

-		}

-		return composedRules;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case InvariantSemanticTypeConfigurationPackage.COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES:

-			return getComposedRules();

-		}

-		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 InvariantSemanticTypeConfigurationPackage.COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES:

-			getComposedRules().clear();

-			getComposedRules().addAll((Collection<? extends InvariantRuleConfiguration>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case InvariantSemanticTypeConfigurationPackage.COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES:

-			getComposedRules().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case InvariantSemanticTypeConfigurationPackage.COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES:

-			return composedRules != null && !composedRules.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // ComposedRuleConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Composed Rule Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.ComposedRuleConfigurationImpl#getComposedRules <em>Composed Rules</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class ComposedRuleConfigurationImpl extends InvariantRuleConfigurationImpl implements ComposedRuleConfiguration {
+	/**
+	 * The cached value of the '{@link #getComposedRules() <em>Composed Rules</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getComposedRules()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<InvariantRuleConfiguration> composedRules;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected ComposedRuleConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return InvariantSemanticTypeConfigurationPackage.Literals.COMPOSED_RULE_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EList<InvariantRuleConfiguration> getComposedRules() {
+		if (composedRules == null) {
+			composedRules = new EObjectResolvingEList<InvariantRuleConfiguration>(InvariantRuleConfiguration.class, this, InvariantSemanticTypeConfigurationPackage.COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES);
+		}
+		return composedRules;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case InvariantSemanticTypeConfigurationPackage.COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES:
+			return getComposedRules();
+		}
+		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 InvariantSemanticTypeConfigurationPackage.COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES:
+			getComposedRules().clear();
+			getComposedRules().addAll((Collection<? extends InvariantRuleConfiguration>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case InvariantSemanticTypeConfigurationPackage.COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES:
+			getComposedRules().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case InvariantSemanticTypeConfigurationPackage.COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES:
+			return composedRules != null && !composedRules.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} // ComposedRuleConfigurationImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantRuleConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantRuleConfigurationImpl.java
index fe99c47924b..8866c1324ec 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantRuleConfigurationImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantRuleConfigurationImpl.java
@@ -1,51 +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.extendedtypes.invariantsemantictypeconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Invariant Rule Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public abstract class InvariantRuleConfigurationImpl extends MinimalEObjectImpl.Container implements InvariantRuleConfiguration {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected InvariantRuleConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return InvariantSemanticTypeConfigurationPackage.Literals.INVARIANT_RULE_CONFIGURATION;

-	}

-

-} // InvariantRuleConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Invariant Rule Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class InvariantRuleConfigurationImpl extends MinimalEObjectImpl.Container implements InvariantRuleConfiguration {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected InvariantRuleConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return InvariantSemanticTypeConfigurationPackage.Literals.INVARIANT_RULE_CONFIGURATION;
+	}
+
+} // InvariantRuleConfigurationImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantSemanticTypeConfigurationFactoryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantSemanticTypeConfigurationFactoryImpl.java
index 18afe9d47e1..a8b3b0aff91 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantSemanticTypeConfigurationFactoryImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantSemanticTypeConfigurationFactoryImpl.java
@@ -1,139 +1,139 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.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.extendedtypes.invariantsemantictypeconfiguration.AndRule;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationFactory;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class InvariantSemanticTypeConfigurationFactoryImpl extends EFactoryImpl implements InvariantSemanticTypeConfigurationFactory {

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static InvariantSemanticTypeConfigurationFactory init() {

-		try {

-			InvariantSemanticTypeConfigurationFactory theInvariantSemanticTypeConfigurationFactory = (InvariantSemanticTypeConfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(InvariantSemanticTypeConfigurationPackage.eNS_URI);

-			if (theInvariantSemanticTypeConfigurationFactory != null) {

-				return theInvariantSemanticTypeConfigurationFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new InvariantSemanticTypeConfigurationFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantSemanticTypeConfigurationFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION:

-			return createInvariantSemanticTypeConfiguration();

-		case InvariantSemanticTypeConfigurationPackage.AND_RULE:

-			return createAndRule();

-		case InvariantSemanticTypeConfigurationPackage.OR_RULE:

-			return createOrRule();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantSemanticTypeConfiguration createInvariantSemanticTypeConfiguration() {

-		InvariantSemanticTypeConfigurationImpl invariantSemanticTypeConfiguration = new InvariantSemanticTypeConfigurationImpl();

-		return invariantSemanticTypeConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public AndRule createAndRule() {

-		AndRuleImpl andRule = new AndRuleImpl();

-		return andRule;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public OrRule createOrRule() {

-		OrRuleImpl orRule = new OrRuleImpl();

-		return orRule;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantSemanticTypeConfigurationPackage getInvariantSemanticTypeConfigurationPackage() {

-		return (InvariantSemanticTypeConfigurationPackage) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static InvariantSemanticTypeConfigurationPackage getPackage() {

-		return InvariantSemanticTypeConfigurationPackage.eINSTANCE;

-	}

-

-} // InvariantSemanticTypeConfigurationFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.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.extendedtypes.invariantsemantictypeconfiguration.AndRule;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationFactory;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class InvariantSemanticTypeConfigurationFactoryImpl extends EFactoryImpl implements InvariantSemanticTypeConfigurationFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static InvariantSemanticTypeConfigurationFactory init() {
+		try {
+			InvariantSemanticTypeConfigurationFactory theInvariantSemanticTypeConfigurationFactory = (InvariantSemanticTypeConfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(InvariantSemanticTypeConfigurationPackage.eNS_URI);
+			if (theInvariantSemanticTypeConfigurationFactory != null) {
+				return theInvariantSemanticTypeConfigurationFactory;
+			}
+		} catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new InvariantSemanticTypeConfigurationFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public InvariantSemanticTypeConfigurationFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+		case InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION:
+			return createInvariantSemanticTypeConfiguration();
+		case InvariantSemanticTypeConfigurationPackage.AND_RULE:
+			return createAndRule();
+		case InvariantSemanticTypeConfigurationPackage.OR_RULE:
+			return createOrRule();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public InvariantSemanticTypeConfiguration createInvariantSemanticTypeConfiguration() {
+		InvariantSemanticTypeConfigurationImpl invariantSemanticTypeConfiguration = new InvariantSemanticTypeConfigurationImpl();
+		return invariantSemanticTypeConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public AndRule createAndRule() {
+		AndRuleImpl andRule = new AndRuleImpl();
+		return andRule;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public OrRule createOrRule() {
+		OrRuleImpl orRule = new OrRuleImpl();
+		return orRule;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public InvariantSemanticTypeConfigurationPackage getInvariantSemanticTypeConfigurationPackage() {
+		return (InvariantSemanticTypeConfigurationPackage) getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static InvariantSemanticTypeConfigurationPackage getPackage() {
+		return InvariantSemanticTypeConfigurationPackage.eINSTANCE;
+	}
+
+} // InvariantSemanticTypeConfigurationFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantSemanticTypeConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantSemanticTypeConfigurationImpl.java
index 44f3ad0ef3d..b77b9f51f1a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantSemanticTypeConfigurationImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantSemanticTypeConfigurationImpl.java
@@ -1,204 +1,204 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.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.papyrus.infra.extendedtypes.impl.SemanticTypeConfigurationImpl;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Invariant Semantic Type Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationImpl#getInvariantRuleConfiguration <em>Invariant Rule Configuration</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class InvariantSemanticTypeConfigurationImpl extends SemanticTypeConfigurationImpl implements InvariantSemanticTypeConfiguration {

-	/**

-	 * The cached value of the '{@link #getInvariantRuleConfiguration() <em>Invariant Rule Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getInvariantRuleConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected InvariantRuleConfiguration invariantRuleConfiguration;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected InvariantSemanticTypeConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return InvariantSemanticTypeConfigurationPackage.Literals.INVARIANT_SEMANTIC_TYPE_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantRuleConfiguration getInvariantRuleConfiguration() {

-		return invariantRuleConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetInvariantRuleConfiguration(InvariantRuleConfiguration newInvariantRuleConfiguration, NotificationChain msgs) {

-		InvariantRuleConfiguration oldInvariantRuleConfiguration = invariantRuleConfiguration;

-		invariantRuleConfiguration = newInvariantRuleConfiguration;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION, oldInvariantRuleConfiguration,

-					newInvariantRuleConfiguration);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setInvariantRuleConfiguration(InvariantRuleConfiguration newInvariantRuleConfiguration) {

-		if (newInvariantRuleConfiguration != invariantRuleConfiguration) {

-			NotificationChain msgs = null;

-			if (invariantRuleConfiguration != null) {

-				msgs = ((InternalEObject) invariantRuleConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION, null, msgs);

-			}

-			if (newInvariantRuleConfiguration != null) {

-				msgs = ((InternalEObject) newInvariantRuleConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION, null, msgs);

-			}

-			msgs = basicSetInvariantRuleConfiguration(newInvariantRuleConfiguration, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION, newInvariantRuleConfiguration, newInvariantRuleConfiguration));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:

-			return basicSetInvariantRuleConfiguration(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 InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:

-			return getInvariantRuleConfiguration();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:

-			setInvariantRuleConfiguration((InvariantRuleConfiguration) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:

-			setInvariantRuleConfiguration((InvariantRuleConfiguration) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:

-			return invariantRuleConfiguration != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // InvariantSemanticTypeConfigurationImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.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.papyrus.infra.extendedtypes.impl.SemanticTypeConfigurationImpl;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Invariant Semantic Type Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationImpl#getInvariantRuleConfiguration <em>Invariant Rule Configuration</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class InvariantSemanticTypeConfigurationImpl extends SemanticTypeConfigurationImpl implements InvariantSemanticTypeConfiguration {
+	/**
+	 * The cached value of the '{@link #getInvariantRuleConfiguration() <em>Invariant Rule Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getInvariantRuleConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected InvariantRuleConfiguration invariantRuleConfiguration;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected InvariantSemanticTypeConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return InvariantSemanticTypeConfigurationPackage.Literals.INVARIANT_SEMANTIC_TYPE_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public InvariantRuleConfiguration getInvariantRuleConfiguration() {
+		return invariantRuleConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public NotificationChain basicSetInvariantRuleConfiguration(InvariantRuleConfiguration newInvariantRuleConfiguration, NotificationChain msgs) {
+		InvariantRuleConfiguration oldInvariantRuleConfiguration = invariantRuleConfiguration;
+		invariantRuleConfiguration = newInvariantRuleConfiguration;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION, oldInvariantRuleConfiguration,
+					newInvariantRuleConfiguration);
+			if (msgs == null) {
+				msgs = notification;
+			} else {
+				msgs.add(notification);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public void setInvariantRuleConfiguration(InvariantRuleConfiguration newInvariantRuleConfiguration) {
+		if (newInvariantRuleConfiguration != invariantRuleConfiguration) {
+			NotificationChain msgs = null;
+			if (invariantRuleConfiguration != null) {
+				msgs = ((InternalEObject) invariantRuleConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION, null, msgs);
+			}
+			if (newInvariantRuleConfiguration != null) {
+				msgs = ((InternalEObject) newInvariantRuleConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION, null, msgs);
+			}
+			msgs = basicSetInvariantRuleConfiguration(newInvariantRuleConfiguration, msgs);
+			if (msgs != null) {
+				msgs.dispatch();
+			}
+		}
+		else if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION, newInvariantRuleConfiguration, newInvariantRuleConfiguration));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:
+			return basicSetInvariantRuleConfiguration(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 InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:
+			return getInvariantRuleConfiguration();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:
+			setInvariantRuleConfiguration((InvariantRuleConfiguration) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:
+			setInvariantRuleConfiguration((InvariantRuleConfiguration) null);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:
+			return invariantRuleConfiguration != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} // InvariantSemanticTypeConfigurationImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantSemanticTypeConfigurationPackageImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantSemanticTypeConfigurationPackageImpl.java
index 00a9fa04f17..0b315065e8d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantSemanticTypeConfigurationPackageImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantSemanticTypeConfigurationPackageImpl.java
@@ -1,315 +1,315 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.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.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationFactory;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class InvariantSemanticTypeConfigurationPackageImpl extends EPackageImpl implements InvariantSemanticTypeConfigurationPackage {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass invariantSemanticTypeConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass invariantRuleConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass composedRuleConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass andRuleEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass orRuleEClass = 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.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private InvariantSemanticTypeConfigurationPackageImpl() {

-		super(eNS_URI, InvariantSemanticTypeConfigurationFactory.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 InvariantSemanticTypeConfigurationPackage#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 InvariantSemanticTypeConfigurationPackage init() {

-		if (isInited) {

-			return (InvariantSemanticTypeConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(InvariantSemanticTypeConfigurationPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		InvariantSemanticTypeConfigurationPackageImpl theInvariantSemanticTypeConfigurationPackage = (InvariantSemanticTypeConfigurationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InvariantSemanticTypeConfigurationPackageImpl ? EPackage.Registry.INSTANCE

-				.get(eNS_URI) : new InvariantSemanticTypeConfigurationPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		ExtendedtypesPackage.eINSTANCE.eClass();

-

-		// Create package meta-data objects

-		theInvariantSemanticTypeConfigurationPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theInvariantSemanticTypeConfigurationPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theInvariantSemanticTypeConfigurationPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(InvariantSemanticTypeConfigurationPackage.eNS_URI, theInvariantSemanticTypeConfigurationPackage);

-		return theInvariantSemanticTypeConfigurationPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getInvariantSemanticTypeConfiguration() {

-		return invariantSemanticTypeConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getInvariantSemanticTypeConfiguration_InvariantRuleConfiguration() {

-		return (EReference) invariantSemanticTypeConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getInvariantRuleConfiguration() {

-		return invariantRuleConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getComposedRuleConfiguration() {

-		return composedRuleConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getComposedRuleConfiguration_ComposedRules() {

-		return (EReference) composedRuleConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getAndRule() {

-		return andRuleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getOrRule() {

-		return orRuleEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantSemanticTypeConfigurationFactory getInvariantSemanticTypeConfigurationFactory() {

-		return (InvariantSemanticTypeConfigurationFactory) 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

-		invariantSemanticTypeConfigurationEClass = createEClass(INVARIANT_SEMANTIC_TYPE_CONFIGURATION);

-		createEReference(invariantSemanticTypeConfigurationEClass, INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION);

-

-		invariantRuleConfigurationEClass = createEClass(INVARIANT_RULE_CONFIGURATION);

-

-		composedRuleConfigurationEClass = createEClass(COMPOSED_RULE_CONFIGURATION);

-		createEReference(composedRuleConfigurationEClass, COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES);

-

-		andRuleEClass = createEClass(AND_RULE);

-

-		orRuleEClass = createEClass(OR_RULE);

-	}

-

-	/**

-	 * <!-- 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

-		ExtendedtypesPackage theExtendedtypesPackage = (ExtendedtypesPackage) EPackage.Registry.INSTANCE.getEPackage(ExtendedtypesPackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		invariantSemanticTypeConfigurationEClass.getESuperTypes().add(theExtendedtypesPackage.getSemanticTypeConfiguration());

-		composedRuleConfigurationEClass.getESuperTypes().add(this.getInvariantRuleConfiguration());

-		andRuleEClass.getESuperTypes().add(this.getComposedRuleConfiguration());

-		orRuleEClass.getESuperTypes().add(this.getComposedRuleConfiguration());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(invariantSemanticTypeConfigurationEClass, InvariantSemanticTypeConfiguration.class, "InvariantSemanticTypeConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getInvariantSemanticTypeConfiguration_InvariantRuleConfiguration(), this.getInvariantRuleConfiguration(), null, "invariantRuleConfiguration", null, 1, 1, InvariantSemanticTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE,

-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(invariantRuleConfigurationEClass, InvariantRuleConfiguration.class, "InvariantRuleConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(composedRuleConfigurationEClass, ComposedRuleConfiguration.class, "ComposedRuleConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getComposedRuleConfiguration_ComposedRules(), this.getInvariantRuleConfiguration(), null, "composedRules", null, 2, -1, ComposedRuleConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(andRuleEClass, AndRule.class, "AndRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(orRuleEClass, OrRule.class, "OrRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		// Create resource

-		createResource(eNS_URI);

-	}

-

-} // InvariantSemanticTypeConfigurationPackageImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.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.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationFactory;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class InvariantSemanticTypeConfigurationPackageImpl extends EPackageImpl implements InvariantSemanticTypeConfigurationPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass invariantSemanticTypeConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass invariantRuleConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass composedRuleConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass andRuleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass orRuleEClass = 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.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private InvariantSemanticTypeConfigurationPackageImpl() {
+		super(eNS_URI, InvariantSemanticTypeConfigurationFactory.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 InvariantSemanticTypeConfigurationPackage#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 InvariantSemanticTypeConfigurationPackage init() {
+		if (isInited) {
+			return (InvariantSemanticTypeConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(InvariantSemanticTypeConfigurationPackage.eNS_URI);
+		}
+
+		// Obtain or create and register package
+		InvariantSemanticTypeConfigurationPackageImpl theInvariantSemanticTypeConfigurationPackage = (InvariantSemanticTypeConfigurationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InvariantSemanticTypeConfigurationPackageImpl ? EPackage.Registry.INSTANCE
+				.get(eNS_URI) : new InvariantSemanticTypeConfigurationPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		ExtendedtypesPackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theInvariantSemanticTypeConfigurationPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theInvariantSemanticTypeConfigurationPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theInvariantSemanticTypeConfigurationPackage.freeze();
+
+
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(InvariantSemanticTypeConfigurationPackage.eNS_URI, theInvariantSemanticTypeConfigurationPackage);
+		return theInvariantSemanticTypeConfigurationPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getInvariantSemanticTypeConfiguration() {
+		return invariantSemanticTypeConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getInvariantSemanticTypeConfiguration_InvariantRuleConfiguration() {
+		return (EReference) invariantSemanticTypeConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getInvariantRuleConfiguration() {
+		return invariantRuleConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getComposedRuleConfiguration() {
+		return composedRuleConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EReference getComposedRuleConfiguration_ComposedRules() {
+		return (EReference) composedRuleConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getAndRule() {
+		return andRuleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EClass getOrRule() {
+		return orRuleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public InvariantSemanticTypeConfigurationFactory getInvariantSemanticTypeConfigurationFactory() {
+		return (InvariantSemanticTypeConfigurationFactory) 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
+		invariantSemanticTypeConfigurationEClass = createEClass(INVARIANT_SEMANTIC_TYPE_CONFIGURATION);
+		createEReference(invariantSemanticTypeConfigurationEClass, INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION);
+
+		invariantRuleConfigurationEClass = createEClass(INVARIANT_RULE_CONFIGURATION);
+
+		composedRuleConfigurationEClass = createEClass(COMPOSED_RULE_CONFIGURATION);
+		createEReference(composedRuleConfigurationEClass, COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES);
+
+		andRuleEClass = createEClass(AND_RULE);
+
+		orRuleEClass = createEClass(OR_RULE);
+	}
+
+	/**
+	 * <!-- 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
+		ExtendedtypesPackage theExtendedtypesPackage = (ExtendedtypesPackage) EPackage.Registry.INSTANCE.getEPackage(ExtendedtypesPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		invariantSemanticTypeConfigurationEClass.getESuperTypes().add(theExtendedtypesPackage.getSemanticTypeConfiguration());
+		composedRuleConfigurationEClass.getESuperTypes().add(this.getInvariantRuleConfiguration());
+		andRuleEClass.getESuperTypes().add(this.getComposedRuleConfiguration());
+		orRuleEClass.getESuperTypes().add(this.getComposedRuleConfiguration());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(invariantSemanticTypeConfigurationEClass, InvariantSemanticTypeConfiguration.class, "InvariantSemanticTypeConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getInvariantSemanticTypeConfiguration_InvariantRuleConfiguration(), this.getInvariantRuleConfiguration(), null, "invariantRuleConfiguration", null, 1, 1, InvariantSemanticTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(invariantRuleConfigurationEClass, InvariantRuleConfiguration.class, "InvariantRuleConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(composedRuleConfigurationEClass, ComposedRuleConfiguration.class, "ComposedRuleConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getComposedRuleConfiguration_ComposedRules(), this.getInvariantRuleConfiguration(), null, "composedRules", null, 2, -1, ComposedRuleConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(andRuleEClass, AndRule.class, "AndRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(orRuleEClass, OrRule.class, "OrRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} // InvariantSemanticTypeConfigurationPackageImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/OrRuleImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/OrRuleImpl.java
index 00bc0f69636..725a93b9767 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/OrRuleImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/OrRuleImpl.java
@@ -1,50 +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.extendedtypes.invariantsemantictypeconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Or Rule</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class OrRuleImpl extends ComposedRuleConfigurationImpl implements OrRule {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected OrRuleImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return InvariantSemanticTypeConfigurationPackage.Literals.OR_RULE;

-	}

-

-} // OrRuleImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Or Rule</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class OrRuleImpl extends ComposedRuleConfigurationImpl implements OrRule {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected OrRuleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return InvariantSemanticTypeConfigurationPackage.Literals.OR_RULE;
+	}
+
+} // OrRuleImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationAdapterFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationAdapterFactory.java
index 4e1f8725b00..03bc90083f8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationAdapterFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationAdapterFactory.java
@@ -1,285 +1,285 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.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.extendedtypes.ConfigurationElement;

-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule;

-

-/**

- * <!-- 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.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage

- * @generated

- */

-public class InvariantSemanticTypeConfigurationAdapterFactory extends AdapterFactoryImpl {

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static InvariantSemanticTypeConfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantSemanticTypeConfigurationAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = InvariantSemanticTypeConfigurationPackage.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 InvariantSemanticTypeConfigurationSwitch<Adapter> modelSwitch =

-			new InvariantSemanticTypeConfigurationSwitch<Adapter>() {

-				@Override

-				public Adapter caseInvariantSemanticTypeConfiguration(InvariantSemanticTypeConfiguration object) {

-					return createInvariantSemanticTypeConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {

-					return createInvariantRuleConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter caseComposedRuleConfiguration(ComposedRuleConfiguration object) {

-					return createComposedRuleConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter caseAndRule(AndRule object) {

-					return createAndRuleAdapter();

-				}

-

-				@Override

-				public Adapter caseOrRule(OrRule object) {

-					return createOrRuleAdapter();

-				}

-

-				@Override

-				public Adapter caseConfigurationElement(ConfigurationElement object) {

-					return createConfigurationElementAdapter();

-				}

-

-				@Override

-				public Adapter caseElementTypeConfiguration(ElementTypeConfiguration object) {

-					return createElementTypeConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter caseSemanticTypeConfiguration(SemanticTypeConfiguration object) {

-					return createSemanticTypeConfigurationAdapter();

-				}

-

-				@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.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration <em>Invariant Semantic Type Configuration</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.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration

-	 * @generated

-	 */

-	public Adapter createInvariantSemanticTypeConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration <em>Invariant Rule Configuration</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.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration

-	 * @generated

-	 */

-	public Adapter createInvariantRuleConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration <em>Composed Rule Configuration</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.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration

-	 * @generated

-	 */

-	public Adapter createComposedRuleConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule <em>And Rule</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.extendedtypes.invariantsemantictypeconfiguration.AndRule

-	 * @generated

-	 */

-	public Adapter createAndRuleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule <em>Or Rule</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.extendedtypes.invariantsemantictypeconfiguration.OrRule

-	 * @generated

-	 */

-	public Adapter createOrRuleAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement <em>Configuration 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.infra.extendedtypes.ConfigurationElement

-	 * @generated

-	 */

-	public Adapter createConfigurationElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration <em>Element Type Configuration</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.extendedtypes.ElementTypeConfiguration

-	 * @generated

-	 */

-	public Adapter createElementTypeConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration <em>Semantic Type Configuration</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.extendedtypes.SemanticTypeConfiguration

-	 * @generated

-	 */

-	public Adapter createSemanticTypeConfigurationAdapter() {

-		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;

-	}

-

-} // InvariantSemanticTypeConfigurationAdapterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.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.extendedtypes.ConfigurationElement;
+import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule;
+
+/**
+ * <!-- 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.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage
+ * @generated
+ */
+public class InvariantSemanticTypeConfigurationAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static InvariantSemanticTypeConfigurationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public InvariantSemanticTypeConfigurationAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = InvariantSemanticTypeConfigurationPackage.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 InvariantSemanticTypeConfigurationSwitch<Adapter> modelSwitch =
+			new InvariantSemanticTypeConfigurationSwitch<Adapter>() {
+				@Override
+				public Adapter caseInvariantSemanticTypeConfiguration(InvariantSemanticTypeConfiguration object) {
+					return createInvariantSemanticTypeConfigurationAdapter();
+				}
+
+				@Override
+				public Adapter caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {
+					return createInvariantRuleConfigurationAdapter();
+				}
+
+				@Override
+				public Adapter caseComposedRuleConfiguration(ComposedRuleConfiguration object) {
+					return createComposedRuleConfigurationAdapter();
+				}
+
+				@Override
+				public Adapter caseAndRule(AndRule object) {
+					return createAndRuleAdapter();
+				}
+
+				@Override
+				public Adapter caseOrRule(OrRule object) {
+					return createOrRuleAdapter();
+				}
+
+				@Override
+				public Adapter caseConfigurationElement(ConfigurationElement object) {
+					return createConfigurationElementAdapter();
+				}
+
+				@Override
+				public Adapter caseElementTypeConfiguration(ElementTypeConfiguration object) {
+					return createElementTypeConfigurationAdapter();
+				}
+
+				@Override
+				public Adapter caseSemanticTypeConfiguration(SemanticTypeConfiguration object) {
+					return createSemanticTypeConfigurationAdapter();
+				}
+
+				@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.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration <em>Invariant Semantic Type Configuration</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.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration
+	 * @generated
+	 */
+	public Adapter createInvariantSemanticTypeConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration <em>Invariant Rule Configuration</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.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration
+	 * @generated
+	 */
+	public Adapter createInvariantRuleConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration <em>Composed Rule Configuration</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.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration
+	 * @generated
+	 */
+	public Adapter createComposedRuleConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule <em>And Rule</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.extendedtypes.invariantsemantictypeconfiguration.AndRule
+	 * @generated
+	 */
+	public Adapter createAndRuleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule <em>Or Rule</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.extendedtypes.invariantsemantictypeconfiguration.OrRule
+	 * @generated
+	 */
+	public Adapter createOrRuleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement <em>Configuration 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.infra.extendedtypes.ConfigurationElement
+	 * @generated
+	 */
+	public Adapter createConfigurationElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration <em>Element Type Configuration</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.extendedtypes.ElementTypeConfiguration
+	 * @generated
+	 */
+	public Adapter createElementTypeConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration <em>Semantic Type Configuration</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.extendedtypes.SemanticTypeConfiguration
+	 * @generated
+	 */
+	public Adapter createSemanticTypeConfigurationAdapter() {
+		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;
+	}
+
+} // InvariantSemanticTypeConfigurationAdapterFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationResourceFactoryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationResourceFactoryImpl.java
index d512bd32eb6..1da0900d319 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationResourceFactoryImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationResourceFactoryImpl.java
@@ -1,52 +1,52 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.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.extendedtypes.invariantsemantictypeconfiguration.util.InvariantSemanticTypeConfigurationResourceImpl

- * @generated

- */

-public class InvariantSemanticTypeConfigurationResourceFactoryImpl extends ResourceFactoryImpl {

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantSemanticTypeConfigurationResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		Resource result = new InvariantSemanticTypeConfigurationResourceImpl(uri);

-		return result;

-	}

-

-} // InvariantSemanticTypeConfigurationResourceFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.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.extendedtypes.invariantsemantictypeconfiguration.util.InvariantSemanticTypeConfigurationResourceImpl
+ * @generated
+ */
+public class InvariantSemanticTypeConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
+	/**
+	 * Creates an instance of the resource factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public InvariantSemanticTypeConfigurationResourceFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Resource createResource(URI uri) {
+		Resource result = new InvariantSemanticTypeConfigurationResourceImpl(uri);
+		return result;
+	}
+
+} // InvariantSemanticTypeConfigurationResourceFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationResourceImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationResourceImpl.java
index f532c1d2986..8164b13aae8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationResourceImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationResourceImpl.java
@@ -1,40 +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.infra.extendedtypes.invariantsemantictypeconfiguration.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.extendedtypes.invariantsemantictypeconfiguration.util.InvariantSemanticTypeConfigurationResourceFactoryImpl

- * @generated

- */

-public class InvariantSemanticTypeConfigurationResourceImpl extends XMLResourceImpl {

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public InvariantSemanticTypeConfigurationResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} // InvariantSemanticTypeConfigurationResourceImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.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.extendedtypes.invariantsemantictypeconfiguration.util.InvariantSemanticTypeConfigurationResourceFactoryImpl
+ * @generated
+ */
+public class InvariantSemanticTypeConfigurationResourceImpl extends XMLResourceImpl {
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param uri
+	 *            the URI of the new resource.
+	 * @generated
+	 */
+	public InvariantSemanticTypeConfigurationResourceImpl(URI uri) {
+		super(uri);
+	}
+
+} // InvariantSemanticTypeConfigurationResourceImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationSwitch.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationSwitch.java
index 9a790337935..e731c65ac5b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationSwitch.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationSwitch.java
@@ -1,312 +1,312 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.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.extendedtypes.ConfigurationElement;

-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule;

-

-/**

- * <!-- 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.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage

- * @generated

- */

-public class InvariantSemanticTypeConfigurationSwitch<T> extends Switch<T> {

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static InvariantSemanticTypeConfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantSemanticTypeConfigurationSwitch() {

-		if (modelPackage == null) {

-			modelPackage = InvariantSemanticTypeConfigurationPackage.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 InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION: {

-			InvariantSemanticTypeConfiguration invariantSemanticTypeConfiguration = (InvariantSemanticTypeConfiguration) theEObject;

-			T result = caseInvariantSemanticTypeConfiguration(invariantSemanticTypeConfiguration);

-			if (result == null) {

-				result = caseSemanticTypeConfiguration(invariantSemanticTypeConfiguration);

-			}

-			if (result == null) {

-				result = caseElementTypeConfiguration(invariantSemanticTypeConfiguration);

-			}

-			if (result == null) {

-				result = caseConfigurationElement(invariantSemanticTypeConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case InvariantSemanticTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION: {

-			InvariantRuleConfiguration invariantRuleConfiguration = (InvariantRuleConfiguration) theEObject;

-			T result = caseInvariantRuleConfiguration(invariantRuleConfiguration);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case InvariantSemanticTypeConfigurationPackage.COMPOSED_RULE_CONFIGURATION: {

-			ComposedRuleConfiguration composedRuleConfiguration = (ComposedRuleConfiguration) theEObject;

-			T result = caseComposedRuleConfiguration(composedRuleConfiguration);

-			if (result == null) {

-				result = caseInvariantRuleConfiguration(composedRuleConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case InvariantSemanticTypeConfigurationPackage.AND_RULE: {

-			AndRule andRule = (AndRule) theEObject;

-			T result = caseAndRule(andRule);

-			if (result == null) {

-				result = caseComposedRuleConfiguration(andRule);

-			}

-			if (result == null) {

-				result = caseInvariantRuleConfiguration(andRule);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case InvariantSemanticTypeConfigurationPackage.OR_RULE: {

-			OrRule orRule = (OrRule) theEObject;

-			T result = caseOrRule(orRule);

-			if (result == null) {

-				result = caseComposedRuleConfiguration(orRule);

-			}

-			if (result == null) {

-				result = caseInvariantRuleConfiguration(orRule);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Invariant Semantic Type Configuration</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>Invariant Semantic Type Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseInvariantSemanticTypeConfiguration(InvariantSemanticTypeConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Invariant Rule Configuration</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>Invariant Rule Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Composed Rule Configuration</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>Composed Rule Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseComposedRuleConfiguration(ComposedRuleConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>And Rule</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>And Rule</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseAndRule(AndRule object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Or Rule</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>Or Rule</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseOrRule(OrRule object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Configuration 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>Configuration Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseConfigurationElement(ConfigurationElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Element Type Configuration</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>Element Type Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseElementTypeConfiguration(ElementTypeConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Semantic Type Configuration</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>Semantic Type Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseSemanticTypeConfiguration(SemanticTypeConfiguration 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;

-	}

-

-} // InvariantSemanticTypeConfigurationSwitch

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.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.extendedtypes.ConfigurationElement;
+import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
+import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule;
+
+/**
+ * <!-- 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.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage
+ * @generated
+ */
+public class InvariantSemanticTypeConfigurationSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static InvariantSemanticTypeConfigurationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public InvariantSemanticTypeConfigurationSwitch() {
+		if (modelPackage == null) {
+			modelPackage = InvariantSemanticTypeConfigurationPackage.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 InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION: {
+			InvariantSemanticTypeConfiguration invariantSemanticTypeConfiguration = (InvariantSemanticTypeConfiguration) theEObject;
+			T result = caseInvariantSemanticTypeConfiguration(invariantSemanticTypeConfiguration);
+			if (result == null) {
+				result = caseSemanticTypeConfiguration(invariantSemanticTypeConfiguration);
+			}
+			if (result == null) {
+				result = caseElementTypeConfiguration(invariantSemanticTypeConfiguration);
+			}
+			if (result == null) {
+				result = caseConfigurationElement(invariantSemanticTypeConfiguration);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case InvariantSemanticTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION: {
+			InvariantRuleConfiguration invariantRuleConfiguration = (InvariantRuleConfiguration) theEObject;
+			T result = caseInvariantRuleConfiguration(invariantRuleConfiguration);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case InvariantSemanticTypeConfigurationPackage.COMPOSED_RULE_CONFIGURATION: {
+			ComposedRuleConfiguration composedRuleConfiguration = (ComposedRuleConfiguration) theEObject;
+			T result = caseComposedRuleConfiguration(composedRuleConfiguration);
+			if (result == null) {
+				result = caseInvariantRuleConfiguration(composedRuleConfiguration);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case InvariantSemanticTypeConfigurationPackage.AND_RULE: {
+			AndRule andRule = (AndRule) theEObject;
+			T result = caseAndRule(andRule);
+			if (result == null) {
+				result = caseComposedRuleConfiguration(andRule);
+			}
+			if (result == null) {
+				result = caseInvariantRuleConfiguration(andRule);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case InvariantSemanticTypeConfigurationPackage.OR_RULE: {
+			OrRule orRule = (OrRule) theEObject;
+			T result = caseOrRule(orRule);
+			if (result == null) {
+				result = caseComposedRuleConfiguration(orRule);
+			}
+			if (result == null) {
+				result = caseInvariantRuleConfiguration(orRule);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Invariant Semantic Type Configuration</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>Invariant Semantic Type Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseInvariantSemanticTypeConfiguration(InvariantSemanticTypeConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Invariant Rule Configuration</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>Invariant Rule Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Composed Rule Configuration</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>Composed Rule Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseComposedRuleConfiguration(ComposedRuleConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>And Rule</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>And Rule</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAndRule(AndRule object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Or Rule</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>Or Rule</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseOrRule(OrRule object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Configuration 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>Configuration Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseConfigurationElement(ConfigurationElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Element Type Configuration</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>Element Type Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseElementTypeConfiguration(ElementTypeConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Semantic Type Configuration</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>Semantic Type Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSemanticTypeConfiguration(SemanticTypeConfiguration 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;
+	}
+
+} // InvariantSemanticTypeConfigurationSwitch
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationXMLProcessor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationXMLProcessor.java
index 50a1ddd9a04..2db03ade5ca 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationXMLProcessor.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationXMLProcessor.java
@@ -1,60 +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.extendedtypes.invariantsemantictypeconfiguration.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.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class InvariantSemanticTypeConfigurationXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantSemanticTypeConfigurationXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		InvariantSemanticTypeConfigurationPackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the InvariantSemanticTypeConfigurationResourceFactoryImpl 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 InvariantSemanticTypeConfigurationResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new InvariantSemanticTypeConfigurationResourceFactoryImpl());

-		}

-		return registrations;

-	}

-

-} // InvariantSemanticTypeConfigurationXMLProcessor

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.invariantsemantictypeconfiguration.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.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
+
+/**
+ * This class contains helper methods to serialize and deserialize XML documents
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class InvariantSemanticTypeConfigurationXMLProcessor extends XMLProcessor {
+
+	/**
+	 * Public constructor to instantiate the helper.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public InvariantSemanticTypeConfigurationXMLProcessor() {
+		super((EPackage.Registry.INSTANCE));
+		InvariantSemanticTypeConfigurationPackage.eINSTANCE.eClass();
+	}
+
+	/**
+	 * Register for "*" and "xml" file extensions the InvariantSemanticTypeConfigurationResourceFactoryImpl 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 InvariantSemanticTypeConfigurationResourceFactoryImpl());
+			registrations.put(STAR_EXTENSION, new InvariantSemanticTypeConfigurationResourceFactoryImpl());
+		}
+		return registrations;
+	}
+
+} // InvariantSemanticTypeConfigurationXMLProcessor
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesAdapterFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesAdapterFactory.java
index 3da21fdb192..4ab37cb925b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesAdapterFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesAdapterFactory.java
@@ -1,400 +1,400 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.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.extendedtypes.ActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;

-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.infra.extendedtypes.IconEntry;

-import org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration;

-

-/**

- * <!-- 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.extendedtypes.ExtendedtypesPackage

- * @generated

- */

-public class ExtendedtypesAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static ExtendedtypesPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ExtendedtypesAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = ExtendedtypesPackage.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 ExtendedtypesSwitch<Adapter> modelSwitch = new ExtendedtypesSwitch<Adapter>() {

-

-		@Override

-		public Adapter caseExtendedElementTypeSet(ExtendedElementTypeSet object) {

-			return createExtendedElementTypeSetAdapter();

-		}

-

-		@Override

-		public Adapter caseElementTypeConfiguration(ElementTypeConfiguration object) {

-			return createElementTypeConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseIconEntry(IconEntry object) {

-			return createIconEntryAdapter();

-		}

-

-		@Override

-		public Adapter caseConfigurationElement(ConfigurationElement object) {

-			return createConfigurationElementAdapter();

-		}

-

-		@Override

-		public Adapter caseMatcherConfiguration(MatcherConfiguration object) {

-			return createMatcherConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseActionConfiguration(ActionConfiguration object) {

-			return createActionConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseViewActionConfiguration(ViewActionConfiguration object) {

-			return createViewActionConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseSemanticActionConfiguration(SemanticActionConfiguration object) {

-			return createSemanticActionConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseSemanticTypeConfiguration(SemanticTypeConfiguration object) {

-			return createSemanticTypeConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseViewTypeConfiguration(ViewTypeConfiguration object) {

-			return createViewTypeConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseElementTypeAdviceConfiguration(ElementTypeAdviceConfiguration object) {

-			return createElementTypeAdviceConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseAspectSemanticTypeConfiguration(AspectSemanticTypeConfiguration object) {

-			return createAspectSemanticTypeConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseAspectViewTypeConfiguration(AspectViewTypeConfiguration object) {

-			return createAspectViewTypeConfigurationAdapter();

-		}

-

-		@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.extendedtypes.ExtendedElementTypeSet

-	 * <em>Extended Element Type Set</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.extendedtypes.ExtendedElementTypeSet

-	 * @generated

-	 */

-	public Adapter createExtendedElementTypeSetAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration

-	 * <em>Element Type Configuration</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.extendedtypes.ElementTypeConfiguration

-	 * @generated

-	 */

-	public Adapter createElementTypeConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry <em>Icon Entry</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.extendedtypes.IconEntry

-	 * @generated

-	 */

-	public Adapter createIconEntryAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement

-	 * <em>Configuration 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.infra.extendedtypes.ConfigurationElement

-	 * @generated

-	 */

-	public Adapter createConfigurationElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration

-	 * <em>Matcher Configuration</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.extendedtypes.MatcherConfiguration

-	 * @generated

-	 */

-	public Adapter createMatcherConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration <em>Action Configuration</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.extendedtypes.ActionConfiguration

-	 * @generated

-	 */

-	public Adapter createActionConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration

-	 * <em>View Action Configuration</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.extendedtypes.ViewActionConfiguration

-	 * @generated

-	 */

-	public Adapter createViewActionConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration

-	 * <em>Semantic Action Configuration</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.extendedtypes.SemanticActionConfiguration

-	 * @generated

-	 */

-	public Adapter createSemanticActionConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration

-	 * <em>Semantic Type Configuration</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.extendedtypes.SemanticTypeConfiguration

-	 * @generated

-	 */

-	public Adapter createSemanticTypeConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration

-	 * <em>View Type Configuration</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.extendedtypes.ViewTypeConfiguration

-	 * @generated

-	 */

-	public Adapter createViewTypeConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration

-	 * <em>Element Type Advice Configuration</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.extendedtypes.ElementTypeAdviceConfiguration

-	 * @generated

-	 */

-	public Adapter createElementTypeAdviceConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration

-	 * <em>Aspect Semantic Type Configuration</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.extendedtypes.AspectSemanticTypeConfiguration

-	 * @generated

-	 */

-	public Adapter createAspectSemanticTypeConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration

-	 * <em>Aspect View Type Configuration</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.extendedtypes.AspectViewTypeConfiguration

-	 * @generated

-	 */

-	public Adapter createAspectViewTypeConfigurationAdapter() {

-		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;

-	}

-} // ExtendedtypesAdapterFactory

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.extendedtypes.ActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;
+import org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.IconEntry;
+import org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration;
+
+/**
+ * <!-- 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.extendedtypes.ExtendedtypesPackage
+ * @generated
+ */
+public class ExtendedtypesAdapterFactory extends AdapterFactoryImpl {
+
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static ExtendedtypesPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ExtendedtypesAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = ExtendedtypesPackage.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 ExtendedtypesSwitch<Adapter> modelSwitch = new ExtendedtypesSwitch<Adapter>() {
+
+		@Override
+		public Adapter caseExtendedElementTypeSet(ExtendedElementTypeSet object) {
+			return createExtendedElementTypeSetAdapter();
+		}
+
+		@Override
+		public Adapter caseElementTypeConfiguration(ElementTypeConfiguration object) {
+			return createElementTypeConfigurationAdapter();
+		}
+
+		@Override
+		public Adapter caseIconEntry(IconEntry object) {
+			return createIconEntryAdapter();
+		}
+
+		@Override
+		public Adapter caseConfigurationElement(ConfigurationElement object) {
+			return createConfigurationElementAdapter();
+		}
+
+		@Override
+		public Adapter caseMatcherConfiguration(MatcherConfiguration object) {
+			return createMatcherConfigurationAdapter();
+		}
+
+		@Override
+		public Adapter caseActionConfiguration(ActionConfiguration object) {
+			return createActionConfigurationAdapter();
+		}
+
+		@Override
+		public Adapter caseViewActionConfiguration(ViewActionConfiguration object) {
+			return createViewActionConfigurationAdapter();
+		}
+
+		@Override
+		public Adapter caseSemanticActionConfiguration(SemanticActionConfiguration object) {
+			return createSemanticActionConfigurationAdapter();
+		}
+
+		@Override
+		public Adapter caseSemanticTypeConfiguration(SemanticTypeConfiguration object) {
+			return createSemanticTypeConfigurationAdapter();
+		}
+
+		@Override
+		public Adapter caseViewTypeConfiguration(ViewTypeConfiguration object) {
+			return createViewTypeConfigurationAdapter();
+		}
+
+		@Override
+		public Adapter caseElementTypeAdviceConfiguration(ElementTypeAdviceConfiguration object) {
+			return createElementTypeAdviceConfigurationAdapter();
+		}
+
+		@Override
+		public Adapter caseAspectSemanticTypeConfiguration(AspectSemanticTypeConfiguration object) {
+			return createAspectSemanticTypeConfigurationAdapter();
+		}
+
+		@Override
+		public Adapter caseAspectViewTypeConfiguration(AspectViewTypeConfiguration object) {
+			return createAspectViewTypeConfigurationAdapter();
+		}
+
+		@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.extendedtypes.ExtendedElementTypeSet
+	 * <em>Extended Element Type Set</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.extendedtypes.ExtendedElementTypeSet
+	 * @generated
+	 */
+	public Adapter createExtendedElementTypeSetAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration
+	 * <em>Element Type Configuration</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.extendedtypes.ElementTypeConfiguration
+	 * @generated
+	 */
+	public Adapter createElementTypeConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry <em>Icon Entry</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.extendedtypes.IconEntry
+	 * @generated
+	 */
+	public Adapter createIconEntryAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement
+	 * <em>Configuration 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.infra.extendedtypes.ConfigurationElement
+	 * @generated
+	 */
+	public Adapter createConfigurationElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration
+	 * <em>Matcher Configuration</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.extendedtypes.MatcherConfiguration
+	 * @generated
+	 */
+	public Adapter createMatcherConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration <em>Action Configuration</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.extendedtypes.ActionConfiguration
+	 * @generated
+	 */
+	public Adapter createActionConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration
+	 * <em>View Action Configuration</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.extendedtypes.ViewActionConfiguration
+	 * @generated
+	 */
+	public Adapter createViewActionConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration
+	 * <em>Semantic Action Configuration</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.extendedtypes.SemanticActionConfiguration
+	 * @generated
+	 */
+	public Adapter createSemanticActionConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration
+	 * <em>Semantic Type Configuration</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.extendedtypes.SemanticTypeConfiguration
+	 * @generated
+	 */
+	public Adapter createSemanticTypeConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration
+	 * <em>View Type Configuration</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.extendedtypes.ViewTypeConfiguration
+	 * @generated
+	 */
+	public Adapter createViewTypeConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration
+	 * <em>Element Type Advice Configuration</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.extendedtypes.ElementTypeAdviceConfiguration
+	 * @generated
+	 */
+	public Adapter createElementTypeAdviceConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration
+	 * <em>Aspect Semantic Type Configuration</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.extendedtypes.AspectSemanticTypeConfiguration
+	 * @generated
+	 */
+	public Adapter createAspectSemanticTypeConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration
+	 * <em>Aspect View Type Configuration</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.extendedtypes.AspectViewTypeConfiguration
+	 * @generated
+	 */
+	public Adapter createAspectViewTypeConfigurationAdapter() {
+		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;
+	}
+} // ExtendedtypesAdapterFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesResourceFactoryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesResourceFactoryImpl.java
index 3b61ab41c08..c21bde332a4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesResourceFactoryImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesResourceFactoryImpl.java
@@ -1,52 +1,52 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.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.extendedtypes.util.ExtendedtypesResourceImpl

- * @generated

- */

-public class ExtendedtypesResourceFactoryImpl extends ResourceFactoryImpl {

-

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ExtendedtypesResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		Resource result = new ExtendedtypesResourceImpl(uri);

-		return result;

-	}

-} // ExtendedtypesResourceFactoryImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.extendedtypes.util.ExtendedtypesResourceImpl
+ * @generated
+ */
+public class ExtendedtypesResourceFactoryImpl extends ResourceFactoryImpl {
+
+	/**
+	 * Creates an instance of the resource factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ExtendedtypesResourceFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Resource createResource(URI uri) {
+		Resource result = new ExtendedtypesResourceImpl(uri);
+		return result;
+	}
+} // ExtendedtypesResourceFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesResourceImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesResourceImpl.java
index ee02e20beaa..a59c18533e6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesResourceImpl.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesResourceImpl.java
@@ -1,40 +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.infra.extendedtypes.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.extendedtypes.util.ExtendedtypesResourceFactoryImpl

- * @generated

- */

-public class ExtendedtypesResourceImpl extends XMLResourceImpl {

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public ExtendedtypesResourceImpl(URI uri) {

-		super(uri);

-	}

-} // ExtendedtypesResourceImpl

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.extendedtypes.util.ExtendedtypesResourceFactoryImpl
+ * @generated
+ */
+public class ExtendedtypesResourceImpl extends XMLResourceImpl {
+
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param uri
+	 *            the URI of the new resource.
+	 * @generated
+	 */
+	public ExtendedtypesResourceImpl(URI uri) {
+		super(uri);
+	}
+} // ExtendedtypesResourceImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesSwitch.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesSwitch.java
index 6ee6dcfd591..8ee84a60110 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesSwitch.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesSwitch.java
@@ -1,496 +1,496 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.extendedtypes.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.extendedtypes.ActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;

-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.infra.extendedtypes.IconEntry;

-import org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration;

-

-/**

- * <!-- 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.extendedtypes.ExtendedtypesPackage

- * @generated

- */

-public class ExtendedtypesSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static ExtendedtypesPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ExtendedtypesSwitch() {

-		if (modelPackage == null) {

-			modelPackage = ExtendedtypesPackage.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 ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET: {

-			ExtendedElementTypeSet extendedElementTypeSet = (ExtendedElementTypeSet) theEObject;

-			T result = caseExtendedElementTypeSet(extendedElementTypeSet);

-			if (result == null) {

-				result = caseConfigurationElement(extendedElementTypeSet);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION: {

-			ElementTypeConfiguration elementTypeConfiguration = (ElementTypeConfiguration) theEObject;

-			T result = caseElementTypeConfiguration(elementTypeConfiguration);

-			if (result == null) {

-				result = caseConfigurationElement(elementTypeConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ExtendedtypesPackage.ICON_ENTRY: {

-			IconEntry iconEntry = (IconEntry) theEObject;

-			T result = caseIconEntry(iconEntry);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT: {

-			ConfigurationElement configurationElement = (ConfigurationElement) theEObject;

-			T result = caseConfigurationElement(configurationElement);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ExtendedtypesPackage.MATCHER_CONFIGURATION: {

-			MatcherConfiguration matcherConfiguration = (MatcherConfiguration) theEObject;

-			T result = caseMatcherConfiguration(matcherConfiguration);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ExtendedtypesPackage.ACTION_CONFIGURATION: {

-			ActionConfiguration actionConfiguration = (ActionConfiguration) theEObject;

-			T result = caseActionConfiguration(actionConfiguration);

-			if (result == null) {

-				result = caseConfigurationElement(actionConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ExtendedtypesPackage.VIEW_ACTION_CONFIGURATION: {

-			ViewActionConfiguration viewActionConfiguration = (ViewActionConfiguration) theEObject;

-			T result = caseViewActionConfiguration(viewActionConfiguration);

-			if (result == null) {

-				result = caseActionConfiguration(viewActionConfiguration);

-			}

-			if (result == null) {

-				result = caseConfigurationElement(viewActionConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION: {

-			SemanticActionConfiguration semanticActionConfiguration = (SemanticActionConfiguration) theEObject;

-			T result = caseSemanticActionConfiguration(semanticActionConfiguration);

-			if (result == null) {

-				result = caseActionConfiguration(semanticActionConfiguration);

-			}

-			if (result == null) {

-				result = caseConfigurationElement(semanticActionConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION: {

-			SemanticTypeConfiguration semanticTypeConfiguration = (SemanticTypeConfiguration) theEObject;

-			T result = caseSemanticTypeConfiguration(semanticTypeConfiguration);

-			if (result == null) {

-				result = caseElementTypeConfiguration(semanticTypeConfiguration);

-			}

-			if (result == null) {

-				result = caseConfigurationElement(semanticTypeConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ExtendedtypesPackage.VIEW_TYPE_CONFIGURATION: {

-			ViewTypeConfiguration viewTypeConfiguration = (ViewTypeConfiguration) theEObject;

-			T result = caseViewTypeConfiguration(viewTypeConfiguration);

-			if (result == null) {

-				result = caseElementTypeConfiguration(viewTypeConfiguration);

-			}

-			if (result == null) {

-				result = caseConfigurationElement(viewTypeConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ExtendedtypesPackage.ELEMENT_TYPE_ADVICE_CONFIGURATION: {

-			ElementTypeAdviceConfiguration elementTypeAdviceConfiguration = (ElementTypeAdviceConfiguration) theEObject;

-			T result = caseElementTypeAdviceConfiguration(elementTypeAdviceConfiguration);

-			if (result == null) {

-				result = caseConfigurationElement(elementTypeAdviceConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION: {

-			AspectSemanticTypeConfiguration aspectSemanticTypeConfiguration = (AspectSemanticTypeConfiguration) theEObject;

-			T result = caseAspectSemanticTypeConfiguration(aspectSemanticTypeConfiguration);

-			if (result == null) {

-				result = caseSemanticTypeConfiguration(aspectSemanticTypeConfiguration);

-			}

-			if (result == null) {

-				result = caseElementTypeConfiguration(aspectSemanticTypeConfiguration);

-			}

-			if (result == null) {

-				result = caseConfigurationElement(aspectSemanticTypeConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION: {

-			AspectViewTypeConfiguration aspectViewTypeConfiguration = (AspectViewTypeConfiguration) theEObject;

-			T result = caseAspectViewTypeConfiguration(aspectViewTypeConfiguration);

-			if (result == null) {

-				result = caseViewTypeConfiguration(aspectViewTypeConfiguration);

-			}

-			if (result == null) {

-				result = caseElementTypeConfiguration(aspectViewTypeConfiguration);

-			}

-			if (result == null) {

-				result = caseConfigurationElement(aspectViewTypeConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Extended Element Type Set</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 Element Type Set</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseExtendedElementTypeSet(ExtendedElementTypeSet object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Element Type Configuration</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>Element Type Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseElementTypeConfiguration(ElementTypeConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Icon Entry</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>Icon Entry</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIconEntry(IconEntry object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Configuration 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>Configuration Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseConfigurationElement(ConfigurationElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Matcher Configuration</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>Matcher Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseMatcherConfiguration(MatcherConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Action Configuration</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>Action Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseActionConfiguration(ActionConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>View Action Configuration</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>View Action Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseViewActionConfiguration(ViewActionConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Semantic Action Configuration</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>Semantic Action Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseSemanticActionConfiguration(SemanticActionConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Semantic Type Configuration</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>Semantic Type Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseSemanticTypeConfiguration(SemanticTypeConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>View Type Configuration</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>View Type Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseViewTypeConfiguration(ViewTypeConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Element Type Advice Configuration</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>Element Type Advice Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseElementTypeAdviceConfiguration(ElementTypeAdviceConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Aspect Semantic Type Configuration</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>Aspect Semantic Type Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseAspectSemanticTypeConfiguration(AspectSemanticTypeConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Aspect View Type Configuration</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>Aspect View Type Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseAspectViewTypeConfiguration(AspectViewTypeConfiguration 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;

-	}

-} // ExtendedtypesSwitch

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.extendedtypes.ActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;
+import org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.IconEntry;
+import org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration;
+
+/**
+ * <!-- 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.extendedtypes.ExtendedtypesPackage
+ * @generated
+ */
+public class ExtendedtypesSwitch<T> extends Switch<T> {
+
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected static ExtendedtypesPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ExtendedtypesSwitch() {
+		if (modelPackage == null) {
+			modelPackage = ExtendedtypesPackage.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 ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET: {
+			ExtendedElementTypeSet extendedElementTypeSet = (ExtendedElementTypeSet) theEObject;
+			T result = caseExtendedElementTypeSet(extendedElementTypeSet);
+			if (result == null) {
+				result = caseConfigurationElement(extendedElementTypeSet);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION: {
+			ElementTypeConfiguration elementTypeConfiguration = (ElementTypeConfiguration) theEObject;
+			T result = caseElementTypeConfiguration(elementTypeConfiguration);
+			if (result == null) {
+				result = caseConfigurationElement(elementTypeConfiguration);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case ExtendedtypesPackage.ICON_ENTRY: {
+			IconEntry iconEntry = (IconEntry) theEObject;
+			T result = caseIconEntry(iconEntry);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case ExtendedtypesPackage.CONFIGURATION_ELEMENT: {
+			ConfigurationElement configurationElement = (ConfigurationElement) theEObject;
+			T result = caseConfigurationElement(configurationElement);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case ExtendedtypesPackage.MATCHER_CONFIGURATION: {
+			MatcherConfiguration matcherConfiguration = (MatcherConfiguration) theEObject;
+			T result = caseMatcherConfiguration(matcherConfiguration);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case ExtendedtypesPackage.ACTION_CONFIGURATION: {
+			ActionConfiguration actionConfiguration = (ActionConfiguration) theEObject;
+			T result = caseActionConfiguration(actionConfiguration);
+			if (result == null) {
+				result = caseConfigurationElement(actionConfiguration);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case ExtendedtypesPackage.VIEW_ACTION_CONFIGURATION: {
+			ViewActionConfiguration viewActionConfiguration = (ViewActionConfiguration) theEObject;
+			T result = caseViewActionConfiguration(viewActionConfiguration);
+			if (result == null) {
+				result = caseActionConfiguration(viewActionConfiguration);
+			}
+			if (result == null) {
+				result = caseConfigurationElement(viewActionConfiguration);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION: {
+			SemanticActionConfiguration semanticActionConfiguration = (SemanticActionConfiguration) theEObject;
+			T result = caseSemanticActionConfiguration(semanticActionConfiguration);
+			if (result == null) {
+				result = caseActionConfiguration(semanticActionConfiguration);
+			}
+			if (result == null) {
+				result = caseConfigurationElement(semanticActionConfiguration);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION: {
+			SemanticTypeConfiguration semanticTypeConfiguration = (SemanticTypeConfiguration) theEObject;
+			T result = caseSemanticTypeConfiguration(semanticTypeConfiguration);
+			if (result == null) {
+				result = caseElementTypeConfiguration(semanticTypeConfiguration);
+			}
+			if (result == null) {
+				result = caseConfigurationElement(semanticTypeConfiguration);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case ExtendedtypesPackage.VIEW_TYPE_CONFIGURATION: {
+			ViewTypeConfiguration viewTypeConfiguration = (ViewTypeConfiguration) theEObject;
+			T result = caseViewTypeConfiguration(viewTypeConfiguration);
+			if (result == null) {
+				result = caseElementTypeConfiguration(viewTypeConfiguration);
+			}
+			if (result == null) {
+				result = caseConfigurationElement(viewTypeConfiguration);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case ExtendedtypesPackage.ELEMENT_TYPE_ADVICE_CONFIGURATION: {
+			ElementTypeAdviceConfiguration elementTypeAdviceConfiguration = (ElementTypeAdviceConfiguration) theEObject;
+			T result = caseElementTypeAdviceConfiguration(elementTypeAdviceConfiguration);
+			if (result == null) {
+				result = caseConfigurationElement(elementTypeAdviceConfiguration);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION: {
+			AspectSemanticTypeConfiguration aspectSemanticTypeConfiguration = (AspectSemanticTypeConfiguration) theEObject;
+			T result = caseAspectSemanticTypeConfiguration(aspectSemanticTypeConfiguration);
+			if (result == null) {
+				result = caseSemanticTypeConfiguration(aspectSemanticTypeConfiguration);
+			}
+			if (result == null) {
+				result = caseElementTypeConfiguration(aspectSemanticTypeConfiguration);
+			}
+			if (result == null) {
+				result = caseConfigurationElement(aspectSemanticTypeConfiguration);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION: {
+			AspectViewTypeConfiguration aspectViewTypeConfiguration = (AspectViewTypeConfiguration) theEObject;
+			T result = caseAspectViewTypeConfiguration(aspectViewTypeConfiguration);
+			if (result == null) {
+				result = caseViewTypeConfiguration(aspectViewTypeConfiguration);
+			}
+			if (result == null) {
+				result = caseElementTypeConfiguration(aspectViewTypeConfiguration);
+			}
+			if (result == null) {
+				result = caseConfigurationElement(aspectViewTypeConfiguration);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Extended Element Type Set</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 Element Type Set</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseExtendedElementTypeSet(ExtendedElementTypeSet object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Element Type Configuration</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>Element Type Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseElementTypeConfiguration(ElementTypeConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Icon Entry</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>Icon Entry</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIconEntry(IconEntry object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Configuration 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>Configuration Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseConfigurationElement(ConfigurationElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Matcher Configuration</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>Matcher Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseMatcherConfiguration(MatcherConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Action Configuration</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>Action Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseActionConfiguration(ActionConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>View Action Configuration</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>View Action Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseViewActionConfiguration(ViewActionConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Semantic Action Configuration</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>Semantic Action Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSemanticActionConfiguration(SemanticActionConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Semantic Type Configuration</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>Semantic Type Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSemanticTypeConfiguration(SemanticTypeConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>View Type Configuration</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>View Type Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseViewTypeConfiguration(ViewTypeConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Element Type Advice Configuration</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>Element Type Advice Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseElementTypeAdviceConfiguration(ElementTypeAdviceConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Aspect Semantic Type Configuration</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>Aspect Semantic Type Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAspectSemanticTypeConfiguration(AspectSemanticTypeConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Aspect View Type Configuration</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>Aspect View Type Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAspectViewTypeConfiguration(AspectViewTypeConfiguration 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;
+	}
+} // ExtendedtypesSwitch
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesXMLProcessor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesXMLProcessor.java
index 964557570eb..6f04e5e130f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesXMLProcessor.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesXMLProcessor.java
@@ -1,59 +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.extendedtypes.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.extendedtypes.ExtendedtypesPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ExtendedtypesXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ExtendedtypesXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		ExtendedtypesPackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the ExtendedtypesResourceFactoryImpl 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 ExtendedtypesResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new ExtendedtypesResourceFactoryImpl());

-		}

-		return registrations;

-	}

-} // ExtendedtypesXMLProcessor

+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this 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.extendedtypes.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.extendedtypes.ExtendedtypesPackage;
+
+/**
+ * This class contains helper methods to serialize and deserialize XML documents
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ExtendedtypesXMLProcessor extends XMLProcessor {
+
+	/**
+	 * Public constructor to instantiate the helper.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public ExtendedtypesXMLProcessor() {
+		super((EPackage.Registry.INSTANCE));
+		ExtendedtypesPackage.eINSTANCE.eClass();
+	}
+
+	/**
+	 * Register for "*" and "xml" file extensions the ExtendedtypesResourceFactoryImpl 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 ExtendedtypesResourceFactoryImpl());
+			registrations.put(STAR_EXTENSION, new ExtendedtypesResourceFactoryImpl());
+		}
+		return registrations;
+	}
+} // ExtendedtypesXMLProcessor
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AbstractConfigurableElementTypeFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AbstractConfigurableElementTypeFactory.java
index eaeb61bb7b0..eaeb61bb7b0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AbstractConfigurableElementTypeFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AbstractConfigurableElementTypeFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/Activator.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/Activator.java
index ba4815c1708..ba4815c1708 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/Activator.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/Activator.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AspectConfigurationFactoryRegistry.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AspectConfigurationFactoryRegistry.java
index c8561cccb9b..c8561cccb9b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AspectConfigurationFactoryRegistry.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AspectConfigurationFactoryRegistry.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AspectSemanticTypeFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AspectSemanticTypeFactory.java
index 262e4f4e846..242ea071b23 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AspectSemanticTypeFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AspectSemanticTypeFactory.java
@@ -1,106 +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:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-

-

-/**

- * Factory to create Aspect Semantic Element Types from their {@link AspectSemanticTypeConfiguration}

- */

-public class AspectSemanticTypeFactory extends AbstractConfigurableElementTypeFactory<AspectSemanticTypeConfiguration> {

-

-	/**

-	 * Default Constructor

-	 */

-	public AspectSemanticTypeFactory() {

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected IEditHelperAdvice createEditHelperAdvice(AspectSemanticTypeConfiguration configuration) {

-		List<SemanticActionConfiguration> semanticActionConfigurations = configuration.getActionConfiguration();

-		List<IEditHelperAdvice> actionAdvices = new ArrayList<IEditHelperAdvice>(semanticActionConfigurations.size());

-		for (SemanticActionConfiguration actionConfiguration : semanticActionConfigurations) {

-			IEditHelperAdvice advice = AspectConfigurationFactoryRegistry.getInstance().createEditHelperAdvice(actionConfiguration);

-			if (advice != null) {

-				actionAdvices.add(advice);

-				// } else {

-				// Activator.log.error("Impossible to create an advice for :" + actionConfiguration, null);

-			}

-		}

-		if (actionAdvices != null && actionAdvices.size() > 0) {

-			return new ComposedEditHelperAdvice(actionAdvices);

-		}

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected IContainerDescriptor createContainerDescriptor(AspectSemanticTypeConfiguration configuration) {

-		List<SemanticActionConfiguration> semanticActionConfigurations = configuration.getActionConfiguration();

-		List<IContainerDescriptor> containerDescriptors = new ArrayList<IContainerDescriptor>(semanticActionConfigurations.size());

-		for (SemanticActionConfiguration actionConfiguration : semanticActionConfigurations) {

-			IContainerDescriptor containerDescriptor = AspectConfigurationFactoryRegistry.getInstance().createContainerDescriptor(actionConfiguration);

-			if (containerDescriptor != null) {

-				containerDescriptors.add(containerDescriptor);

-				// } else {

-				// Activator.log.error("Impossible to create a container descriptor for :" + actionConfiguration, null);

-			}

-		}

-		if (containerDescriptors != null && containerDescriptors.size() > 0) {

-			return new ComposedContainerDescriptor(containerDescriptors);

-		}

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public ICreationElementValidator createElementCreationValidator(AspectSemanticTypeConfiguration configuration) {

-		List<SemanticActionConfiguration> semanticActionConfigurations = configuration.getActionConfiguration();

-		List<ICreationElementValidator> actionValidators = new ArrayList<ICreationElementValidator>(semanticActionConfigurations.size());

-		for (SemanticActionConfiguration actionConfiguration : semanticActionConfigurations) {

-			ICreationElementValidator validator = AspectConfigurationFactoryRegistry.getInstance().createCreationElementValidator(actionConfiguration);

-			if (validator != null) {

-				actionValidators.add(validator);

-				// } else {

-				// Activator.log.error("Impossible to create a creation element validator for :" + actionConfiguration, null);

-			}

-		}

-		if (actionValidators != null && actionValidators.size() > 0) {

-			return new ComposedElementCreationValidator(actionValidators);

-		}

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected IElementMatcher createElementMatcher(AspectSemanticTypeConfiguration configuration) {

-		// these element types are there only for creation => it can not be match at any time

-		return new NullElementMatcher();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+import org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+
+
+/**
+ * Factory to create Aspect Semantic Element Types from their {@link AspectSemanticTypeConfiguration}
+ */
+public class AspectSemanticTypeFactory extends AbstractConfigurableElementTypeFactory<AspectSemanticTypeConfiguration> {
+
+	/**
+	 * Default Constructor
+	 */
+	public AspectSemanticTypeFactory() {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected IEditHelperAdvice createEditHelperAdvice(AspectSemanticTypeConfiguration configuration) {
+		List<SemanticActionConfiguration> semanticActionConfigurations = configuration.getActionConfiguration();
+		List<IEditHelperAdvice> actionAdvices = new ArrayList<IEditHelperAdvice>(semanticActionConfigurations.size());
+		for (SemanticActionConfiguration actionConfiguration : semanticActionConfigurations) {
+			IEditHelperAdvice advice = AspectConfigurationFactoryRegistry.getInstance().createEditHelperAdvice(actionConfiguration);
+			if (advice != null) {
+				actionAdvices.add(advice);
+				// } else {
+				// Activator.log.error("Impossible to create an advice for :" + actionConfiguration, null);
+			}
+		}
+		if (actionAdvices != null && actionAdvices.size() > 0) {
+			return new ComposedEditHelperAdvice(actionAdvices);
+		}
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected IContainerDescriptor createContainerDescriptor(AspectSemanticTypeConfiguration configuration) {
+		List<SemanticActionConfiguration> semanticActionConfigurations = configuration.getActionConfiguration();
+		List<IContainerDescriptor> containerDescriptors = new ArrayList<IContainerDescriptor>(semanticActionConfigurations.size());
+		for (SemanticActionConfiguration actionConfiguration : semanticActionConfigurations) {
+			IContainerDescriptor containerDescriptor = AspectConfigurationFactoryRegistry.getInstance().createContainerDescriptor(actionConfiguration);
+			if (containerDescriptor != null) {
+				containerDescriptors.add(containerDescriptor);
+				// } else {
+				// Activator.log.error("Impossible to create a container descriptor for :" + actionConfiguration, null);
+			}
+		}
+		if (containerDescriptors != null && containerDescriptors.size() > 0) {
+			return new ComposedContainerDescriptor(containerDescriptors);
+		}
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ICreationElementValidator createElementCreationValidator(AspectSemanticTypeConfiguration configuration) {
+		List<SemanticActionConfiguration> semanticActionConfigurations = configuration.getActionConfiguration();
+		List<ICreationElementValidator> actionValidators = new ArrayList<ICreationElementValidator>(semanticActionConfigurations.size());
+		for (SemanticActionConfiguration actionConfiguration : semanticActionConfigurations) {
+			ICreationElementValidator validator = AspectConfigurationFactoryRegistry.getInstance().createCreationElementValidator(actionConfiguration);
+			if (validator != null) {
+				actionValidators.add(validator);
+				// } else {
+				// Activator.log.error("Impossible to create a creation element validator for :" + actionConfiguration, null);
+			}
+		}
+		if (actionValidators != null && actionValidators.size() > 0) {
+			return new ComposedElementCreationValidator(actionValidators);
+		}
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected IElementMatcher createElementMatcher(AspectSemanticTypeConfiguration configuration) {
+		// these element types are there only for creation => it can not be match at any time
+		return new NullElementMatcher();
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedContainerDescriptor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedContainerDescriptor.java
index 2bb5c37866f..eee67c4fedc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedContainerDescriptor.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedContainerDescriptor.java
@@ -1,95 +1,95 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-

-/**

- * @author RS211865

- */

-public class ComposedContainerDescriptor implements IContainerDescriptor {

-

-	private final List<IContainerDescriptor> containerDescriptors;

-

-	/**

-	 * @param containerDescriptors

-	 */

-	public ComposedContainerDescriptor(List<IContainerDescriptor> containerDescriptors) {

-		this.containerDescriptors = containerDescriptors;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public IElementMatcher getMatcher() {

-		List<IElementMatcher> matchers = new ArrayList<IElementMatcher>();

-		// creates a composed matcher from all container descriptors

-		for (IContainerDescriptor containerDescriptor : getContainerDescriptors()) {

-			// each composed advice should approve the request

-			IElementMatcher composedMatcher = containerDescriptor.getMatcher();

-			if (composedMatcher != null) {

-				matchers.add(composedMatcher);

-			}

-		}

-		if (matchers != null && !matchers.isEmpty()) {

-			return new ComposedElementMatcher(matchers);

-		}

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public EReference[] getContainmentFeatures() {

-		// retrieve all references in the intersection of all composed container descriptors

-		List<EReference> joinReferences = null;

-		// creates a composed matcher from all container descriptors

-		for (IContainerDescriptor containerDescriptor : getContainerDescriptors()) {

-			// each composed advice should approve the request

-			EReference[] eReferencesArray = containerDescriptor.getContainmentFeatures();

-			if (eReferencesArray != null) {

-				List<EReference> eReferences = Arrays.asList(eReferencesArray);

-				// if join references has not been set yet, set the list of possible containment features

-				// if not, make the intersection of both list

-				if (joinReferences == null) {

-					joinReferences = eReferences;

-				} else {

-					List<EReference> newReferences = new ArrayList<EReference>();

-					for (EReference eReference : joinReferences) {

-						if (eReferences.contains(eReference)) {

-							newReferences.add(eReference);

-						}

-					}

-					joinReferences = newReferences;

-				}

-			}

-		}

-		if (joinReferences != null) {

-			return joinReferences.toArray(new EReference[] {});

-		}

-		return null;

-	}

-

-	/**

-	 * @return the containerDescriptors

-	 */

-	protected List<IContainerDescriptor> getContainerDescriptors() {

-		return containerDescriptors;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+
+/**
+ * @author RS211865
+ */
+public class ComposedContainerDescriptor implements IContainerDescriptor {
+
+	private final List<IContainerDescriptor> containerDescriptors;
+
+	/**
+	 * @param containerDescriptors
+	 */
+	public ComposedContainerDescriptor(List<IContainerDescriptor> containerDescriptors) {
+		this.containerDescriptors = containerDescriptors;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public IElementMatcher getMatcher() {
+		List<IElementMatcher> matchers = new ArrayList<IElementMatcher>();
+		// creates a composed matcher from all container descriptors
+		for (IContainerDescriptor containerDescriptor : getContainerDescriptors()) {
+			// each composed advice should approve the request
+			IElementMatcher composedMatcher = containerDescriptor.getMatcher();
+			if (composedMatcher != null) {
+				matchers.add(composedMatcher);
+			}
+		}
+		if (matchers != null && !matchers.isEmpty()) {
+			return new ComposedElementMatcher(matchers);
+		}
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public EReference[] getContainmentFeatures() {
+		// retrieve all references in the intersection of all composed container descriptors
+		List<EReference> joinReferences = null;
+		// creates a composed matcher from all container descriptors
+		for (IContainerDescriptor containerDescriptor : getContainerDescriptors()) {
+			// each composed advice should approve the request
+			EReference[] eReferencesArray = containerDescriptor.getContainmentFeatures();
+			if (eReferencesArray != null) {
+				List<EReference> eReferences = Arrays.asList(eReferencesArray);
+				// if join references has not been set yet, set the list of possible containment features
+				// if not, make the intersection of both list
+				if (joinReferences == null) {
+					joinReferences = eReferences;
+				} else {
+					List<EReference> newReferences = new ArrayList<EReference>();
+					for (EReference eReference : joinReferences) {
+						if (eReferences.contains(eReference)) {
+							newReferences.add(eReference);
+						}
+					}
+					joinReferences = newReferences;
+				}
+			}
+		}
+		if (joinReferences != null) {
+			return joinReferences.toArray(new EReference[] {});
+		}
+		return null;
+	}
+
+	/**
+	 * @return the containerDescriptors
+	 */
+	protected List<IContainerDescriptor> getContainerDescriptors() {
+		return containerDescriptors;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedEditHelperAdvice.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedEditHelperAdvice.java
index 20a3b431566..ae5fba0c6e6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedEditHelperAdvice.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedEditHelperAdvice.java
@@ -1,178 +1,178 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes;

-

-import java.util.List;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-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.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-

-/**

- * Generic class for Aspect Element types

- */

-public class ComposedEditHelperAdvice extends AbstractEditHelperAdvice {

-

-	/**

-	 * List of composed advices

-	 */

-	private final List<IEditHelperAdvice> composedAdvices;

-

-	/**

-	 * Creates a composed edit helper advice from an ordered list of advices

-	 */

-	public ComposedEditHelperAdvice(List<IEditHelperAdvice> composedAdvices) {

-		this.composedAdvices = composedAdvices;

-	}

-

-	/**

-	 * Returns the list of composed advices for this edit helper advice.

-	 *

-	 * @return the list of composed advices

-	 */

-	protected List<IEditHelperAdvice> getComposedAdvices() {

-		return composedAdvices;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean approveRequest(IEditCommandRequest request) {

-		for (IEditHelperAdvice advice : getComposedAdvices()) {

-			// each composed advice should approve the request

-			if (!advice.approveRequest(request)) {

-				return false;

-			}

-		}

-		return super.approveRequest(request);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {

-		ICommand resultCommand = null;

-		for (IEditHelperAdvice advice : getComposedAdvices()) {

-			ICommand command = advice.getBeforeEditCommand(request);

-			if (command != null) {

-				if (resultCommand != null) {

-					resultCommand = resultCommand.compose(command);

-				} else {

-					resultCommand = command;

-				}

-			}

-		}

-		return resultCommand;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getAfterConfigureCommand(ConfigureRequest request) {

-		ICommand resultCommand = null;

-		for (IEditHelperAdvice advice : getComposedAdvices()) {

-			ICommand command = advice.getAfterEditCommand(request);

-			if (command != null) {

-				if (resultCommand != null) {

-					resultCommand = resultCommand.compose(command);

-				} else {

-					resultCommand = command;

-				}

-			}

-		}

-		return resultCommand;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getBeforeCreateCommand(CreateElementRequest request) {

-		ICommand resultCommand = null;

-		for (IEditHelperAdvice advice : getComposedAdvices()) {

-			ICommand command = advice.getBeforeEditCommand(request);

-			if (command != null) {

-				if (resultCommand != null) {

-					resultCommand = resultCommand.compose(command);

-				} else {

-					resultCommand = command;

-				}

-			}

-		}

-		return resultCommand;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getAfterCreateCommand(CreateElementRequest request) {

-		ICommand resultCommand = null;

-		for (IEditHelperAdvice advice : getComposedAdvices()) {

-			ICommand command = advice.getAfterEditCommand(request);

-			if (command != null) {

-				if (resultCommand != null) {

-					resultCommand = resultCommand.compose(command);

-				} else {

-					resultCommand = command;

-				}

-			}

-		}

-		return resultCommand;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getBeforeCreateRelationshipCommand(CreateRelationshipRequest request) {

-		ICommand resultCommand = null;

-		for (IEditHelperAdvice advice : getComposedAdvices()) {

-			ICommand command = advice.getBeforeEditCommand(request);

-			if (command != null) {

-				if (resultCommand != null) {

-					resultCommand = resultCommand.compose(command);

-				} else {

-					resultCommand = command;

-				}

-			}

-		}

-		return resultCommand;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getAfterCreateRelationshipCommand(CreateRelationshipRequest request) {

-		ICommand resultCommand = null;

-		for (IEditHelperAdvice advice : getComposedAdvices()) {

-			ICommand command = advice.getAfterEditCommand(request);

-			if (command != null) {

-				if (resultCommand != null) {

-					resultCommand = resultCommand.compose(command);

-				} else {

-					resultCommand = command;

-				}

-			}

-		}

-		return resultCommand;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes;
+
+import java.util.List;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+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.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+
+/**
+ * Generic class for Aspect Element types
+ */
+public class ComposedEditHelperAdvice extends AbstractEditHelperAdvice {
+
+	/**
+	 * List of composed advices
+	 */
+	private final List<IEditHelperAdvice> composedAdvices;
+
+	/**
+	 * Creates a composed edit helper advice from an ordered list of advices
+	 */
+	public ComposedEditHelperAdvice(List<IEditHelperAdvice> composedAdvices) {
+		this.composedAdvices = composedAdvices;
+	}
+
+	/**
+	 * Returns the list of composed advices for this edit helper advice.
+	 *
+	 * @return the list of composed advices
+	 */
+	protected List<IEditHelperAdvice> getComposedAdvices() {
+		return composedAdvices;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean approveRequest(IEditCommandRequest request) {
+		for (IEditHelperAdvice advice : getComposedAdvices()) {
+			// each composed advice should approve the request
+			if (!advice.approveRequest(request)) {
+				return false;
+			}
+		}
+		return super.approveRequest(request);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {
+		ICommand resultCommand = null;
+		for (IEditHelperAdvice advice : getComposedAdvices()) {
+			ICommand command = advice.getBeforeEditCommand(request);
+			if (command != null) {
+				if (resultCommand != null) {
+					resultCommand = resultCommand.compose(command);
+				} else {
+					resultCommand = command;
+				}
+			}
+		}
+		return resultCommand;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getAfterConfigureCommand(ConfigureRequest request) {
+		ICommand resultCommand = null;
+		for (IEditHelperAdvice advice : getComposedAdvices()) {
+			ICommand command = advice.getAfterEditCommand(request);
+			if (command != null) {
+				if (resultCommand != null) {
+					resultCommand = resultCommand.compose(command);
+				} else {
+					resultCommand = command;
+				}
+			}
+		}
+		return resultCommand;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getBeforeCreateCommand(CreateElementRequest request) {
+		ICommand resultCommand = null;
+		for (IEditHelperAdvice advice : getComposedAdvices()) {
+			ICommand command = advice.getBeforeEditCommand(request);
+			if (command != null) {
+				if (resultCommand != null) {
+					resultCommand = resultCommand.compose(command);
+				} else {
+					resultCommand = command;
+				}
+			}
+		}
+		return resultCommand;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getAfterCreateCommand(CreateElementRequest request) {
+		ICommand resultCommand = null;
+		for (IEditHelperAdvice advice : getComposedAdvices()) {
+			ICommand command = advice.getAfterEditCommand(request);
+			if (command != null) {
+				if (resultCommand != null) {
+					resultCommand = resultCommand.compose(command);
+				} else {
+					resultCommand = command;
+				}
+			}
+		}
+		return resultCommand;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getBeforeCreateRelationshipCommand(CreateRelationshipRequest request) {
+		ICommand resultCommand = null;
+		for (IEditHelperAdvice advice : getComposedAdvices()) {
+			ICommand command = advice.getBeforeEditCommand(request);
+			if (command != null) {
+				if (resultCommand != null) {
+					resultCommand = resultCommand.compose(command);
+				} else {
+					resultCommand = command;
+				}
+			}
+		}
+		return resultCommand;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected ICommand getAfterCreateRelationshipCommand(CreateRelationshipRequest request) {
+		ICommand resultCommand = null;
+		for (IEditHelperAdvice advice : getComposedAdvices()) {
+			ICommand command = advice.getAfterEditCommand(request);
+			if (command != null) {
+				if (resultCommand != null) {
+					resultCommand = resultCommand.compose(command);
+				} else {
+					resultCommand = command;
+				}
+			}
+		}
+		return resultCommand;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedElementCreationValidator.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedElementCreationValidator.java
index ef76621e622..cbe283a8f64 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedElementCreationValidator.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedElementCreationValidator.java
@@ -1,59 +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:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes;

-

-import java.util.List;

-

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-

-

-/**

- * {@link ICreationElementValidator} composed by several validators

- */

-public class ComposedElementCreationValidator implements ICreationElementValidator {

-

-

-	private final List<ICreationElementValidator> composedValidators;

-

-	/**

-	 * Default Constructor

-	 *

-	 * @param composedValidators

-	 *            the list of composed validators

-	 */

-	public ComposedElementCreationValidator(List<ICreationElementValidator> composedValidators) {

-		this.composedValidators = composedValidators;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public boolean canCreate(CreateElementRequest request) {

-		for (ICreationElementValidator validator : getComposedValidators()) {

-			if (!validator.canCreate(request)) {

-				return false;

-			}

-		}

-		// all validators were OK => element can be created

-		return true;

-	}

-

-	/**

-	 * Returns the list of composed validators

-	 *

-	 * @return the list of composed validators

-	 */

-	protected List<ICreationElementValidator> getComposedValidators() {

-		return composedValidators;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes;
+
+import java.util.List;
+
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+
+
+/**
+ * {@link ICreationElementValidator} composed by several validators
+ */
+public class ComposedElementCreationValidator implements ICreationElementValidator {
+
+
+	private final List<ICreationElementValidator> composedValidators;
+
+	/**
+	 * Default Constructor
+	 *
+	 * @param composedValidators
+	 *            the list of composed validators
+	 */
+	public ComposedElementCreationValidator(List<ICreationElementValidator> composedValidators) {
+		this.composedValidators = composedValidators;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public boolean canCreate(CreateElementRequest request) {
+		for (ICreationElementValidator validator : getComposedValidators()) {
+			if (!validator.canCreate(request)) {
+				return false;
+			}
+		}
+		// all validators were OK => element can be created
+		return true;
+	}
+
+	/**
+	 * Returns the list of composed validators
+	 *
+	 * @return the list of composed validators
+	 */
+	protected List<ICreationElementValidator> getComposedValidators() {
+		return composedValidators;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedElementMatcher.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedElementMatcher.java
index 732fc3cf80b..de437cdd300 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedElementMatcher.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedElementMatcher.java
@@ -1,50 +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:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes;

-

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-

-

-/**

- * @author RS211865

- */

-public class ComposedElementMatcher implements IElementMatcher {

-

-	private final List<IElementMatcher> matchers;

-

-	public ComposedElementMatcher(List<IElementMatcher> matchers) {

-		this.matchers = matchers;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public boolean matches(EObject eObject) {

-		for (IElementMatcher matcher : getMatchers()) {

-			if (!matcher.matches(eObject)) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-	/**

-	 * @return the matchers

-	 */

-	protected List<IElementMatcher> getMatchers() {

-		return matchers;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+
+
+/**
+ * @author RS211865
+ */
+public class ComposedElementMatcher implements IElementMatcher {
+
+	private final List<IElementMatcher> matchers;
+
+	public ComposedElementMatcher(List<IElementMatcher> matchers) {
+		this.matchers = matchers;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public boolean matches(EObject eObject) {
+		for (IElementMatcher matcher : getMatchers()) {
+			if (!matcher.matches(eObject)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * @return the matchers
+	 */
+	protected List<IElementMatcher> getMatchers() {
+		return matchers;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ConfigurableElementMatcherFactoryRegistry.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ConfigurableElementMatcherFactoryRegistry.java
index 22fec1b1ebe..22fec1b1ebe 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ConfigurableElementMatcherFactoryRegistry.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ConfigurableElementMatcherFactoryRegistry.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ElementTypeSetUtils.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ElementTypeSetUtils.java
index e143ee86007..e143ee86007 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ElementTypeSetUtils.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ElementTypeSetUtils.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeSetRegistry.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeSetRegistry.java
index 0c2aa4964ec..0c2aa4964ec 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeSetRegistry.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeSetRegistry.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedTypeRegistryService.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedTypeRegistryService.java
index f08da3a43fc..f08da3a43fc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedTypeRegistryService.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedTypeRegistryService.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionConfigurationModelCreation.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionConfigurationModelCreation.java
index 36a57fd7339..1364c39d18d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionConfigurationModelCreation.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionConfigurationModelCreation.java
@@ -1,22 +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:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes;

-

-

-/**

- * Interface used to create new aspect action model element in the configuration model

- */

-public interface IActionConfigurationModelCreation<T extends ActionConfiguration> {

-

-	public T createConfigurationModel();

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes;
+
+
+/**
+ * Interface used to create new aspect action model element in the configuration model
+ */
+public interface IActionConfigurationModelCreation<T extends ActionConfiguration> {
+
+	public T createConfigurationModel();
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionContainerDescriptor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionContainerDescriptor.java
index 44c74af2a1c..1b71bf52bbf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionContainerDescriptor.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionContainerDescriptor.java
@@ -1,30 +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:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes;

-

-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;

-

-

-/**

- * Descriptor for the configurable container descriptor

- */

-public interface IActionContainerDescriptor<T extends ActionConfiguration> extends IContainerDescriptor {

-

-	/**

-	 * Initializes the container descriptor using the given configuration

-	 *

-	 * @param actionConfiguration

-	 *            the confiugration for this container descriptor

-	 */

-	void init(T actionConfiguration);

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes;
+
+import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
+
+
+/**
+ * Descriptor for the configurable container descriptor
+ */
+public interface IActionContainerDescriptor<T extends ActionConfiguration> extends IContainerDescriptor {
+
+	/**
+	 * Initializes the container descriptor using the given configuration
+	 *
+	 * @param actionConfiguration
+	 *            the confiugration for this container descriptor
+	 */
+	void init(T actionConfiguration);
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionCreationElementValidator.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionCreationElementValidator.java
index 5a245040ef7..037a56994e7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionCreationElementValidator.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionCreationElementValidator.java
@@ -1,26 +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:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes;

-

-

-/**

- * Interface implemented by all {@link ICreationElementValidator} configured by {@link ActionConfiguration}

- */

-public interface IActionCreationElementValidator<T extends ActionConfiguration> extends ICreationElementValidator {

-

-

-	/**

-	 * Initialize the validator with the given action configuration

-	 */

-	void init(T configuration);

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes;
+
+
+/**
+ * Interface implemented by all {@link ICreationElementValidator} configured by {@link ActionConfiguration}
+ */
+public interface IActionCreationElementValidator<T extends ActionConfiguration> extends ICreationElementValidator {
+
+
+	/**
+	 * Initialize the validator with the given action configuration
+	 */
+	void init(T configuration);
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionEditHelperAdvice.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionEditHelperAdvice.java
index 5d34b70c84a..7d6bd8e78b4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionEditHelperAdvice.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionEditHelperAdvice.java
@@ -1,24 +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:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes;

-

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-

-

-/**

- *

- */

-public interface IActionEditHelperAdvice<T extends ActionConfiguration> extends IEditHelperAdvice {

-

-	public void init(T configuration);

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes;
+
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+
+
+/**
+ *
+ */
+public interface IActionEditHelperAdvice<T extends ActionConfiguration> extends IEditHelperAdvice {
+
+	public void init(T configuration);
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IAspectTypeExtensionPoint.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IAspectTypeExtensionPoint.java
index 7c69ddaa2b3..7c69ddaa2b3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IAspectTypeExtensionPoint.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IAspectTypeExtensionPoint.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IConfigurableElementMatcher.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IConfigurableElementMatcher.java
index df6518f6ce0..e2b02bdd02e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IConfigurableElementMatcher.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IConfigurableElementMatcher.java
@@ -1,30 +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:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes;

-

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-

-

-/**

- * Interface implemented by all element matchers configured by a {@link MatcherConfiguration}

- */

-public interface IConfigurableElementMatcher<T extends MatcherConfiguration> extends IElementMatcher {

-

-	/**

-	 * Inits the element matcher with the given contribution. Should be called once, after element matcher instantiation

-	 *

-	 * @param configuration

-	 *            the configuration of this {@link IElementMatcher}

-	 */

-	// public void init(T configuration);

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes;
+
+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
+
+
+/**
+ * Interface implemented by all element matchers configured by a {@link MatcherConfiguration}
+ */
+public interface IConfigurableElementMatcher<T extends MatcherConfiguration> extends IElementMatcher {
+
+	/**
+	 * Inits the element matcher with the given contribution. Should be called once, after element matcher instantiation
+	 *
+	 * @param configuration
+	 *            the configuration of this {@link IElementMatcher}
+	 */
+	// public void init(T configuration);
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IConfigurableElementMatcherFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IConfigurableElementMatcherFactory.java
index a7e2cd495b2..a7e2cd495b2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IConfigurableElementMatcherFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IConfigurableElementMatcherFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ICreationElementValidator.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ICreationElementValidator.java
index ffc53f9935a..ffc53f9935a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ICreationElementValidator.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ICreationElementValidator.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IEditHelperAdviceConstants.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IEditHelperAdviceConstants.java
index 7de483db1cb..155a5189141 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IEditHelperAdviceConstants.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IEditHelperAdviceConstants.java
@@ -1,22 +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:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.extendedtypes;

-

-

-/**

- * Constants used by Papyrus edit helper advices

- */

-public interface IEditHelperAdviceConstants {

-

-	public String NO_UI_KEY = "no_ui";

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes;
+
+
+/**
+ * Constants used by Papyrus edit helper advices
+ */
+public interface IEditHelperAdviceConstants {
+
+	public String NO_UI_KEY = "no_ui";
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IElementMatcherConfigurationModelCreation.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IElementMatcherConfigurationModelCreation.java
index 0e831b6b4d1..0e831b6b4d1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IElementMatcherConfigurationModelCreation.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IElementMatcherConfigurationModelCreation.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IElementMatcherExtensionPoint.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IElementMatcherExtensionPoint.java
index 81a1157c10c..81a1157c10c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IElementMatcherExtensionPoint.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IElementMatcherExtensionPoint.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedElementTypeFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedElementTypeFactory.java
index f15147da7be..f15147da7be 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedElementTypeFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedElementTypeFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedElementTypeSetExtensionPoint.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedElementTypeSetExtensionPoint.java
index 6ab8e147751..6ab8e147751 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedElementTypeSetExtensionPoint.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedElementTypeSetExtensionPoint.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedTypeConfigurationExtensionPoint.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedTypeConfigurationExtensionPoint.java
index b129474889c..b129474889c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedTypeConfigurationExtensionPoint.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedTypeConfigurationExtensionPoint.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/UserExtendedTypesRegistry.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/UserExtendedTypesRegistry.java
index e94d7291781..e94d7291781 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/UserExtendedTypesRegistry.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/UserExtendedTypesRegistry.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/advices/ExtendedTypesOwnerAdvice.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/advices/ExtendedTypesOwnerAdvice.java
index 76c7c0d7dd1..76c7c0d7dd1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/advices/ExtendedTypesOwnerAdvice.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/advices/ExtendedTypesOwnerAdvice.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/internal/spi/IUserExtendedTypesProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/internal/spi/IUserExtendedTypesProvider.java
index ca558417d00..ca558417d00 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/internal/spi/IUserExtendedTypesProvider.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/internal/spi/IUserExtendedTypesProvider.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationContainerDescriptor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationContainerDescriptor.java
index 8e85a2ca13c..8e85a2ca13c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationContainerDescriptor.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationContainerDescriptor.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationModelCreation.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationModelCreation.java
index 4d294cd94a9..4d294cd94a9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationModelCreation.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationModelCreation.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerEditHelperAdvice.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerEditHelperAdvice.java
index 5dace245400..5dace245400 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerEditHelperAdvice.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerEditHelperAdvice.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerMatcher.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerMatcher.java
index 1998d627068..1998d627068 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerMatcher.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerMatcher.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRuleCreationElementValidator.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRuleCreationElementValidator.java
index 20d119ccd7b..20d119ccd7b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRuleCreationElementValidator.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRuleCreationElementValidator.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRuleEditHelperAdvice.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRuleEditHelperAdvice.java
index c58c5842a5d..c58c5842a5d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRuleEditHelperAdvice.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRuleEditHelperAdvice.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRuleElementMatcher.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRuleElementMatcher.java
index 233ca8c7707..233ca8c7707 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRuleElementMatcher.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRuleElementMatcher.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantConfigurationModelCreation.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantConfigurationModelCreation.java
index c089f4d28cc..c089f4d28cc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantConfigurationModelCreation.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantConfigurationModelCreation.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantContainerDescriptor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantContainerDescriptor.java
index 75da81c8f4d..75da81c8f4d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantContainerDescriptor.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantContainerDescriptor.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantCreationElementValidator.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantCreationElementValidator.java
index abeb9cafa6a..abeb9cafa6a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantCreationElementValidator.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantCreationElementValidator.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantEditHelperAdvice.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantEditHelperAdvice.java
index d50cf3ddd43..d50cf3ddd43 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantEditHelperAdvice.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantEditHelperAdvice.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantElementMatcher.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantElementMatcher.java
index 361021e0d74..361021e0d74 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantElementMatcher.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantElementMatcher.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantRuleExtensionPoint.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantRuleExtensionPoint.java
index 17551f2b2ae..17551f2b2ae 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantRuleExtensionPoint.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantRuleExtensionPoint.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantElementTypeFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantElementTypeFactory.java
index 882fe8ab63f..882fe8ab63f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantElementTypeFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantElementTypeFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeContainerDescriptor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeContainerDescriptor.java
index 3d5e695d937..3d5e695d937 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeContainerDescriptor.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeContainerDescriptor.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeEditHelperAdvice.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeEditHelperAdvice.java
index 401b8330c88..401b8330c88 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeEditHelperAdvice.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeEditHelperAdvice.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRuleCreationElementValidator.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRuleCreationElementValidator.java
index 815538de96d..815538de96d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRuleCreationElementValidator.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRuleCreationElementValidator.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRuleEditHelperAdvice.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRuleEditHelperAdvice.java
index b3bbcb1deeb..b3bbcb1deeb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRuleEditHelperAdvice.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRuleEditHelperAdvice.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRuleElementMatcher.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRuleElementMatcher.java
index dfd9aea8d50..dfd9aea8d50 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRuleElementMatcher.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRuleElementMatcher.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/RuleConfigurationFactoryRegistry.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/RuleConfigurationFactoryRegistry.java
index 1f5c0f214f8..1f5c0f214f8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/RuleConfigurationFactoryRegistry.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/RuleConfigurationFactoryRegistry.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/semantic/ISemanticTypeFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/semantic/ISemanticTypeFactory.java
index 2502447d1f9..2502447d1f9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/semantic/ISemanticTypeFactory.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/semantic/ISemanticTypeFactory.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/types/ExtendedHintedElementType.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/types/ExtendedHintedElementType.java
index 8c75f235bf1..8c75f235bf1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/types/ExtendedHintedElementType.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/types/ExtendedHintedElementType.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/types/IExtendedHintedElementType.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/types/IExtendedHintedElementType.java
index c33df0e396f..c33df0e396f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/types/IExtendedHintedElementType.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/types/IExtendedHintedElementType.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/util/ElementTypeUtils.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/util/ElementTypeUtils.java
index 0be7bad9d21..0be7bad9d21 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/util/ElementTypeUtils.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/util/ElementTypeUtils.java
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/util/InternalUtils.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/util/InternalUtils.java
index 8ae43cff4e3..8ae43cff4e3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/util/InternalUtils.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/util/InternalUtils.java
diff --git a/plugins/infra/xtypes/pom.xml b/plugins/infra/xtypes/pom.xml
new file mode 100644
index 00000000000..fc325def5f6
--- /dev/null
+++ b/plugins/infra/xtypes/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.infra-xtypes</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+	<name>Papyrus Infra Extended Element Types</name>
+	<description>Plug-ins contributing model-driven "extended" types to the GMF Run-time Element-Types registry.</description>
+
+	<modules>
+		<module>org.eclipse.papyrus.infra.extendedtypes</module>
+		<module>org.eclipse.papyrus.infra.extendedtypes.edit</module>
+		<module>org.eclipse.papyrus.infra.extendedtypes.emf</module>
+		<module>org.eclipse.papyrus.infra.extendedtypes.ui</module>
+	</modules>
+</project>